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 #ifndef GOT_DEFAULT_EDITOR
72 #define GOT_DEFAULT_EDITOR "/usr/bin/vi"
75 static volatile sig_atomic_t sigint_received;
76 static volatile sig_atomic_t sigpipe_received;
79 catch_sigint(int signo)
85 catch_sigpipe(int signo)
93 const struct got_error *(*cmd_main)(int, char *[]);
94 void (*cmd_usage)(void);
95 const char *cmd_alias;
98 __dead static void usage(int, int);
99 __dead static void usage_import(void);
100 __dead static void usage_clone(void);
101 __dead static void usage_fetch(void);
102 __dead static void usage_checkout(void);
103 __dead static void usage_update(void);
104 __dead static void usage_log(void);
105 __dead static void usage_diff(void);
106 __dead static void usage_blame(void);
107 __dead static void usage_tree(void);
108 __dead static void usage_status(void);
109 __dead static void usage_ref(void);
110 __dead static void usage_branch(void);
111 __dead static void usage_tag(void);
112 __dead static void usage_add(void);
113 __dead static void usage_remove(void);
114 __dead static void usage_patch(void);
115 __dead static void usage_revert(void);
116 __dead static void usage_commit(void);
117 __dead static void usage_send(void);
118 __dead static void usage_cherrypick(void);
119 __dead static void usage_backout(void);
120 __dead static void usage_rebase(void);
121 __dead static void usage_histedit(void);
122 __dead static void usage_integrate(void);
123 __dead static void usage_merge(void);
124 __dead static void usage_stage(void);
125 __dead static void usage_unstage(void);
126 __dead static void usage_cat(void);
127 __dead static void usage_info(void);
129 static const struct got_error* cmd_import(int, char *[]);
130 static const struct got_error* cmd_clone(int, char *[]);
131 static const struct got_error* cmd_fetch(int, char *[]);
132 static const struct got_error* cmd_checkout(int, char *[]);
133 static const struct got_error* cmd_update(int, char *[]);
134 static const struct got_error* cmd_log(int, char *[]);
135 static const struct got_error* cmd_diff(int, char *[]);
136 static const struct got_error* cmd_blame(int, char *[]);
137 static const struct got_error* cmd_tree(int, char *[]);
138 static const struct got_error* cmd_status(int, char *[]);
139 static const struct got_error* cmd_ref(int, char *[]);
140 static const struct got_error* cmd_branch(int, char *[]);
141 static const struct got_error* cmd_tag(int, char *[]);
142 static const struct got_error* cmd_add(int, char *[]);
143 static const struct got_error* cmd_remove(int, char *[]);
144 static const struct got_error* cmd_patch(int, char *[]);
145 static const struct got_error* cmd_revert(int, char *[]);
146 static const struct got_error* cmd_commit(int, char *[]);
147 static const struct got_error* cmd_send(int, char *[]);
148 static const struct got_error* cmd_cherrypick(int, char *[]);
149 static const struct got_error* cmd_backout(int, char *[]);
150 static const struct got_error* cmd_rebase(int, char *[]);
151 static const struct got_error* cmd_histedit(int, char *[]);
152 static const struct got_error* cmd_integrate(int, char *[]);
153 static const struct got_error* cmd_merge(int, char *[]);
154 static const struct got_error* cmd_stage(int, char *[]);
155 static const struct got_error* cmd_unstage(int, char *[]);
156 static const struct got_error* cmd_cat(int, char *[]);
157 static const struct got_error* cmd_info(int, char *[]);
159 static const struct got_cmd got_commands[] = {
160 { "import", cmd_import, usage_import, "im" },
161 { "clone", cmd_clone, usage_clone, "cl" },
162 { "fetch", cmd_fetch, usage_fetch, "fe" },
163 { "checkout", cmd_checkout, usage_checkout, "co" },
164 { "update", cmd_update, usage_update, "up" },
165 { "log", cmd_log, usage_log, "" },
166 { "diff", cmd_diff, usage_diff, "di" },
167 { "blame", cmd_blame, usage_blame, "bl" },
168 { "tree", cmd_tree, usage_tree, "tr" },
169 { "status", cmd_status, usage_status, "st" },
170 { "ref", cmd_ref, usage_ref, "" },
171 { "branch", cmd_branch, usage_branch, "br" },
172 { "tag", cmd_tag, usage_tag, "" },
173 { "add", cmd_add, usage_add, "" },
174 { "remove", cmd_remove, usage_remove, "rm" },
175 { "patch", cmd_patch, usage_patch, "pa" },
176 { "revert", cmd_revert, usage_revert, "rv" },
177 { "commit", cmd_commit, usage_commit, "ci" },
178 { "send", cmd_send, usage_send, "se" },
179 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
180 { "backout", cmd_backout, usage_backout, "bo" },
181 { "rebase", cmd_rebase, usage_rebase, "rb" },
182 { "histedit", cmd_histedit, usage_histedit, "he" },
183 { "integrate", cmd_integrate, usage_integrate,"ig" },
184 { "merge", cmd_merge, usage_merge, "mg" },
185 { "stage", cmd_stage, usage_stage, "sg" },
186 { "unstage", cmd_unstage, usage_unstage, "ug" },
187 { "cat", cmd_cat, usage_cat, "" },
188 { "info", cmd_info, usage_info, "" },
192 list_commands(FILE *fp)
196 fprintf(fp, "commands:");
197 for (i = 0; i < nitems(got_commands); i++) {
198 const struct got_cmd *cmd = &got_commands[i];
199 fprintf(fp, " %s", cmd->cmd_name);
205 option_conflict(char a, char b)
207 errx(1, "-%c and -%c options are mutually exclusive", a, b);
211 main(int argc, char *argv[])
213 const struct got_cmd *cmd;
216 int hflag = 0, Vflag = 0;
217 static const struct option longopts[] = {
218 { "version", no_argument, NULL, 'V' },
222 setlocale(LC_CTYPE, "");
224 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
244 got_version_print_str();
249 usage(hflag, hflag ? 0 : 1);
251 signal(SIGINT, catch_sigint);
252 signal(SIGPIPE, catch_sigpipe);
254 for (i = 0; i < nitems(got_commands); i++) {
255 const struct got_error *error;
257 cmd = &got_commands[i];
259 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
260 strcmp(cmd->cmd_alias, argv[0]) != 0)
266 error = cmd->cmd_main(argc, argv);
267 if (error && error->code != GOT_ERR_CANCELLED &&
268 error->code != GOT_ERR_PRIVSEP_EXIT &&
269 !(sigpipe_received &&
270 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
272 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
274 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
281 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
282 list_commands(stderr);
287 usage(int hflag, int status)
289 FILE *fp = (status == 0) ? stdout : stderr;
291 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
298 static const struct got_error *
299 get_editor(char **abspath)
301 const struct got_error *err = NULL;
306 editor = getenv("VISUAL");
308 editor = getenv("EDITOR");
311 err = got_path_find_prog(abspath, editor);
316 if (*abspath == NULL) {
317 *abspath = strdup(GOT_DEFAULT_EDITOR);
318 if (*abspath == NULL)
319 return got_error_from_errno("strdup");
325 static const struct got_error *
326 apply_unveil(const char *repo_path, int repo_read_only,
327 const char *worktree_path)
329 const struct got_error *err;
332 if (unveil("gmon.out", "rwc") != 0)
333 return got_error_from_errno2("unveil", "gmon.out");
335 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
336 return got_error_from_errno2("unveil", repo_path);
338 if (worktree_path && unveil(worktree_path, "rwc") != 0)
339 return got_error_from_errno2("unveil", worktree_path);
341 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
342 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
344 err = got_privsep_unveil_exec_helpers();
348 if (unveil(NULL, NULL) != 0)
349 return got_error_from_errno("unveil");
357 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
358 "[-r repository-path] directory\n", getprogname());
363 spawn_editor(const char *editor, const char *file)
366 sig_t sighup, sigint, sigquit;
369 sighup = signal(SIGHUP, SIG_IGN);
370 sigint = signal(SIGINT, SIG_IGN);
371 sigquit = signal(SIGQUIT, SIG_IGN);
373 switch (pid = fork()) {
377 execl(editor, editor, file, (char *)NULL);
381 while (waitpid(pid, &st, 0) == -1)
386 (void)signal(SIGHUP, sighup);
387 (void)signal(SIGINT, sigint);
388 (void)signal(SIGQUIT, sigquit);
390 if (!WIFEXITED(st)) {
395 return WEXITSTATUS(st);
398 static const struct got_error *
399 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
401 const struct got_error *err = NULL;
408 if (fseeko(fp, 0L, SEEK_SET) == -1)
409 return got_error_from_errno("fseeko");
411 *logmsg = malloc(filesize + 1);
413 return got_error_from_errno("malloc");
416 while (getline(&line, &linesize, fp) != -1) {
417 if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
418 continue; /* remove comments and leading empty lines */
419 *len = strlcat(*logmsg, line, filesize + 1);
420 if (*len >= filesize + 1) {
421 err = got_error(GOT_ERR_NO_SPACE);
426 err = got_ferror(fp, GOT_ERR_IO);
430 while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
431 (*logmsg)[*len - 1] = '\0';
444 static const struct got_error *
445 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
446 const char *initial_content, size_t initial_content_len,
447 int require_modification)
449 const struct got_error *err = NULL;
456 if (stat(logmsg_path, &st) == -1)
457 return got_error_from_errno2("stat", logmsg_path);
459 if (spawn_editor(editor, logmsg_path) == -1)
460 return got_error_from_errno("failed spawning editor");
462 if (require_modification) {
463 struct timespec timeout;
467 nanosleep(&timeout, NULL);
470 if (stat(logmsg_path, &st2) == -1)
471 return got_error_from_errno2("stat", logmsg_path);
473 if (require_modification && st.st_size == st2.st_size &&
474 timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
475 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
476 "no changes made to commit message, aborting");
478 fp = fopen(logmsg_path, "re");
480 err = got_error_from_errno("fopen");
484 /* strip comments and leading/trailing newlines */
485 err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
488 if (logmsg_len == 0) {
489 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
490 "commit message cannot be empty, aborting");
494 if (fp && fclose(fp) == EOF && err == NULL)
495 err = got_error_from_errno("fclose");
503 static const struct got_error *
504 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
505 const char *path_dir, const char *branch_name)
507 char *initial_content = NULL;
508 const struct got_error *err = NULL;
509 int initial_content_len;
512 initial_content_len = asprintf(&initial_content,
513 "\n# %s to be imported to branch %s\n", path_dir,
515 if (initial_content_len == -1)
516 return got_error_from_errno("asprintf");
518 err = got_opentemp_named_fd(logmsg_path, &fd,
519 GOT_TMPDIR_STR "/got-importmsg", "");
523 if (write(fd, initial_content, initial_content_len) == -1) {
524 err = got_error_from_errno2("write", *logmsg_path);
527 if (close(fd) == -1) {
528 err = got_error_from_errno2("close", *logmsg_path);
533 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
534 initial_content_len, 1);
536 if (fd != -1 && close(fd) == -1 && err == NULL)
537 err = got_error_from_errno2("close", *logmsg_path);
538 free(initial_content);
546 static const struct got_error *
547 import_progress(void *arg, const char *path)
549 printf("A %s\n", path);
553 static const struct got_error *
554 valid_author(const char *author)
556 const char *email = author;
559 * Git' expects the author (or committer) to be in the form
560 * "name <email>", which are mostly free form (see the
561 * "committer" description in git-fast-import(1)). We're only
562 * doing this to avoid git's object parser breaking on commits
566 while (*author && *author != '\n' && *author != '<' && *author != '>')
568 if (author != email && *author == '<' && *(author - 1) != ' ')
569 return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
570 "between author name and email required", email);
571 if (*author++ != '<')
572 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
573 while (*author && *author != '\n' && *author != '<' && *author != '>')
575 if (strcmp(author, ">") != 0)
576 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
580 static const struct got_error *
581 get_author(char **author, struct got_repository *repo,
582 struct got_worktree *worktree)
584 const struct got_error *err = NULL;
585 const char *got_author = NULL, *name, *email;
586 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
591 worktree_conf = got_worktree_get_gotconfig(worktree);
592 repo_conf = got_repo_get_gotconfig(repo);
595 * Priority of potential author information sources, from most
596 * significant to least significant:
597 * 1) work tree's .got/got.conf file
598 * 2) repository's got.conf file
599 * 3) repository's git config file
600 * 4) environment variables
601 * 5) global git config files (in user's home directory or /etc)
605 got_author = got_gotconfig_get_author(worktree_conf);
606 if (got_author == NULL)
607 got_author = got_gotconfig_get_author(repo_conf);
608 if (got_author == NULL) {
609 name = got_repo_get_gitconfig_author_name(repo);
610 email = got_repo_get_gitconfig_author_email(repo);
612 if (asprintf(author, "%s <%s>", name, email) == -1)
613 return got_error_from_errno("asprintf");
617 got_author = getenv("GOT_AUTHOR");
618 if (got_author == NULL) {
619 name = got_repo_get_global_gitconfig_author_name(repo);
620 email = got_repo_get_global_gitconfig_author_email(
623 if (asprintf(author, "%s <%s>", name, email)
625 return got_error_from_errno("asprintf");
628 /* TODO: Look up user in password database? */
629 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
633 *author = strdup(got_author);
635 return got_error_from_errno("strdup");
637 err = valid_author(*author);
645 static const struct got_error *
646 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
647 struct got_worktree *worktree)
649 const char *got_allowed_signers = NULL;
650 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
652 *allowed_signers = NULL;
655 worktree_conf = got_worktree_get_gotconfig(worktree);
656 repo_conf = got_repo_get_gotconfig(repo);
659 * Priority of potential author information sources, from most
660 * significant to least significant:
661 * 1) work tree's .got/got.conf file
662 * 2) repository's got.conf file
666 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
668 if (got_allowed_signers == NULL)
669 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
672 if (got_allowed_signers) {
673 *allowed_signers = strdup(got_allowed_signers);
674 if (*allowed_signers == NULL)
675 return got_error_from_errno("strdup");
680 static const struct got_error *
681 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
682 struct got_worktree *worktree)
684 const char *got_revoked_signers = NULL;
685 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
687 *revoked_signers = NULL;
690 worktree_conf = got_worktree_get_gotconfig(worktree);
691 repo_conf = got_repo_get_gotconfig(repo);
694 * Priority of potential author information sources, from most
695 * significant to least significant:
696 * 1) work tree's .got/got.conf file
697 * 2) repository's got.conf file
701 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
703 if (got_revoked_signers == NULL)
704 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
707 if (got_revoked_signers) {
708 *revoked_signers = strdup(got_revoked_signers);
709 if (*revoked_signers == NULL)
710 return got_error_from_errno("strdup");
716 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
718 const char *got_signer_id = NULL;
719 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
722 worktree_conf = got_worktree_get_gotconfig(worktree);
723 repo_conf = got_repo_get_gotconfig(repo);
726 * Priority of potential author information sources, from most
727 * significant to least significant:
728 * 1) work tree's .got/got.conf file
729 * 2) repository's got.conf file
733 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
734 if (got_signer_id == NULL)
735 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
737 return got_signer_id;
740 static const struct got_error *
741 get_gitconfig_path(char **gitconfig_path)
743 const char *homedir = getenv("HOME");
745 *gitconfig_path = NULL;
747 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
748 return got_error_from_errno("asprintf");
754 static const struct got_error *
755 cmd_import(int argc, char *argv[])
757 const struct got_error *error = NULL;
758 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
759 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
760 const char *branch_name = NULL;
761 char *id_str = NULL, *logmsg_path = NULL;
762 char refname[PATH_MAX] = "refs/heads/";
763 struct got_repository *repo = NULL;
764 struct got_reference *branch_ref = NULL, *head_ref = NULL;
765 struct got_object_id *new_commit_id = NULL;
767 struct got_pathlist_head ignores;
768 struct got_pathlist_entry *pe;
769 int preserve_logmsg = 0;
770 int *pack_fds = NULL;
772 TAILQ_INIT(&ignores);
775 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
781 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
784 branch_name = optarg;
787 if (optarg[0] == '\0')
789 error = got_pathlist_insert(&pe, &ignores, optarg,
795 logmsg = strdup(optarg);
796 if (logmsg == NULL) {
797 error = got_error_from_errno("strdup");
802 repo_path = realpath(optarg, NULL);
803 if (repo_path == NULL) {
804 error = got_error_from_errno2("realpath",
821 if (repo_path == NULL) {
822 repo_path = getcwd(NULL, 0);
823 if (repo_path == NULL)
824 return got_error_from_errno("getcwd");
826 got_path_strip_trailing_slashes(repo_path);
827 error = get_gitconfig_path(&gitconfig_path);
830 error = got_repo_pack_fds_open(&pack_fds);
833 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
837 path_dir = realpath(argv[0], NULL);
838 if (path_dir == NULL) {
839 error = got_error_from_errno2("realpath", argv[0]);
842 got_path_strip_trailing_slashes(path_dir);
844 error = get_editor(&editor);
848 if (unveil(path_dir, "r") != 0) {
849 error = got_error_from_errno2("unveil", path_dir);
852 if (unveil(editor, "x") != 0) {
853 error = got_error_from_errno2("unveil", editor);
856 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
860 error = get_author(&author, repo, NULL);
865 * Don't let the user create a branch name with a leading '-'.
866 * While technically a valid reference name, this case is usually
867 * an unintended typo.
869 if (branch_name && branch_name[0] == '-')
870 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
872 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
873 if (error && error->code != GOT_ERR_NOT_REF)
877 n = strlcat(refname, branch_name, sizeof(refname));
878 else if (head_ref && got_ref_is_symbolic(head_ref))
879 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
882 n = strlcat(refname, "main", sizeof(refname));
883 if (n >= sizeof(refname)) {
884 error = got_error(GOT_ERR_NO_SPACE);
888 error = got_ref_open(&branch_ref, repo, refname, 0);
890 if (error->code != GOT_ERR_NOT_REF)
893 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
894 "import target branch already exists");
898 if (logmsg == NULL || *logmsg == '\0') {
900 error = collect_import_msg(&logmsg, &logmsg_path, editor,
903 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
910 error = got_repo_import(&new_commit_id, path_dir, logmsg,
911 author, &ignores, repo, import_progress, NULL);
918 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
925 error = got_ref_write(branch_ref, repo);
932 error = got_object_id_str(&id_str, new_commit_id);
939 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
941 if (error->code != GOT_ERR_NOT_REF) {
947 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
955 error = got_ref_write(head_ref, repo);
963 printf("Created branch %s with commit %s\n",
964 got_ref_get_name(branch_ref), id_str);
967 const struct got_error *pack_err =
968 got_repo_pack_fds_close(pack_fds);
973 const struct got_error *close_err = got_repo_close(repo);
977 if (preserve_logmsg) {
978 fprintf(stderr, "%s: log message preserved in %s\n",
979 getprogname(), logmsg_path);
980 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
981 error = got_error_from_errno2("unlink", logmsg_path);
989 free(gitconfig_path);
991 got_ref_close(branch_ref);
993 got_ref_close(head_ref);
1000 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
1001 "repository-URL [directory]\n", getprogname());
1005 struct got_fetch_progress_arg {
1006 char last_scaled_size[FMT_SCALED_STRSIZE];
1008 int last_p_resolved;
1011 struct got_repository *repo;
1014 int configs_created;
1016 struct got_pathlist_head *symrefs;
1017 struct got_pathlist_head *wanted_branches;
1018 struct got_pathlist_head *wanted_refs;
1022 const char *remote_repo_path;
1023 const char *git_url;
1024 int fetch_all_branches;
1025 int mirror_references;
1029 /* XXX forward declaration */
1030 static const struct got_error *
1031 create_config_files(const char *proto, const char *host, const char *port,
1032 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1033 int mirror_references, struct got_pathlist_head *symrefs,
1034 struct got_pathlist_head *wanted_branches,
1035 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1037 static const struct got_error *
1038 fetch_progress(void *arg, const char *message, off_t packfile_size,
1039 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1041 const struct got_error *err = NULL;
1042 struct got_fetch_progress_arg *a = arg;
1043 char scaled_size[FMT_SCALED_STRSIZE];
1044 int p_indexed, p_resolved;
1045 int print_size = 0, print_indexed = 0, print_resolved = 0;
1048 * In order to allow a failed clone to be resumed with 'got fetch'
1049 * we try to create configuration files as soon as possible.
1050 * Once the server has sent information about its default branch
1051 * we have all required information.
1053 if (a->create_configs && !a->configs_created &&
1054 !TAILQ_EMPTY(a->config_info.symrefs)) {
1055 err = create_config_files(a->config_info.proto,
1056 a->config_info.host, a->config_info.port,
1057 a->config_info.remote_repo_path,
1058 a->config_info.git_url,
1059 a->config_info.fetch_all_branches,
1060 a->config_info.mirror_references,
1061 a->config_info.symrefs,
1062 a->config_info.wanted_branches,
1063 a->config_info.wanted_refs, a->repo);
1066 a->configs_created = 1;
1069 if (a->verbosity < 0)
1072 if (message && message[0] != '\0') {
1073 printf("\rserver: %s", message);
1078 if (packfile_size > 0 || nobj_indexed > 0) {
1079 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1080 (a->last_scaled_size[0] == '\0' ||
1081 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1083 if (strlcpy(a->last_scaled_size, scaled_size,
1084 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1085 return got_error(GOT_ERR_NO_SPACE);
1087 if (nobj_indexed > 0) {
1088 p_indexed = (nobj_indexed * 100) / nobj_total;
1089 if (p_indexed != a->last_p_indexed) {
1090 a->last_p_indexed = p_indexed;
1095 if (nobj_resolved > 0) {
1096 p_resolved = (nobj_resolved * 100) /
1097 (nobj_total - nobj_loose);
1098 if (p_resolved != a->last_p_resolved) {
1099 a->last_p_resolved = p_resolved;
1107 if (print_size || print_indexed || print_resolved)
1110 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1112 printf("; indexing %d%%", p_indexed);
1114 printf("; resolving deltas %d%%", p_resolved);
1115 if (print_size || print_indexed || print_resolved)
1121 static const struct got_error *
1122 create_symref(const char *refname, struct got_reference *target_ref,
1123 int verbosity, struct got_repository *repo)
1125 const struct got_error *err;
1126 struct got_reference *head_symref;
1128 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1132 err = got_ref_write(head_symref, repo);
1133 if (err == NULL && verbosity > 0) {
1134 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1135 got_ref_get_name(target_ref));
1137 got_ref_close(head_symref);
1141 static const struct got_error *
1142 list_remote_refs(struct got_pathlist_head *symrefs,
1143 struct got_pathlist_head *refs)
1145 const struct got_error *err;
1146 struct got_pathlist_entry *pe;
1148 TAILQ_FOREACH(pe, symrefs, entry) {
1149 const char *refname = pe->path;
1150 const char *targetref = pe->data;
1152 printf("%s: %s\n", refname, targetref);
1155 TAILQ_FOREACH(pe, refs, entry) {
1156 const char *refname = pe->path;
1157 struct got_object_id *id = pe->data;
1160 err = got_object_id_str(&id_str, id);
1163 printf("%s: %s\n", refname, id_str);
1170 static const struct got_error *
1171 create_ref(const char *refname, struct got_object_id *id,
1172 int verbosity, struct got_repository *repo)
1174 const struct got_error *err = NULL;
1175 struct got_reference *ref;
1178 err = got_object_id_str(&id_str, id);
1182 err = got_ref_alloc(&ref, refname, id);
1186 err = got_ref_write(ref, repo);
1189 if (err == NULL && verbosity >= 0)
1190 printf("Created reference %s: %s\n", refname, id_str);
1197 match_wanted_ref(const char *refname, const char *wanted_ref)
1199 if (strncmp(refname, "refs/", 5) != 0)
1204 * Prevent fetching of references that won't make any
1205 * sense outside of the remote repository's context.
1207 if (strncmp(refname, "got/", 4) == 0)
1209 if (strncmp(refname, "remotes/", 8) == 0)
1212 if (strncmp(wanted_ref, "refs/", 5) == 0)
1215 /* Allow prefix match. */
1216 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1219 /* Allow exact match. */
1220 return (strcmp(refname, wanted_ref) == 0);
1224 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1226 struct got_pathlist_entry *pe;
1228 TAILQ_FOREACH(pe, wanted_refs, entry) {
1229 if (match_wanted_ref(refname, pe->path))
1236 static const struct got_error *
1237 create_wanted_ref(const char *refname, struct got_object_id *id,
1238 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1240 const struct got_error *err;
1241 char *remote_refname;
1243 if (strncmp("refs/", refname, 5) == 0)
1246 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1247 remote_repo_name, refname) == -1)
1248 return got_error_from_errno("asprintf");
1250 err = create_ref(remote_refname, id, verbosity, repo);
1251 free(remote_refname);
1255 static const struct got_error *
1256 create_gotconfig(const char *proto, const char *host, const char *port,
1257 const char *remote_repo_path, const char *default_branch,
1258 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1259 struct got_pathlist_head *wanted_refs, int mirror_references,
1260 struct got_repository *repo)
1262 const struct got_error *err = NULL;
1263 char *gotconfig_path = NULL;
1264 char *gotconfig = NULL;
1265 FILE *gotconfig_file = NULL;
1266 const char *branchname = NULL;
1267 char *branches = NULL, *refs = NULL;
1270 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1271 struct got_pathlist_entry *pe;
1272 TAILQ_FOREACH(pe, wanted_branches, entry) {
1274 branchname = pe->path;
1275 if (strncmp(branchname, "refs/heads/", 11) == 0)
1277 if (asprintf(&s, "%s\"%s\" ",
1278 branches ? branches : "", branchname) == -1) {
1279 err = got_error_from_errno("asprintf");
1285 } else if (!fetch_all_branches && default_branch) {
1286 branchname = default_branch;
1287 if (strncmp(branchname, "refs/heads/", 11) == 0)
1289 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1290 err = got_error_from_errno("asprintf");
1294 if (!TAILQ_EMPTY(wanted_refs)) {
1295 struct got_pathlist_entry *pe;
1296 TAILQ_FOREACH(pe, wanted_refs, entry) {
1298 const char *refname = pe->path;
1299 if (strncmp(refname, "refs/", 5) == 0)
1301 if (asprintf(&s, "%s\"%s\" ",
1302 refs ? refs : "", refname) == -1) {
1303 err = got_error_from_errno("asprintf");
1311 /* Create got.conf(5). */
1312 gotconfig_path = got_repo_get_path_gotconfig(repo);
1313 if (gotconfig_path == NULL) {
1314 err = got_error_from_errno("got_repo_get_path_gotconfig");
1317 gotconfig_file = fopen(gotconfig_path, "ae");
1318 if (gotconfig_file == NULL) {
1319 err = got_error_from_errno2("fopen", gotconfig_path);
1322 if (asprintf(&gotconfig,
1327 "\trepository \"%s\"\n"
1333 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1334 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1335 remote_repo_path, branches ? "\tbranch { " : "",
1336 branches ? branches : "", branches ? "}\n" : "",
1337 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1338 mirror_references ? "\tmirror_references yes\n" : "",
1339 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1340 err = got_error_from_errno("asprintf");
1343 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1344 if (n != strlen(gotconfig)) {
1345 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1350 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1351 err = got_error_from_errno2("fclose", gotconfig_path);
1352 free(gotconfig_path);
1357 static const struct got_error *
1358 create_gitconfig(const char *git_url, const char *default_branch,
1359 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1360 struct got_pathlist_head *wanted_refs, int mirror_references,
1361 struct got_repository *repo)
1363 const struct got_error *err = NULL;
1364 char *gitconfig_path = NULL;
1365 char *gitconfig = NULL;
1366 FILE *gitconfig_file = NULL;
1367 char *branches = NULL, *refs = NULL;
1368 const char *branchname;
1371 /* Create a config file Git can understand. */
1372 gitconfig_path = got_repo_get_path_gitconfig(repo);
1373 if (gitconfig_path == NULL) {
1374 err = got_error_from_errno("got_repo_get_path_gitconfig");
1377 gitconfig_file = fopen(gitconfig_path, "ae");
1378 if (gitconfig_file == NULL) {
1379 err = got_error_from_errno2("fopen", gitconfig_path);
1382 if (fetch_all_branches) {
1383 if (mirror_references) {
1384 if (asprintf(&branches,
1385 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1386 err = got_error_from_errno("asprintf");
1389 } else if (asprintf(&branches,
1390 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1391 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1392 err = got_error_from_errno("asprintf");
1395 } else if (!TAILQ_EMPTY(wanted_branches)) {
1396 struct got_pathlist_entry *pe;
1397 TAILQ_FOREACH(pe, wanted_branches, entry) {
1399 branchname = pe->path;
1400 if (strncmp(branchname, "refs/heads/", 11) == 0)
1402 if (mirror_references) {
1404 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1405 branches ? branches : "",
1406 branchname, branchname) == -1) {
1407 err = got_error_from_errno("asprintf");
1410 } else if (asprintf(&s,
1411 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1412 branches ? branches : "",
1413 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1414 branchname) == -1) {
1415 err = got_error_from_errno("asprintf");
1423 * If the server specified a default branch, use just that one.
1424 * Otherwise fall back to fetching all branches on next fetch.
1426 if (default_branch) {
1427 branchname = default_branch;
1428 if (strncmp(branchname, "refs/heads/", 11) == 0)
1431 branchname = "*"; /* fall back to all branches */
1432 if (mirror_references) {
1433 if (asprintf(&branches,
1434 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1435 branchname, branchname) == -1) {
1436 err = got_error_from_errno("asprintf");
1439 } else if (asprintf(&branches,
1440 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1441 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1442 branchname) == -1) {
1443 err = got_error_from_errno("asprintf");
1447 if (!TAILQ_EMPTY(wanted_refs)) {
1448 struct got_pathlist_entry *pe;
1449 TAILQ_FOREACH(pe, wanted_refs, entry) {
1451 const char *refname = pe->path;
1452 if (strncmp(refname, "refs/", 5) == 0)
1454 if (mirror_references) {
1456 "%s\tfetch = refs/%s:refs/%s\n",
1457 refs ? refs : "", refname, refname) == -1) {
1458 err = got_error_from_errno("asprintf");
1461 } else if (asprintf(&s,
1462 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1464 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1466 err = got_error_from_errno("asprintf");
1474 if (asprintf(&gitconfig,
1479 "\tfetch = refs/tags/*:refs/tags/*\n",
1480 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1481 refs ? refs : "") == -1) {
1482 err = got_error_from_errno("asprintf");
1485 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1486 if (n != strlen(gitconfig)) {
1487 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1491 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1492 err = got_error_from_errno2("fclose", gitconfig_path);
1493 free(gitconfig_path);
1498 static const struct got_error *
1499 create_config_files(const char *proto, const char *host, const char *port,
1500 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1501 int mirror_references, struct got_pathlist_head *symrefs,
1502 struct got_pathlist_head *wanted_branches,
1503 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1505 const struct got_error *err = NULL;
1506 const char *default_branch = NULL;
1507 struct got_pathlist_entry *pe;
1510 * If we asked for a set of wanted branches then use the first
1513 if (!TAILQ_EMPTY(wanted_branches)) {
1514 pe = TAILQ_FIRST(wanted_branches);
1515 default_branch = pe->path;
1517 /* First HEAD ref listed by server is the default branch. */
1518 TAILQ_FOREACH(pe, symrefs, entry) {
1519 const char *refname = pe->path;
1520 const char *target = pe->data;
1522 if (strcmp(refname, GOT_REF_HEAD) != 0)
1525 default_branch = target;
1530 /* Create got.conf(5). */
1531 err = create_gotconfig(proto, host, port, remote_repo_path,
1532 default_branch, fetch_all_branches, wanted_branches,
1533 wanted_refs, mirror_references, repo);
1537 /* Create a config file Git can understand. */
1538 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1539 wanted_branches, wanted_refs, mirror_references, repo);
1542 static const struct got_error *
1543 cmd_clone(int argc, char *argv[])
1545 const struct got_error *error = NULL;
1546 const char *uri, *dirname;
1547 char *proto, *host, *port, *repo_name, *server_path;
1548 char *default_destdir = NULL, *id_str = NULL;
1549 const char *repo_path;
1550 struct got_repository *repo = NULL;
1551 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1552 struct got_pathlist_entry *pe;
1553 struct got_object_id *pack_hash = NULL;
1554 int ch, fetchfd = -1, fetchstatus;
1555 pid_t fetchpid = -1;
1556 struct got_fetch_progress_arg fpa;
1557 char *git_url = NULL;
1558 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1559 int bflag = 0, list_refs_only = 0;
1560 int *pack_fds = NULL;
1563 TAILQ_INIT(&symrefs);
1564 TAILQ_INIT(&wanted_branches);
1565 TAILQ_INIT(&wanted_refs);
1567 while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1570 fetch_all_branches = 1;
1573 error = got_pathlist_append(&wanted_branches,
1583 mirror_references = 1;
1589 error = got_pathlist_append(&wanted_refs,
1597 else if (verbosity < 3)
1608 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1609 option_conflict('a', 'b');
1610 if (list_refs_only) {
1611 if (!TAILQ_EMPTY(&wanted_branches))
1612 option_conflict('l', 'b');
1613 if (fetch_all_branches)
1614 option_conflict('l', 'a');
1615 if (mirror_references)
1616 option_conflict('l', 'm');
1617 if (!TAILQ_EMPTY(&wanted_refs))
1618 option_conflict('l', 'R');
1630 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1635 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1636 host, port ? ":" : "", port ? port : "",
1637 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1638 error = got_error_from_errno("asprintf");
1642 if (strcmp(proto, "git") == 0) {
1644 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1645 "sendfd dns inet unveil", NULL) == -1)
1648 } else if (strcmp(proto, "git+ssh") == 0 ||
1649 strcmp(proto, "ssh") == 0 ||
1650 strcmp(proto, "git+http") == 0 ||
1651 strcmp(proto, "http") == 0 ||
1652 strcmp(proto, "git+https") == 0 ||
1653 strcmp(proto, "https") == 0) {
1655 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1656 "sendfd unveil", NULL) == -1)
1660 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1663 if (dirname == NULL) {
1664 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1665 error = got_error_from_errno("asprintf");
1668 repo_path = default_destdir;
1670 repo_path = dirname;
1672 if (!list_refs_only) {
1673 error = got_path_mkdir(repo_path);
1675 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1676 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1678 if (!got_path_dir_is_empty(repo_path)) {
1679 error = got_error_path(repo_path,
1680 GOT_ERR_DIR_NOT_EMPTY);
1685 error = got_dial_apply_unveil(proto);
1689 error = apply_unveil(repo_path, 0, NULL);
1694 printf("Connecting to %s\n", git_url);
1696 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1697 server_path, verbosity);
1702 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd",
1706 if (!list_refs_only) {
1707 error = got_repo_init(repo_path, NULL);
1710 error = got_repo_pack_fds_open(&pack_fds);
1713 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1718 fpa.last_scaled_size[0] = '\0';
1719 fpa.last_p_indexed = -1;
1720 fpa.last_p_resolved = -1;
1721 fpa.verbosity = verbosity;
1722 fpa.create_configs = 1;
1723 fpa.configs_created = 0;
1725 fpa.config_info.symrefs = &symrefs;
1726 fpa.config_info.wanted_branches = &wanted_branches;
1727 fpa.config_info.wanted_refs = &wanted_refs;
1728 fpa.config_info.proto = proto;
1729 fpa.config_info.host = host;
1730 fpa.config_info.port = port;
1731 fpa.config_info.remote_repo_path = server_path;
1732 fpa.config_info.git_url = git_url;
1733 fpa.config_info.fetch_all_branches = fetch_all_branches;
1734 fpa.config_info.mirror_references = mirror_references;
1735 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1736 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1737 fetch_all_branches, &wanted_branches, &wanted_refs,
1738 list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1739 fetch_progress, &fpa);
1743 if (list_refs_only) {
1744 error = list_remote_refs(&symrefs, &refs);
1748 if (pack_hash == NULL) {
1749 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1750 "server sent an empty pack file");
1753 error = got_object_id_str(&id_str, pack_hash);
1757 printf("\nFetched %s.pack\n", id_str);
1760 /* Set up references provided with the pack file. */
1761 TAILQ_FOREACH(pe, &refs, entry) {
1762 const char *refname = pe->path;
1763 struct got_object_id *id = pe->data;
1764 char *remote_refname;
1766 if (is_wanted_ref(&wanted_refs, refname) &&
1767 !mirror_references) {
1768 error = create_wanted_ref(refname, id,
1769 GOT_FETCH_DEFAULT_REMOTE_NAME,
1770 verbosity - 1, repo);
1776 error = create_ref(refname, id, verbosity - 1, repo);
1780 if (mirror_references)
1783 if (strncmp("refs/heads/", refname, 11) != 0)
1786 if (asprintf(&remote_refname,
1787 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1788 refname + 11) == -1) {
1789 error = got_error_from_errno("asprintf");
1792 error = create_ref(remote_refname, id, verbosity - 1, repo);
1793 free(remote_refname);
1798 /* Set the HEAD reference if the server provided one. */
1799 TAILQ_FOREACH(pe, &symrefs, entry) {
1800 struct got_reference *target_ref;
1801 const char *refname = pe->path;
1802 const char *target = pe->data;
1803 char *remote_refname = NULL, *remote_target = NULL;
1805 if (strcmp(refname, GOT_REF_HEAD) != 0)
1808 error = got_ref_open(&target_ref, repo, target, 0);
1810 if (error->code == GOT_ERR_NOT_REF) {
1817 error = create_symref(refname, target_ref, verbosity, repo);
1818 got_ref_close(target_ref);
1822 if (mirror_references)
1825 if (strncmp("refs/heads/", target, 11) != 0)
1828 if (asprintf(&remote_refname,
1829 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1831 error = got_error_from_errno("asprintf");
1834 if (asprintf(&remote_target,
1835 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1836 target + 11) == -1) {
1837 error = got_error_from_errno("asprintf");
1838 free(remote_refname);
1841 error = got_ref_open(&target_ref, repo, remote_target, 0);
1843 free(remote_refname);
1844 free(remote_target);
1845 if (error->code == GOT_ERR_NOT_REF) {
1851 error = create_symref(remote_refname, target_ref,
1852 verbosity - 1, repo);
1853 free(remote_refname);
1854 free(remote_target);
1855 got_ref_close(target_ref);
1861 * We failed to set the HEAD reference. If we asked for
1862 * a set of wanted branches use the first of one of those
1863 * which could be fetched instead.
1865 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1866 const char *target = pe->path;
1867 struct got_reference *target_ref;
1869 error = got_ref_open(&target_ref, repo, target, 0);
1871 if (error->code == GOT_ERR_NOT_REF) {
1878 error = create_symref(GOT_REF_HEAD, target_ref,
1880 got_ref_close(target_ref);
1886 if (!fpa.configs_created && pe != NULL) {
1887 error = create_config_files(fpa.config_info.proto,
1888 fpa.config_info.host, fpa.config_info.port,
1889 fpa.config_info.remote_repo_path,
1890 fpa.config_info.git_url,
1891 fpa.config_info.fetch_all_branches,
1892 fpa.config_info.mirror_references,
1893 fpa.config_info.symrefs,
1894 fpa.config_info.wanted_branches,
1895 fpa.config_info.wanted_refs, fpa.repo);
1902 printf("Created %s repository '%s'\n",
1903 mirror_references ? "mirrored" : "cloned", repo_path);
1906 const struct got_error *pack_err =
1907 got_repo_pack_fds_close(pack_fds);
1912 if (kill(fetchpid, SIGTERM) == -1)
1913 error = got_error_from_errno("kill");
1914 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1915 error = got_error_from_errno("waitpid");
1917 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1918 error = got_error_from_errno("close");
1920 const struct got_error *close_err = got_repo_close(repo);
1924 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1925 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1926 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1927 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1934 free(default_destdir);
1939 static const struct got_error *
1940 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1941 int replace_tags, int verbosity, struct got_repository *repo)
1943 const struct got_error *err = NULL;
1944 char *new_id_str = NULL;
1945 struct got_object_id *old_id = NULL;
1947 err = got_object_id_str(&new_id_str, new_id);
1951 if (!replace_tags &&
1952 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1953 err = got_ref_resolve(&old_id, repo, ref);
1956 if (got_object_id_cmp(old_id, new_id) == 0)
1958 if (verbosity >= 0) {
1959 printf("Rejecting update of existing tag %s: %s\n",
1960 got_ref_get_name(ref), new_id_str);
1965 if (got_ref_is_symbolic(ref)) {
1966 if (verbosity >= 0) {
1967 printf("Replacing reference %s: %s\n",
1968 got_ref_get_name(ref),
1969 got_ref_get_symref_target(ref));
1971 err = got_ref_change_symref_to_ref(ref, new_id);
1974 err = got_ref_write(ref, repo);
1978 err = got_ref_resolve(&old_id, repo, ref);
1981 if (got_object_id_cmp(old_id, new_id) == 0)
1984 err = got_ref_change_ref(ref, new_id);
1987 err = got_ref_write(ref, repo);
1993 printf("Updated %s: %s\n", got_ref_get_name(ref),
2001 static const struct got_error *
2002 update_symref(const char *refname, struct got_reference *target_ref,
2003 int verbosity, struct got_repository *repo)
2005 const struct got_error *err = NULL, *unlock_err;
2006 struct got_reference *symref;
2007 int symref_is_locked = 0;
2009 err = got_ref_open(&symref, repo, refname, 1);
2011 if (err->code != GOT_ERR_NOT_REF)
2013 err = got_ref_alloc_symref(&symref, refname, target_ref);
2017 err = got_ref_write(symref, repo);
2022 printf("Created reference %s: %s\n",
2023 got_ref_get_name(symref),
2024 got_ref_get_symref_target(symref));
2026 symref_is_locked = 1;
2028 if (strcmp(got_ref_get_symref_target(symref),
2029 got_ref_get_name(target_ref)) == 0)
2032 err = got_ref_change_symref(symref,
2033 got_ref_get_name(target_ref));
2037 err = got_ref_write(symref, repo);
2042 printf("Updated %s: %s\n", got_ref_get_name(symref),
2043 got_ref_get_symref_target(symref));
2047 if (symref_is_locked) {
2048 unlock_err = got_ref_unlock(symref);
2049 if (unlock_err && err == NULL)
2052 got_ref_close(symref);
2059 fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2060 "[-R reference] [-r repository-path] [remote-repository]\n",
2065 static const struct got_error *
2066 delete_missing_ref(struct got_reference *ref,
2067 int verbosity, struct got_repository *repo)
2069 const struct got_error *err = NULL;
2070 struct got_object_id *id = NULL;
2071 char *id_str = NULL;
2073 if (got_ref_is_symbolic(ref)) {
2074 err = got_ref_delete(ref, repo);
2077 if (verbosity >= 0) {
2078 printf("Deleted %s: %s\n",
2079 got_ref_get_name(ref),
2080 got_ref_get_symref_target(ref));
2083 err = got_ref_resolve(&id, repo, ref);
2086 err = got_object_id_str(&id_str, id);
2090 err = got_ref_delete(ref, repo);
2093 if (verbosity >= 0) {
2094 printf("Deleted %s: %s\n",
2095 got_ref_get_name(ref), id_str);
2104 static const struct got_error *
2105 delete_missing_refs(struct got_pathlist_head *their_refs,
2106 struct got_pathlist_head *their_symrefs,
2107 const struct got_remote_repo *remote,
2108 int verbosity, struct got_repository *repo)
2110 const struct got_error *err = NULL, *unlock_err;
2111 struct got_reflist_head my_refs;
2112 struct got_reflist_entry *re;
2113 struct got_pathlist_entry *pe;
2114 char *remote_namespace = NULL;
2115 char *local_refname = NULL;
2117 TAILQ_INIT(&my_refs);
2119 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2121 return got_error_from_errno("asprintf");
2123 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2127 TAILQ_FOREACH(re, &my_refs, entry) {
2128 const char *refname = got_ref_get_name(re->ref);
2129 const char *their_refname;
2131 if (remote->mirror_references) {
2132 their_refname = refname;
2134 if (strncmp(refname, remote_namespace,
2135 strlen(remote_namespace)) == 0) {
2136 if (strcmp(refname + strlen(remote_namespace),
2139 if (asprintf(&local_refname, "refs/heads/%s",
2140 refname + strlen(remote_namespace)) == -1) {
2141 err = got_error_from_errno("asprintf");
2144 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2147 their_refname = local_refname;
2150 TAILQ_FOREACH(pe, their_refs, entry) {
2151 if (strcmp(their_refname, pe->path) == 0)
2157 TAILQ_FOREACH(pe, their_symrefs, entry) {
2158 if (strcmp(their_refname, pe->path) == 0)
2164 err = delete_missing_ref(re->ref, verbosity, repo);
2168 if (local_refname) {
2169 struct got_reference *ref;
2170 err = got_ref_open(&ref, repo, local_refname, 1);
2172 if (err->code != GOT_ERR_NOT_REF)
2174 free(local_refname);
2175 local_refname = NULL;
2178 err = delete_missing_ref(ref, verbosity, repo);
2181 unlock_err = got_ref_unlock(ref);
2183 if (unlock_err && err == NULL) {
2188 free(local_refname);
2189 local_refname = NULL;
2193 got_ref_list_free(&my_refs);
2194 free(remote_namespace);
2195 free(local_refname);
2199 static const struct got_error *
2200 update_wanted_ref(const char *refname, struct got_object_id *id,
2201 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2203 const struct got_error *err, *unlock_err;
2204 char *remote_refname;
2205 struct got_reference *ref;
2207 if (strncmp("refs/", refname, 5) == 0)
2210 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2211 remote_repo_name, refname) == -1)
2212 return got_error_from_errno("asprintf");
2214 err = got_ref_open(&ref, repo, remote_refname, 1);
2216 if (err->code != GOT_ERR_NOT_REF)
2218 err = create_ref(remote_refname, id, verbosity, repo);
2220 err = update_ref(ref, id, 0, verbosity, repo);
2221 unlock_err = got_ref_unlock(ref);
2222 if (unlock_err && err == NULL)
2227 free(remote_refname);
2231 static const struct got_error *
2232 delete_ref(struct got_repository *repo, struct got_reference *ref)
2234 const struct got_error *err = NULL;
2235 struct got_object_id *id = NULL;
2236 char *id_str = NULL;
2239 if (got_ref_is_symbolic(ref)) {
2240 target = got_ref_get_symref_target(ref);
2242 err = got_ref_resolve(&id, repo, ref);
2245 err = got_object_id_str(&id_str, id);
2251 err = got_ref_delete(ref, repo);
2255 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2262 static const struct got_error *
2263 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2265 const struct got_error *err = NULL;
2266 struct got_reflist_head refs;
2267 struct got_reflist_entry *re;
2272 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2273 err = got_error_from_errno("asprintf");
2276 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2280 TAILQ_FOREACH(re, &refs, entry)
2281 delete_ref(repo, re->ref);
2283 got_ref_list_free(&refs);
2287 static const struct got_error *
2288 cmd_fetch(int argc, char *argv[])
2290 const struct got_error *error = NULL, *unlock_err;
2291 char *cwd = NULL, *repo_path = NULL;
2292 const char *remote_name;
2293 char *proto = NULL, *host = NULL, *port = NULL;
2294 char *repo_name = NULL, *server_path = NULL;
2295 const struct got_remote_repo *remotes;
2296 struct got_remote_repo *remote = NULL;
2298 char *id_str = NULL;
2299 struct got_repository *repo = NULL;
2300 struct got_worktree *worktree = NULL;
2301 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2302 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2303 char *head_refname = NULL;
2304 struct got_pathlist_entry *pe;
2305 struct got_reflist_head remote_refs;
2306 struct got_reflist_entry *re;
2307 struct got_object_id *pack_hash = NULL;
2308 int i, ch, fetchfd = -1, fetchstatus;
2309 pid_t fetchpid = -1;
2310 struct got_fetch_progress_arg fpa;
2311 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2312 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2313 int *pack_fds = NULL, have_bflag = 0;
2314 const char *remote_head = NULL, *worktree_branch = NULL;
2317 TAILQ_INIT(&symrefs);
2318 TAILQ_INIT(&remote_refs);
2319 TAILQ_INIT(&wanted_branches);
2320 TAILQ_INIT(&wanted_refs);
2322 while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2325 fetch_all_branches = 1;
2328 error = got_pathlist_append(&wanted_branches,
2344 error = got_pathlist_append(&wanted_refs,
2350 repo_path = realpath(optarg, NULL);
2351 if (repo_path == NULL)
2352 return got_error_from_errno2("realpath",
2354 got_path_strip_trailing_slashes(repo_path);
2362 else if (verbosity < 3)
2376 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2377 option_conflict('a', 'b');
2378 if (list_refs_only) {
2379 if (!TAILQ_EMPTY(&wanted_branches))
2380 option_conflict('l', 'b');
2381 if (fetch_all_branches)
2382 option_conflict('l', 'a');
2384 option_conflict('l', 'd');
2386 option_conflict('l', 'X');
2388 if (delete_remote) {
2389 if (fetch_all_branches)
2390 option_conflict('X', 'a');
2391 if (!TAILQ_EMPTY(&wanted_branches))
2392 option_conflict('X', 'b');
2394 option_conflict('X', 'd');
2396 option_conflict('X', 't');
2397 if (!TAILQ_EMPTY(&wanted_refs))
2398 option_conflict('X', 'R');
2403 errx(1, "-X option requires a remote name");
2404 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2405 } else if (argc == 1)
2406 remote_name = argv[0];
2410 cwd = getcwd(NULL, 0);
2412 error = got_error_from_errno("getcwd");
2416 error = got_repo_pack_fds_open(&pack_fds);
2420 if (repo_path == NULL) {
2421 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
2422 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2428 strdup(got_worktree_get_repo_path(worktree));
2429 if (repo_path == NULL)
2430 error = got_error_from_errno("strdup");
2434 repo_path = strdup(cwd);
2435 if (repo_path == NULL) {
2436 error = got_error_from_errno("strdup");
2442 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2446 if (delete_remote) {
2447 error = delete_refs_for_remote(repo, remote_name);
2448 goto done; /* nothing else to do */
2452 worktree_conf = got_worktree_get_gotconfig(worktree);
2453 if (worktree_conf) {
2454 got_gotconfig_get_remotes(&nremotes, &remotes,
2456 for (i = 0; i < nremotes; i++) {
2457 if (strcmp(remotes[i].name, remote_name) == 0) {
2458 error = got_repo_remote_repo_dup(&remote,
2467 if (remote == NULL) {
2468 repo_conf = got_repo_get_gotconfig(repo);
2470 got_gotconfig_get_remotes(&nremotes, &remotes,
2472 for (i = 0; i < nremotes; i++) {
2473 if (strcmp(remotes[i].name, remote_name) == 0) {
2474 error = got_repo_remote_repo_dup(&remote,
2483 if (remote == NULL) {
2484 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2485 for (i = 0; i < nremotes; i++) {
2486 if (strcmp(remotes[i].name, remote_name) == 0) {
2487 error = got_repo_remote_repo_dup(&remote,
2495 if (remote == NULL) {
2496 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2500 if (TAILQ_EMPTY(&wanted_branches)) {
2501 if (!fetch_all_branches)
2502 fetch_all_branches = remote->fetch_all_branches;
2503 for (i = 0; i < remote->nfetch_branches; i++) {
2504 error = got_pathlist_append(&wanted_branches,
2505 remote->fetch_branches[i], NULL);
2510 if (TAILQ_EMPTY(&wanted_refs)) {
2511 for (i = 0; i < remote->nfetch_refs; i++) {
2512 error = got_pathlist_append(&wanted_refs,
2513 remote->fetch_refs[i], NULL);
2519 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2520 &repo_name, remote->fetch_url);
2524 if (strcmp(proto, "git") == 0) {
2526 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2527 "sendfd dns inet unveil", NULL) == -1)
2530 } else if (strcmp(proto, "git+ssh") == 0 ||
2531 strcmp(proto, "ssh") == 0 ||
2532 strcmp(proto, "git+http") == 0 ||
2533 strcmp(proto, "http") == 0 ||
2534 strcmp(proto, "git+https") == 0 ||
2535 strcmp(proto, "https") == 0) {
2537 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2538 "sendfd unveil", NULL) == -1)
2542 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2546 error = got_dial_apply_unveil(proto);
2550 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2555 head_refname = strdup(got_worktree_get_head_ref_name(worktree));
2556 if (head_refname == NULL) {
2557 error = got_error_from_errno("strdup");
2561 /* Release work tree lock. */
2562 got_worktree_close(worktree);
2566 if (verbosity >= 0) {
2567 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2568 remote->name, proto, host,
2569 port ? ":" : "", port ? port : "",
2570 *server_path == '/' ? "" : "/", server_path);
2573 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2574 server_path, verbosity);
2578 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd",
2584 * If set, get this remote's HEAD ref target so
2585 * if it has changed on the server we can fetch it.
2587 error = got_ref_list(&remote_refs, repo, "refs/remotes",
2588 got_ref_cmp_by_name, repo);
2592 TAILQ_FOREACH(re, &remote_refs, entry) {
2593 const char *remote_refname, *remote_target;
2594 size_t remote_name_len;
2596 if (!got_ref_is_symbolic(re->ref))
2599 remote_name_len = strlen(remote->name);
2600 remote_refname = got_ref_get_name(re->ref);
2602 /* we only want refs/remotes/$remote->name/HEAD */
2603 if (strncmp(remote_refname + 13, remote->name,
2604 remote_name_len) != 0)
2607 if (strcmp(remote_refname + remote_name_len + 14,
2612 * Take the name itself because we already
2613 * only match with refs/heads/ in fetch_pack().
2615 remote_target = got_ref_get_symref_target(re->ref);
2616 remote_head = remote_target + remote_name_len + 14;
2621 strncmp(head_refname, "refs/heads/", 11) == 0)
2622 worktree_branch = head_refname;
2625 fpa.last_scaled_size[0] = '\0';
2626 fpa.last_p_indexed = -1;
2627 fpa.last_p_resolved = -1;
2628 fpa.verbosity = verbosity;
2630 fpa.create_configs = 0;
2631 fpa.configs_created = 0;
2632 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2634 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2635 remote->mirror_references, fetch_all_branches, &wanted_branches,
2636 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2637 worktree_branch, remote_head, have_bflag, fetch_progress, &fpa);
2641 if (list_refs_only) {
2642 error = list_remote_refs(&symrefs, &refs);
2646 if (pack_hash == NULL) {
2648 printf("Already up-to-date\n");
2649 } else if (verbosity >= 0) {
2650 error = got_object_id_str(&id_str, pack_hash);
2653 printf("\nFetched %s.pack\n", id_str);
2658 /* Update references provided with the pack file. */
2659 TAILQ_FOREACH(pe, &refs, entry) {
2660 const char *refname = pe->path;
2661 struct got_object_id *id = pe->data;
2662 struct got_reference *ref;
2663 char *remote_refname;
2665 if (is_wanted_ref(&wanted_refs, refname) &&
2666 !remote->mirror_references) {
2667 error = update_wanted_ref(refname, id,
2668 remote->name, verbosity, repo);
2674 if (remote->mirror_references ||
2675 strncmp("refs/tags/", refname, 10) == 0) {
2676 error = got_ref_open(&ref, repo, refname, 1);
2678 if (error->code != GOT_ERR_NOT_REF)
2680 error = create_ref(refname, id, verbosity,
2685 error = update_ref(ref, id, replace_tags,
2687 unlock_err = got_ref_unlock(ref);
2688 if (unlock_err && error == NULL)
2694 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2695 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2696 remote_name, refname + 11) == -1) {
2697 error = got_error_from_errno("asprintf");
2701 error = got_ref_open(&ref, repo, remote_refname, 1);
2703 if (error->code != GOT_ERR_NOT_REF)
2705 error = create_ref(remote_refname, id,
2710 error = update_ref(ref, id, replace_tags,
2712 unlock_err = got_ref_unlock(ref);
2713 if (unlock_err && error == NULL)
2720 /* Also create a local branch if none exists yet. */
2721 error = got_ref_open(&ref, repo, refname, 1);
2723 if (error->code != GOT_ERR_NOT_REF)
2725 error = create_ref(refname, id, verbosity,
2730 unlock_err = got_ref_unlock(ref);
2731 if (unlock_err && error == NULL)
2738 error = delete_missing_refs(&refs, &symrefs, remote,
2744 if (!remote->mirror_references) {
2745 /* Update remote HEAD reference if the server provided one. */
2746 TAILQ_FOREACH(pe, &symrefs, entry) {
2747 struct got_reference *target_ref;
2748 const char *refname = pe->path;
2749 const char *target = pe->data;
2750 char *remote_refname = NULL, *remote_target = NULL;
2752 if (strcmp(refname, GOT_REF_HEAD) != 0)
2755 if (strncmp("refs/heads/", target, 11) != 0)
2758 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2759 remote->name, refname) == -1) {
2760 error = got_error_from_errno("asprintf");
2763 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2764 remote->name, target + 11) == -1) {
2765 error = got_error_from_errno("asprintf");
2766 free(remote_refname);
2770 error = got_ref_open(&target_ref, repo, remote_target,
2773 free(remote_refname);
2774 free(remote_target);
2775 if (error->code == GOT_ERR_NOT_REF) {
2781 error = update_symref(remote_refname, target_ref,
2783 free(remote_refname);
2784 free(remote_target);
2785 got_ref_close(target_ref);
2792 if (kill(fetchpid, SIGTERM) == -1)
2793 error = got_error_from_errno("kill");
2794 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2795 error = got_error_from_errno("waitpid");
2797 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2798 error = got_error_from_errno("close");
2800 const struct got_error *close_err = got_repo_close(repo);
2805 got_worktree_close(worktree);
2807 const struct got_error *pack_err =
2808 got_repo_pack_fds_close(pack_fds);
2812 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
2813 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
2814 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2815 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2816 got_ref_list_free(&remote_refs);
2817 got_repo_free_remote_repo_data(remote);
2834 usage_checkout(void)
2836 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2837 "[-p path-prefix] repository-path [work-tree-path]\n",
2843 show_worktree_base_ref_warning(void)
2845 fprintf(stderr, "%s: warning: could not create a reference "
2846 "to the work tree's base commit; the commit could be "
2847 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2848 "repository writable and running 'got update' will prevent this\n",
2852 struct got_checkout_progress_arg {
2853 const char *worktree_path;
2854 int had_base_commit_ref_error;
2858 static const struct got_error *
2859 checkout_progress(void *arg, unsigned char status, const char *path)
2861 struct got_checkout_progress_arg *a = arg;
2863 /* Base commit bump happens silently. */
2864 if (status == GOT_STATUS_BUMP_BASE)
2867 if (status == GOT_STATUS_BASE_REF_ERR) {
2868 a->had_base_commit_ref_error = 1;
2872 while (path[0] == '/')
2875 if (a->verbosity >= 0)
2876 printf("%c %s/%s\n", status, a->worktree_path, path);
2881 static const struct got_error *
2882 check_cancelled(void *arg)
2884 if (sigint_received || sigpipe_received)
2885 return got_error(GOT_ERR_CANCELLED);
2889 static const struct got_error *
2890 check_linear_ancestry(struct got_object_id *commit_id,
2891 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2892 struct got_repository *repo)
2894 const struct got_error *err = NULL;
2895 struct got_object_id *yca_id;
2897 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2898 commit_id, base_commit_id, 1, 0, repo, check_cancelled, NULL);
2903 return got_error(GOT_ERR_ANCESTRY);
2906 * Require a straight line of history between the target commit
2907 * and the work tree's base commit.
2909 * Non-linear situations such as this require a rebase:
2911 * (commit) D F (base_commit)
2919 * 'got update' only handles linear cases:
2920 * Update forwards in time: A (base/yca) - B - C - D (commit)
2921 * Update backwards in time: D (base) - C - B - A (commit/yca)
2923 if (allow_forwards_in_time_only) {
2924 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2925 return got_error(GOT_ERR_ANCESTRY);
2926 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2927 got_object_id_cmp(base_commit_id, yca_id) != 0)
2928 return got_error(GOT_ERR_ANCESTRY);
2934 static const struct got_error *
2935 check_same_branch(struct got_object_id *commit_id,
2936 struct got_reference *head_ref, struct got_repository *repo)
2938 const struct got_error *err = NULL;
2939 struct got_commit_graph *graph = NULL;
2940 struct got_object_id *head_commit_id = NULL;
2942 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2946 if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2949 err = got_commit_graph_open(&graph, "/", 1);
2953 err = got_commit_graph_bfsort(graph, head_commit_id, repo,
2954 check_cancelled, NULL);
2959 struct got_object_id id;
2961 err = got_commit_graph_iter_next(&id, graph, repo,
2962 check_cancelled, NULL);
2964 if (err->code == GOT_ERR_ITER_COMPLETED)
2965 err = got_error(GOT_ERR_ANCESTRY);
2969 if (got_object_id_cmp(&id, commit_id) == 0)
2974 got_commit_graph_close(graph);
2975 free(head_commit_id);
2979 static const struct got_error *
2980 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2982 static char msg[512];
2983 const char *branch_name;
2985 if (got_ref_is_symbolic(ref))
2986 branch_name = got_ref_get_symref_target(ref);
2988 branch_name = got_ref_get_name(ref);
2990 if (strncmp("refs/heads/", branch_name, 11) == 0)
2993 snprintf(msg, sizeof(msg),
2994 "target commit is not contained in branch '%s'; "
2995 "the branch to use must be specified with -b; "
2996 "if necessary a new branch can be created for "
2997 "this commit with 'got branch -c %s BRANCH_NAME'",
2998 branch_name, commit_id_str);
3000 return got_error_msg(GOT_ERR_ANCESTRY, msg);
3003 static const struct got_error *
3004 cmd_checkout(int argc, char *argv[])
3006 const struct got_error *close_err, *error = NULL;
3007 struct got_repository *repo = NULL;
3008 struct got_reference *head_ref = NULL, *ref = NULL;
3009 struct got_worktree *worktree = NULL;
3010 char *repo_path = NULL;
3011 char *worktree_path = NULL;
3012 const char *path_prefix = "";
3013 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
3014 char *commit_id_str = NULL, *keyword_idstr = NULL;
3015 struct got_object_id *commit_id = NULL;
3017 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
3018 struct got_pathlist_head paths;
3019 struct got_checkout_progress_arg cpa;
3020 int *pack_fds = NULL;
3025 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3026 "unveil", NULL) == -1)
3030 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
3033 branch_name = optarg;
3036 commit_id_str = strdup(optarg);
3037 if (commit_id_str == NULL)
3038 return got_error_from_errno("strdup");
3044 path_prefix = optarg;
3059 char *base, *dotgit;
3061 repo_path = realpath(argv[0], NULL);
3062 if (repo_path == NULL)
3063 return got_error_from_errno2("realpath", argv[0]);
3064 cwd = getcwd(NULL, 0);
3066 error = got_error_from_errno("getcwd");
3073 error = got_path_basename(&base, path);
3076 dotgit = strstr(base, ".git");
3079 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3080 error = got_error_from_errno("asprintf");
3085 } else if (argc == 2) {
3086 repo_path = realpath(argv[0], NULL);
3087 if (repo_path == NULL) {
3088 error = got_error_from_errno2("realpath", argv[0]);
3091 worktree_path = realpath(argv[1], NULL);
3092 if (worktree_path == NULL) {
3093 if (errno != ENOENT) {
3094 error = got_error_from_errno2("realpath",
3098 worktree_path = strdup(argv[1]);
3099 if (worktree_path == NULL) {
3100 error = got_error_from_errno("strdup");
3107 got_path_strip_trailing_slashes(repo_path);
3108 got_path_strip_trailing_slashes(worktree_path);
3110 if (got_path_is_child(worktree_path, repo_path, strlen(repo_path)) ||
3111 got_path_is_child(repo_path, worktree_path,
3112 strlen(worktree_path))) {
3113 error = got_error_fmt(GOT_ERR_BAD_PATH,
3114 "work tree and repository paths may not overlap: %s",
3119 error = got_repo_pack_fds_open(&pack_fds);
3123 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3127 /* Pre-create work tree path for unveil(2) */
3128 error = got_path_mkdir(worktree_path);
3130 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3131 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3133 if (!allow_nonempty &&
3134 !got_path_dir_is_empty(worktree_path)) {
3135 error = got_error_path(worktree_path,
3136 GOT_ERR_DIR_NOT_EMPTY);
3141 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3145 error = got_ref_open(&head_ref, repo, branch_name, 0);
3149 error = got_worktree_init(worktree_path, head_ref, path_prefix,
3150 GOT_WORKTREE_GOT_DIR, repo);
3151 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3154 error = got_worktree_open(&worktree, worktree_path,
3155 GOT_WORKTREE_GOT_DIR);
3159 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3163 if (!same_path_prefix) {
3164 error = got_error(GOT_ERR_PATH_PREFIX);
3168 if (commit_id_str) {
3169 struct got_reflist_head refs;
3171 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3176 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3180 if (keyword_idstr != NULL) {
3181 free(commit_id_str);
3182 commit_id_str = keyword_idstr;
3185 error = got_repo_match_object_id(&commit_id, NULL,
3186 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3187 got_ref_list_free(&refs);
3190 error = check_linear_ancestry(commit_id,
3191 got_worktree_get_base_commit_id(worktree), 0, repo);
3192 if (error != NULL) {
3193 if (error->code == GOT_ERR_ANCESTRY) {
3194 error = checkout_ancestry_error(
3195 head_ref, commit_id_str);
3199 error = check_same_branch(commit_id, head_ref, repo);
3201 if (error->code == GOT_ERR_ANCESTRY) {
3202 error = checkout_ancestry_error(
3203 head_ref, commit_id_str);
3207 error = got_worktree_set_base_commit_id(worktree, repo,
3211 /* Expand potentially abbreviated commit ID string. */
3212 free(commit_id_str);
3213 error = got_object_id_str(&commit_id_str, commit_id);
3217 commit_id = got_object_id_dup(
3218 got_worktree_get_base_commit_id(worktree));
3219 if (commit_id == NULL) {
3220 error = got_error_from_errno("got_object_id_dup");
3223 error = got_object_id_str(&commit_id_str, commit_id);
3228 error = got_pathlist_append(&paths, "", NULL);
3231 cpa.worktree_path = worktree_path;
3232 cpa.had_base_commit_ref_error = 0;
3233 cpa.verbosity = verbosity;
3234 error = got_worktree_checkout_files(worktree, &paths, repo,
3235 checkout_progress, &cpa, check_cancelled, NULL);
3239 if (got_ref_is_symbolic(head_ref)) {
3240 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3243 refname = got_ref_get_name(ref);
3245 refname = got_ref_get_name(head_ref);
3246 printf("Checked out %s: %s\n", refname, commit_id_str);
3247 printf("Now shut up and hack\n");
3248 if (cpa.had_base_commit_ref_error)
3249 show_worktree_base_ref_warning();
3252 const struct got_error *pack_err =
3253 got_repo_pack_fds_close(pack_fds);
3258 got_ref_close(head_ref);
3262 close_err = got_repo_close(repo);
3266 if (worktree != NULL) {
3267 close_err = got_worktree_close(worktree);
3271 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
3272 free(commit_id_str);
3275 free(worktree_path);
3280 struct got_update_progress_arg {
3292 print_update_progress_stats(struct got_update_progress_arg *upa)
3294 if (!upa->did_something)
3297 if (upa->conflicts > 0)
3298 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3299 if (upa->obstructed > 0)
3300 printf("File paths obstructed by a non-regular file: %d\n",
3302 if (upa->not_updated > 0)
3303 printf("Files not updated because of existing merge "
3304 "conflicts: %d\n", upa->not_updated);
3308 * The meaning of some status codes differs between merge-style operations and
3309 * update operations. For example, the ! status code means "file was missing"
3310 * if changes were merged into the work tree, and "missing file was restored"
3311 * if the work tree was updated. This function should be used by any operation
3312 * which merges changes into the work tree without updating the work tree.
3315 print_merge_progress_stats(struct got_update_progress_arg *upa)
3317 if (!upa->did_something)
3320 if (upa->conflicts > 0)
3321 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3322 if (upa->obstructed > 0)
3323 printf("File paths obstructed by a non-regular file: %d\n",
3325 if (upa->missing > 0)
3326 printf("Files which had incoming changes but could not be "
3327 "found in the work tree: %d\n", upa->missing);
3328 if (upa->not_deleted > 0)
3329 printf("Files not deleted due to differences in deleted "
3330 "content: %d\n", upa->not_deleted);
3331 if (upa->unversioned > 0)
3332 printf("Files not merged because an unversioned file was "
3333 "found in the work tree: %d\n", upa->unversioned);
3339 fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3340 "[path ...]\n", getprogname());
3344 static const struct got_error *
3345 update_progress(void *arg, unsigned char status, const char *path)
3347 struct got_update_progress_arg *upa = arg;
3349 if (status == GOT_STATUS_EXISTS ||
3350 status == GOT_STATUS_BASE_REF_ERR)
3353 upa->did_something = 1;
3355 /* Base commit bump happens silently. */
3356 if (status == GOT_STATUS_BUMP_BASE)
3359 if (status == GOT_STATUS_CONFLICT)
3361 if (status == GOT_STATUS_OBSTRUCTED)
3363 if (status == GOT_STATUS_CANNOT_UPDATE)
3365 if (status == GOT_STATUS_MISSING)
3367 if (status == GOT_STATUS_CANNOT_DELETE)
3369 if (status == GOT_STATUS_UNVERSIONED)
3372 while (path[0] == '/')
3374 if (upa->verbosity >= 0)
3375 printf("%c %s\n", status, path);
3380 static const struct got_error *
3381 switch_head_ref(struct got_reference *head_ref,
3382 struct got_object_id *commit_id, struct got_worktree *worktree,
3383 struct got_repository *repo)
3385 const struct got_error *err = NULL;
3387 int ref_has_moved = 0;
3389 /* Trivial case: switching between two different references. */
3390 if (strcmp(got_ref_get_name(head_ref),
3391 got_worktree_get_head_ref_name(worktree)) != 0) {
3392 printf("Switching work tree from %s to %s\n",
3393 got_worktree_get_head_ref_name(worktree),
3394 got_ref_get_name(head_ref));
3395 return got_worktree_set_head_ref(worktree, head_ref);
3398 err = check_linear_ancestry(commit_id,
3399 got_worktree_get_base_commit_id(worktree), 0, repo);
3401 if (err->code != GOT_ERR_ANCESTRY)
3408 /* Switching to a rebased branch with the same reference name. */
3409 err = got_object_id_str(&base_id_str,
3410 got_worktree_get_base_commit_id(worktree));
3413 printf("Reference %s now points at a different branch\n",
3414 got_worktree_get_head_ref_name(worktree));
3415 printf("Switching work tree from %s to %s\n", base_id_str,
3416 got_worktree_get_head_ref_name(worktree));
3420 static const struct got_error *
3421 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3423 const struct got_error *err;
3426 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3430 return got_error(GOT_ERR_REBASING);
3432 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3436 return got_error(GOT_ERR_HISTEDIT_BUSY);
3441 static const struct got_error *
3442 check_merge_in_progress(struct got_worktree *worktree,
3443 struct got_repository *repo)
3445 const struct got_error *err;
3448 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3452 return got_error(GOT_ERR_MERGE_BUSY);
3457 static const struct got_error *
3458 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3459 char *argv[], struct got_worktree *worktree)
3461 const struct got_error *err = NULL;
3463 struct got_pathlist_entry *new;
3469 return got_error_from_errno("strdup");
3470 return got_pathlist_append(paths, path, NULL);
3473 for (i = 0; i < argc; i++) {
3474 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3477 err = got_pathlist_insert(&new, paths, path, NULL);
3478 if (err || new == NULL /* duplicate */) {
3488 static const struct got_error *
3489 wrap_not_worktree_error(const struct got_error *orig_err,
3490 const char *cmdname, const char *path)
3492 const struct got_error *err;
3493 struct got_repository *repo;
3494 static char msg[512];
3495 int *pack_fds = NULL;
3497 err = got_repo_pack_fds_open(&pack_fds);
3501 err = got_repo_open(&repo, path, NULL, pack_fds);
3505 snprintf(msg, sizeof(msg),
3506 "'got %s' needs a work tree in addition to a git repository\n"
3507 "Work trees can be checked out from this Git repository with "
3509 "The got(1) manual page contains more information.", cmdname);
3510 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3512 const struct got_error *close_err = got_repo_close(repo);
3517 const struct got_error *pack_err =
3518 got_repo_pack_fds_close(pack_fds);
3525 static const struct got_error *
3526 cmd_update(int argc, char *argv[])
3528 const struct got_error *close_err, *error = NULL;
3529 struct got_repository *repo = NULL;
3530 struct got_worktree *worktree = NULL;
3531 char *worktree_path = NULL;
3532 struct got_object_id *commit_id = NULL;
3533 char *commit_id_str = NULL;
3534 const char *branch_name = NULL;
3535 struct got_reference *head_ref = NULL;
3536 struct got_pathlist_head paths;
3537 struct got_pathlist_entry *pe;
3538 int ch, verbosity = 0;
3539 struct got_update_progress_arg upa;
3540 int *pack_fds = NULL;
3545 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3546 "unveil", NULL) == -1)
3550 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3553 branch_name = optarg;
3556 commit_id_str = strdup(optarg);
3557 if (commit_id_str == NULL)
3558 return got_error_from_errno("strdup");
3572 worktree_path = getcwd(NULL, 0);
3573 if (worktree_path == NULL) {
3574 error = got_error_from_errno("getcwd");
3578 error = got_repo_pack_fds_open(&pack_fds);
3582 error = got_worktree_open(&worktree, worktree_path,
3583 GOT_WORKTREE_GOT_DIR);
3585 if (error->code == GOT_ERR_NOT_WORKTREE)
3586 error = wrap_not_worktree_error(error, "update",
3591 error = check_rebase_or_histedit_in_progress(worktree);
3595 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3600 error = apply_unveil(got_repo_get_path(repo), 0,
3601 got_worktree_get_root_path(worktree));
3605 error = check_merge_in_progress(worktree, repo);
3609 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3613 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3614 got_worktree_get_head_ref_name(worktree), 0);
3617 if (commit_id_str == NULL) {
3618 error = got_ref_resolve(&commit_id, repo, head_ref);
3621 error = got_object_id_str(&commit_id_str, commit_id);
3625 struct got_reflist_head refs;
3626 char *keyword_idstr = NULL;
3630 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3635 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3639 if (keyword_idstr != NULL) {
3640 free(commit_id_str);
3641 commit_id_str = keyword_idstr;
3644 error = got_repo_match_object_id(&commit_id, NULL,
3645 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3646 got_ref_list_free(&refs);
3647 free(commit_id_str);
3648 commit_id_str = NULL;
3651 error = got_object_id_str(&commit_id_str, commit_id);
3657 struct got_object_id *head_commit_id;
3658 TAILQ_FOREACH(pe, &paths, entry) {
3659 if (pe->path_len == 0)
3661 error = got_error_msg(GOT_ERR_BAD_PATH,
3662 "switching between branches requires that "
3663 "the entire work tree gets updated");
3666 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3669 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3671 free(head_commit_id);
3674 error = check_same_branch(commit_id, head_ref, repo);
3677 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3681 error = check_linear_ancestry(commit_id,
3682 got_worktree_get_base_commit_id(worktree), 0, repo);
3683 if (error != NULL) {
3684 if (error->code == GOT_ERR_ANCESTRY)
3685 error = got_error(GOT_ERR_BRANCH_MOVED);
3688 error = check_same_branch(commit_id, head_ref, repo);
3693 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3695 error = got_worktree_set_base_commit_id(worktree, repo,
3701 memset(&upa, 0, sizeof(upa));
3702 upa.verbosity = verbosity;
3703 error = got_worktree_checkout_files(worktree, &paths, repo,
3704 update_progress, &upa, check_cancelled, NULL);
3708 if (upa.did_something) {
3709 printf("Updated to %s: %s\n",
3710 got_worktree_get_head_ref_name(worktree), commit_id_str);
3712 printf("Already up-to-date\n");
3714 print_update_progress_stats(&upa);
3717 const struct got_error *pack_err =
3718 got_repo_pack_fds_close(pack_fds);
3723 close_err = got_repo_close(repo);
3727 if (worktree != NULL) {
3728 close_err = got_worktree_close(worktree);
3732 if (head_ref != NULL)
3733 got_ref_close(head_ref);
3734 free(worktree_path);
3735 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3737 free(commit_id_str);
3741 static const struct got_error *
3742 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3743 const char *path, int diff_context, int ignore_whitespace,
3744 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3745 struct got_repository *repo, FILE *outfile)
3747 const struct got_error *err = NULL;
3748 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3749 FILE *f1 = NULL, *f2 = NULL;
3750 int fd1 = -1, fd2 = -1;
3752 fd1 = got_opentempfd();
3754 return got_error_from_errno("got_opentempfd");
3755 fd2 = got_opentempfd();
3757 err = got_error_from_errno("got_opentempfd");
3762 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3768 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3772 f1 = got_opentemp();
3774 err = got_error_from_errno("got_opentemp");
3777 f2 = got_opentemp();
3779 err = got_error_from_errno("got_opentemp");
3783 while (path[0] == '/')
3785 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3786 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3787 force_text_diff, dsa, outfile);
3789 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3790 err = got_error_from_errno("close");
3792 got_object_blob_close(blob1);
3793 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3794 err = got_error_from_errno("close");
3796 got_object_blob_close(blob2);
3797 if (f1 && fclose(f1) == EOF && err == NULL)
3798 err = got_error_from_errno("fclose");
3799 if (f2 && fclose(f2) == EOF && err == NULL)
3800 err = got_error_from_errno("fclose");
3804 static const struct got_error *
3805 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3806 const char *path, int diff_context, int ignore_whitespace,
3807 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3808 struct got_repository *repo, FILE *outfile)
3810 const struct got_error *err = NULL;
3811 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3812 struct got_diff_blob_output_unidiff_arg arg;
3813 FILE *f1 = NULL, *f2 = NULL;
3814 int fd1 = -1, fd2 = -1;
3817 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3820 fd1 = got_opentempfd();
3822 err = got_error_from_errno("got_opentempfd");
3827 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3831 f1 = got_opentemp();
3833 err = got_error_from_errno("got_opentemp");
3837 f2 = got_opentemp();
3839 err = got_error_from_errno("got_opentemp");
3842 fd2 = got_opentempfd();
3844 err = got_error_from_errno("got_opentempfd");
3847 arg.diff_context = diff_context;
3848 arg.ignore_whitespace = ignore_whitespace;
3849 arg.force_text_diff = force_text_diff;
3851 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3852 arg.outfile = outfile;
3855 while (path[0] == '/')
3857 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3858 got_diff_blob_output_unidiff, &arg, 1);
3861 got_object_tree_close(tree1);
3863 got_object_tree_close(tree2);
3864 if (f1 && fclose(f1) == EOF && err == NULL)
3865 err = got_error_from_errno("fclose");
3866 if (f2 && fclose(f2) == EOF && err == NULL)
3867 err = got_error_from_errno("fclose");
3868 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3869 err = got_error_from_errno("close");
3870 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3871 err = got_error_from_errno("close");
3875 static const struct got_error *
3876 get_changed_paths(struct got_pathlist_head *paths,
3877 struct got_commit_object *commit, struct got_repository *repo,
3878 struct got_diffstat_cb_arg *dsa)
3880 const struct got_error *err = NULL;
3881 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3882 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3883 struct got_object_qid *qid;
3884 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3885 FILE *f1 = NULL, *f2 = NULL;
3886 int fd1 = -1, fd2 = -1;
3889 cb = got_diff_tree_compute_diffstat;
3891 f1 = got_opentemp();
3893 err = got_error_from_errno("got_opentemp");
3896 f2 = got_opentemp();
3898 err = got_error_from_errno("got_opentemp");
3901 fd1 = got_opentempfd();
3903 err = got_error_from_errno("got_opentempfd");
3906 fd2 = got_opentempfd();
3908 err = got_error_from_errno("got_opentempfd");
3913 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3915 struct got_commit_object *pcommit;
3916 err = got_object_open_as_commit(&pcommit, repo,
3921 tree_id1 = got_object_id_dup(
3922 got_object_commit_get_tree_id(pcommit));
3923 if (tree_id1 == NULL) {
3924 got_object_commit_close(pcommit);
3925 return got_error_from_errno("got_object_id_dup");
3927 got_object_commit_close(pcommit);
3932 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3937 tree_id2 = got_object_commit_get_tree_id(commit);
3938 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3942 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3943 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3946 got_object_tree_close(tree1);
3948 got_object_tree_close(tree2);
3949 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3950 err = got_error_from_errno("close");
3951 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3952 err = got_error_from_errno("close");
3953 if (f1 && fclose(f1) == EOF && err == NULL)
3954 err = got_error_from_errno("fclose");
3955 if (f2 && fclose(f2) == EOF && err == NULL)
3956 err = got_error_from_errno("fclose");
3961 static const struct got_error *
3962 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3963 const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3964 struct got_repository *repo, FILE *outfile)
3966 const struct got_error *err = NULL;
3967 struct got_commit_object *pcommit = NULL;
3968 char *id_str1 = NULL, *id_str2 = NULL;
3969 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3970 struct got_object_qid *qid;
3972 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3974 err = got_object_open_as_commit(&pcommit, repo,
3978 err = got_object_id_str(&id_str1, &qid->id);
3983 err = got_object_id_str(&id_str2, id);
3987 if (path && path[0] != '\0') {
3989 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3993 err = got_object_id_by_path(&obj_id1, repo,
3996 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
4002 err = got_object_get_type(&obj_type, repo, obj_id2);
4008 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
4009 fprintf(outfile, "commit - %s\n",
4010 id_str1 ? id_str1 : "/dev/null");
4011 fprintf(outfile, "commit + %s\n", id_str2);
4013 case GOT_OBJ_TYPE_BLOB:
4014 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
4015 0, 0, dsa, repo, outfile);
4017 case GOT_OBJ_TYPE_TREE:
4018 err = diff_trees(obj_id1, obj_id2, path, diff_context,
4019 0, 0, dsa, repo, outfile);
4022 err = got_error(GOT_ERR_OBJ_TYPE);
4028 obj_id2 = got_object_commit_get_tree_id(commit);
4030 obj_id1 = got_object_commit_get_tree_id(pcommit);
4032 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
4033 fprintf(outfile, "commit - %s\n",
4034 id_str1 ? id_str1 : "/dev/null");
4035 fprintf(outfile, "commit + %s\n", id_str2);
4036 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
4037 dsa, repo, outfile);
4043 got_object_commit_close(pcommit);
4048 get_datestr(time_t *time, char *datebuf)
4050 struct tm mytm, *tm;
4053 tm = gmtime_r(time, &mytm);
4056 s = asctime_r(tm, datebuf);
4059 p = strchr(s, '\n');
4065 static const struct got_error *
4066 match_commit(int *have_match, struct got_object_id *id,
4067 struct got_commit_object *commit, regex_t *regex)
4069 const struct got_error *err = NULL;
4070 regmatch_t regmatch;
4071 char *id_str = NULL, *logmsg = NULL;
4075 err = got_object_id_str(&id_str, id);
4079 err = got_object_commit_get_logmsg(&logmsg, commit);
4083 if (regexec(regex, got_object_commit_get_author(commit), 1,
4084 ®match, 0) == 0 ||
4085 regexec(regex, got_object_commit_get_committer(commit), 1,
4086 ®match, 0) == 0 ||
4087 regexec(regex, id_str, 1, ®match, 0) == 0 ||
4088 regexec(regex, logmsg, 1, ®match, 0) == 0)
4097 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
4100 regmatch_t regmatch;
4101 struct got_pathlist_entry *pe;
4105 TAILQ_FOREACH(pe, changed_paths, entry) {
4106 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
4113 static const struct got_error *
4114 match_patch(int *have_match, struct got_commit_object *commit,
4115 struct got_object_id *id, const char *path, int diff_context,
4116 struct got_repository *repo, regex_t *regex, FILE *f)
4118 const struct got_error *err = NULL;
4120 size_t linesize = 0;
4121 regmatch_t regmatch;
4125 err = got_opentemp_truncate(f);
4129 err = print_patch(commit, id, path, diff_context, NULL, repo, f);
4133 if (fseeko(f, 0L, SEEK_SET) == -1) {
4134 err = got_error_from_errno("fseeko");
4138 while (getline(&line, &linesize, f) != -1) {
4139 if (regexec(regex, line, 1, ®match, 0) == 0) {
4149 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
4151 static const struct got_error*
4152 build_refs_str(char **refs_str, struct got_reflist_head *refs,
4153 struct got_object_id *id, struct got_repository *repo,
4156 static const struct got_error *err = NULL;
4157 struct got_reflist_entry *re;
4163 TAILQ_FOREACH(re, refs, entry) {
4164 struct got_tag_object *tag = NULL;
4165 struct got_object_id *ref_id;
4168 name = got_ref_get_name(re->ref);
4169 if (strcmp(name, GOT_REF_HEAD) == 0)
4171 if (strncmp(name, "refs/", 5) == 0)
4173 if (strncmp(name, "got/", 4) == 0)
4175 if (strncmp(name, "heads/", 6) == 0)
4177 if (strncmp(name, "remotes/", 8) == 0) {
4181 s = strstr(name, "/" GOT_REF_HEAD);
4182 if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
4185 err = got_ref_resolve(&ref_id, repo, re->ref);
4188 if (strncmp(name, "tags/", 5) == 0) {
4189 err = got_object_open_as_tag(&tag, repo, ref_id);
4191 if (err->code != GOT_ERR_OBJ_TYPE) {
4195 /* Ref points at something other than a tag. */
4200 cmp = got_object_id_cmp(tag ?
4201 got_object_tag_get_object_id(tag) : ref_id, id);
4204 got_object_tag_close(tag);
4208 if (asprintf(refs_str, "%s%s%s", s ? s : "",
4209 s ? ", " : "", name) == -1) {
4210 err = got_error_from_errno("asprintf");
4221 static const struct got_error *
4222 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4223 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4225 const struct got_error *err = NULL;
4226 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4227 char *comma, *s, *nl;
4228 struct got_reflist_head *refs;
4229 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4231 time_t committer_time;
4233 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4235 err = build_refs_str(&ref_str, refs, id, repo, 1);
4239 /* Display the first matching ref only. */
4240 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4244 if (ref_str == NULL) {
4245 err = got_object_id_str(&id_str, id);
4250 committer_time = got_object_commit_get_committer_time(commit);
4251 if (gmtime_r(&committer_time, &tm) == NULL) {
4252 err = got_error_from_errno("gmtime_r");
4255 if (strftime(datebuf, sizeof(datebuf), "%F ", &tm) == 0) {
4256 err = got_error(GOT_ERR_NO_SPACE);
4260 err = got_object_commit_get_logmsg(&logmsg0, commit);
4265 while (isspace((unsigned char)s[0]))
4268 nl = strchr(s, '\n');
4274 printf("%s%-7s %s\n", datebuf, ref_str, s);
4276 printf("%s%.7s %s\n", datebuf, id_str, s);
4278 if (fflush(stdout) != 0 && err == NULL)
4279 err = got_error_from_errno("fflush");
4287 static const struct got_error *
4288 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
4290 struct got_pathlist_entry *pe;
4293 printf("%s\n", header);
4295 TAILQ_FOREACH(pe, dsa->paths, entry) {
4296 struct got_diff_changed_path *cp = pe->data;
4297 int pad = dsa->max_path_len - pe->path_len + 1;
4299 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
4300 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
4302 printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
4303 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
4304 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
4306 if (fflush(stdout) != 0)
4307 return got_error_from_errno("fflush");
4312 static const struct got_error *
4318 if (fseeko(f, 0L, SEEK_SET) == -1)
4319 return got_error_from_errno("fseek");
4322 r = fread(buf, 1, sizeof(buf), f);
4325 return got_error_from_errno("fread");
4329 if (fwrite(buf, 1, r, stdout) != r)
4330 return got_ferror(stdout, GOT_ERR_IO);
4336 static const struct got_error *
4337 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4338 struct got_repository *repo, const char *path,
4339 struct got_pathlist_head *changed_paths,
4340 struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
4341 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
4344 const struct got_error *err = NULL;
4346 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4348 time_t committer_time;
4349 const char *author, *committer;
4350 char *refs_str = NULL;
4352 err = got_object_id_str(&id_str, id);
4356 if (custom_refs_str == NULL) {
4357 struct got_reflist_head *refs;
4358 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4360 err = build_refs_str(&refs_str, refs, id, repo, 0);
4366 printf(GOT_COMMIT_SEP_STR);
4367 if (custom_refs_str)
4368 printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
4371 printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
4372 refs_str ? " (" : "", refs_str ? refs_str : "",
4373 refs_str ? ")" : "");
4378 printf("from: %s\n", got_object_commit_get_author(commit));
4379 author = got_object_commit_get_author(commit);
4380 committer = got_object_commit_get_committer(commit);
4381 if (strcmp(author, committer) != 0)
4382 printf("via: %s\n", committer);
4383 committer_time = got_object_commit_get_committer_time(commit);
4384 datestr = get_datestr(&committer_time, datebuf);
4386 printf("date: %s UTC\n", datestr);
4387 if (got_object_commit_get_nparents(commit) > 1) {
4388 const struct got_object_id_queue *parent_ids;
4389 struct got_object_qid *qid;
4391 parent_ids = got_object_commit_get_parent_ids(commit);
4392 STAILQ_FOREACH(qid, parent_ids, entry) {
4393 err = got_object_id_str(&id_str, &qid->id);
4396 printf("parent %d: %s\n", n++, id_str);
4402 err = got_object_commit_get_logmsg(&logmsg0, commit);
4408 line = strsep(&logmsg, "\n");
4410 printf(" %s\n", line);
4414 if (changed_paths && diffstat == NULL) {
4415 struct got_pathlist_entry *pe;
4417 TAILQ_FOREACH(pe, changed_paths, entry) {
4418 struct got_diff_changed_path *cp = pe->data;
4420 printf(" %c %s\n", cp->status, pe->path);
4428 err = got_error_from_errno("got_opentemp");
4433 err = print_patch(commit, id, path, diff_context, diffstat,
4434 repo, diffstat == NULL ? stdout : f);
4439 err = print_diffstat(diffstat, NULL);
4451 if (fflush(stdout) != 0 && err == NULL)
4452 err = got_error_from_errno("fflush");
4454 if (f && fclose(f) == EOF && err == NULL)
4455 err = got_error_from_errno("fclose");
4461 static const struct got_error *
4462 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4463 struct got_repository *repo, const char *path, int show_changed_paths,
4464 int show_diffstat, int show_patch, const char *search_pattern,
4465 int diff_context, int limit, int log_branches, int reverse_display_order,
4466 struct got_reflist_object_id_map *refs_idmap, int one_line, int toposort,
4469 const struct got_error *err;
4470 struct got_commit_graph *graph;
4473 struct got_object_id_queue reversed_commits;
4474 struct got_object_qid *qid;
4475 struct got_commit_object *commit;
4476 struct got_pathlist_head changed_paths;
4478 STAILQ_INIT(&reversed_commits);
4479 TAILQ_INIT(&changed_paths);
4481 if (search_pattern && regcomp(®ex, search_pattern,
4482 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4483 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4485 err = got_commit_graph_open(&graph, path, !log_branches);
4488 if (log_branches && toposort) {
4489 err = got_commit_graph_toposort(graph, root_id, repo,
4490 check_cancelled, NULL);
4492 err = got_commit_graph_bfsort(graph, root_id, repo,
4493 check_cancelled, NULL);
4498 struct got_object_id id;
4499 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4500 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4502 if (sigint_received || sigpipe_received)
4505 err = got_commit_graph_iter_next(&id, graph, repo,
4506 check_cancelled, NULL);
4508 if (err->code == GOT_ERR_ITER_COMPLETED)
4513 err = got_object_open_as_commit(&commit, repo, &id);
4517 if (((show_changed_paths && !show_diffstat) ||
4518 (show_diffstat && !show_patch))
4519 && !reverse_display_order) {
4520 err = get_changed_paths(&changed_paths, commit, repo,
4521 show_diffstat ? &dsa : NULL);
4526 if (search_pattern) {
4527 err = match_commit(&have_match, &id, commit, ®ex);
4529 got_object_commit_close(commit);
4532 if (have_match == 0 && show_changed_paths)
4533 match_changed_paths(&have_match,
4534 &changed_paths, ®ex);
4535 if (have_match == 0 && show_patch) {
4536 err = match_patch(&have_match, commit, &id,
4537 path, diff_context, repo, ®ex, tmpfile);
4541 if (have_match == 0) {
4542 got_object_commit_close(commit);
4543 got_pathlist_free(&changed_paths,
4544 GOT_PATHLIST_FREE_ALL);
4549 if (reverse_display_order) {
4550 err = got_object_qid_alloc(&qid, &id);
4553 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4554 got_object_commit_close(commit);
4557 err = print_commit_oneline(commit, &id,
4560 err = print_commit(commit, &id, repo, path,
4561 (show_changed_paths || show_diffstat) ?
4562 &changed_paths : NULL,
4563 show_diffstat ? &dsa : NULL, show_patch,
4564 diff_context, refs_idmap, NULL, NULL);
4565 got_object_commit_close(commit);
4569 if ((limit && --limit == 0) ||
4570 (end_id && got_object_id_cmp(&id, end_id) == 0))
4573 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4575 if (reverse_display_order) {
4576 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4577 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4578 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4580 err = got_object_open_as_commit(&commit, repo,
4584 if ((show_changed_paths && !show_diffstat) ||
4585 (show_diffstat && !show_patch)) {
4586 err = get_changed_paths(&changed_paths, commit,
4587 repo, show_diffstat ? &dsa : NULL);
4592 err = print_commit_oneline(commit, &qid->id,
4595 err = print_commit(commit, &qid->id, repo, path,
4596 (show_changed_paths || show_diffstat) ?
4597 &changed_paths : NULL,
4598 show_diffstat ? &dsa : NULL, show_patch,
4599 diff_context, refs_idmap, NULL, NULL);
4600 got_object_commit_close(commit);
4603 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4607 while (!STAILQ_EMPTY(&reversed_commits)) {
4608 qid = STAILQ_FIRST(&reversed_commits);
4609 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4610 got_object_qid_free(qid);
4612 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4615 got_commit_graph_close(graph);
4622 fprintf(stderr, "usage: %s log [-bdPpRst] [-C number] [-c commit] "
4623 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4624 "[path]\n", getprogname());
4629 get_default_log_limit(void)
4631 const char *got_default_log_limit;
4635 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4636 if (got_default_log_limit == NULL)
4638 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4644 static const struct got_error *
4645 cmd_log(int argc, char *argv[])
4647 const struct got_error *error;
4648 struct got_repository *repo = NULL;
4649 struct got_worktree *worktree = NULL;
4650 struct got_object_id *start_id = NULL, *end_id = NULL;
4651 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4652 char *keyword_idstr = NULL;
4653 const char *start_commit = NULL, *end_commit = NULL;
4654 const char *search_pattern = NULL;
4655 int diff_context = -1, ch;
4656 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4657 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4660 struct got_reflist_head refs;
4661 struct got_reflist_object_id_map *refs_idmap = NULL;
4662 FILE *tmpfile = NULL;
4663 int *pack_fds = NULL;
4668 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4674 limit = get_default_log_limit();
4676 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:stx:")) != -1) {
4682 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4685 errx(1, "number of context lines is %s: %s",
4689 start_commit = optarg;
4695 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4697 errx(1, "number of commits is %s: %s",
4701 show_changed_paths = 1;
4707 reverse_display_order = 1;
4710 repo_path = realpath(optarg, NULL);
4711 if (repo_path == NULL)
4712 return got_error_from_errno2("realpath",
4714 got_path_strip_trailing_slashes(repo_path);
4717 search_pattern = optarg;
4726 end_commit = optarg;
4737 if (diff_context == -1)
4739 else if (!show_patch)
4740 errx(1, "-C requires -p");
4742 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4743 errx(1, "cannot use -s with -d, -p or -P");
4745 cwd = getcwd(NULL, 0);
4747 error = got_error_from_errno("getcwd");
4751 error = got_repo_pack_fds_open(&pack_fds);
4755 if (repo_path == NULL) {
4756 error = got_worktree_open(&worktree, cwd,
4757 GOT_WORKTREE_GOT_DIR);
4758 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4765 error = got_worktree_resolve_path(&path, worktree,
4770 path = strdup(argv[0]);
4772 error = got_error_from_errno("strdup");
4776 } else if (argc != 0)
4779 if (repo_path == NULL) {
4780 repo_path = worktree ?
4781 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4783 if (repo_path == NULL) {
4784 error = got_error_from_errno("strdup");
4788 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4792 error = apply_unveil(got_repo_get_path(repo), 1,
4793 worktree ? got_worktree_get_root_path(worktree) : NULL);
4797 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4801 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4805 if (start_commit == NULL) {
4806 struct got_reference *head_ref;
4807 struct got_commit_object *commit = NULL;
4808 error = got_ref_open(&head_ref, repo,
4809 worktree ? got_worktree_get_head_ref_name(worktree)
4813 error = got_ref_resolve(&start_id, repo, head_ref);
4814 got_ref_close(head_ref);
4817 error = got_object_open_as_commit(&commit, repo,
4821 got_object_commit_close(commit);
4823 error = got_keyword_to_idstr(&keyword_idstr, start_commit,
4827 if (keyword_idstr != NULL)
4828 start_commit = keyword_idstr;
4830 error = got_repo_match_object_id(&start_id, NULL,
4831 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4835 if (end_commit != NULL) {
4836 error = got_keyword_to_idstr(&keyword_idstr, end_commit,
4840 if (keyword_idstr != NULL)
4841 end_commit = keyword_idstr;
4843 error = got_repo_match_object_id(&end_id, NULL,
4844 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4851 * If a path was specified on the command line it was resolved
4852 * to a path in the work tree above. Prepend the work tree's
4853 * path prefix to obtain the corresponding in-repository path.
4857 prefix = got_worktree_get_path_prefix(worktree);
4858 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4859 (path[0] != '\0') ? "/" : "", path) == -1) {
4860 error = got_error_from_errno("asprintf");
4865 error = got_repo_map_path(&in_repo_path, repo,
4871 path = in_repo_path;
4875 /* Release work tree lock. */
4876 got_worktree_close(worktree);
4880 if (search_pattern && show_patch) {
4881 tmpfile = got_opentemp();
4882 if (tmpfile == NULL) {
4883 error = got_error_from_errno("got_opentemp");
4888 error = print_commits(start_id, end_id, repo, path ? path : "",
4889 show_changed_paths, show_diffstat, show_patch, search_pattern,
4890 diff_context, limit, log_branches, reverse_display_order,
4891 refs_idmap, one_line, toposort, tmpfile);
4898 free(keyword_idstr);
4900 got_worktree_close(worktree);
4902 const struct got_error *close_err = got_repo_close(repo);
4907 const struct got_error *pack_err =
4908 got_repo_pack_fds_close(pack_fds);
4913 got_reflist_object_id_map_free(refs_idmap);
4914 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4915 error = got_error_from_errno("fclose");
4916 got_ref_list_free(&refs);
4923 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4924 "[-r repository-path] [object1 object2 | path ...]\n",
4929 struct print_diff_arg {
4930 struct got_repository *repo;
4931 struct got_worktree *worktree;
4932 struct got_diffstat_cb_arg *diffstat;
4937 enum got_diff_algorithm diff_algo;
4938 int ignore_whitespace;
4939 int force_text_diff;
4946 * Create a file which contains the target path of a symlink so we can feed
4947 * it as content to the diff engine.
4949 static const struct got_error *
4950 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4951 const char *abspath)
4953 const struct got_error *err = NULL;
4954 char target_path[PATH_MAX];
4955 ssize_t target_len, outlen;
4960 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4961 if (target_len == -1)
4962 return got_error_from_errno2("readlinkat", abspath);
4964 target_len = readlink(abspath, target_path, PATH_MAX);
4965 if (target_len == -1)
4966 return got_error_from_errno2("readlink", abspath);
4969 *fd = got_opentempfd();
4971 return got_error_from_errno("got_opentempfd");
4973 outlen = write(*fd, target_path, target_len);
4975 err = got_error_from_errno("got_opentempfd");
4979 if (lseek(*fd, 0, SEEK_SET) == -1) {
4980 err = got_error_from_errno2("lseek", abspath);
4991 static const struct got_error *
4992 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4993 const char *path, struct got_object_id *blob_id,
4994 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4995 int dirfd, const char *de_name)
4997 struct print_diff_arg *a = arg;
4998 const struct got_error *err = NULL;
4999 struct got_blob_object *blob1 = NULL;
5000 int fd = -1, fd1 = -1, fd2 = -1;
5002 char *abspath = NULL, *label1 = NULL;
5007 memset(&sb, 0, sizeof(sb));
5009 if (a->diff_staged) {
5010 if (staged_status != GOT_STATUS_MODIFY &&
5011 staged_status != GOT_STATUS_ADD &&
5012 staged_status != GOT_STATUS_DELETE)
5015 if (staged_status == GOT_STATUS_DELETE)
5017 if (status == GOT_STATUS_NONEXISTENT)
5018 return got_error_set_errno(ENOENT, path);
5019 if (status != GOT_STATUS_MODIFY &&
5020 status != GOT_STATUS_ADD &&
5021 status != GOT_STATUS_DELETE &&
5022 status != GOT_STATUS_CONFLICT)
5026 err = got_opentemp_truncate(a->f1);
5028 return got_error_from_errno("got_opentemp_truncate");
5029 err = got_opentemp_truncate(a->f2);
5031 return got_error_from_errno("got_opentemp_truncate");
5033 if (!a->header_shown) {
5034 if (fprintf(a->outfile, "diff %s%s\n",
5035 a->diff_staged ? "-s " : "",
5036 got_worktree_get_root_path(a->worktree)) < 0) {
5037 err = got_error_from_errno("fprintf");
5040 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
5041 err = got_error_from_errno("fprintf");
5044 if (fprintf(a->outfile, "path + %s%s\n",
5045 got_worktree_get_root_path(a->worktree),
5046 a->diff_staged ? " (staged changes)" : "") < 0) {
5047 err = got_error_from_errno("fprintf");
5050 a->header_shown = 1;
5053 if (a->diff_staged) {
5054 const char *label1 = NULL, *label2 = NULL;
5055 switch (staged_status) {
5056 case GOT_STATUS_MODIFY:
5060 case GOT_STATUS_ADD:
5063 case GOT_STATUS_DELETE:
5067 return got_error(GOT_ERR_FILE_STATUS);
5069 fd1 = got_opentempfd();
5071 err = got_error_from_errno("got_opentempfd");
5074 fd2 = got_opentempfd();
5076 err = got_error_from_errno("got_opentempfd");
5079 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
5080 fd1, fd2, blob_id, staged_blob_id, label1, label2,
5081 a->diff_algo, a->diff_context, a->ignore_whitespace,
5082 a->force_text_diff, a->diffstat, a->repo, a->outfile);
5086 fd1 = got_opentempfd();
5088 err = got_error_from_errno("got_opentempfd");
5092 if (staged_status == GOT_STATUS_ADD ||
5093 staged_status == GOT_STATUS_MODIFY) {
5095 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
5099 err = got_object_id_str(&id_str, staged_blob_id);
5102 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
5103 err = got_error_from_errno("asprintf");
5108 } else if (status != GOT_STATUS_ADD) {
5109 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
5115 if (status != GOT_STATUS_DELETE) {
5116 if (asprintf(&abspath, "%s/%s",
5117 got_worktree_get_root_path(a->worktree), path) == -1) {
5118 err = got_error_from_errno("asprintf");
5123 fd = openat(dirfd, de_name,
5124 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5126 if (!got_err_open_nofollow_on_symlink()) {
5127 err = got_error_from_errno2("openat",
5131 err = get_symlink_target_file(&fd, dirfd,
5137 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5139 if (!got_err_open_nofollow_on_symlink()) {
5140 err = got_error_from_errno2("open",
5144 err = get_symlink_target_file(&fd, dirfd,
5150 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
5151 err = got_error_from_errno2("fstatat", abspath);
5154 f2 = fdopen(fd, "r");
5156 err = got_error_from_errno2("fdopen", abspath);
5164 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5170 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
5171 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
5172 a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
5174 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5175 err = got_error_from_errno("close");
5176 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5177 err = got_error_from_errno("close");
5179 got_object_blob_close(blob1);
5180 if (fd != -1 && close(fd) == -1 && err == NULL)
5181 err = got_error_from_errno("close");
5182 if (f2 && fclose(f2) == EOF && err == NULL)
5183 err = got_error_from_errno("fclose");
5188 static const struct got_error *
5189 cmd_diff(int argc, char *argv[])
5191 const struct got_error *error;
5192 struct got_repository *repo = NULL;
5193 struct got_worktree *worktree = NULL;
5194 char *cwd = NULL, *repo_path = NULL;
5195 const char *commit_args[2] = { NULL, NULL };
5196 int ncommit_args = 0;
5197 struct got_object_id *ids[2] = { NULL, NULL };
5198 char *labels[2] = { NULL, NULL };
5199 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5200 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5201 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5203 struct got_reflist_head refs;
5204 struct got_pathlist_head diffstat_paths, paths;
5205 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5206 int fd1 = -1, fd2 = -1;
5207 int *pack_fds = NULL;
5208 struct got_diffstat_cb_arg dsa;
5210 memset(&dsa, 0, sizeof(dsa));
5214 TAILQ_INIT(&diffstat_paths);
5217 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5222 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5225 force_text_diff = 1;
5228 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5231 errx(1, "number of context lines is %s: %s",
5235 if (ncommit_args >= 2)
5236 errx(1, "too many -c options used");
5237 commit_args[ncommit_args++] = optarg;
5246 repo_path = realpath(optarg, NULL);
5247 if (repo_path == NULL)
5248 return got_error_from_errno2("realpath",
5250 got_path_strip_trailing_slashes(repo_path);
5257 ignore_whitespace = 1;
5268 cwd = getcwd(NULL, 0);
5270 error = got_error_from_errno("getcwd");
5274 error = got_repo_pack_fds_open(&pack_fds);
5278 if (repo_path == NULL) {
5279 error = got_worktree_open(&worktree, cwd,
5280 GOT_WORKTREE_GOT_DIR);
5281 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5287 strdup(got_worktree_get_repo_path(worktree));
5288 if (repo_path == NULL) {
5289 error = got_error_from_errno("strdup");
5293 repo_path = strdup(cwd);
5294 if (repo_path == NULL) {
5295 error = got_error_from_errno("strdup");
5301 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5306 if (show_diffstat) {
5307 dsa.paths = &diffstat_paths;
5308 dsa.force_text = force_text_diff;
5309 dsa.ignore_ws = ignore_whitespace;
5310 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5313 if (rflag || worktree == NULL || ncommit_args > 0) {
5315 error = got_error_msg(GOT_ERR_NOT_IMPL,
5316 "-P option can only be used when diffing "
5321 error = got_error_msg(GOT_ERR_NOT_IMPL,
5322 "-s option can only be used when diffing "
5328 error = apply_unveil(got_repo_get_path(repo), 1,
5329 worktree ? got_worktree_get_root_path(worktree) : NULL);
5333 if ((!force_path && argc == 2) || ncommit_args > 0) {
5334 int obj_type = (ncommit_args > 0 ?
5335 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5336 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5340 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5342 char *keyword_idstr = NULL;
5344 if (ncommit_args > 0)
5345 arg = commit_args[i];
5349 error = got_keyword_to_idstr(&keyword_idstr, arg,
5353 if (keyword_idstr != NULL)
5354 arg = keyword_idstr;
5356 error = got_repo_match_object_id(&ids[i], &labels[i],
5357 arg, obj_type, &refs, repo);
5358 free(keyword_idstr);
5360 if (error->code != GOT_ERR_NOT_REF &&
5361 error->code != GOT_ERR_NO_OBJ)
5363 if (ncommit_args > 0)
5371 f1 = got_opentemp();
5373 error = got_error_from_errno("got_opentemp");
5377 f2 = got_opentemp();
5379 error = got_error_from_errno("got_opentemp");
5383 outfile = got_opentemp();
5384 if (outfile == NULL) {
5385 error = got_error_from_errno("got_opentemp");
5389 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5390 struct print_diff_arg arg;
5393 if (worktree == NULL) {
5394 if (argc == 2 && ids[0] == NULL) {
5395 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5397 } else if (argc == 2 && ids[1] == NULL) {
5398 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5400 } else if (argc > 0) {
5401 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5402 "%s", "specified paths cannot be resolved");
5405 error = got_error(GOT_ERR_NOT_WORKTREE);
5410 error = get_worktree_paths_from_argv(&paths, argc, argv,
5415 error = got_object_id_str(&id_str,
5416 got_worktree_get_base_commit_id(worktree));
5420 arg.worktree = worktree;
5421 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5422 arg.diff_context = diff_context;
5423 arg.id_str = id_str;
5424 arg.header_shown = 0;
5425 arg.diff_staged = diff_staged;
5426 arg.ignore_whitespace = ignore_whitespace;
5427 arg.force_text_diff = force_text_diff;
5428 arg.diffstat = show_diffstat ? &dsa : NULL;
5431 arg.outfile = outfile;
5433 error = got_worktree_status(worktree, &paths, repo, 0,
5434 print_diff, &arg, check_cancelled, NULL);
5439 if (show_diffstat && dsa.nfiles > 0) {
5442 if (asprintf(&header, "diffstat %s%s",
5443 diff_staged ? "-s " : "",
5444 got_worktree_get_root_path(worktree)) == -1) {
5445 error = got_error_from_errno("asprintf");
5449 error = print_diffstat(&dsa, header);
5455 error = printfile(outfile);
5459 if (ncommit_args == 1) {
5460 struct got_commit_object *commit;
5461 error = got_object_open_as_commit(&commit, repo, ids[0]);
5465 labels[1] = labels[0];
5467 if (got_object_commit_get_nparents(commit) > 0) {
5468 const struct got_object_id_queue *pids;
5469 struct got_object_qid *pid;
5470 pids = got_object_commit_get_parent_ids(commit);
5471 pid = STAILQ_FIRST(pids);
5472 ids[0] = got_object_id_dup(&pid->id);
5473 if (ids[0] == NULL) {
5474 error = got_error_from_errno(
5475 "got_object_id_dup");
5476 got_object_commit_close(commit);
5479 error = got_object_id_str(&labels[0], ids[0]);
5481 got_object_commit_close(commit);
5486 labels[0] = strdup("/dev/null");
5487 if (labels[0] == NULL) {
5488 error = got_error_from_errno("strdup");
5489 got_object_commit_close(commit);
5494 got_object_commit_close(commit);
5497 if (ncommit_args == 0 && argc > 2) {
5498 error = got_error_msg(GOT_ERR_BAD_PATH,
5499 "path arguments cannot be used when diffing two objects");
5504 error = got_object_get_type(&type1, repo, ids[0]);
5509 error = got_object_get_type(&type2, repo, ids[1]);
5512 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5513 error = got_error(GOT_ERR_OBJ_TYPE);
5516 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5517 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5518 "path arguments cannot be used when diffing blobs");
5522 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5524 struct got_pathlist_entry *new;
5528 error = got_worktree_resolve_path(&p, worktree,
5532 prefix = got_worktree_get_path_prefix(worktree);
5533 while (prefix[0] == '/')
5535 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5536 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5538 error = got_error_from_errno("asprintf");
5544 char *mapped_path, *s;
5545 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5551 in_repo_path = strdup(s);
5552 if (in_repo_path == NULL) {
5553 error = got_error_from_errno("asprintf");
5560 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5561 if (error || new == NULL /* duplicate */)
5568 /* Release work tree lock. */
5569 got_worktree_close(worktree);
5573 fd1 = got_opentempfd();
5575 error = got_error_from_errno("got_opentempfd");
5579 fd2 = got_opentempfd();
5581 error = got_error_from_errno("got_opentempfd");
5585 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5586 case GOT_OBJ_TYPE_BLOB:
5587 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5588 fd1, fd2, ids[0], ids[1], NULL, NULL,
5589 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5590 ignore_whitespace, force_text_diff,
5591 show_diffstat ? &dsa : NULL, repo, outfile);
5593 case GOT_OBJ_TYPE_TREE:
5594 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5595 ids[0], ids[1], &paths, "", "",
5596 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5597 ignore_whitespace, force_text_diff,
5598 show_diffstat ? &dsa : NULL, repo, outfile);
5600 case GOT_OBJ_TYPE_COMMIT:
5601 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5602 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5603 fd1, fd2, ids[0], ids[1], &paths,
5604 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5605 ignore_whitespace, force_text_diff,
5606 show_diffstat ? &dsa : NULL, repo, outfile);
5609 error = got_error(GOT_ERR_OBJ_TYPE);
5614 if (show_diffstat && dsa.nfiles > 0) {
5615 char *header = NULL;
5617 if (asprintf(&header, "diffstat %s %s",
5618 labels[0], labels[1]) == -1) {
5619 error = got_error_from_errno("asprintf");
5623 error = print_diffstat(&dsa, header);
5629 error = printfile(outfile);
5637 got_worktree_close(worktree);
5639 const struct got_error *close_err = got_repo_close(repo);
5644 const struct got_error *pack_err =
5645 got_repo_pack_fds_close(pack_fds);
5649 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5650 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5651 got_ref_list_free(&refs);
5652 if (outfile && fclose(outfile) == EOF && error == NULL)
5653 error = got_error_from_errno("fclose");
5654 if (f1 && fclose(f1) == EOF && error == NULL)
5655 error = got_error_from_errno("fclose");
5656 if (f2 && fclose(f2) == EOF && error == NULL)
5657 error = got_error_from_errno("fclose");
5658 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5659 error = got_error_from_errno("close");
5660 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5661 error = got_error_from_errno("close");
5669 "usage: %s blame [-c commit] [-r repository-path] path\n",
5678 char datebuf[11]; /* YYYY-MM-DD + NUL */
5681 struct blame_cb_args {
5682 struct blame_line *lines;
5686 off_t *line_offsets;
5688 struct got_repository *repo;
5691 static const struct got_error *
5692 blame_cb(void *arg, int nlines, int lineno,
5693 struct got_commit_object *commit, struct got_object_id *id)
5695 const struct got_error *err = NULL;
5696 struct blame_cb_args *a = arg;
5697 struct blame_line *bline;
5699 size_t linesize = 0;
5702 time_t committer_time;
5704 if (nlines != a->nlines ||
5705 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5706 return got_error(GOT_ERR_RANGE);
5708 if (sigint_received)
5709 return got_error(GOT_ERR_ITER_COMPLETED);
5712 return NULL; /* no change in this commit */
5714 /* Annotate this line. */
5715 bline = &a->lines[lineno - 1];
5716 if (bline->annotated)
5718 err = got_object_id_str(&bline->id_str, id);
5722 bline->committer = strdup(got_object_commit_get_committer(commit));
5723 if (bline->committer == NULL) {
5724 err = got_error_from_errno("strdup");
5728 committer_time = got_object_commit_get_committer_time(commit);
5729 if (gmtime_r(&committer_time, &tm) == NULL)
5730 return got_error_from_errno("gmtime_r");
5731 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%F", &tm) == 0) {
5732 err = got_error(GOT_ERR_NO_SPACE);
5735 bline->annotated = 1;
5737 /* Print lines annotated so far. */
5738 bline = &a->lines[a->lineno_cur - 1];
5739 if (!bline->annotated)
5742 offset = a->line_offsets[a->lineno_cur - 1];
5743 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5744 err = got_error_from_errno("fseeko");
5748 while (a->lineno_cur <= a->nlines && bline->annotated) {
5749 char *smallerthan, *at, *nl, *committer;
5752 if (getline(&line, &linesize, a->f) == -1) {
5754 err = got_error_from_errno("getline");
5758 committer = bline->committer;
5759 smallerthan = strchr(committer, '<');
5760 if (smallerthan && smallerthan[1] != '\0')
5761 committer = smallerthan + 1;
5762 at = strchr(committer, '@');
5765 len = strlen(committer);
5767 committer[8] = '\0';
5769 nl = strchr(line, '\n');
5772 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5773 bline->id_str, bline->datebuf, committer, line);
5776 bline = &a->lines[a->lineno_cur - 1];
5783 static const struct got_error *
5784 cmd_blame(int argc, char *argv[])
5786 const struct got_error *error;
5787 struct got_repository *repo = NULL;
5788 struct got_worktree *worktree = NULL;
5789 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5790 char *link_target = NULL;
5791 struct got_object_id *obj_id = NULL;
5792 struct got_object_id *commit_id = NULL;
5793 struct got_commit_object *commit = NULL;
5794 struct got_blob_object *blob = NULL;
5795 char *commit_id_str = NULL, *keyword_idstr = NULL;
5796 struct blame_cb_args bca;
5797 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5799 int *pack_fds = NULL;
5800 FILE *f1 = NULL, *f2 = NULL;
5802 fd1 = got_opentempfd();
5804 return got_error_from_errno("got_opentempfd");
5806 memset(&bca, 0, sizeof(bca));
5809 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5814 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5817 commit_id_str = optarg;
5820 repo_path = realpath(optarg, NULL);
5821 if (repo_path == NULL)
5822 return got_error_from_errno2("realpath",
5824 got_path_strip_trailing_slashes(repo_path);
5840 cwd = getcwd(NULL, 0);
5842 error = got_error_from_errno("getcwd");
5846 error = got_repo_pack_fds_open(&pack_fds);
5850 if (repo_path == NULL) {
5851 error = got_worktree_open(&worktree, cwd,
5852 GOT_WORKTREE_GOT_DIR);
5853 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5859 strdup(got_worktree_get_repo_path(worktree));
5860 if (repo_path == NULL) {
5861 error = got_error_from_errno("strdup");
5866 repo_path = strdup(cwd);
5867 if (repo_path == NULL) {
5868 error = got_error_from_errno("strdup");
5874 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5879 const char *prefix = got_worktree_get_path_prefix(worktree);
5882 error = got_worktree_resolve_path(&p, worktree, path);
5885 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5886 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5888 error = got_error_from_errno("asprintf");
5893 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5895 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5898 error = got_repo_map_path(&in_repo_path, repo, path);
5903 if (commit_id_str == NULL) {
5904 struct got_reference *head_ref;
5905 error = got_ref_open(&head_ref, repo, worktree ?
5906 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5909 error = got_ref_resolve(&commit_id, repo, head_ref);
5910 got_ref_close(head_ref);
5914 struct got_reflist_head refs;
5917 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5922 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
5926 if (keyword_idstr != NULL)
5927 commit_id_str = keyword_idstr;
5929 error = got_repo_match_object_id(&commit_id, NULL,
5930 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5931 got_ref_list_free(&refs);
5937 /* Release work tree lock. */
5938 got_worktree_close(worktree);
5942 error = got_object_open_as_commit(&commit, repo, commit_id);
5946 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5951 error = got_object_id_by_path(&obj_id, repo, commit,
5952 link_target ? link_target : in_repo_path);
5956 error = got_object_get_type(&obj_type, repo, obj_id);
5960 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5961 error = got_error_path(link_target ? link_target : in_repo_path,
5966 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5969 bca.f = got_opentemp();
5970 if (bca.f == NULL) {
5971 error = got_error_from_errno("got_opentemp");
5974 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5975 &bca.line_offsets, bca.f, blob);
5976 if (error || bca.nlines == 0)
5979 /* Don't include \n at EOF in the blame line count. */
5980 if (bca.line_offsets[bca.nlines - 1] == filesize)
5983 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5984 if (bca.lines == NULL) {
5985 error = got_error_from_errno("calloc");
5989 bca.nlines_prec = 0;
5997 fd2 = got_opentempfd();
5999 error = got_error_from_errno("got_opentempfd");
6002 fd3 = got_opentempfd();
6004 error = got_error_from_errno("got_opentempfd");
6007 f1 = got_opentemp();
6009 error = got_error_from_errno("got_opentemp");
6012 f2 = got_opentemp();
6014 error = got_error_from_errno("got_opentemp");
6017 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
6018 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
6019 check_cancelled, NULL, fd2, fd3, f1, f2);
6021 free(keyword_idstr);
6029 got_object_commit_close(commit);
6031 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
6032 error = got_error_from_errno("close");
6033 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
6034 error = got_error_from_errno("close");
6035 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
6036 error = got_error_from_errno("close");
6037 if (f1 && fclose(f1) == EOF && error == NULL)
6038 error = got_error_from_errno("fclose");
6039 if (f2 && fclose(f2) == EOF && error == NULL)
6040 error = got_error_from_errno("fclose");
6043 got_object_blob_close(blob);
6045 got_worktree_close(worktree);
6047 const struct got_error *close_err = got_repo_close(repo);
6052 const struct got_error *pack_err =
6053 got_repo_pack_fds_close(pack_fds);
6058 for (i = 0; i < bca.nlines; i++) {
6059 struct blame_line *bline = &bca.lines[i];
6060 free(bline->id_str);
6061 free(bline->committer);
6065 free(bca.line_offsets);
6066 if (bca.f && fclose(bca.f) == EOF && error == NULL)
6067 error = got_error_from_errno("fclose");
6074 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
6075 "[path]\n", getprogname());
6079 static const struct got_error *
6080 print_entry(struct got_tree_entry *te, const char *id, const char *path,
6081 const char *root_path, struct got_repository *repo)
6083 const struct got_error *err = NULL;
6084 int is_root_path = (strcmp(path, root_path) == 0);
6085 const char *modestr = "";
6086 mode_t mode = got_tree_entry_get_mode(te);
6087 char *link_target = NULL;
6089 path += strlen(root_path);
6090 while (path[0] == '/')
6093 if (got_object_tree_entry_is_submodule(te))
6095 else if (S_ISLNK(mode)) {
6098 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
6101 for (i = 0; link_target[i] != '\0'; i++) {
6102 if (!isprint((unsigned char)link_target[i]))
6103 link_target[i] = '?';
6108 else if (S_ISDIR(mode))
6110 else if (mode & S_IXUSR)
6113 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
6114 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
6115 link_target ? " -> ": "", link_target ? link_target : "");
6121 static const struct got_error *
6122 print_tree(const char *path, struct got_commit_object *commit,
6123 int show_ids, int recurse, const char *root_path,
6124 struct got_repository *repo)
6126 const struct got_error *err = NULL;
6127 struct got_object_id *tree_id = NULL;
6128 struct got_tree_object *tree = NULL;
6131 err = got_object_id_by_path(&tree_id, repo, commit, path);
6135 err = got_object_open_as_tree(&tree, repo, tree_id);
6138 nentries = got_object_tree_get_nentries(tree);
6139 for (i = 0; i < nentries; i++) {
6140 struct got_tree_entry *te;
6143 if (sigint_received || sigpipe_received)
6146 te = got_object_tree_get_entry(tree, i);
6149 err = got_object_id_str(&id_str,
6150 got_tree_entry_get_id(te));
6153 if (asprintf(&id, "%s ", id_str) == -1) {
6154 err = got_error_from_errno("asprintf");
6160 err = print_entry(te, id, path, root_path, repo);
6165 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
6167 if (asprintf(&child_path, "%s%s%s", path,
6168 path[0] == '/' && path[1] == '\0' ? "" : "/",
6169 got_tree_entry_get_name(te)) == -1) {
6170 err = got_error_from_errno("asprintf");
6173 err = print_tree(child_path, commit, show_ids, 1,
6182 got_object_tree_close(tree);
6187 static const struct got_error *
6188 cmd_tree(int argc, char *argv[])
6190 const struct got_error *error;
6191 struct got_repository *repo = NULL;
6192 struct got_worktree *worktree = NULL;
6193 const char *path, *refname = NULL;
6194 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6195 struct got_object_id *commit_id = NULL;
6196 struct got_commit_object *commit = NULL;
6197 char *commit_id_str = NULL, *keyword_idstr = NULL;
6198 int show_ids = 0, recurse = 0;
6200 int *pack_fds = NULL;
6203 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6208 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6211 commit_id_str = optarg;
6220 repo_path = realpath(optarg, NULL);
6221 if (repo_path == NULL)
6222 return got_error_from_errno2("realpath",
6224 got_path_strip_trailing_slashes(repo_path);
6242 cwd = getcwd(NULL, 0);
6244 error = got_error_from_errno("getcwd");
6248 error = got_repo_pack_fds_open(&pack_fds);
6252 if (repo_path == NULL) {
6253 error = got_worktree_open(&worktree, cwd,
6254 GOT_WORKTREE_GOT_DIR);
6255 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6261 strdup(got_worktree_get_repo_path(worktree));
6262 if (repo_path == NULL)
6263 error = got_error_from_errno("strdup");
6267 repo_path = strdup(cwd);
6268 if (repo_path == NULL) {
6269 error = got_error_from_errno("strdup");
6275 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6280 const char *prefix = got_worktree_get_path_prefix(worktree);
6283 if (path == NULL || got_path_is_root_dir(path))
6285 error = got_worktree_resolve_path(&p, worktree, path);
6288 if (asprintf(&in_repo_path, "%s%s%s", prefix,
6289 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
6291 error = got_error_from_errno("asprintf");
6296 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6300 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6305 error = got_repo_map_path(&in_repo_path, repo, path);
6310 if (commit_id_str == NULL) {
6311 struct got_reference *head_ref;
6313 refname = got_worktree_get_head_ref_name(worktree);
6315 refname = GOT_REF_HEAD;
6316 error = got_ref_open(&head_ref, repo, refname, 0);
6319 error = got_ref_resolve(&commit_id, repo, head_ref);
6320 got_ref_close(head_ref);
6324 struct got_reflist_head refs;
6327 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6332 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
6336 if (keyword_idstr != NULL)
6337 commit_id_str = keyword_idstr;
6339 error = got_repo_match_object_id(&commit_id, NULL,
6340 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6341 got_ref_list_free(&refs);
6347 /* Release work tree lock. */
6348 got_worktree_close(worktree);
6352 error = got_object_open_as_commit(&commit, repo, commit_id);
6356 error = print_tree(in_repo_path, commit, show_ids, recurse,
6357 in_repo_path, repo);
6359 free(keyword_idstr);
6365 got_object_commit_close(commit);
6367 got_worktree_close(worktree);
6369 const struct got_error *close_err = got_repo_close(repo);
6374 const struct got_error *pack_err =
6375 got_repo_pack_fds_close(pack_fds);
6385 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6386 "[-s status-codes] [path ...]\n", getprogname());
6390 struct got_status_arg {
6395 static const struct got_error *
6396 print_status(void *arg, unsigned char status, unsigned char staged_status,
6397 const char *path, struct got_object_id *blob_id,
6398 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6399 int dirfd, const char *de_name)
6401 struct got_status_arg *st = arg;
6403 if (status == staged_status && (status == GOT_STATUS_DELETE))
6404 status = GOT_STATUS_NO_CHANGE;
6405 if (st != NULL && st->status_codes) {
6406 size_t ncodes = strlen(st->status_codes);
6409 for (i = 0; i < ncodes ; i++) {
6411 if (status == st->status_codes[i] ||
6412 staged_status == st->status_codes[i]) {
6417 if (status == st->status_codes[i] ||
6418 staged_status == st->status_codes[i])
6423 if (st->suppress && j == 0)
6430 printf("%c%c %s\n", status, staged_status, path);
6434 static const struct got_error *
6435 show_operation_in_progress(struct got_worktree *worktree,
6436 struct got_repository *repo)
6438 const struct got_error *err;
6439 char *new_base_branch_name = NULL;
6440 char *branch_name = NULL;
6441 int rebase_in_progress, histedit_in_progress, merge_in_progress;
6443 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6446 if (rebase_in_progress) {
6447 err = got_worktree_rebase_info(&new_base_branch_name,
6448 &branch_name, worktree, repo);
6451 printf("Work tree is rebasing %s onto %s\n",
6452 branch_name, new_base_branch_name);
6455 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6459 if (histedit_in_progress) {
6460 err = got_worktree_histedit_info(&branch_name, worktree, repo);
6463 printf("Work tree is editing the history of %s\n", branch_name);
6466 err = got_worktree_merge_in_progress(&merge_in_progress,
6470 if (merge_in_progress) {
6471 err = got_worktree_merge_info(&branch_name, worktree,
6475 printf("Work tree is merging %s into %s\n", branch_name,
6476 got_worktree_get_head_ref_name(worktree));
6479 free(new_base_branch_name);
6484 static const struct got_error *
6485 cmd_status(int argc, char *argv[])
6487 const struct got_error *close_err, *error = NULL;
6488 struct got_repository *repo = NULL;
6489 struct got_worktree *worktree = NULL;
6490 struct got_status_arg st;
6492 struct got_pathlist_head paths;
6493 int ch, i, no_ignores = 0;
6494 int *pack_fds = NULL;
6498 memset(&st, 0, sizeof(st));
6499 st.status_codes = NULL;
6503 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6508 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6514 if (st.status_codes != NULL && st.suppress == 0)
6515 option_conflict('S', 's');
6519 for (i = 0; optarg[i] != '\0'; i++) {
6520 switch (optarg[i]) {
6521 case GOT_STATUS_MODIFY:
6522 case GOT_STATUS_ADD:
6523 case GOT_STATUS_DELETE:
6524 case GOT_STATUS_CONFLICT:
6525 case GOT_STATUS_MISSING:
6526 case GOT_STATUS_OBSTRUCTED:
6527 case GOT_STATUS_UNVERSIONED:
6528 case GOT_STATUS_MODE_CHANGE:
6529 case GOT_STATUS_NONEXISTENT:
6532 errx(1, "invalid status code '%c'",
6536 if (ch == 's' && st.suppress)
6537 option_conflict('s', 'S');
6538 st.status_codes = optarg;
6549 cwd = getcwd(NULL, 0);
6551 error = got_error_from_errno("getcwd");
6555 error = got_repo_pack_fds_open(&pack_fds);
6559 error = got_worktree_open(&worktree, cwd,
6560 GOT_WORKTREE_GOT_DIR);
6562 if (error->code == GOT_ERR_NOT_WORKTREE)
6563 error = wrap_not_worktree_error(error, "status", cwd);
6567 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6572 error = apply_unveil(got_repo_get_path(repo), 1,
6573 got_worktree_get_root_path(worktree));
6577 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6581 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6582 print_status, &st, check_cancelled, NULL);
6586 error = show_operation_in_progress(worktree, repo);
6589 const struct got_error *pack_err =
6590 got_repo_pack_fds_close(pack_fds);
6595 close_err = got_repo_close(repo);
6599 if (worktree != NULL) {
6600 close_err = got_worktree_close(worktree);
6605 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6613 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6614 "[-s reference] [name]\n", getprogname());
6618 static const struct got_error *
6619 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6621 static const struct got_error *err = NULL;
6622 struct got_reflist_head refs;
6623 struct got_reflist_entry *re;
6626 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6627 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6632 TAILQ_FOREACH(re, &refs, entry) {
6634 refstr = got_ref_to_str(re->ref);
6635 if (refstr == NULL) {
6636 err = got_error_from_errno("got_ref_to_str");
6639 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6643 got_ref_list_free(&refs);
6647 static const struct got_error *
6648 delete_ref_by_name(struct got_repository *repo, const char *refname)
6650 const struct got_error *err;
6651 struct got_reference *ref;
6653 err = got_ref_open(&ref, repo, refname, 0);
6657 err = delete_ref(repo, ref);
6662 static const struct got_error *
6663 add_ref(struct got_repository *repo, const char *refname, const char *target)
6665 const struct got_error *err = NULL;
6666 struct got_object_id *id = NULL;
6667 struct got_reference *ref = NULL;
6668 struct got_reflist_head refs;
6671 * Don't let the user create a reference name with a leading '-'.
6672 * While technically a valid reference name, this case is usually
6673 * an unintended typo.
6675 if (refname[0] == '-')
6676 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6679 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6682 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6684 got_ref_list_free(&refs);
6688 err = got_ref_alloc(&ref, refname, id);
6692 err = got_ref_write(ref, repo);
6700 static const struct got_error *
6701 add_symref(struct got_repository *repo, const char *refname, const char *target)
6703 const struct got_error *err = NULL;
6704 struct got_reference *ref = NULL;
6705 struct got_reference *target_ref = NULL;
6708 * Don't let the user create a reference name with a leading '-'.
6709 * While technically a valid reference name, this case is usually
6710 * an unintended typo.
6712 if (refname[0] == '-')
6713 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6715 err = got_ref_open(&target_ref, repo, target, 0);
6719 err = got_ref_alloc_symref(&ref, refname, target_ref);
6723 err = got_ref_write(ref, repo);
6726 got_ref_close(target_ref);
6732 static const struct got_error *
6733 cmd_ref(int argc, char *argv[])
6735 const struct got_error *error = NULL;
6736 struct got_repository *repo = NULL;
6737 struct got_worktree *worktree = NULL;
6738 char *cwd = NULL, *repo_path = NULL;
6739 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6740 const char *obj_arg = NULL, *symref_target= NULL;
6741 char *refname = NULL, *keyword_idstr = NULL;
6742 int *pack_fds = NULL;
6745 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6746 "sendfd unveil", NULL) == -1)
6750 while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6762 repo_path = realpath(optarg, NULL);
6763 if (repo_path == NULL)
6764 return got_error_from_errno2("realpath",
6766 got_path_strip_trailing_slashes(repo_path);
6769 symref_target = optarg;
6780 if (obj_arg && do_list)
6781 option_conflict('c', 'l');
6782 if (obj_arg && do_delete)
6783 option_conflict('c', 'd');
6784 if (obj_arg && symref_target)
6785 option_conflict('c', 's');
6786 if (symref_target && do_delete)
6787 option_conflict('s', 'd');
6788 if (symref_target && do_list)
6789 option_conflict('s', 'l');
6790 if (do_delete && do_list)
6791 option_conflict('d', 'l');
6792 if (sort_by_time && !do_list)
6793 errx(1, "-t option requires -l option");
6799 if (argc != 0 && argc != 1)
6802 refname = strdup(argv[0]);
6803 if (refname == NULL) {
6804 error = got_error_from_errno("strdup");
6811 refname = strdup(argv[0]);
6812 if (refname == NULL) {
6813 error = got_error_from_errno("strdup");
6819 got_path_strip_trailing_slashes(refname);
6821 cwd = getcwd(NULL, 0);
6823 error = got_error_from_errno("getcwd");
6827 error = got_repo_pack_fds_open(&pack_fds);
6831 if (repo_path == NULL) {
6832 error = got_worktree_open(&worktree, cwd,
6833 GOT_WORKTREE_GOT_DIR);
6834 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6840 strdup(got_worktree_get_repo_path(worktree));
6841 if (repo_path == NULL)
6842 error = got_error_from_errno("strdup");
6846 repo_path = strdup(cwd);
6847 if (repo_path == NULL) {
6848 error = got_error_from_errno("strdup");
6854 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6860 /* Remove "cpath" promise. */
6861 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6867 error = apply_unveil(got_repo_get_path(repo), do_list,
6868 worktree ? got_worktree_get_root_path(worktree) : NULL);
6873 error = list_refs(repo, refname, sort_by_time);
6875 error = delete_ref_by_name(repo, refname);
6876 else if (symref_target)
6877 error = add_symref(repo, refname, symref_target);
6879 if (obj_arg == NULL)
6882 error = got_keyword_to_idstr(&keyword_idstr, obj_arg,
6886 if (keyword_idstr != NULL)
6887 obj_arg = keyword_idstr;
6889 error = add_ref(repo, refname, obj_arg);
6894 const struct got_error *close_err = got_repo_close(repo);
6899 got_worktree_close(worktree);
6901 const struct got_error *pack_err =
6902 got_repo_pack_fds_close(pack_fds);
6908 free(keyword_idstr);
6915 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6916 "[-r repository-path] [name]\n", getprogname());
6920 static const struct got_error *
6921 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6922 struct got_reference *ref)
6924 const struct got_error *err = NULL;
6925 const char *refname;
6929 refname = got_ref_get_name(ref);
6930 if (worktree && strcmp(refname,
6931 got_worktree_get_head_ref_name(worktree)) == 0) {
6932 err = got_worktree_get_state(&marker, repo, worktree,
6933 check_cancelled, NULL);
6938 if (strncmp(refname, "refs/heads/", 11) == 0)
6940 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6942 if (strncmp(refname, "refs/remotes/", 13) == 0)
6945 refstr = got_ref_to_str(ref);
6947 return got_error_from_errno("got_ref_to_str");
6949 printf("%c %s: %s\n", marker, refname, refstr);
6954 static const struct got_error *
6955 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6957 const char *refname;
6959 if (worktree == NULL)
6960 return got_error(GOT_ERR_NOT_WORKTREE);
6962 refname = got_worktree_get_head_ref_name(worktree);
6964 if (strncmp(refname, "refs/heads/", 11) == 0)
6966 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6969 printf("%s\n", refname);
6974 static const struct got_error *
6975 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6978 static const struct got_error *err = NULL;
6979 struct got_reflist_head refs;
6980 struct got_reflist_entry *re;
6981 struct got_reference *temp_ref = NULL;
6982 int rebase_in_progress, histedit_in_progress;
6987 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6992 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6997 if (rebase_in_progress || histedit_in_progress) {
6998 err = got_ref_open(&temp_ref, repo,
6999 got_worktree_get_head_ref_name(worktree), 0);
7002 list_branch(repo, worktree, temp_ref);
7003 got_ref_close(temp_ref);
7007 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
7008 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
7013 TAILQ_FOREACH(re, &refs, entry)
7014 list_branch(repo, worktree, re->ref);
7016 got_ref_list_free(&refs);
7018 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
7019 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
7024 TAILQ_FOREACH(re, &refs, entry)
7025 list_branch(repo, worktree, re->ref);
7027 got_ref_list_free(&refs);
7032 static const struct got_error *
7033 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
7034 const char *branch_name)
7036 const struct got_error *err = NULL;
7037 struct got_reference *ref = NULL;
7038 char *refname, *remote_refname = NULL;
7040 if (strncmp(branch_name, "refs/", 5) == 0)
7042 if (strncmp(branch_name, "heads/", 6) == 0)
7044 else if (strncmp(branch_name, "remotes/", 8) == 0)
7047 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
7048 return got_error_from_errno("asprintf");
7050 if (asprintf(&remote_refname, "refs/remotes/%s",
7051 branch_name) == -1) {
7052 err = got_error_from_errno("asprintf");
7056 err = got_ref_open(&ref, repo, refname, 0);
7058 const struct got_error *err2;
7059 if (err->code != GOT_ERR_NOT_REF)
7062 * Keep 'err' intact such that if neither branch exists
7063 * we report "refs/heads" rather than "refs/remotes" in
7064 * our error message.
7066 err2 = got_ref_open(&ref, repo, remote_refname, 0);
7073 strcmp(got_worktree_get_head_ref_name(worktree),
7074 got_ref_get_name(ref)) == 0) {
7075 err = got_error_msg(GOT_ERR_SAME_BRANCH,
7076 "will not delete this work tree's current branch");
7080 err = delete_ref(repo, ref);
7085 free(remote_refname);
7089 static const struct got_error *
7090 add_branch(struct got_repository *repo, const char *branch_name,
7091 struct got_object_id *base_commit_id)
7093 const struct got_error *err = NULL;
7094 struct got_reference *ref = NULL;
7095 char *refname = NULL;
7098 * Don't let the user create a branch name with a leading '-'.
7099 * While technically a valid reference name, this case is usually
7100 * an unintended typo.
7102 if (branch_name[0] == '-')
7103 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
7105 if (strncmp(branch_name, "refs/heads/", 11) == 0)
7108 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
7109 err = got_error_from_errno("asprintf");
7113 err = got_ref_open(&ref, repo, refname, 0);
7115 err = got_error(GOT_ERR_BRANCH_EXISTS);
7117 } else if (err->code != GOT_ERR_NOT_REF)
7120 err = got_ref_alloc(&ref, refname, base_commit_id);
7124 err = got_ref_write(ref, repo);
7132 static const struct got_error *
7133 cmd_branch(int argc, char *argv[])
7135 const struct got_error *error = NULL;
7136 struct got_repository *repo = NULL;
7137 struct got_worktree *worktree = NULL;
7138 char *cwd = NULL, *repo_path = NULL;
7139 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
7140 const char *delref = NULL, *commit_id_arg = NULL;
7141 struct got_reference *ref = NULL;
7142 struct got_pathlist_head paths;
7143 struct got_object_id *commit_id = NULL;
7144 char *commit_id_str = NULL, *keyword_idstr = NULL;;
7145 int *pack_fds = NULL;
7150 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7151 "sendfd unveil", NULL) == -1)
7155 while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
7158 commit_id_arg = optarg;
7170 repo_path = realpath(optarg, NULL);
7171 if (repo_path == NULL)
7172 return got_error_from_errno2("realpath",
7174 got_path_strip_trailing_slashes(repo_path);
7185 if (do_list && delref)
7186 option_conflict('l', 'd');
7187 if (sort_by_time && !do_list)
7188 errx(1, "-t option requires -l option");
7193 if (!do_list && !delref && argc == 0)
7196 if ((do_list || delref || do_show) && commit_id_arg != NULL)
7197 errx(1, "-c option can only be used when creating a branch");
7199 if (do_list || delref) {
7202 } else if (!do_show && argc != 1)
7205 cwd = getcwd(NULL, 0);
7207 error = got_error_from_errno("getcwd");
7211 error = got_repo_pack_fds_open(&pack_fds);
7215 if (repo_path == NULL) {
7216 error = got_worktree_open(&worktree, cwd,
7217 GOT_WORKTREE_GOT_DIR);
7218 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7224 strdup(got_worktree_get_repo_path(worktree));
7225 if (repo_path == NULL)
7226 error = got_error_from_errno("strdup");
7230 repo_path = strdup(cwd);
7231 if (repo_path == NULL) {
7232 error = got_error_from_errno("strdup");
7238 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7243 if (do_list || do_show) {
7244 /* Remove "cpath" promise. */
7245 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7251 error = apply_unveil(got_repo_get_path(repo), do_list,
7252 worktree ? got_worktree_get_root_path(worktree) : NULL);
7257 error = show_current_branch(repo, worktree);
7259 error = list_branches(repo, worktree, sort_by_time);
7261 error = delete_branch(repo, worktree, delref);
7263 struct got_reflist_head refs;
7265 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
7269 if (commit_id_arg == NULL)
7270 commit_id_arg = worktree ?
7271 got_worktree_get_head_ref_name(worktree) :
7274 error = got_keyword_to_idstr(&keyword_idstr,
7275 commit_id_arg, repo, worktree);
7278 if (keyword_idstr != NULL)
7279 commit_id_arg = keyword_idstr;
7281 error = got_repo_match_object_id(&commit_id, NULL,
7282 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
7283 got_ref_list_free(&refs);
7286 error = add_branch(repo, argv[0], commit_id);
7289 if (worktree && do_update) {
7290 struct got_update_progress_arg upa;
7291 char *branch_refname = NULL;
7293 error = got_object_id_str(&commit_id_str, commit_id);
7296 error = get_worktree_paths_from_argv(&paths, 0, NULL,
7300 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7302 error = got_error_from_errno("asprintf");
7305 error = got_ref_open(&ref, repo, branch_refname, 0);
7306 free(branch_refname);
7309 error = switch_head_ref(ref, commit_id, worktree,
7313 error = got_worktree_set_base_commit_id(worktree, repo,
7317 memset(&upa, 0, sizeof(upa));
7318 error = got_worktree_checkout_files(worktree, &paths,
7319 repo, update_progress, &upa, check_cancelled,
7323 if (upa.did_something) {
7324 printf("Updated to %s: %s\n",
7325 got_worktree_get_head_ref_name(worktree),
7328 print_update_progress_stats(&upa);
7332 free(keyword_idstr);
7336 const struct got_error *close_err = got_repo_close(repo);
7341 got_worktree_close(worktree);
7343 const struct got_error *pack_err =
7344 got_repo_pack_fds_close(pack_fds);
7351 free(commit_id_str);
7352 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7360 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7361 "[-r repository-path] [-s signer-id] name\n", getprogname());
7366 static const struct got_error *
7367 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7369 const struct got_error *err = NULL;
7370 struct got_reflist_entry *re, *se, *new;
7371 struct got_object_id *re_id, *se_id;
7372 struct got_tag_object *re_tag, *se_tag;
7373 time_t re_time, se_time;
7375 STAILQ_FOREACH(re, tags, entry) {
7376 se = STAILQ_FIRST(sorted);
7378 err = got_reflist_entry_dup(&new, re);
7381 STAILQ_INSERT_HEAD(sorted, new, entry);
7384 err = got_ref_resolve(&re_id, repo, re->ref);
7387 err = got_object_open_as_tag(&re_tag, repo, re_id);
7391 re_time = got_object_tag_get_tagger_time(re_tag);
7392 got_object_tag_close(re_tag);
7396 err = got_ref_resolve(&se_id, repo, re->ref);
7399 err = got_object_open_as_tag(&se_tag, repo, se_id);
7403 se_time = got_object_tag_get_tagger_time(se_tag);
7404 got_object_tag_close(se_tag);
7406 if (se_time > re_time) {
7407 err = got_reflist_entry_dup(&new, re);
7410 STAILQ_INSERT_AFTER(sorted, se, new, entry);
7413 se = STAILQ_NEXT(se, entry);
7422 static const struct got_error *
7423 get_tag_refname(char **refname, const char *tag_name)
7425 const struct got_error *err;
7427 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7428 *refname = strdup(tag_name);
7429 if (*refname == NULL)
7430 return got_error_from_errno("strdup");
7431 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7432 err = got_error_from_errno("asprintf");
7440 static const struct got_error *
7441 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7442 const char *allowed_signers, const char *revoked_signers, int verbosity)
7444 static const struct got_error *err = NULL;
7445 struct got_reflist_head refs;
7446 struct got_reflist_entry *re;
7447 char *wanted_refname = NULL;
7452 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7457 struct got_reference *ref;
7458 err = get_tag_refname(&wanted_refname, tag_name);
7461 /* Wanted tag reference should exist. */
7462 err = got_ref_open(&ref, repo, wanted_refname, 0);
7468 TAILQ_FOREACH(re, &refs, entry) {
7469 const char *refname;
7470 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7472 const char *tagger, *ssh_sig = NULL;
7473 char *sig_msg = NULL;
7475 struct got_object_id *id;
7476 struct got_tag_object *tag;
7477 struct got_commit_object *commit = NULL;
7479 refname = got_ref_get_name(re->ref);
7480 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7481 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7484 refstr = got_ref_to_str(re->ref);
7485 if (refstr == NULL) {
7486 err = got_error_from_errno("got_ref_to_str");
7490 err = got_ref_resolve(&id, repo, re->ref);
7493 err = got_object_open_as_tag(&tag, repo, id);
7495 if (err->code != GOT_ERR_OBJ_TYPE) {
7499 /* "lightweight" tag */
7500 err = got_object_open_as_commit(&commit, repo, id);
7505 tagger = got_object_commit_get_committer(commit);
7507 got_object_commit_get_committer_time(commit);
7508 err = got_object_id_str(&id_str, id);
7514 tagger = got_object_tag_get_tagger(tag);
7515 tagger_time = got_object_tag_get_tagger_time(tag);
7516 err = got_object_id_str(&id_str,
7517 got_object_tag_get_object_id(tag));
7522 if (tag && verify_tags) {
7523 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7524 got_object_tag_get_message(tag));
7525 if (ssh_sig && allowed_signers == NULL) {
7526 err = got_error_msg(
7527 GOT_ERR_VERIFY_TAG_SIGNATURE,
7528 "SSH signature verification requires "
7529 "setting allowed_signers in "
7535 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7537 printf("from: %s\n", tagger);
7538 datestr = get_datestr(&tagger_time, datebuf);
7540 printf("date: %s UTC\n", datestr);
7542 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7544 switch (got_object_tag_get_object_type(tag)) {
7545 case GOT_OBJ_TYPE_BLOB:
7546 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7549 case GOT_OBJ_TYPE_TREE:
7550 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7553 case GOT_OBJ_TYPE_COMMIT:
7554 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7557 case GOT_OBJ_TYPE_TAG:
7558 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7568 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7569 allowed_signers, revoked_signers, verbosity);
7570 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7574 printf("signature: %s", sig_msg);
7580 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7583 got_object_commit_close(commit);
7585 tagmsg0 = strdup(got_object_tag_get_message(tag));
7586 got_object_tag_close(tag);
7587 if (tagmsg0 == NULL) {
7588 err = got_error_from_errno("strdup");
7595 line = strsep(&tagmsg, "\n");
7597 printf(" %s\n", line);
7602 got_ref_list_free(&refs);
7603 free(wanted_refname);
7605 if (err == NULL && bad_sigs)
7606 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7610 static const struct got_error *
7611 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7612 const char *tag_name, const char *editor, const char *repo_path)
7614 const struct got_error *err = NULL;
7615 char *template = NULL, *initial_content = NULL;
7616 int initial_content_len;
7619 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7620 err = got_error_from_errno("asprintf");
7624 initial_content_len = asprintf(&initial_content,
7625 "\n# tagging commit %s as %s\n",
7626 commit_id_str, tag_name);
7627 if (initial_content_len == -1) {
7628 err = got_error_from_errno("asprintf");
7632 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7636 if (write(fd, initial_content, initial_content_len) == -1) {
7637 err = got_error_from_errno2("write", *tagmsg_path);
7640 if (close(fd) == -1) {
7641 err = got_error_from_errno2("close", *tagmsg_path);
7646 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7647 initial_content_len, 1);
7649 free(initial_content);
7652 if (fd != -1 && close(fd) == -1 && err == NULL)
7653 err = got_error_from_errno2("close", *tagmsg_path);
7662 static const struct got_error *
7663 add_tag(struct got_repository *repo, const char *tagger,
7664 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7665 const char *signer_id, const char *editor, int verbosity)
7667 const struct got_error *err = NULL;
7668 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7669 char *label = NULL, *commit_id_str = NULL;
7670 struct got_reference *ref = NULL;
7671 char *refname = NULL, *tagmsg = NULL;
7672 char *tagmsg_path = NULL, *tag_id_str = NULL;
7673 int preserve_tagmsg = 0;
7674 struct got_reflist_head refs;
7679 * Don't let the user create a tag name with a leading '-'.
7680 * While technically a valid reference name, this case is usually
7681 * an unintended typo.
7683 if (tag_name[0] == '-')
7684 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7686 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7690 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7691 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7695 err = got_object_id_str(&commit_id_str, commit_id);
7699 err = get_tag_refname(&refname, tag_name);
7702 if (strncmp("refs/tags/", tag_name, 10) == 0)
7705 err = got_ref_open(&ref, repo, refname, 0);
7707 err = got_error(GOT_ERR_TAG_EXISTS);
7709 } else if (err->code != GOT_ERR_NOT_REF)
7712 if (tagmsg_arg == NULL) {
7713 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7714 tag_name, editor, got_repo_get_path(repo));
7716 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7717 tagmsg_path != NULL)
7718 preserve_tagmsg = 1;
7723 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7724 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7728 preserve_tagmsg = 1;
7732 err = got_ref_alloc(&ref, refname, tag_id);
7735 preserve_tagmsg = 1;
7739 err = got_ref_write(ref, repo);
7742 preserve_tagmsg = 1;
7746 err = got_object_id_str(&tag_id_str, tag_id);
7749 preserve_tagmsg = 1;
7752 printf("Created tag %s\n", tag_id_str);
7754 if (preserve_tagmsg) {
7755 fprintf(stderr, "%s: tag message preserved in %s\n",
7756 getprogname(), tagmsg_path);
7757 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7758 err = got_error_from_errno2("unlink", tagmsg_path);
7763 free(commit_id_str);
7767 got_ref_list_free(&refs);
7771 static const struct got_error *
7772 cmd_tag(int argc, char *argv[])
7774 const struct got_error *error = NULL;
7775 struct got_repository *repo = NULL;
7776 struct got_worktree *worktree = NULL;
7777 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7778 char *gitconfig_path = NULL, *tagger = NULL, *keyword_idstr = NULL;
7779 char *allowed_signers = NULL, *revoked_signers = NULL, *editor = NULL;
7780 const char *signer_id = NULL;
7781 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7782 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7783 int *pack_fds = NULL;
7786 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7787 "sendfd unveil", NULL) == -1)
7791 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7794 commit_id_arg = optarg;
7803 repo_path = realpath(optarg, NULL);
7804 if (repo_path == NULL) {
7805 error = got_error_from_errno2("realpath",
7809 got_path_strip_trailing_slashes(repo_path);
7820 else if (verbosity < 3)
7832 if (do_list || verify_tags) {
7833 if (commit_id_arg != NULL)
7835 "-c option can only be used when creating a tag");
7838 option_conflict('l', 'm');
7840 option_conflict('V', 'm');
7844 option_conflict('l', 's');
7846 option_conflict('V', 's');
7850 } else if (argc != 1)
7856 cwd = getcwd(NULL, 0);
7858 error = got_error_from_errno("getcwd");
7862 error = got_repo_pack_fds_open(&pack_fds);
7866 if (repo_path == NULL) {
7867 error = got_worktree_open(&worktree, cwd,
7868 GOT_WORKTREE_GOT_DIR);
7869 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7875 strdup(got_worktree_get_repo_path(worktree));
7876 if (repo_path == NULL)
7877 error = got_error_from_errno("strdup");
7881 repo_path = strdup(cwd);
7882 if (repo_path == NULL) {
7883 error = got_error_from_errno("strdup");
7889 if (do_list || verify_tags) {
7890 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7893 error = get_allowed_signers(&allowed_signers, repo, worktree);
7896 error = get_revoked_signers(&revoked_signers, repo, worktree);
7900 /* Release work tree lock. */
7901 got_worktree_close(worktree);
7906 * Remove "cpath" promise unless needed for signature tmpfile
7910 got_sigs_apply_unveil();
7913 if (pledge("stdio rpath wpath flock proc exec sendfd "
7914 "unveil", NULL) == -1)
7918 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7921 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7922 revoked_signers, verbosity);
7924 error = get_gitconfig_path(&gitconfig_path);
7927 error = got_repo_open(&repo, repo_path, gitconfig_path,
7932 error = get_author(&tagger, repo, worktree);
7935 if (signer_id == NULL)
7936 signer_id = get_signer_id(repo, worktree);
7938 if (tagmsg == NULL) {
7939 error = get_editor(&editor);
7942 if (unveil(editor, "x") != 0) {
7943 error = got_error_from_errno2("unveil", editor);
7948 error = got_sigs_apply_unveil();
7952 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7956 if (commit_id_arg == NULL) {
7957 struct got_reference *head_ref;
7958 struct got_object_id *commit_id;
7959 error = got_ref_open(&head_ref, repo,
7960 worktree ? got_worktree_get_head_ref_name(worktree)
7964 error = got_ref_resolve(&commit_id, repo, head_ref);
7965 got_ref_close(head_ref);
7968 error = got_object_id_str(&commit_id_str, commit_id);
7973 error = got_keyword_to_idstr(&keyword_idstr,
7974 commit_id_arg, repo, worktree);
7977 commit_id_str = keyword_idstr;
7981 /* Release work tree lock. */
7982 got_worktree_close(worktree);
7986 error = add_tag(repo, tagger, tag_name,
7987 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7988 signer_id, editor, verbosity);
7992 const struct got_error *close_err = got_repo_close(repo);
7997 got_worktree_close(worktree);
7999 const struct got_error *pack_err =
8000 got_repo_pack_fds_close(pack_fds);
8007 free(gitconfig_path);
8008 free(commit_id_str);
8010 free(allowed_signers);
8011 free(revoked_signers);
8018 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
8022 static const struct got_error *
8023 add_progress(void *arg, unsigned char status, const char *path)
8025 while (path[0] == '/')
8027 printf("%c %s\n", status, path);
8031 static const struct got_error *
8032 cmd_add(int argc, char *argv[])
8034 const struct got_error *error = NULL;
8035 struct got_repository *repo = NULL;
8036 struct got_worktree *worktree = NULL;
8038 struct got_pathlist_head paths;
8039 struct got_pathlist_entry *pe;
8040 int ch, can_recurse = 0, no_ignores = 0;
8041 int *pack_fds = NULL;
8046 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8051 while ((ch = getopt(argc, argv, "IR")) != -1) {
8071 cwd = getcwd(NULL, 0);
8073 error = got_error_from_errno("getcwd");
8077 error = got_repo_pack_fds_open(&pack_fds);
8081 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8083 if (error->code == GOT_ERR_NOT_WORKTREE)
8084 error = wrap_not_worktree_error(error, "add", cwd);
8088 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8093 error = apply_unveil(got_repo_get_path(repo), 1,
8094 got_worktree_get_root_path(worktree));
8098 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8105 TAILQ_FOREACH(pe, &paths, entry) {
8106 if (asprintf(&ondisk_path, "%s/%s",
8107 got_worktree_get_root_path(worktree),
8109 error = got_error_from_errno("asprintf");
8112 if (lstat(ondisk_path, &sb) == -1) {
8113 if (errno == ENOENT) {
8117 error = got_error_from_errno2("lstat",
8123 if (S_ISDIR(sb.st_mode)) {
8124 error = got_error_msg(GOT_ERR_BAD_PATH,
8125 "adding directories requires -R option");
8131 error = got_worktree_schedule_add(worktree, &paths, add_progress,
8132 NULL, repo, no_ignores);
8135 const struct got_error *close_err = got_repo_close(repo);
8140 got_worktree_close(worktree);
8142 const struct got_error *pack_err =
8143 got_repo_pack_fds_close(pack_fds);
8147 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8155 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
8160 static const struct got_error *
8161 print_remove_status(void *arg, unsigned char status,
8162 unsigned char staged_status, const char *path)
8164 while (path[0] == '/')
8166 if (status == GOT_STATUS_NONEXISTENT)
8168 if (status == staged_status && (status == GOT_STATUS_DELETE))
8169 status = GOT_STATUS_NO_CHANGE;
8170 printf("%c%c %s\n", status, staged_status, path);
8174 static const struct got_error *
8175 cmd_remove(int argc, char *argv[])
8177 const struct got_error *error = NULL;
8178 struct got_worktree *worktree = NULL;
8179 struct got_repository *repo = NULL;
8180 const char *status_codes = NULL;
8182 struct got_pathlist_head paths;
8183 struct got_pathlist_entry *pe;
8184 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
8185 int ignore_missing_paths = 0;
8186 int *pack_fds = NULL;
8191 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8196 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
8199 delete_local_mods = 1;
8200 ignore_missing_paths = 1;
8209 for (i = 0; optarg[i] != '\0'; i++) {
8210 switch (optarg[i]) {
8211 case GOT_STATUS_MODIFY:
8212 delete_local_mods = 1;
8214 case GOT_STATUS_MISSING:
8215 ignore_missing_paths = 1;
8218 errx(1, "invalid status code '%c'",
8222 status_codes = optarg;
8236 cwd = getcwd(NULL, 0);
8238 error = got_error_from_errno("getcwd");
8242 error = got_repo_pack_fds_open(&pack_fds);
8246 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8248 if (error->code == GOT_ERR_NOT_WORKTREE)
8249 error = wrap_not_worktree_error(error, "remove", cwd);
8253 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8258 error = apply_unveil(got_repo_get_path(repo), 1,
8259 got_worktree_get_root_path(worktree));
8263 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8270 TAILQ_FOREACH(pe, &paths, entry) {
8271 if (asprintf(&ondisk_path, "%s/%s",
8272 got_worktree_get_root_path(worktree),
8274 error = got_error_from_errno("asprintf");
8277 if (lstat(ondisk_path, &sb) == -1) {
8278 if (errno == ENOENT) {
8282 error = got_error_from_errno2("lstat",
8288 if (S_ISDIR(sb.st_mode)) {
8289 error = got_error_msg(GOT_ERR_BAD_PATH,
8290 "removing directories requires -R option");
8296 error = got_worktree_schedule_delete(worktree, &paths,
8297 delete_local_mods, status_codes, print_remove_status, NULL,
8298 repo, keep_on_disk, ignore_missing_paths);
8301 const struct got_error *close_err = got_repo_close(repo);
8306 got_worktree_close(worktree);
8308 const struct got_error *pack_err =
8309 got_repo_pack_fds_close(pack_fds);
8313 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8321 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8322 "[patchfile]\n", getprogname());
8326 static const struct got_error *
8327 patch_from_stdin(int *patchfd)
8329 const struct got_error *err = NULL;
8332 sig_t sighup, sigint, sigquit;
8334 *patchfd = got_opentempfd();
8336 return got_error_from_errno("got_opentempfd");
8338 sighup = signal(SIGHUP, SIG_DFL);
8339 sigint = signal(SIGINT, SIG_DFL);
8340 sigquit = signal(SIGQUIT, SIG_DFL);
8343 r = read(0, buf, sizeof(buf));
8345 err = got_error_from_errno("read");
8350 if (write(*patchfd, buf, r) == -1) {
8351 err = got_error_from_errno("write");
8356 signal(SIGHUP, sighup);
8357 signal(SIGINT, sigint);
8358 signal(SIGQUIT, sigquit);
8360 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8361 err = got_error_from_errno("lseek");
8371 struct got_patch_progress_arg {
8377 static const struct got_error *
8378 patch_progress(void *arg, const char *old, const char *new,
8379 unsigned char status, const struct got_error *error, int old_from,
8380 int old_lines, int new_from, int new_lines, int offset,
8381 int ws_mangled, const struct got_error *hunk_err)
8383 const char *path = new == NULL ? old : new;
8384 struct got_patch_progress_arg *a = arg;
8386 while (*path == '/')
8389 if (status != GOT_STATUS_NO_CHANGE &&
8390 status != 0 /* per-hunk progress */) {
8391 printf("%c %s\n", status, path);
8392 a->did_something = 1;
8395 if (hunk_err == NULL) {
8396 if (status == GOT_STATUS_CANNOT_UPDATE)
8398 else if (status == GOT_STATUS_CONFLICT)
8403 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8405 if (offset != 0 || hunk_err != NULL || ws_mangled) {
8406 printf("@@ -%d,%d +%d,%d @@ ", old_from,
8407 old_lines, new_from, new_lines);
8408 if (hunk_err != NULL)
8409 printf("%s\n", hunk_err->msg);
8410 else if (offset != 0)
8411 printf("applied with offset %d\n", offset);
8413 printf("hunk contains mangled whitespace\n");
8420 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
8422 if (!ppa->did_something)
8425 if (ppa->conflicts > 0)
8426 printf("Files with merge conflicts: %d\n", ppa->conflicts);
8428 if (ppa->rejects > 0) {
8429 printf("Files where patch failed to apply: %d\n",
8434 static const struct got_error *
8435 cmd_patch(int argc, char *argv[])
8437 const struct got_error *error = NULL, *close_error = NULL;
8438 struct got_worktree *worktree = NULL;
8439 struct got_repository *repo = NULL;
8440 struct got_reflist_head refs;
8441 struct got_object_id *commit_id = NULL;
8442 const char *commit_id_str = NULL;
8445 char *cwd = NULL, *keyword_idstr = NULL;
8446 int ch, nop = 0, strip = -1, reverse = 0;
8448 int *pack_fds = NULL;
8449 struct got_patch_progress_arg ppa;
8454 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8455 "unveil", NULL) == -1)
8459 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8462 commit_id_str = optarg;
8468 strip = strtonum(optarg, 0, INT_MAX, &errstr);
8470 errx(1, "pathname strip count is %s: %s",
8486 error = patch_from_stdin(&patchfd);
8489 } else if (argc == 1) {
8490 patchfd = open(argv[0], O_RDONLY);
8491 if (patchfd == -1) {
8492 error = got_error_from_errno2("open", argv[0]);
8495 if (fstat(patchfd, &sb) == -1) {
8496 error = got_error_from_errno2("fstat", argv[0]);
8499 if (!S_ISREG(sb.st_mode)) {
8500 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8506 if ((cwd = getcwd(NULL, 0)) == NULL) {
8507 error = got_error_from_errno("getcwd");
8511 error = got_repo_pack_fds_open(&pack_fds);
8515 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8519 const char *repo_path = got_worktree_get_repo_path(worktree);
8520 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8524 error = apply_unveil(got_repo_get_path(repo), 0,
8525 got_worktree_get_root_path(worktree));
8529 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8533 if (commit_id_str != NULL) {
8534 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
8539 error = got_repo_match_object_id(&commit_id, NULL,
8540 keyword_idstr != NULL ? keyword_idstr : commit_id_str,
8541 GOT_OBJ_TYPE_COMMIT, &refs, repo);
8546 memset(&ppa, 0, sizeof(ppa));
8547 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8548 commit_id, patch_progress, &ppa, check_cancelled, NULL);
8549 print_patch_progress_stats(&ppa);
8551 got_ref_list_free(&refs);
8552 free(keyword_idstr);
8555 close_error = got_repo_close(repo);
8557 error = close_error;
8559 if (worktree != NULL) {
8560 close_error = got_worktree_close(worktree);
8562 error = close_error;
8565 const struct got_error *pack_err =
8566 got_repo_pack_fds_close(pack_fds);
8577 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8582 static const struct got_error *
8583 revert_progress(void *arg, unsigned char status, const char *path)
8585 if (status == GOT_STATUS_UNVERSIONED)
8588 while (path[0] == '/')
8590 printf("%c %s\n", status, path);
8594 struct choose_patch_arg {
8595 FILE *patch_script_file;
8599 static const struct got_error *
8600 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8601 int nchanges, const char *action)
8603 const struct got_error *err;
8605 size_t linesize = 0;
8609 case GOT_STATUS_ADD:
8610 printf("A %s\n%s this addition? [y/n] ", path, action);
8612 case GOT_STATUS_DELETE:
8613 printf("D %s\n%s this deletion? [y/n] ", path, action);
8615 case GOT_STATUS_MODIFY:
8616 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8617 return got_error_from_errno("fseek");
8618 printf(GOT_COMMIT_SEP_STR);
8619 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8621 if (linelen == -1 && ferror(patch_file)) {
8622 err = got_error_from_errno("getline");
8627 printf(GOT_COMMIT_SEP_STR);
8628 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8629 path, n, nchanges, action);
8632 return got_error_path(path, GOT_ERR_FILE_STATUS);
8639 #define CHOOSE_PATCH_VALID_RESPONSES "ynq"
8641 static const struct got_error *
8642 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8643 FILE *patch_file, int n, int nchanges)
8645 const struct got_error *err = NULL;
8646 char *nl, *line = NULL;
8648 size_t linesize = 0;
8650 int interactive = 1;
8651 struct choose_patch_arg *a = arg;
8653 *choice = GOT_PATCH_CHOICE_NONE;
8655 if (a->patch_script_file) {
8657 fp = a->patch_script_file;
8661 err = show_change(status, path, patch_file, n, nchanges,
8666 linelen = getline(&line, &linesize, fp);
8667 if (linelen == -1) {
8670 return got_error_from_errno("getline");
8672 return got_error(GOT_ERR_EOF);
8676 nl = strchr(line, '\n');
8679 if (strlen(line) != 1 ||
8680 !strchr(CHOOSE_PATCH_VALID_RESPONSES, line[0])) {
8681 printf("invalid response '%s'\n", line);
8686 /* ADD and DELETE do not accept 'q' response currently. */
8687 if (status != GOT_STATUS_MODIFY && line[0] == 'q') {
8688 printf("invalid response '%s'\n", line);
8697 *choice = GOT_PATCH_CHOICE_YES;
8700 *choice = GOT_PATCH_CHOICE_NO;
8703 if (status == GOT_STATUS_MODIFY)
8704 *choice = GOT_PATCH_CHOICE_QUIT;
8707 printf("invalid response '%s'\n", line);
8713 printf("%c\n", line[0]);
8719 struct wt_commitable_path_arg {
8720 struct got_pathlist_head *commit_paths;
8725 * Shortcut work tree status callback to determine if the set of paths scanned
8726 * has at least one versioned path that is being modified and, if not NULL, is
8727 * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
8728 * soon as a path is passed with a status that satisfies this criteria.
8730 static const struct got_error *
8731 worktree_has_commitable_path(void *arg, unsigned char status,
8732 unsigned char staged_status, const char *path,
8733 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8734 struct got_object_id *commit_id, int dirfd, const char *de_name)
8736 struct wt_commitable_path_arg *a = arg;
8738 if (status == staged_status && (status == GOT_STATUS_DELETE))
8739 status = GOT_STATUS_NO_CHANGE;
8741 if (!(status == GOT_STATUS_NO_CHANGE ||
8742 status == GOT_STATUS_UNVERSIONED) ||
8743 staged_status != GOT_STATUS_NO_CHANGE) {
8744 if (a->commit_paths != NULL) {
8745 struct got_pathlist_entry *pe;
8747 TAILQ_FOREACH(pe, a->commit_paths, entry) {
8748 if (strncmp(path, pe->path,
8749 pe->path_len) == 0) {
8750 *a->has_changes = 1;
8755 *a->has_changes = 1;
8757 if (*a->has_changes)
8758 return got_error(GOT_ERR_FILE_MODIFIED);
8765 * Check that the changeset of the commit identified by id is
8766 * comprised of at least one modified path that is being committed.
8768 static const struct got_error *
8769 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
8770 struct got_object_id *id, struct got_worktree *worktree,
8771 struct got_repository *repo)
8773 const struct got_error *err;
8774 struct got_pathlist_head paths;
8775 struct got_commit_object *commit = NULL, *pcommit = NULL;
8776 struct got_tree_object *tree = NULL, *ptree = NULL;
8777 struct got_object_qid *pid;
8781 err = got_object_open_as_commit(&commit, repo, id);
8785 err = got_object_open_as_tree(&tree, repo,
8786 got_object_commit_get_tree_id(commit));
8790 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8792 err = got_object_open_as_commit(&pcommit, repo, &pid->id);
8796 err = got_object_open_as_tree(&ptree, repo,
8797 got_object_commit_get_tree_id(pcommit));
8802 err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
8803 got_diff_tree_collect_changed_paths, &paths, 0);
8807 err = got_worktree_status(worktree, &paths, repo, 0,
8808 worktree_has_commitable_path, wcpa, check_cancelled, NULL);
8809 if (err && err->code == GOT_ERR_FILE_MODIFIED) {
8811 * At least one changed path in the referenced commit is
8812 * modified in the work tree, that's all we need to know!
8818 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8820 got_object_commit_close(commit);
8822 got_object_commit_close(pcommit);
8824 got_object_tree_close(tree);
8826 got_object_tree_close(ptree);
8831 * Remove any "logmsg" reference comprised entirely of paths that have
8832 * been reverted in this work tree. If any path in the logmsg ref changeset
8833 * remains in a changed state in the worktree, do not remove the reference.
8835 static const struct got_error *
8836 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
8838 const struct got_error *err;
8839 struct got_reflist_head refs;
8840 struct got_reflist_entry *re;
8841 struct got_commit_object *commit = NULL;
8842 struct got_object_id *commit_id = NULL;
8843 struct wt_commitable_path_arg wcpa;
8844 char *uuidstr = NULL;
8848 err = got_worktree_get_uuid(&uuidstr, worktree);
8852 err = got_ref_list(&refs, repo, "refs/got/worktree",
8853 got_ref_cmp_by_name, repo);
8857 TAILQ_FOREACH(re, &refs, entry) {
8858 const char *refname;
8859 int has_changes = 0;
8861 refname = got_ref_get_name(re->ref);
8863 if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8864 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
8865 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
8866 else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8867 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
8868 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
8872 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
8873 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8877 err = got_repo_match_object_id(&commit_id, NULL, refname,
8878 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8882 err = got_object_open_as_commit(&commit, repo, commit_id);
8886 wcpa.commit_paths = NULL;
8887 wcpa.has_changes = &has_changes;
8889 err = commit_path_changed_in_worktree(&wcpa, commit_id,
8895 err = got_ref_delete(re->ref, repo);
8900 got_object_commit_close(commit);
8909 got_ref_list_free(&refs);
8911 got_object_commit_close(commit);
8915 static const struct got_error *
8916 cmd_revert(int argc, char *argv[])
8918 const struct got_error *error = NULL;
8919 struct got_worktree *worktree = NULL;
8920 struct got_repository *repo = NULL;
8921 char *cwd = NULL, *path = NULL;
8922 struct got_pathlist_head paths;
8923 struct got_pathlist_entry *pe;
8924 int ch, can_recurse = 0, pflag = 0;
8925 FILE *patch_script_file = NULL;
8926 const char *patch_script_path = NULL;
8927 struct choose_patch_arg cpa;
8928 int *pack_fds = NULL;
8933 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8934 "unveil", NULL) == -1)
8938 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8941 patch_script_path = optarg;
8960 if (patch_script_path && !pflag)
8961 errx(1, "-F option can only be used together with -p option");
8963 cwd = getcwd(NULL, 0);
8965 error = got_error_from_errno("getcwd");
8969 error = got_repo_pack_fds_open(&pack_fds);
8973 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8975 if (error->code == GOT_ERR_NOT_WORKTREE)
8976 error = wrap_not_worktree_error(error, "revert", cwd);
8980 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8985 if (patch_script_path) {
8986 patch_script_file = fopen(patch_script_path, "re");
8987 if (patch_script_file == NULL) {
8988 error = got_error_from_errno2("fopen",
8995 * XXX "c" perm needed on repo dir to delete merge references.
8997 error = apply_unveil(got_repo_get_path(repo), 0,
8998 got_worktree_get_root_path(worktree));
9002 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9009 TAILQ_FOREACH(pe, &paths, entry) {
9010 if (asprintf(&ondisk_path, "%s/%s",
9011 got_worktree_get_root_path(worktree),
9013 error = got_error_from_errno("asprintf");
9016 if (lstat(ondisk_path, &sb) == -1) {
9017 if (errno == ENOENT) {
9021 error = got_error_from_errno2("lstat",
9027 if (S_ISDIR(sb.st_mode)) {
9028 error = got_error_msg(GOT_ERR_BAD_PATH,
9029 "reverting directories requires -R option");
9035 cpa.patch_script_file = patch_script_file;
9036 cpa.action = "revert";
9037 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
9038 pflag ? choose_patch : NULL, &cpa, repo);
9040 error = rm_logmsg_ref(worktree, repo);
9042 if (patch_script_file && fclose(patch_script_file) == EOF &&
9044 error = got_error_from_errno2("fclose", patch_script_path);
9046 const struct got_error *close_err = got_repo_close(repo);
9051 got_worktree_close(worktree);
9053 const struct got_error *pack_err =
9054 got_repo_pack_fds_close(pack_fds);
9058 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9067 fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
9068 "[-m message] [path ...]\n", getprogname());
9072 struct collect_commit_logmsg_arg {
9073 const char *cmdline_log;
9074 const char *prepared_log;
9075 const char *merged_log;
9076 int non_interactive;
9078 const char *worktree_path;
9079 const char *branch_name;
9080 const char *repo_path;
9085 static const struct got_error *
9086 read_prepared_logmsg(char **logmsg, const char *path)
9088 const struct got_error *err = NULL;
9094 memset(&sb, 0, sizeof(sb));
9096 f = fopen(path, "re");
9098 return got_error_from_errno2("fopen", path);
9100 if (fstat(fileno(f), &sb) == -1) {
9101 err = got_error_from_errno2("fstat", path);
9104 if (sb.st_size == 0) {
9105 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
9109 *logmsg = malloc(sb.st_size + 1);
9110 if (*logmsg == NULL) {
9111 err = got_error_from_errno("malloc");
9115 r = fread(*logmsg, 1, sb.st_size, f);
9116 if (r != sb.st_size) {
9118 err = got_error_from_errno2("fread", path);
9120 err = got_error(GOT_ERR_IO);
9123 (*logmsg)[sb.st_size] = '\0';
9125 if (fclose(f) == EOF && err == NULL)
9126 err = got_error_from_errno2("fclose", path);
9134 static const struct got_error *
9135 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
9136 const char *diff_path, char **logmsg, void *arg)
9138 char *initial_content = NULL;
9139 struct got_pathlist_entry *pe;
9140 const struct got_error *err = NULL;
9141 char *template = NULL;
9142 char *prepared_msg = NULL, *merged_msg = NULL;
9143 struct collect_commit_logmsg_arg *a = arg;
9144 int initial_content_len;
9148 /* if a message was specified on the command line, just use it */
9149 if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
9150 len = strlen(a->cmdline_log) + 1;
9151 *logmsg = malloc(len + 1);
9152 if (*logmsg == NULL)
9153 return got_error_from_errno("malloc");
9154 strlcpy(*logmsg, a->cmdline_log, len);
9156 } else if (a->prepared_log != NULL && a->non_interactive)
9157 return read_prepared_logmsg(logmsg, a->prepared_log);
9159 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
9160 return got_error_from_errno("asprintf");
9162 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
9166 if (a->prepared_log) {
9167 err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
9170 } else if (a->merged_log) {
9171 err = read_prepared_logmsg(&merged_msg, a->merged_log);
9176 initial_content_len = asprintf(&initial_content,
9177 "%s%s\n# changes to be committed on branch %s:\n",
9178 prepared_msg ? prepared_msg : "",
9179 merged_msg ? merged_msg : "", a->branch_name);
9180 if (initial_content_len == -1) {
9181 err = got_error_from_errno("asprintf");
9185 if (write(fd, initial_content, initial_content_len) == -1) {
9186 err = got_error_from_errno2("write", a->logmsg_path);
9190 TAILQ_FOREACH(pe, commitable_paths, entry) {
9191 struct got_commitable *ct = pe->data;
9192 dprintf(fd, "# %c %s\n",
9193 got_commitable_get_status(ct),
9194 got_commitable_get_path(ct));
9198 dprintf(fd, "# detailed changes can be viewed in %s\n",
9202 if (close(fd) == -1) {
9203 err = got_error_from_errno2("close", a->logmsg_path);
9208 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
9209 initial_content_len, a->prepared_log ? 0 : 1);
9211 free(initial_content);
9216 if (fd != -1 && close(fd) == -1 && err == NULL)
9217 err = got_error_from_errno2("close", a->logmsg_path);
9225 static const struct got_error *
9226 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
9227 const char *type, int has_content)
9229 const struct got_error *err = NULL;
9230 char *logmsg = NULL;
9232 err = got_object_commit_get_logmsg(&logmsg, commit);
9236 if (fprintf(f, "%s# log message of %s commit %s:%s",
9237 has_content ? "\n" : "", type, idstr, logmsg) < 0)
9238 err = got_ferror(f, GOT_ERR_IO);
9245 * Lookup "logmsg" references of backed-out and cherrypicked commits
9246 * belonging to the current work tree. If found, and the worktree has
9247 * at least one modified file that was changed in the referenced commit,
9248 * add its log message to a new temporary file at *logmsg_path.
9249 * Add all refs found to matched_refs to be scheduled for removal on
9250 * successful commit.
9252 static const struct got_error *
9253 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
9254 struct got_reflist_head *matched_refs, struct got_worktree *worktree,
9255 struct got_repository *repo)
9257 const struct got_error *err;
9258 struct got_commit_object *commit = NULL;
9259 struct got_object_id *id = NULL;
9260 struct got_reflist_head refs;
9261 struct got_reflist_entry *re, *re_match;
9263 char *uuidstr = NULL;
9264 int added_logmsg = 0;
9268 *logmsg_path = NULL;
9270 err = got_worktree_get_uuid(&uuidstr, worktree);
9274 err = got_ref_list(&refs, repo, "refs/got/worktree",
9275 got_ref_cmp_by_name, repo);
9279 TAILQ_FOREACH(re, &refs, entry) {
9280 const char *refname, *type;
9281 struct wt_commitable_path_arg wcpa;
9284 refname = got_ref_get_name(re->ref);
9286 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
9287 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
9288 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
9289 type = "cherrypicked";
9290 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
9291 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
9292 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
9293 type = "backed-out";
9297 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
9298 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
9302 err = got_repo_match_object_id(&id, NULL, refname,
9303 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9307 err = got_object_open_as_commit(&commit, repo, id);
9311 wcpa.commit_paths = paths;
9312 wcpa.has_changes = &add_logmsg;
9314 err = commit_path_changed_in_worktree(&wcpa, id,
9321 err = got_opentemp_named(logmsg_path, &f,
9322 "got-commit-logmsg", "");
9326 err = cat_logmsg(f, commit, refname, type,
9333 err = got_reflist_entry_dup(&re_match, re);
9336 TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
9339 got_object_commit_close(commit);
9348 got_ref_list_free(&refs);
9350 got_object_commit_close(commit);
9351 if (f && fclose(f) == EOF && err == NULL)
9352 err = got_error_from_errno("fclose");
9353 if (!added_logmsg) {
9354 if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
9355 err = got_error_from_errno2("unlink", *logmsg_path);
9356 *logmsg_path = NULL;
9361 static const struct got_error *
9362 cmd_commit(int argc, char *argv[])
9364 const struct got_error *error = NULL;
9365 struct got_worktree *worktree = NULL;
9366 struct got_repository *repo = NULL;
9367 char *cwd = NULL, *id_str = NULL;
9368 struct got_object_id *id = NULL;
9369 const char *logmsg = NULL;
9370 char *prepared_logmsg = NULL, *merged_logmsg = NULL;
9371 struct collect_commit_logmsg_arg cl_arg;
9372 const char *author = NULL;
9373 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
9374 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
9375 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
9376 int show_diff = 1, commit_conflicts = 0;
9377 struct got_pathlist_head paths;
9378 struct got_reflist_head refs;
9379 struct got_reflist_entry *re;
9380 int *pack_fds = NULL;
9384 cl_arg.logmsg_path = NULL;
9387 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9388 "unveil", NULL) == -1)
9392 while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
9396 error = valid_author(author);
9401 commit_conflicts = 1;
9405 option_conflict('F', 'm');
9406 prepared_logmsg = realpath(optarg, NULL);
9407 if (prepared_logmsg == NULL)
9408 return got_error_from_errno2("realpath",
9412 if (prepared_logmsg)
9413 option_conflict('m', 'F');
9417 non_interactive = 1;
9423 allow_bad_symlinks = 1;
9434 cwd = getcwd(NULL, 0);
9436 error = got_error_from_errno("getcwd");
9440 error = got_repo_pack_fds_open(&pack_fds);
9444 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9446 if (error->code == GOT_ERR_NOT_WORKTREE)
9447 error = wrap_not_worktree_error(error, "commit", cwd);
9451 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9454 if (rebase_in_progress) {
9455 error = got_error(GOT_ERR_REBASING);
9459 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9464 error = get_gitconfig_path(&gitconfig_path);
9467 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9468 gitconfig_path, pack_fds);
9472 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
9475 if (merge_in_progress) {
9476 error = got_error(GOT_ERR_MERGE_BUSY);
9480 error = get_author(&committer, repo, worktree);
9487 if (logmsg == NULL || strlen(logmsg) == 0) {
9488 error = get_editor(&editor);
9491 if (unveil(editor, "x") != 0) {
9492 error = got_error_from_errno2("unveil", editor);
9496 if (prepared_logmsg) {
9497 if (unveil(prepared_logmsg, "r") != 0) {
9498 error = got_error_from_errno2("unveil",
9504 error = apply_unveil(got_repo_get_path(repo), 0,
9505 got_worktree_get_root_path(worktree));
9509 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9513 if (prepared_logmsg == NULL) {
9514 error = lookup_logmsg_ref(&merged_logmsg,
9515 argc > 0 ? &paths : NULL, &refs, worktree, repo);
9520 cl_arg.editor = editor;
9521 cl_arg.cmdline_log = logmsg;
9522 cl_arg.prepared_log = prepared_logmsg;
9523 cl_arg.merged_log = merged_logmsg;
9524 cl_arg.non_interactive = non_interactive;
9525 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
9526 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
9527 if (!histedit_in_progress) {
9528 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
9529 error = got_error(GOT_ERR_COMMIT_BRANCH);
9532 cl_arg.branch_name += 11;
9534 cl_arg.repo_path = got_repo_get_path(repo);
9535 error = got_worktree_commit(&id, worktree, &paths, author, committer,
9536 allow_bad_symlinks, show_diff, commit_conflicts,
9537 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
9539 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
9540 cl_arg.logmsg_path != NULL)
9541 preserve_logmsg = 1;
9545 error = got_object_id_str(&id_str, id);
9548 printf("Created commit %s\n", id_str);
9550 TAILQ_FOREACH(re, &refs, entry) {
9551 error = got_ref_delete(re->ref, repo);
9557 if (preserve_logmsg) {
9558 fprintf(stderr, "%s: log message preserved in %s\n",
9559 getprogname(), cl_arg.logmsg_path);
9560 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
9562 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
9563 free(cl_arg.logmsg_path);
9564 if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
9565 error = got_error_from_errno2("unlink", merged_logmsg);
9566 free(merged_logmsg);
9568 const struct got_error *close_err = got_repo_close(repo);
9573 got_worktree_close(worktree);
9575 const struct got_error *pack_err =
9576 got_repo_pack_fds_close(pack_fds);
9580 got_ref_list_free(&refs);
9581 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9584 free(gitconfig_path);
9587 free(prepared_logmsg);
9594 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
9595 "[-r repository-path] [-t tag] [remote-repository]\n",
9601 print_load_info(int print_colored, int print_found, int print_trees,
9602 int ncolored, int nfound, int ntrees)
9604 if (print_colored) {
9605 printf("%d commit%s colored", ncolored,
9606 ncolored == 1 ? "" : "s");
9609 printf("%s%d object%s found",
9610 ncolored > 0 ? "; " : "",
9611 nfound, nfound == 1 ? "" : "s");
9614 printf("; %d tree%s scanned", ntrees,
9615 ntrees == 1 ? "" : "s");
9619 struct got_send_progress_arg {
9620 char last_scaled_packsize[FMT_SCALED_STRSIZE];
9627 int last_nobj_total;
9631 int printed_something;
9633 struct got_pathlist_head *delete_branches;
9636 static const struct got_error *
9637 send_progress(void *arg, int ncolored, int nfound, int ntrees,
9638 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
9639 int nobj_written, off_t bytes_sent, const char *refname,
9640 const char *errmsg, int success)
9642 struct got_send_progress_arg *a = arg;
9643 char scaled_packsize[FMT_SCALED_STRSIZE];
9644 char scaled_sent[FMT_SCALED_STRSIZE];
9645 int p_deltify = 0, p_written = 0, p_sent = 0;
9646 int print_colored = 0, print_found = 0, print_trees = 0;
9647 int print_searching = 0, print_total = 0;
9648 int print_deltify = 0, print_written = 0, print_sent = 0;
9650 if (a->verbosity < 0)
9654 const char *status = success ? "accepted" : "rejected";
9657 struct got_pathlist_entry *pe;
9658 TAILQ_FOREACH(pe, a->delete_branches, entry) {
9659 const char *branchname = pe->path;
9660 if (got_path_cmp(branchname, refname,
9661 strlen(branchname), strlen(refname)) == 0) {
9663 a->sent_something = 1;
9669 if (a->printed_something)
9671 printf("Server has %s %s", status, refname);
9673 printf(": %s", errmsg);
9674 a->printed_something = 1;
9678 if (a->last_ncolored != ncolored) {
9680 a->last_ncolored = ncolored;
9683 if (a->last_nfound != nfound) {
9686 a->last_nfound = nfound;
9689 if (a->last_ntrees != ntrees) {
9693 a->last_ntrees = ntrees;
9696 if ((print_colored || print_found || print_trees) &&
9699 print_load_info(print_colored, print_found, print_trees,
9700 ncolored, nfound, ntrees);
9701 a->printed_something = 1;
9704 } else if (!a->loading_done) {
9706 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
9708 a->loading_done = 1;
9711 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
9712 return got_error_from_errno("fmt_scaled");
9713 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
9714 return got_error_from_errno("fmt_scaled");
9716 if (a->last_ncommits != ncommits) {
9717 print_searching = 1;
9718 a->last_ncommits = ncommits;
9721 if (a->last_nobj_total != nobj_total) {
9722 print_searching = 1;
9724 a->last_nobj_total = nobj_total;
9727 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9728 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9729 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9730 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9731 return got_error(GOT_ERR_NO_SPACE);
9734 if (nobj_deltify > 0 || nobj_written > 0) {
9735 if (nobj_deltify > 0) {
9736 p_deltify = (nobj_deltify * 100) / nobj_total;
9737 if (p_deltify != a->last_p_deltify) {
9738 a->last_p_deltify = p_deltify;
9739 print_searching = 1;
9744 if (nobj_written > 0) {
9745 p_written = (nobj_written * 100) / nobj_total;
9746 if (p_written != a->last_p_written) {
9747 a->last_p_written = p_written;
9748 print_searching = 1;
9756 if (bytes_sent > 0) {
9757 p_sent = (bytes_sent * 100) / packfile_size;
9758 if (p_sent != a->last_p_sent) {
9759 a->last_p_sent = p_sent;
9760 print_searching = 1;
9766 a->sent_something = 1;
9769 if (print_searching || print_total || print_deltify || print_written ||
9772 if (print_searching)
9773 printf("packing %d reference%s", ncommits,
9774 ncommits == 1 ? "" : "s");
9776 printf("; %d object%s", nobj_total,
9777 nobj_total == 1 ? "" : "s");
9779 printf("; deltify: %d%%", p_deltify);
9781 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9782 scaled_packsize, p_sent);
9783 else if (print_written)
9784 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9785 scaled_packsize, p_written);
9786 if (print_searching || print_total || print_deltify ||
9787 print_written || print_sent) {
9788 a->printed_something = 1;
9794 static const struct got_error *
9795 cmd_send(int argc, char *argv[])
9797 const struct got_error *error = NULL;
9798 char *cwd = NULL, *repo_path = NULL;
9799 const char *remote_name;
9800 char *proto = NULL, *host = NULL, *port = NULL;
9801 char *repo_name = NULL, *server_path = NULL;
9802 const struct got_remote_repo *remotes;
9803 struct got_remote_repo *remote = NULL;
9804 int nremotes, nbranches = 0, ndelete_branches = 0;
9805 struct got_repository *repo = NULL;
9806 struct got_worktree *worktree = NULL;
9807 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9808 struct got_pathlist_head branches;
9809 struct got_pathlist_head tags;
9810 struct got_reflist_head all_branches;
9811 struct got_reflist_head all_tags;
9812 struct got_pathlist_head delete_args;
9813 struct got_pathlist_head delete_branches;
9814 struct got_reflist_entry *re;
9815 struct got_pathlist_entry *pe;
9816 int i, ch, sendfd = -1, sendstatus;
9818 struct got_send_progress_arg spa;
9819 int verbosity = 0, overwrite_refs = 0;
9820 int send_all_branches = 0, send_all_tags = 0;
9821 struct got_reference *ref = NULL;
9822 int *pack_fds = NULL;
9824 TAILQ_INIT(&branches);
9826 TAILQ_INIT(&all_branches);
9827 TAILQ_INIT(&all_tags);
9828 TAILQ_INIT(&delete_args);
9829 TAILQ_INIT(&delete_branches);
9831 while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9834 send_all_branches = 1;
9837 error = got_pathlist_append(&branches, optarg, NULL);
9843 error = got_pathlist_append(&delete_args, optarg, NULL);
9854 repo_path = realpath(optarg, NULL);
9855 if (repo_path == NULL)
9856 return got_error_from_errno2("realpath",
9858 got_path_strip_trailing_slashes(repo_path);
9864 error = got_pathlist_append(&tags, optarg, NULL);
9871 else if (verbosity < 3)
9882 if (send_all_branches && !TAILQ_EMPTY(&branches))
9883 option_conflict('a', 'b');
9884 if (send_all_tags && !TAILQ_EMPTY(&tags))
9885 option_conflict('T', 't');
9889 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9891 remote_name = argv[0];
9895 cwd = getcwd(NULL, 0);
9897 error = got_error_from_errno("getcwd");
9901 error = got_repo_pack_fds_open(&pack_fds);
9905 if (repo_path == NULL) {
9906 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9907 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9913 strdup(got_worktree_get_repo_path(worktree));
9914 if (repo_path == NULL)
9915 error = got_error_from_errno("strdup");
9919 repo_path = strdup(cwd);
9920 if (repo_path == NULL) {
9921 error = got_error_from_errno("strdup");
9927 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9932 worktree_conf = got_worktree_get_gotconfig(worktree);
9933 if (worktree_conf) {
9934 got_gotconfig_get_remotes(&nremotes, &remotes,
9936 for (i = 0; i < nremotes; i++) {
9937 if (strcmp(remotes[i].name, remote_name) == 0) {
9938 error = got_repo_remote_repo_dup(&remote,
9947 if (remote == NULL) {
9948 repo_conf = got_repo_get_gotconfig(repo);
9950 got_gotconfig_get_remotes(&nremotes, &remotes,
9952 for (i = 0; i < nremotes; i++) {
9953 if (strcmp(remotes[i].name, remote_name) == 0) {
9954 error = got_repo_remote_repo_dup(&remote,
9963 if (remote == NULL) {
9964 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9965 for (i = 0; i < nremotes; i++) {
9966 if (strcmp(remotes[i].name, remote_name) == 0) {
9967 error = got_repo_remote_repo_dup(&remote,
9975 if (remote == NULL) {
9976 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9980 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9981 &repo_name, remote->send_url);
9985 if (strcmp(proto, "git") == 0) {
9987 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9988 "sendfd dns inet unveil", NULL) == -1)
9991 } else if (strcmp(proto, "git+ssh") == 0 ||
9992 strcmp(proto, "ssh") == 0) {
9994 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9995 "sendfd unveil", NULL) == -1)
9998 } else if (strcmp(proto, "http") == 0 ||
9999 strcmp(proto, "git+http") == 0) {
10000 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
10003 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
10007 error = got_dial_apply_unveil(proto);
10011 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
10015 if (send_all_branches) {
10016 error = got_ref_list(&all_branches, repo, "refs/heads",
10017 got_ref_cmp_by_name, NULL);
10020 TAILQ_FOREACH(re, &all_branches, entry) {
10021 const char *branchname = got_ref_get_name(re->ref);
10022 error = got_pathlist_append(&branches,
10028 } else if (nbranches == 0) {
10029 for (i = 0; i < remote->nsend_branches; i++) {
10030 error = got_pathlist_append(&branches,
10031 remote->send_branches[i], NULL);
10037 if (send_all_tags) {
10038 error = got_ref_list(&all_tags, repo, "refs/tags",
10039 got_ref_cmp_by_name, NULL);
10042 TAILQ_FOREACH(re, &all_tags, entry) {
10043 const char *tagname = got_ref_get_name(re->ref);
10044 error = got_pathlist_append(&tags,
10052 * To prevent accidents only branches in refs/heads/ can be deleted
10053 * with 'got send -d'.
10054 * Deleting anything else requires local repository access or Git.
10056 TAILQ_FOREACH(pe, &delete_args, entry) {
10057 const char *branchname = pe->path;
10059 struct got_pathlist_entry *new;
10060 if (strncmp(branchname, "refs/heads/", 11) == 0) {
10061 s = strdup(branchname);
10063 error = got_error_from_errno("strdup");
10067 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
10068 error = got_error_from_errno("asprintf");
10072 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
10073 if (error || new == NULL /* duplicate */)
10077 ndelete_branches++;
10080 if (nbranches == 0 && ndelete_branches == 0) {
10081 struct got_reference *head_ref;
10083 error = got_ref_open(&head_ref, repo,
10084 got_worktree_get_head_ref_name(worktree), 0);
10086 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
10089 if (got_ref_is_symbolic(head_ref)) {
10090 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
10091 got_ref_close(head_ref);
10096 error = got_pathlist_append(&branches, got_ref_get_name(ref),
10104 /* Release work tree lock. */
10105 got_worktree_close(worktree);
10109 if (verbosity >= 0) {
10110 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
10111 remote->name, proto, host,
10112 port ? ":" : "", port ? port : "",
10113 *server_path == '/' ? "" : "/", server_path);
10116 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
10117 server_path, verbosity);
10121 memset(&spa, 0, sizeof(spa));
10122 spa.last_scaled_packsize[0] = '\0';
10123 spa.last_p_deltify = -1;
10124 spa.last_p_written = -1;
10125 spa.verbosity = verbosity;
10126 spa.delete_branches = &delete_branches;
10127 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
10128 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
10129 check_cancelled, NULL);
10130 if (spa.printed_something)
10134 if (!spa.sent_something && verbosity >= 0)
10135 printf("Already up-to-date\n");
10138 if (kill(sendpid, SIGTERM) == -1)
10139 error = got_error_from_errno("kill");
10140 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
10141 error = got_error_from_errno("waitpid");
10143 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
10144 error = got_error_from_errno("close");
10146 const struct got_error *close_err = got_repo_close(repo);
10151 got_worktree_close(worktree);
10153 const struct got_error *pack_err =
10154 got_repo_pack_fds_close(pack_fds);
10159 got_ref_close(ref);
10160 got_repo_free_remote_repo_data(remote);
10162 got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
10163 got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
10164 got_ref_list_free(&all_branches);
10165 got_ref_list_free(&all_tags);
10166 got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
10167 got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
10179 * Print and if delete is set delete all ref_prefix references.
10180 * If wanted_ref is not NULL, only print or delete this reference.
10182 static const struct got_error *
10183 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
10184 const char *wanted_ref, int delete, struct got_worktree *worktree,
10185 struct got_repository *repo)
10187 const struct got_error *err;
10188 struct got_pathlist_head paths;
10189 struct got_reflist_head refs;
10190 struct got_reflist_entry *re;
10191 struct got_reflist_object_id_map *refs_idmap = NULL;
10192 struct got_commit_object *commit = NULL;
10193 struct got_object_id *id = NULL;
10194 const char *header_prefix;
10195 char *uuidstr = NULL;
10199 TAILQ_INIT(&paths);
10201 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
10205 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10209 if (worktree != NULL) {
10210 err = got_worktree_get_uuid(&uuidstr, worktree);
10216 if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
10220 if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
10221 header_prefix = "backout";
10223 header_prefix = "cherrypick";
10225 TAILQ_FOREACH(re, &refs, entry) {
10226 const char *refname, *wt;
10228 refname = got_ref_get_name(re->ref);
10230 err = check_cancelled(NULL);
10234 if (strncmp(refname, ref_prefix, prefix_len) == 0)
10235 refname += prefix_len + 1; /* skip '-' delimiter */
10241 if (worktree == NULL || strncmp(refname, uuidstr,
10242 GOT_WORKTREE_UUID_STRLEN) == 0)
10243 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
10247 err = got_repo_match_object_id(&id, NULL, refname,
10248 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10252 err = got_object_open_as_commit(&commit, repo, id);
10257 found = strncmp(wanted_ref, refname,
10258 strlen(wanted_ref)) == 0;
10259 if (wanted_ref && !found) {
10260 struct got_reflist_head *ci_refs;
10262 ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
10266 char *refs_str = NULL;
10267 char const *r = NULL;
10269 err = build_refs_str(&refs_str, ci_refs, id,
10276 if (strncmp(r, wanted_ref,
10277 strlen(wanted_ref)) == 0) {
10281 r = strchr(r, ' ');
10289 if (wanted_ref == NULL || found) {
10291 err = got_ref_delete(re->ref, repo);
10294 printf("Deleted: ");
10295 err = print_commit_oneline(commit, id, repo,
10299 * Print paths modified by commit to help
10300 * associate commits with worktree changes.
10302 err = get_changed_paths(&paths, commit,
10307 err = print_commit(commit, id, repo, NULL,
10308 &paths, NULL, 0, 0, refs_idmap, NULL,
10310 got_pathlist_free(&paths,
10311 GOT_PATHLIST_FREE_ALL);
10313 if (worktree == NULL)
10314 printf("work tree: %.*s\n\n",
10315 GOT_WORKTREE_UUID_STRLEN, wt);
10321 got_object_commit_close(commit);
10327 if (wanted_ref != NULL && !found)
10328 err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
10333 got_ref_list_free(&refs);
10334 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
10336 got_reflist_object_id_map_free(refs_idmap);
10338 got_object_commit_close(commit);
10343 * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
10344 * identified by id for log messages to prepopulate the editor on commit.
10346 static const struct got_error *
10347 logmsg_ref(struct got_object_id *id, const char *prefix,
10348 struct got_worktree *worktree, struct got_repository *repo)
10350 const struct got_error *err = NULL;
10351 char *idstr, *ref = NULL, *refname = NULL;
10352 int histedit_in_progress;
10353 int rebase_in_progress, merge_in_progress;
10356 * Silenty refuse to create merge reference if any histedit, merge,
10357 * or rebase operation is in progress.
10359 err = got_worktree_histedit_in_progress(&histedit_in_progress,
10363 if (histedit_in_progress)
10366 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10369 if (rebase_in_progress)
10372 err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10376 if (merge_in_progress)
10379 err = got_object_id_str(&idstr, id);
10383 err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
10387 if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
10388 err = got_error_from_errno("asprintf");
10392 err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
10402 usage_cherrypick(void)
10404 fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
10409 static const struct got_error *
10410 cmd_cherrypick(int argc, char *argv[])
10412 const struct got_error *error = NULL;
10413 struct got_worktree *worktree = NULL;
10414 struct got_repository *repo = NULL;
10415 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10416 struct got_object_id *commit_id = NULL;
10417 struct got_commit_object *commit = NULL;
10418 struct got_object_qid *pid;
10419 int ch, list_refs = 0, remove_refs = 0;
10420 struct got_update_progress_arg upa;
10421 int *pack_fds = NULL;
10424 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10425 "unveil", NULL) == -1)
10429 while ((ch = getopt(argc, argv, "lX")) != -1) {
10438 usage_cherrypick();
10446 if (list_refs || remove_refs) {
10447 if (argc != 0 && argc != 1)
10448 usage_cherrypick();
10449 } else if (argc != 1)
10450 usage_cherrypick();
10451 if (list_refs && remove_refs)
10452 option_conflict('l', 'X');
10454 cwd = getcwd(NULL, 0);
10456 error = got_error_from_errno("getcwd");
10460 error = got_repo_pack_fds_open(&pack_fds);
10464 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10466 if (list_refs || remove_refs) {
10467 if (error->code != GOT_ERR_NOT_WORKTREE)
10470 if (error->code == GOT_ERR_NOT_WORKTREE)
10471 error = wrap_not_worktree_error(error,
10472 "cherrypick", cwd);
10477 error = got_repo_open(&repo,
10478 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10483 error = apply_unveil(got_repo_get_path(repo), 0,
10484 worktree ? got_worktree_get_root_path(worktree) : NULL);
10488 if (list_refs || remove_refs) {
10489 error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
10490 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
10491 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10495 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10499 error = got_repo_match_object_id(&commit_id, NULL,
10500 keyword_idstr != NULL ? keyword_idstr : argv[0],
10501 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10504 error = got_object_id_str(&commit_id_str, commit_id);
10508 error = got_object_open_as_commit(&commit, repo, commit_id);
10511 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10512 memset(&upa, 0, sizeof(upa));
10513 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
10514 commit_id, repo, update_progress, &upa, check_cancelled,
10519 if (upa.did_something) {
10520 error = logmsg_ref(commit_id,
10521 GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
10524 printf("Merged commit %s\n", commit_id_str);
10526 print_merge_progress_stats(&upa);
10529 free(keyword_idstr);
10531 got_object_commit_close(commit);
10532 free(commit_id_str);
10534 got_worktree_close(worktree);
10536 const struct got_error *close_err = got_repo_close(repo);
10541 const struct got_error *pack_err =
10542 got_repo_pack_fds_close(pack_fds);
10551 usage_backout(void)
10553 fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
10557 static const struct got_error *
10558 cmd_backout(int argc, char *argv[])
10560 const struct got_error *error = NULL;
10561 struct got_worktree *worktree = NULL;
10562 struct got_repository *repo = NULL;
10563 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10564 struct got_object_id *commit_id = NULL;
10565 struct got_commit_object *commit = NULL;
10566 struct got_object_qid *pid;
10567 int ch, list_refs = 0, remove_refs = 0;
10568 struct got_update_progress_arg upa;
10569 int *pack_fds = NULL;
10572 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10573 "unveil", NULL) == -1)
10577 while ((ch = getopt(argc, argv, "lX")) != -1) {
10594 if (list_refs || remove_refs) {
10595 if (argc != 0 && argc != 1)
10597 } else if (argc != 1)
10599 if (list_refs && remove_refs)
10600 option_conflict('l', 'X');
10602 cwd = getcwd(NULL, 0);
10604 error = got_error_from_errno("getcwd");
10608 error = got_repo_pack_fds_open(&pack_fds);
10612 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10614 if (list_refs || remove_refs) {
10615 if (error->code != GOT_ERR_NOT_WORKTREE)
10618 if (error->code == GOT_ERR_NOT_WORKTREE)
10619 error = wrap_not_worktree_error(error,
10625 error = got_repo_open(&repo,
10626 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10631 error = apply_unveil(got_repo_get_path(repo), 0,
10632 worktree ? got_worktree_get_root_path(worktree) : NULL);
10636 if (list_refs || remove_refs) {
10637 error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
10638 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
10639 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10643 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10647 error = got_repo_match_object_id(&commit_id, NULL,
10648 keyword_idstr != NULL ? keyword_idstr : argv[0],
10649 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10652 error = got_object_id_str(&commit_id_str, commit_id);
10656 error = got_object_open_as_commit(&commit, repo, commit_id);
10659 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10661 error = got_error(GOT_ERR_ROOT_COMMIT);
10665 memset(&upa, 0, sizeof(upa));
10666 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
10667 repo, update_progress, &upa, check_cancelled, NULL);
10671 if (upa.did_something) {
10672 error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
10676 printf("Backed out commit %s\n", commit_id_str);
10678 print_merge_progress_stats(&upa);
10681 free(keyword_idstr);
10683 got_object_commit_close(commit);
10684 free(commit_id_str);
10686 got_worktree_close(worktree);
10688 const struct got_error *close_err = got_repo_close(repo);
10693 const struct got_error *pack_err =
10694 got_repo_pack_fds_close(pack_fds);
10704 fprintf(stderr, "usage: %s rebase [-aCclX] [branch]\n", getprogname());
10709 trim_logmsg(char *logmsg, int limit)
10714 len = strlen(logmsg);
10717 logmsg[len] = '\0';
10718 nl = strchr(logmsg, '\n');
10723 static const struct got_error *
10724 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
10726 const struct got_error *err;
10727 char *logmsg0 = NULL;
10730 err = got_object_commit_get_logmsg(&logmsg0, commit);
10735 while (isspace((unsigned char)s[0]))
10738 *logmsg = strdup(s);
10739 if (*logmsg == NULL) {
10740 err = got_error_from_errno("strdup");
10744 trim_logmsg(*logmsg, limit);
10750 static const struct got_error *
10751 show_rebase_merge_conflict(struct got_object_id *id,
10752 struct got_repository *repo)
10754 const struct got_error *err;
10755 struct got_commit_object *commit = NULL;
10756 char *id_str = NULL, *logmsg = NULL;
10758 err = got_object_open_as_commit(&commit, repo, id);
10762 err = got_object_id_str(&id_str, id);
10768 err = get_short_logmsg(&logmsg, 42, commit);
10772 printf("%s -> merge conflict: %s\n", id_str, logmsg);
10775 got_object_commit_close(commit);
10780 static const struct got_error *
10781 show_rebase_progress(struct got_commit_object *commit,
10782 struct got_object_id *old_id, struct got_object_id *new_id)
10784 const struct got_error *err;
10785 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10787 err = got_object_id_str(&old_id_str, old_id);
10792 err = got_object_id_str(&new_id_str, new_id);
10797 old_id_str[12] = '\0';
10799 new_id_str[12] = '\0';
10801 err = get_short_logmsg(&logmsg, 42, commit);
10805 printf("%s -> %s: %s\n", old_id_str,
10806 new_id_str ? new_id_str : "no-op change", logmsg);
10814 static const struct got_error *
10815 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
10816 struct got_reference *branch, struct got_reference *tmp_branch,
10817 struct got_repository *repo, int create_backup)
10819 printf("Switching work tree to %s\n", got_ref_get_name(branch));
10820 return got_worktree_rebase_complete(worktree, fileindex,
10821 tmp_branch, branch, repo, create_backup);
10824 static const struct got_error *
10825 rebase_commit(struct got_pathlist_head *merged_paths,
10826 struct got_worktree *worktree, struct got_fileindex *fileindex,
10827 struct got_reference *tmp_branch, const char *committer,
10828 struct got_object_id *commit_id, int allow_conflict,
10829 struct got_repository *repo)
10831 const struct got_error *error;
10832 struct got_commit_object *commit;
10833 struct got_object_id *new_commit_id;
10835 error = got_object_open_as_commit(&commit, repo, commit_id);
10839 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
10840 worktree, fileindex, tmp_branch, committer, commit, commit_id,
10841 allow_conflict, repo);
10843 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
10845 error = show_rebase_progress(commit, commit_id, NULL);
10847 error = show_rebase_progress(commit, commit_id, new_commit_id);
10848 free(new_commit_id);
10851 got_object_commit_close(commit);
10855 struct check_path_prefix_arg {
10856 const char *path_prefix;
10861 static const struct got_error *
10862 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
10863 struct got_blob_object *blob2, FILE *f1, FILE *f2,
10864 struct got_object_id *id1, struct got_object_id *id2,
10865 const char *path1, const char *path2,
10866 mode_t mode1, mode_t mode2, struct got_repository *repo)
10868 struct check_path_prefix_arg *a = arg;
10870 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
10871 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
10872 return got_error(a->errcode);
10877 static const struct got_error *
10878 check_path_prefix(struct got_object_id *parent_id,
10879 struct got_object_id *commit_id, const char *path_prefix,
10880 int errcode, struct got_repository *repo)
10882 const struct got_error *err;
10883 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
10884 struct got_commit_object *commit = NULL, *parent_commit = NULL;
10885 struct check_path_prefix_arg cpp_arg;
10887 if (got_path_is_root_dir(path_prefix))
10890 err = got_object_open_as_commit(&commit, repo, commit_id);
10894 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
10898 err = got_object_open_as_tree(&tree1, repo,
10899 got_object_commit_get_tree_id(parent_commit));
10903 err = got_object_open_as_tree(&tree2, repo,
10904 got_object_commit_get_tree_id(commit));
10908 cpp_arg.path_prefix = path_prefix;
10909 while (cpp_arg.path_prefix[0] == '/')
10910 cpp_arg.path_prefix++;
10911 cpp_arg.len = strlen(cpp_arg.path_prefix);
10912 cpp_arg.errcode = errcode;
10913 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
10914 check_path_prefix_in_diff, &cpp_arg, 0);
10917 got_object_tree_close(tree1);
10919 got_object_tree_close(tree2);
10921 got_object_commit_close(commit);
10923 got_object_commit_close(parent_commit);
10927 static const struct got_error *
10928 collect_commits(struct got_object_id_queue *commits,
10929 struct got_object_id *initial_commit_id,
10930 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
10931 const char *path_prefix, int path_prefix_errcode,
10932 struct got_repository *repo)
10934 const struct got_error *err = NULL;
10935 struct got_commit_graph *graph = NULL;
10936 struct got_object_id parent_id, commit_id;
10937 struct got_object_qid *qid;
10939 err = got_commit_graph_open(&graph, "/", 1);
10943 err = got_commit_graph_bfsort(graph, iter_start_id, repo,
10944 check_cancelled, NULL);
10948 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
10949 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
10950 err = got_commit_graph_iter_next(&parent_id, graph, repo,
10951 check_cancelled, NULL);
10953 if (err->code == GOT_ERR_ITER_COMPLETED) {
10954 err = got_error_msg(GOT_ERR_ANCESTRY,
10955 "ran out of commits to rebase before "
10956 "youngest common ancestor commit has "
10957 "been reached?!?");
10961 err = check_path_prefix(&parent_id, &commit_id,
10962 path_prefix, path_prefix_errcode, repo);
10966 err = got_object_qid_alloc(&qid, &commit_id);
10969 STAILQ_INSERT_HEAD(commits, qid, entry);
10971 memcpy(&commit_id, &parent_id, sizeof(commit_id));
10975 got_commit_graph_close(graph);
10979 static const struct got_error *
10980 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
10982 const struct got_error *err = NULL;
10983 time_t committer_time;
10985 char datebuf[11]; /* YYYY-MM-DD + NUL */
10986 char *author0 = NULL, *author, *smallerthan;
10987 char *logmsg0 = NULL, *logmsg, *newline;
10989 committer_time = got_object_commit_get_committer_time(commit);
10990 if (gmtime_r(&committer_time, &tm) == NULL)
10991 return got_error_from_errno("gmtime_r");
10992 if (strftime(datebuf, sizeof(datebuf), "%F", &tm) == 0)
10993 return got_error(GOT_ERR_NO_SPACE);
10995 author0 = strdup(got_object_commit_get_author(commit));
10996 if (author0 == NULL)
10997 return got_error_from_errno("strdup");
10999 smallerthan = strchr(author, '<');
11000 if (smallerthan && smallerthan[1] != '\0')
11001 author = smallerthan + 1;
11002 author[strcspn(author, "@>")] = '\0';
11004 err = got_object_commit_get_logmsg(&logmsg0, commit);
11008 while (*logmsg == '\n')
11010 newline = strchr(logmsg, '\n');
11014 if (asprintf(brief_str, "%s %s %s",
11015 datebuf, author, logmsg) == -1)
11016 err = got_error_from_errno("asprintf");
11023 static const struct got_error *
11024 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
11025 struct got_repository *repo)
11027 const struct got_error *err;
11030 err = got_object_id_str(&id_str, id);
11034 err = got_ref_delete(ref, repo);
11038 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
11044 static const struct got_error *
11045 print_backup_ref(const char *branch_name, const char *new_id_str,
11046 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
11047 struct got_reflist_object_id_map *refs_idmap,
11048 struct got_repository *repo)
11050 const struct got_error *err = NULL;
11051 struct got_reflist_head *refs;
11052 char *refs_str = NULL;
11053 struct got_object_id *new_commit_id = NULL;
11054 struct got_commit_object *new_commit = NULL;
11055 char *new_commit_brief_str = NULL;
11056 struct got_object_id *yca_id = NULL;
11057 struct got_commit_object *yca_commit = NULL;
11058 char *yca_id_str = NULL, *yca_brief_str = NULL;
11059 char *custom_refs_str;
11061 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
11062 return got_error_from_errno("asprintf");
11064 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
11065 0, 0, refs_idmap, custom_refs_str, NULL);
11069 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
11073 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
11075 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
11080 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
11084 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
11088 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11089 old_commit_id, new_commit_id, 1, 0, repo, check_cancelled, NULL);
11093 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
11094 refs_str ? " (" : "", refs_str ? refs_str : "",
11095 refs_str ? ")" : "", new_commit_brief_str);
11096 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
11097 got_object_id_cmp(yca_id, old_commit_id) != 0) {
11101 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
11105 err = get_commit_brief_str(&yca_brief_str, yca_commit);
11109 err = got_object_id_str(&yca_id_str, yca_id);
11113 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
11115 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
11119 printf("history forked at %s%s%s%s\n %s\n",
11121 refs_str ? " (" : "", refs_str ? refs_str : "",
11122 refs_str ? ")" : "", yca_brief_str);
11125 free(custom_refs_str);
11126 free(new_commit_id);
11130 free(yca_brief_str);
11132 got_object_commit_close(new_commit);
11134 got_object_commit_close(yca_commit);
11139 static const struct got_error *
11140 worktree_has_logmsg_ref(const char *caller, struct got_worktree *worktree,
11141 struct got_repository *repo)
11143 const struct got_error *err;
11144 struct got_reflist_head refs;
11145 struct got_reflist_entry *re;
11146 char *uuidstr = NULL;
11147 static char msg[160];
11151 err = got_worktree_get_uuid(&uuidstr, worktree);
11155 err = got_ref_list(&refs, repo, "refs/got/worktree",
11156 got_ref_cmp_by_name, repo);
11160 TAILQ_FOREACH(re, &refs, entry) {
11161 const char *cmd, *refname, *type;
11163 refname = got_ref_get_name(re->ref);
11165 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
11166 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
11167 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
11168 cmd = "cherrypick";
11169 type = "cherrypicked";
11170 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
11171 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
11172 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
11174 type = "backed-out";
11178 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) != 0)
11181 snprintf(msg, sizeof(msg),
11182 "work tree has references created by %s commits which "
11183 "must be removed with 'got %s -X' before running the %s "
11184 "command", type, cmd, caller);
11185 err = got_error_msg(GOT_ERR_WORKTREE_META, msg);
11191 got_ref_list_free(&refs);
11195 static const struct got_error *
11196 process_backup_refs(const char *backup_ref_prefix,
11197 const char *wanted_branch_name,
11198 int delete, struct got_repository *repo)
11200 const struct got_error *err;
11201 struct got_reflist_head refs, backup_refs;
11202 struct got_reflist_entry *re;
11203 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
11204 struct got_object_id *old_commit_id = NULL;
11205 char *branch_name = NULL;
11206 struct got_commit_object *old_commit = NULL;
11207 struct got_reflist_object_id_map *refs_idmap = NULL;
11208 int wanted_branch_found = 0;
11211 TAILQ_INIT(&backup_refs);
11213 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11217 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
11221 if (wanted_branch_name) {
11222 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
11223 wanted_branch_name += 11;
11226 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
11227 got_ref_cmp_by_commit_timestamp_descending, repo);
11231 TAILQ_FOREACH(re, &backup_refs, entry) {
11232 const char *refname = got_ref_get_name(re->ref);
11235 err = check_cancelled(NULL);
11239 err = got_ref_resolve(&old_commit_id, repo, re->ref);
11243 err = got_object_open_as_commit(&old_commit, repo,
11248 if (strncmp(backup_ref_prefix, refname,
11249 backup_ref_prefix_len) == 0)
11250 refname += backup_ref_prefix_len;
11252 while (refname[0] == '/')
11255 branch_name = strdup(refname);
11256 if (branch_name == NULL) {
11257 err = got_error_from_errno("strdup");
11260 slash = strrchr(branch_name, '/');
11263 refname += strlen(branch_name) + 1;
11266 if (wanted_branch_name == NULL ||
11267 strcmp(wanted_branch_name, branch_name) == 0) {
11268 wanted_branch_found = 1;
11270 err = delete_backup_ref(re->ref,
11271 old_commit_id, repo);
11273 err = print_backup_ref(branch_name, refname,
11274 old_commit_id, old_commit, refs_idmap,
11281 free(old_commit_id);
11282 old_commit_id = NULL;
11284 branch_name = NULL;
11285 got_object_commit_close(old_commit);
11289 if (wanted_branch_name && !wanted_branch_found) {
11290 err = got_error_fmt(GOT_ERR_NOT_REF,
11291 "%s/%s/", backup_ref_prefix, wanted_branch_name);
11295 got_reflist_object_id_map_free(refs_idmap);
11296 got_ref_list_free(&refs);
11297 got_ref_list_free(&backup_refs);
11298 free(old_commit_id);
11301 got_object_commit_close(old_commit);
11305 static const struct got_error *
11306 abort_progress(void *arg, unsigned char status, const char *path)
11309 * Unversioned files should not clutter progress output when
11310 * an operation is aborted.
11312 if (status == GOT_STATUS_UNVERSIONED)
11315 return update_progress(arg, status, path);
11318 static const struct got_error *
11319 find_merge_commit_yca(struct got_object_id **new_yca_id,
11320 struct got_object_id *branch_head_commit_id,
11321 struct got_object_id *yca_id,
11322 struct got_object_id *base_commit_id,
11323 struct got_repository *repo)
11325 const struct got_error *err = NULL;
11326 struct got_commit_graph *graph = NULL;
11327 struct got_commit_object *commit = NULL;
11329 *new_yca_id = NULL;
11331 err = got_commit_graph_open(&graph, "/", 1);
11335 err = got_commit_graph_bfsort(graph, base_commit_id,
11336 repo, check_cancelled, NULL);
11341 struct got_object_id id;
11343 err = got_commit_graph_iter_next(&id, graph, repo,
11344 check_cancelled, NULL);
11346 if (err->code == GOT_ERR_ITER_COMPLETED)
11351 err = got_object_open_as_commit(&commit, repo, &id);
11355 if (got_object_commit_get_nparents(commit) > 1) {
11356 /* Search for a better YCA using toposort. */
11357 err = got_commit_graph_find_youngest_common_ancestor(
11358 new_yca_id, base_commit_id, branch_head_commit_id,
11359 0, 1, repo, check_cancelled, NULL);
11363 if (got_object_id_cmp(&id, yca_id) == 0)
11365 got_object_commit_close(commit);
11369 got_commit_graph_close(graph);
11371 got_object_commit_close(commit);
11375 static const struct got_error *
11376 cmd_rebase(int argc, char *argv[])
11378 const struct got_error *error = NULL;
11379 struct got_worktree *worktree = NULL;
11380 struct got_repository *repo = NULL;
11381 struct got_fileindex *fileindex = NULL;
11382 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11383 struct got_reference *branch = NULL;
11384 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
11385 struct got_object_id *commit_id = NULL, *parent_id = NULL;
11386 struct got_object_id *resume_commit_id = NULL;
11387 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
11388 struct got_object_id *head_commit_id = NULL;
11389 struct got_reference *head_ref = NULL;
11390 struct got_commit_object *commit = NULL;
11391 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
11392 int histedit_in_progress = 0, merge_in_progress = 0;
11393 int create_backup = 1, list_backups = 0, delete_backups = 0;
11394 int allow_conflict = 0;
11395 struct got_object_id_queue commits;
11396 struct got_pathlist_head merged_paths;
11397 const struct got_object_id_queue *parent_ids;
11398 struct got_object_qid *qid, *pid;
11399 struct got_update_progress_arg upa;
11400 int *pack_fds = NULL;
11402 STAILQ_INIT(&commits);
11403 TAILQ_INIT(&merged_paths);
11404 memset(&upa, 0, sizeof(upa));
11407 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11408 "unveil", NULL) == -1)
11412 while ((ch = getopt(argc, argv, "aCclX")) != -1) {
11418 allow_conflict = 1;
11421 continue_rebase = 1;
11427 delete_backups = 1;
11438 if (list_backups) {
11440 option_conflict('l', 'a');
11441 if (allow_conflict)
11442 option_conflict('l', 'C');
11443 if (continue_rebase)
11444 option_conflict('l', 'c');
11445 if (delete_backups)
11446 option_conflict('l', 'X');
11447 if (argc != 0 && argc != 1)
11449 } else if (delete_backups) {
11451 option_conflict('X', 'a');
11452 if (allow_conflict)
11453 option_conflict('X', 'C');
11454 if (continue_rebase)
11455 option_conflict('X', 'c');
11457 option_conflict('l', 'X');
11458 if (argc != 0 && argc != 1)
11460 } else if (allow_conflict) {
11462 option_conflict('C', 'a');
11463 if (!continue_rebase)
11464 errx(1, "-C option requires -c");
11466 if (abort_rebase && continue_rebase)
11468 else if (abort_rebase || continue_rebase) {
11471 } else if (argc != 1)
11475 cwd = getcwd(NULL, 0);
11477 error = got_error_from_errno("getcwd");
11481 error = got_repo_pack_fds_open(&pack_fds);
11485 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
11487 if (list_backups || delete_backups) {
11488 if (error->code != GOT_ERR_NOT_WORKTREE)
11491 if (error->code == GOT_ERR_NOT_WORKTREE)
11492 error = wrap_not_worktree_error(error,
11498 error = get_gitconfig_path(&gitconfig_path);
11501 error = got_repo_open(&repo,
11502 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11503 gitconfig_path, pack_fds);
11507 if (worktree != NULL && !list_backups && !delete_backups) {
11508 error = worktree_has_logmsg_ref("rebase", worktree, repo);
11513 error = get_author(&committer, repo, worktree);
11514 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
11517 error = apply_unveil(got_repo_get_path(repo), 0,
11518 worktree ? got_worktree_get_root_path(worktree) : NULL);
11522 if (list_backups || delete_backups) {
11523 error = process_backup_refs(
11524 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
11525 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11526 goto done; /* nothing else to do */
11529 error = got_worktree_histedit_in_progress(&histedit_in_progress,
11533 if (histedit_in_progress) {
11534 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11538 error = got_worktree_merge_in_progress(&merge_in_progress,
11542 if (merge_in_progress) {
11543 error = got_error(GOT_ERR_MERGE_BUSY);
11547 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11551 if (abort_rebase) {
11552 if (!rebase_in_progress) {
11553 error = got_error(GOT_ERR_NOT_REBASING);
11556 error = got_worktree_rebase_continue(&resume_commit_id,
11557 &new_base_branch, &tmp_branch, &branch, &fileindex,
11561 printf("Switching work tree to %s\n",
11562 got_ref_get_symref_target(new_base_branch));
11563 error = got_worktree_rebase_abort(worktree, fileindex, repo,
11564 new_base_branch, abort_progress, &upa);
11567 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
11568 print_merge_progress_stats(&upa);
11569 goto done; /* nothing else to do */
11572 if (continue_rebase) {
11573 if (!rebase_in_progress) {
11574 error = got_error(GOT_ERR_NOT_REBASING);
11577 error = got_worktree_rebase_continue(&resume_commit_id,
11578 &new_base_branch, &tmp_branch, &branch, &fileindex,
11583 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
11584 committer, resume_commit_id, allow_conflict, repo);
11588 yca_id = got_object_id_dup(resume_commit_id);
11589 if (yca_id == NULL) {
11590 error = got_error_from_errno("got_object_id_dup");
11594 error = got_ref_open(&branch, repo, argv[0], 0);
11597 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11598 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11599 "will not rebase a branch which lives outside "
11600 "the \"refs/heads/\" reference namespace");
11605 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
11609 if (!continue_rebase) {
11610 struct got_object_id *base_commit_id;
11612 error = got_ref_open(&head_ref, repo,
11613 got_worktree_get_head_ref_name(worktree), 0);
11616 error = got_ref_resolve(&head_commit_id, repo, head_ref);
11619 base_commit_id = got_worktree_get_base_commit_id(worktree);
11620 if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
11621 error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
11625 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11626 base_commit_id, branch_head_commit_id, 1, 0,
11627 repo, check_cancelled, NULL);
11629 if (error->code == GOT_ERR_ANCESTRY) {
11630 error = got_error_msg(GOT_ERR_ANCESTRY,
11631 "specified branch shares no common "
11632 "ancestry with work tree's branch");
11638 * If a merge commit appears between the new base branch tip
11639 * and a YCA found via first-parent traversal then we might
11640 * find a better YCA using topologically sorted commits.
11642 if (got_object_id_cmp(base_commit_id, yca_id) != 0) {
11643 struct got_object_id *better_yca_id;
11644 error = find_merge_commit_yca(&better_yca_id,
11645 branch_head_commit_id, yca_id,
11646 base_commit_id, repo);
11649 if (better_yca_id) {
11651 yca_id = better_yca_id;
11655 if (got_object_id_cmp(base_commit_id, yca_id) == 0) {
11656 struct got_pathlist_head paths;
11657 printf("%s is already based on %s\n",
11658 got_ref_get_name(branch),
11659 got_worktree_get_head_ref_name(worktree));
11660 error = switch_head_ref(branch, branch_head_commit_id,
11664 error = got_worktree_set_base_commit_id(worktree, repo,
11665 branch_head_commit_id);
11668 TAILQ_INIT(&paths);
11669 error = got_pathlist_append(&paths, "", NULL);
11672 error = got_worktree_checkout_files(worktree,
11673 &paths, repo, update_progress, &upa,
11674 check_cancelled, NULL);
11675 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
11678 if (upa.did_something) {
11680 error = got_object_id_str(&id_str,
11681 branch_head_commit_id);
11684 printf("Updated to %s: %s\n",
11685 got_worktree_get_head_ref_name(worktree),
11689 printf("Already up-to-date\n");
11690 print_update_progress_stats(&upa);
11695 commit_id = branch_head_commit_id;
11696 error = got_object_open_as_commit(&commit, repo, commit_id);
11700 parent_ids = got_object_commit_get_parent_ids(commit);
11701 pid = STAILQ_FIRST(parent_ids);
11703 error = collect_commits(&commits, commit_id, &pid->id,
11704 yca_id, got_worktree_get_path_prefix(worktree),
11705 GOT_ERR_REBASE_PATH, repo);
11710 got_object_commit_close(commit);
11713 if (!continue_rebase) {
11714 error = got_worktree_rebase_prepare(&new_base_branch,
11715 &tmp_branch, &fileindex, worktree, branch, repo);
11720 if (STAILQ_EMPTY(&commits)) {
11721 if (continue_rebase) {
11722 error = rebase_complete(worktree, fileindex,
11723 branch, tmp_branch, repo, create_backup);
11726 /* Fast-forward the reference of the branch. */
11727 struct got_object_id *new_head_commit_id;
11729 error = got_ref_resolve(&new_head_commit_id, repo,
11733 error = got_object_id_str(&id_str, new_head_commit_id);
11736 printf("Forwarding %s to commit %s\n",
11737 got_ref_get_name(branch), id_str);
11739 error = got_ref_change_ref(branch,
11740 new_head_commit_id);
11743 /* No backup needed since objects did not change. */
11749 STAILQ_FOREACH(qid, &commits, entry) {
11751 commit_id = &qid->id;
11752 parent_id = pid ? &pid->id : yca_id;
11755 memset(&upa, 0, sizeof(upa));
11756 error = got_worktree_rebase_merge_files(&merged_paths,
11757 worktree, fileindex, parent_id, commit_id, repo,
11758 update_progress, &upa, check_cancelled, NULL);
11762 print_merge_progress_stats(&upa);
11763 if (upa.conflicts > 0 || upa.missing > 0 ||
11764 upa.not_deleted > 0 || upa.unversioned > 0) {
11765 if (upa.conflicts > 0) {
11766 error = show_rebase_merge_conflict(&qid->id,
11771 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11775 error = rebase_commit(&merged_paths, worktree, fileindex,
11776 tmp_branch, committer, commit_id, 0, repo);
11777 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11782 if (upa.conflicts > 0 || upa.missing > 0 ||
11783 upa.not_deleted > 0 || upa.unversioned > 0) {
11784 error = got_worktree_rebase_postpone(worktree, fileindex);
11787 if (upa.conflicts > 0 && upa.missing == 0 &&
11788 upa.not_deleted == 0 && upa.unversioned == 0) {
11789 error = got_error_msg(GOT_ERR_CONFLICTS,
11790 "conflicts must be resolved before rebasing "
11792 } else if (upa.conflicts > 0) {
11793 error = got_error_msg(GOT_ERR_CONFLICTS,
11794 "conflicts must be resolved before rebasing "
11795 "can continue; changes destined for some "
11796 "files were not yet merged and should be "
11797 "merged manually if required before the "
11798 "rebase operation is continued");
11800 error = got_error_msg(GOT_ERR_CONFLICTS,
11801 "changes destined for some files were not "
11802 "yet merged and should be merged manually "
11803 "if required before the rebase operation "
11807 error = rebase_complete(worktree, fileindex, branch,
11808 tmp_branch, repo, create_backup);
11812 free(gitconfig_path);
11813 got_object_id_queue_free(&commits);
11814 free(branch_head_commit_id);
11815 free(resume_commit_id);
11816 free(head_commit_id);
11819 got_object_commit_close(commit);
11821 got_ref_close(branch);
11822 if (new_base_branch)
11823 got_ref_close(new_base_branch);
11825 got_ref_close(tmp_branch);
11827 got_ref_close(head_ref);
11829 got_worktree_close(worktree);
11831 const struct got_error *close_err = got_repo_close(repo);
11836 const struct got_error *pack_err =
11837 got_repo_pack_fds_close(pack_fds);
11845 usage_histedit(void)
11847 fprintf(stderr, "usage: %s histedit [-aCcdeflmX] [-F histedit-script] "
11848 "[branch]\n", getprogname());
11852 #define GOT_HISTEDIT_PICK 'p'
11853 #define GOT_HISTEDIT_EDIT 'e'
11854 #define GOT_HISTEDIT_FOLD 'f'
11855 #define GOT_HISTEDIT_DROP 'd'
11856 #define GOT_HISTEDIT_MESG 'm'
11858 static const struct got_histedit_cmd {
11859 unsigned char code;
11862 } got_histedit_cmds[] = {
11863 { GOT_HISTEDIT_PICK, "pick", "use commit" },
11864 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
11865 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
11867 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
11868 { GOT_HISTEDIT_MESG, "mesg", "open editor to edit the log message" },
11871 struct got_histedit_list_entry {
11872 TAILQ_ENTRY(got_histedit_list_entry) entry;
11873 struct got_object_id *commit_id;
11874 const struct got_histedit_cmd *cmd;
11877 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
11879 static const struct got_error *
11880 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
11881 FILE *f, struct got_repository *repo)
11883 const struct got_error *err = NULL;
11884 char *logmsg = NULL, *id_str = NULL;
11885 struct got_commit_object *commit = NULL;
11888 err = got_object_open_as_commit(&commit, repo, commit_id);
11892 err = get_short_logmsg(&logmsg, 34, commit);
11896 err = got_object_id_str(&id_str, commit_id);
11900 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
11902 err = got_ferror(f, GOT_ERR_IO);
11905 got_object_commit_close(commit);
11911 static const struct got_error *
11912 histedit_write_commit_list(struct got_object_id_queue *commits,
11913 FILE *f, int edit_logmsg_only, int fold_only, int drop_only,
11914 int edit_only, struct got_repository *repo)
11916 const struct got_error *err = NULL;
11917 struct got_object_qid *qid;
11918 const char *histedit_cmd = NULL;
11920 if (STAILQ_EMPTY(commits))
11921 return got_error(GOT_ERR_EMPTY_HISTEDIT);
11923 STAILQ_FOREACH(qid, commits, entry) {
11924 histedit_cmd = got_histedit_cmds[0].name;
11926 histedit_cmd = "drop";
11927 else if (edit_only)
11928 histedit_cmd = "edit";
11929 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
11930 histedit_cmd = "fold";
11931 else if (edit_logmsg_only)
11932 histedit_cmd = "mesg";
11933 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
11941 static const struct got_error *
11942 write_cmd_list(FILE *f, const char *branch_name,
11943 struct got_object_id_queue *commits)
11945 const struct got_error *err = NULL;
11949 struct got_object_qid *qid;
11951 qid = STAILQ_FIRST(commits);
11952 err = got_object_id_str(&id_str, &qid->id);
11957 "# Editing the history of branch '%s' starting at\n"
11959 "# Commits will be processed in order from top to "
11960 "bottom of this file.\n", branch_name, id_str);
11962 err = got_ferror(f, GOT_ERR_IO);
11966 n = fprintf(f, "# Available histedit commands:\n");
11968 err = got_ferror(f, GOT_ERR_IO);
11972 for (i = 0; i < nitems(got_histedit_cmds); i++) {
11973 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
11974 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
11977 err = got_ferror(f, GOT_ERR_IO);
11986 static const struct got_error *
11987 histedit_syntax_error(int lineno)
11989 static char msg[42];
11992 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
11994 if (ret < 0 || (size_t)ret >= sizeof(msg))
11995 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
11997 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
12000 static const struct got_error *
12001 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
12002 char *logmsg, struct got_repository *repo)
12004 const struct got_error *err;
12005 struct got_commit_object *folded_commit = NULL;
12006 char *id_str, *folded_logmsg = NULL;
12008 err = got_object_id_str(&id_str, hle->commit_id);
12012 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
12016 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
12019 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
12020 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
12021 folded_logmsg) == -1) {
12022 err = got_error_from_errno("asprintf");
12026 got_object_commit_close(folded_commit);
12028 free(folded_logmsg);
12032 static struct got_histedit_list_entry *
12033 get_folded_commits(struct got_histedit_list_entry *hle)
12035 struct got_histedit_list_entry *prev, *folded = NULL;
12037 prev = TAILQ_PREV(hle, got_histedit_list, entry);
12038 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
12039 prev->cmd->code == GOT_HISTEDIT_DROP)) {
12040 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
12042 prev = TAILQ_PREV(prev, got_histedit_list, entry);
12048 static const struct got_error *
12049 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
12050 const char *editor, struct got_repository *repo)
12052 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
12053 char *logmsg = NULL, *new_msg = NULL;
12054 const struct got_error *err = NULL;
12055 struct got_commit_object *commit = NULL;
12058 struct got_histedit_list_entry *folded = NULL;
12060 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12064 folded = get_folded_commits(hle);
12066 while (folded != hle) {
12067 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
12068 folded = TAILQ_NEXT(folded, entry);
12071 err = append_folded_commit_msg(&new_msg, folded,
12077 folded = TAILQ_NEXT(folded, entry);
12081 err = got_object_id_str(&id_str, hle->commit_id);
12084 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
12087 logmsg_len = asprintf(&new_msg,
12088 "%s\n# original log message of commit %s: %s",
12089 logmsg ? logmsg : "", id_str, orig_logmsg);
12090 if (logmsg_len == -1) {
12091 err = got_error_from_errno("asprintf");
12097 err = got_object_id_str(&id_str, hle->commit_id);
12101 err = got_opentemp_named_fd(&logmsg_path, &fd,
12102 GOT_TMPDIR_STR "/got-logmsg", "");
12106 if (write(fd, logmsg, logmsg_len) == -1) {
12107 err = got_error_from_errno2("write", logmsg_path);
12110 if (close(fd) == -1) {
12111 err = got_error_from_errno2("close", logmsg_path);
12116 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
12119 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
12122 hle->logmsg = strdup(new_msg);
12123 if (hle->logmsg == NULL)
12124 err = got_error_from_errno("strdup");
12127 if (fd != -1 && close(fd) == -1 && err == NULL)
12128 err = got_error_from_errno2("close", logmsg_path);
12129 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
12130 err = got_error_from_errno2("unlink", logmsg_path);
12135 got_object_commit_close(commit);
12139 static const struct got_error *
12140 histedit_parse_list(struct got_histedit_list *histedit_cmds,
12141 FILE *f, struct got_repository *repo)
12143 const struct got_error *err = NULL;
12144 char *line = NULL, *p, *end;
12145 size_t i, linesize = 0;
12148 const struct got_histedit_cmd *cmd;
12149 struct got_object_id *commit_id = NULL;
12150 struct got_histedit_list_entry *hle = NULL;
12153 linelen = getline(&line, &linesize, f);
12154 if (linelen == -1) {
12155 const struct got_error *getline_err;
12158 getline_err = got_error_from_errno("getline");
12159 err = got_ferror(f, getline_err->code);
12164 while (isspace((unsigned char)p[0]))
12166 if (p[0] == '#' || p[0] == '\0')
12169 for (i = 0; i < nitems(got_histedit_cmds); i++) {
12170 cmd = &got_histedit_cmds[i];
12171 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
12172 isspace((unsigned char)p[strlen(cmd->name)])) {
12173 p += strlen(cmd->name);
12176 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
12181 if (i == nitems(got_histedit_cmds)) {
12182 err = histedit_syntax_error(lineno);
12185 while (isspace((unsigned char)p[0]))
12188 while (end[0] && !isspace((unsigned char)end[0]))
12191 err = got_object_resolve_id_str(&commit_id, repo, p);
12193 /* override error code */
12194 err = histedit_syntax_error(lineno);
12197 hle = malloc(sizeof(*hle));
12199 err = got_error_from_errno("malloc");
12203 hle->commit_id = commit_id;
12204 hle->logmsg = NULL;
12206 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
12214 static const struct got_error *
12215 histedit_check_script(struct got_histedit_list *histedit_cmds,
12216 struct got_object_id_queue *commits, struct got_repository *repo)
12218 const struct got_error *err = NULL;
12219 struct got_object_qid *qid;
12220 struct got_histedit_list_entry *hle;
12221 static char msg[92];
12224 if (TAILQ_EMPTY(histedit_cmds))
12225 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12226 "histedit script contains no commands");
12227 if (STAILQ_EMPTY(commits))
12228 return got_error(GOT_ERR_EMPTY_HISTEDIT);
12230 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12231 struct got_histedit_list_entry *hle2;
12232 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
12235 if (got_object_id_cmp(hle->commit_id,
12236 hle2->commit_id) != 0)
12238 err = got_object_id_str(&id_str, hle->commit_id);
12241 snprintf(msg, sizeof(msg), "commit %s is listed "
12242 "more than once in histedit script", id_str);
12244 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12248 STAILQ_FOREACH(qid, commits, entry) {
12249 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12250 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
12254 err = got_object_id_str(&id_str, &qid->id);
12257 snprintf(msg, sizeof(msg),
12258 "commit %s missing from histedit script", id_str);
12260 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12264 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
12265 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
12266 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
12267 "last commit in histedit script cannot be folded");
12272 static const struct got_error *
12273 histedit_run_editor(struct got_histedit_list *histedit_cmds,
12274 const char *editor, const char *path,
12275 struct got_object_id_queue *commits, struct got_repository *repo)
12277 const struct got_error *err = NULL;
12278 struct stat st, st2;
12279 struct timespec timeout;
12282 if (stat(path, &st) == -1) {
12283 err = got_error_from_errno2("stat", path);
12287 if (spawn_editor(editor, path) == -1) {
12288 err = got_error_from_errno("failed spawning editor");
12292 timeout.tv_sec = 0;
12293 timeout.tv_nsec = 1;
12294 nanosleep(&timeout, NULL);
12296 if (stat(path, &st2) == -1) {
12297 err = got_error_from_errno2("stat", path);
12301 if (st.st_size == st2.st_size &&
12302 timespeccmp(&st.st_mtim, &st2.st_mtim, ==)) {
12303 err = got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12304 "no changes made to histedit script, aborting");
12308 f = fopen(path, "re");
12310 err = got_error_from_errno("fopen");
12313 err = histedit_parse_list(histedit_cmds, f, repo);
12317 err = histedit_check_script(histedit_cmds, commits, repo);
12319 if (f && fclose(f) == EOF && err == NULL)
12320 err = got_error_from_errno("fclose");
12324 static const struct got_error *
12325 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
12326 struct got_object_id_queue *, const char *, const char *, const char *,
12327 struct got_repository *);
12329 static const struct got_error *
12330 histedit_edit_script(struct got_histedit_list *histedit_cmds,
12331 struct got_object_id_queue *commits, const char *branch_name,
12332 int edit_logmsg_only, int fold_only, int drop_only, int edit_only,
12333 const char *editor, struct got_repository *repo)
12335 const struct got_error *err;
12339 err = got_opentemp_named(&path, &f, "got-histedit", "");
12343 err = write_cmd_list(f, branch_name, commits);
12347 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
12348 fold_only, drop_only, edit_only, repo);
12352 if (drop_only || edit_logmsg_only || fold_only || edit_only) {
12354 err = histedit_parse_list(histedit_cmds, f, repo);
12356 if (fclose(f) == EOF) {
12357 err = got_error_from_errno("fclose");
12361 err = histedit_run_editor(histedit_cmds, editor, path,
12364 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12365 err->code != GOT_ERR_HISTEDIT_CMD)
12367 err = histedit_edit_list_retry(histedit_cmds, err,
12368 commits, editor, path, branch_name, repo);
12372 if (f && fclose(f) == EOF && err == NULL)
12373 err = got_error_from_errno("fclose");
12374 if (path && unlink(path) != 0 && err == NULL)
12375 err = got_error_from_errno2("unlink", path);
12380 static const struct got_error *
12381 histedit_save_list(struct got_histedit_list *histedit_cmds,
12382 struct got_worktree *worktree, struct got_repository *repo)
12384 const struct got_error *err = NULL;
12387 struct got_histedit_list_entry *hle;
12389 err = got_worktree_get_histedit_script_path(&path, worktree);
12393 f = fopen(path, "we");
12395 err = got_error_from_errno2("fopen", path);
12398 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12399 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
12405 if (f && fclose(f) == EOF && err == NULL)
12406 err = got_error_from_errno("fclose");
12412 histedit_free_list(struct got_histedit_list *histedit_cmds)
12414 struct got_histedit_list_entry *hle;
12416 while ((hle = TAILQ_FIRST(histedit_cmds))) {
12417 TAILQ_REMOVE(histedit_cmds, hle, entry);
12422 static const struct got_error *
12423 histedit_load_list(struct got_histedit_list *histedit_cmds,
12424 const char *path, struct got_repository *repo)
12426 const struct got_error *err = NULL;
12429 f = fopen(path, "re");
12431 err = got_error_from_errno2("fopen", path);
12435 err = histedit_parse_list(histedit_cmds, f, repo);
12437 if (f && fclose(f) == EOF && err == NULL)
12438 err = got_error_from_errno("fclose");
12442 static const struct got_error *
12443 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
12444 const struct got_error *edit_err, struct got_object_id_queue *commits,
12445 const char *editor, const char *path, const char *branch_name,
12446 struct got_repository *repo)
12448 const struct got_error *err = NULL, *prev_err = edit_err;
12451 while (resp != 'c' && resp != 'r' && resp != 'a') {
12452 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
12453 "or (a)bort: ", getprogname(), prev_err->msg);
12458 histedit_free_list(histedit_cmds);
12459 err = histedit_run_editor(histedit_cmds, editor, path,
12462 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12463 err->code != GOT_ERR_HISTEDIT_CMD)
12470 } else if (resp == 'r') {
12471 histedit_free_list(histedit_cmds);
12472 err = histedit_edit_script(histedit_cmds,
12473 commits, branch_name, 0, 0, 0, 0, editor, repo);
12475 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12476 err->code != GOT_ERR_HISTEDIT_CMD)
12483 } else if (resp == 'a') {
12484 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
12487 printf("invalid response '%c'\n", resp);
12493 static const struct got_error *
12494 histedit_complete(struct got_worktree *worktree,
12495 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
12496 struct got_reference *branch, struct got_repository *repo)
12498 printf("Switching work tree to %s\n",
12499 got_ref_get_symref_target(branch));
12500 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
12504 static const struct got_error *
12505 show_histedit_progress(struct got_commit_object *commit,
12506 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
12508 const struct got_error *err;
12509 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
12511 err = got_object_id_str(&old_id_str, hle->commit_id);
12516 err = got_object_id_str(&new_id_str, new_id);
12521 old_id_str[12] = '\0';
12523 new_id_str[12] = '\0';
12526 logmsg = strdup(hle->logmsg);
12527 if (logmsg == NULL) {
12528 err = got_error_from_errno("strdup");
12531 trim_logmsg(logmsg, 42);
12533 err = get_short_logmsg(&logmsg, 42, commit);
12538 switch (hle->cmd->code) {
12539 case GOT_HISTEDIT_PICK:
12540 case GOT_HISTEDIT_EDIT:
12541 case GOT_HISTEDIT_MESG:
12542 printf("%s -> %s: %s\n", old_id_str,
12543 new_id_str ? new_id_str : "no-op change", logmsg);
12545 case GOT_HISTEDIT_DROP:
12546 case GOT_HISTEDIT_FOLD:
12547 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
12559 static const struct got_error *
12560 histedit_commit(struct got_pathlist_head *merged_paths,
12561 struct got_worktree *worktree, struct got_fileindex *fileindex,
12562 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
12563 const char *committer, int allow_conflict, const char *editor,
12564 struct got_repository *repo)
12566 const struct got_error *err;
12567 struct got_commit_object *commit;
12568 struct got_object_id *new_commit_id;
12570 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
12571 && hle->logmsg == NULL) {
12572 err = histedit_edit_logmsg(hle, editor, repo);
12577 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12581 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
12582 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
12583 hle->logmsg, allow_conflict, repo);
12585 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
12587 err = show_histedit_progress(commit, hle, NULL);
12589 err = show_histedit_progress(commit, hle, new_commit_id);
12590 free(new_commit_id);
12593 got_object_commit_close(commit);
12597 static const struct got_error *
12598 histedit_skip_commit(struct got_histedit_list_entry *hle,
12599 struct got_worktree *worktree, struct got_repository *repo)
12601 const struct got_error *error;
12602 struct got_commit_object *commit;
12604 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
12609 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
12613 error = show_histedit_progress(commit, hle, NULL);
12614 got_object_commit_close(commit);
12618 static const struct got_error *
12619 check_local_changes(void *arg, unsigned char status,
12620 unsigned char staged_status, const char *path,
12621 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12622 struct got_object_id *commit_id, int dirfd, const char *de_name)
12624 int *have_local_changes = arg;
12627 case GOT_STATUS_ADD:
12628 case GOT_STATUS_DELETE:
12629 case GOT_STATUS_MODIFY:
12630 case GOT_STATUS_CONFLICT:
12631 *have_local_changes = 1;
12632 return got_error(GOT_ERR_CANCELLED);
12637 switch (staged_status) {
12638 case GOT_STATUS_ADD:
12639 case GOT_STATUS_DELETE:
12640 case GOT_STATUS_MODIFY:
12641 *have_local_changes = 1;
12642 return got_error(GOT_ERR_CANCELLED);
12650 static const struct got_error *
12651 cmd_histedit(int argc, char *argv[])
12653 const struct got_error *error = NULL;
12654 struct got_worktree *worktree = NULL;
12655 struct got_fileindex *fileindex = NULL;
12656 struct got_repository *repo = NULL;
12657 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
12658 struct got_reference *branch = NULL;
12659 struct got_reference *tmp_branch = NULL;
12660 struct got_object_id *resume_commit_id = NULL;
12661 struct got_object_id *base_commit_id = NULL;
12662 struct got_object_id *head_commit_id = NULL;
12663 struct got_commit_object *commit = NULL;
12664 int ch, rebase_in_progress = 0, merge_in_progress = 0;
12665 struct got_update_progress_arg upa;
12666 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
12667 int drop_only = 0, edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
12668 int allow_conflict = 0, list_backups = 0, delete_backups = 0;
12669 const char *edit_script_path = NULL;
12670 char *editor = NULL;
12671 struct got_object_id_queue commits;
12672 struct got_pathlist_head merged_paths;
12673 const struct got_object_id_queue *parent_ids;
12674 struct got_object_qid *pid;
12675 struct got_histedit_list histedit_cmds;
12676 struct got_histedit_list_entry *hle;
12677 int *pack_fds = NULL;
12679 STAILQ_INIT(&commits);
12680 TAILQ_INIT(&histedit_cmds);
12681 TAILQ_INIT(&merged_paths);
12682 memset(&upa, 0, sizeof(upa));
12685 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12686 "unveil", NULL) == -1)
12690 while ((ch = getopt(argc, argv, "aCcdeF:flmX")) != -1) {
12696 allow_conflict = 1;
12708 edit_script_path = optarg;
12717 edit_logmsg_only = 1;
12720 delete_backups = 1;
12731 if (abort_edit && allow_conflict)
12732 option_conflict('a', 'C');
12733 if (abort_edit && continue_edit)
12734 option_conflict('a', 'c');
12735 if (edit_script_path && allow_conflict)
12736 option_conflict('F', 'C');
12737 if (edit_script_path && edit_logmsg_only)
12738 option_conflict('F', 'm');
12739 if (abort_edit && edit_logmsg_only)
12740 option_conflict('a', 'm');
12741 if (edit_logmsg_only && allow_conflict)
12742 option_conflict('m', 'C');
12743 if (continue_edit && edit_logmsg_only)
12744 option_conflict('c', 'm');
12745 if (abort_edit && fold_only)
12746 option_conflict('a', 'f');
12747 if (fold_only && allow_conflict)
12748 option_conflict('f', 'C');
12749 if (continue_edit && fold_only)
12750 option_conflict('c', 'f');
12751 if (fold_only && edit_logmsg_only)
12752 option_conflict('f', 'm');
12753 if (edit_script_path && fold_only)
12754 option_conflict('F', 'f');
12755 if (abort_edit && edit_only)
12756 option_conflict('a', 'e');
12757 if (continue_edit && edit_only)
12758 option_conflict('c', 'e');
12759 if (edit_only && edit_logmsg_only)
12760 option_conflict('e', 'm');
12761 if (edit_script_path && edit_only)
12762 option_conflict('F', 'e');
12763 if (fold_only && edit_only)
12764 option_conflict('f', 'e');
12765 if (drop_only && abort_edit)
12766 option_conflict('d', 'a');
12767 if (drop_only && allow_conflict)
12768 option_conflict('d', 'C');
12769 if (drop_only && continue_edit)
12770 option_conflict('d', 'c');
12771 if (drop_only && edit_logmsg_only)
12772 option_conflict('d', 'm');
12773 if (drop_only && edit_only)
12774 option_conflict('d', 'e');
12775 if (drop_only && edit_script_path)
12776 option_conflict('d', 'F');
12777 if (drop_only && fold_only)
12778 option_conflict('d', 'f');
12779 if (list_backups) {
12781 option_conflict('l', 'a');
12782 if (allow_conflict)
12783 option_conflict('l', 'C');
12785 option_conflict('l', 'c');
12786 if (edit_script_path)
12787 option_conflict('l', 'F');
12788 if (edit_logmsg_only)
12789 option_conflict('l', 'm');
12791 option_conflict('l', 'd');
12793 option_conflict('l', 'f');
12795 option_conflict('l', 'e');
12796 if (delete_backups)
12797 option_conflict('l', 'X');
12798 if (argc != 0 && argc != 1)
12800 } else if (delete_backups) {
12802 option_conflict('X', 'a');
12803 if (allow_conflict)
12804 option_conflict('X', 'C');
12806 option_conflict('X', 'c');
12808 option_conflict('X', 'd');
12809 if (edit_script_path)
12810 option_conflict('X', 'F');
12811 if (edit_logmsg_only)
12812 option_conflict('X', 'm');
12814 option_conflict('X', 'f');
12816 option_conflict('X', 'e');
12818 option_conflict('X', 'l');
12819 if (argc != 0 && argc != 1)
12821 } else if (allow_conflict && !continue_edit)
12822 errx(1, "-C option requires -c");
12823 else if (argc != 0)
12826 cwd = getcwd(NULL, 0);
12828 error = got_error_from_errno("getcwd");
12832 error = got_repo_pack_fds_open(&pack_fds);
12836 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
12838 if (list_backups || delete_backups) {
12839 if (error->code != GOT_ERR_NOT_WORKTREE)
12842 if (error->code == GOT_ERR_NOT_WORKTREE)
12843 error = wrap_not_worktree_error(error,
12849 if (list_backups || delete_backups) {
12850 error = got_repo_open(&repo,
12851 worktree ? got_worktree_get_repo_path(worktree) : cwd,
12855 error = apply_unveil(got_repo_get_path(repo), 0,
12856 worktree ? got_worktree_get_root_path(worktree) : NULL);
12859 error = process_backup_refs(
12860 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
12861 argc == 1 ? argv[0] : NULL, delete_backups, repo);
12862 goto done; /* nothing else to do */
12864 error = get_gitconfig_path(&gitconfig_path);
12867 error = got_repo_open(&repo,
12868 got_worktree_get_repo_path(worktree), gitconfig_path,
12872 error = get_editor(&editor);
12875 if (unveil(editor, "x") != 0) {
12876 error = got_error_from_errno2("unveil", editor);
12879 if (edit_script_path) {
12880 if (unveil(edit_script_path, "r") != 0) {
12881 error = got_error_from_errno2("unveil",
12886 error = apply_unveil(got_repo_get_path(repo), 0,
12887 got_worktree_get_root_path(worktree));
12892 if (worktree != NULL && !list_backups && !delete_backups) {
12893 error = worktree_has_logmsg_ref("histedit", worktree, repo);
12898 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
12901 if (rebase_in_progress) {
12902 error = got_error(GOT_ERR_REBASING);
12906 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12910 if (merge_in_progress) {
12911 error = got_error(GOT_ERR_MERGE_BUSY);
12915 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
12919 if (edit_in_progress && edit_logmsg_only) {
12920 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12921 "histedit operation is in progress in this "
12922 "work tree and must be continued or aborted "
12923 "before the -m option can be used");
12926 if (edit_in_progress && drop_only) {
12927 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12928 "histedit operation is in progress in this "
12929 "work tree and must be continued or aborted "
12930 "before the -d option can be used");
12933 if (edit_in_progress && fold_only) {
12934 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12935 "histedit operation is in progress in this "
12936 "work tree and must be continued or aborted "
12937 "before the -f option can be used");
12940 if (edit_in_progress && edit_only) {
12941 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12942 "histedit operation is in progress in this "
12943 "work tree and must be continued or aborted "
12944 "before the -e option can be used");
12948 if (edit_in_progress && abort_edit) {
12949 error = got_worktree_histedit_continue(&resume_commit_id,
12950 &tmp_branch, &branch, &base_commit_id, &fileindex,
12954 printf("Switching work tree to %s\n",
12955 got_ref_get_symref_target(branch));
12956 error = got_worktree_histedit_abort(worktree, fileindex, repo,
12957 branch, base_commit_id, abort_progress, &upa);
12960 printf("Histedit of %s aborted\n",
12961 got_ref_get_symref_target(branch));
12962 print_merge_progress_stats(&upa);
12963 goto done; /* nothing else to do */
12964 } else if (abort_edit) {
12965 error = got_error(GOT_ERR_NOT_HISTEDIT);
12969 error = get_author(&committer, repo, worktree);
12973 if (continue_edit) {
12976 if (!edit_in_progress) {
12977 error = got_error(GOT_ERR_NOT_HISTEDIT);
12981 error = got_worktree_get_histedit_script_path(&path, worktree);
12985 error = histedit_load_list(&histedit_cmds, path, repo);
12990 error = got_worktree_histedit_continue(&resume_commit_id,
12991 &tmp_branch, &branch, &base_commit_id, &fileindex,
12996 error = got_ref_resolve(&head_commit_id, repo, branch);
13000 error = got_object_open_as_commit(&commit, repo,
13004 parent_ids = got_object_commit_get_parent_ids(commit);
13005 pid = STAILQ_FIRST(parent_ids);
13007 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13010 error = collect_commits(&commits, head_commit_id, &pid->id,
13011 base_commit_id, got_worktree_get_path_prefix(worktree),
13012 GOT_ERR_HISTEDIT_PATH, repo);
13013 got_object_commit_close(commit);
13018 if (edit_in_progress) {
13019 error = got_error(GOT_ERR_HISTEDIT_BUSY);
13023 error = got_ref_open(&branch, repo,
13024 got_worktree_get_head_ref_name(worktree), 0);
13028 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
13029 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
13030 "will not edit commit history of a branch outside "
13031 "the \"refs/heads/\" reference namespace");
13035 error = got_ref_resolve(&head_commit_id, repo, branch);
13036 got_ref_close(branch);
13041 error = got_object_open_as_commit(&commit, repo,
13045 parent_ids = got_object_commit_get_parent_ids(commit);
13046 pid = STAILQ_FIRST(parent_ids);
13048 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13051 error = collect_commits(&commits, head_commit_id, &pid->id,
13052 got_worktree_get_base_commit_id(worktree),
13053 got_worktree_get_path_prefix(worktree),
13054 GOT_ERR_HISTEDIT_PATH, repo);
13055 got_object_commit_close(commit);
13060 if (STAILQ_EMPTY(&commits)) {
13061 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13065 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
13066 &base_commit_id, &fileindex, worktree, repo);
13070 if (edit_script_path) {
13071 error = histedit_load_list(&histedit_cmds,
13072 edit_script_path, repo);
13074 got_worktree_histedit_abort(worktree, fileindex,
13075 repo, branch, base_commit_id,
13076 abort_progress, &upa);
13077 print_merge_progress_stats(&upa);
13081 const char *branch_name;
13082 branch_name = got_ref_get_symref_target(branch);
13083 if (strncmp(branch_name, "refs/heads/", 11) == 0)
13085 error = histedit_edit_script(&histedit_cmds, &commits,
13086 branch_name, edit_logmsg_only, fold_only,
13087 drop_only, edit_only, editor, repo);
13089 got_worktree_histedit_abort(worktree, fileindex,
13090 repo, branch, base_commit_id,
13091 abort_progress, &upa);
13092 print_merge_progress_stats(&upa);
13098 error = histedit_save_list(&histedit_cmds, worktree,
13101 got_worktree_histedit_abort(worktree, fileindex,
13102 repo, branch, base_commit_id,
13103 abort_progress, &upa);
13104 print_merge_progress_stats(&upa);
13110 error = histedit_check_script(&histedit_cmds, &commits, repo);
13114 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
13115 if (resume_commit_id) {
13116 if (got_object_id_cmp(hle->commit_id,
13117 resume_commit_id) != 0)
13120 resume_commit_id = NULL;
13121 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
13122 hle->cmd->code == GOT_HISTEDIT_FOLD) {
13123 error = histedit_skip_commit(hle, worktree,
13128 struct got_pathlist_head paths;
13129 int have_changes = 0;
13131 TAILQ_INIT(&paths);
13132 error = got_pathlist_append(&paths, "", NULL);
13135 error = got_worktree_status(worktree, &paths,
13136 repo, 0, check_local_changes, &have_changes,
13137 check_cancelled, NULL);
13138 got_pathlist_free(&paths,
13139 GOT_PATHLIST_FREE_NONE);
13141 if (error->code != GOT_ERR_CANCELLED)
13143 if (sigint_received || sigpipe_received)
13146 if (have_changes) {
13147 error = histedit_commit(NULL, worktree,
13148 fileindex, tmp_branch, hle,
13149 committer, allow_conflict, editor,
13154 error = got_object_open_as_commit(
13155 &commit, repo, hle->commit_id);
13158 error = show_histedit_progress(commit,
13160 got_object_commit_close(commit);
13169 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
13170 error = histedit_skip_commit(hle, worktree, repo);
13175 error = got_object_open_as_commit(&commit, repo,
13179 parent_ids = got_object_commit_get_parent_ids(commit);
13180 pid = STAILQ_FIRST(parent_ids);
13182 error = got_worktree_histedit_merge_files(&merged_paths,
13183 worktree, fileindex, &pid->id, hle->commit_id, repo,
13184 update_progress, &upa, check_cancelled, NULL);
13187 got_object_commit_close(commit);
13190 print_merge_progress_stats(&upa);
13191 if (upa.conflicts > 0 || upa.missing > 0 ||
13192 upa.not_deleted > 0 || upa.unversioned > 0) {
13193 if (upa.conflicts > 0) {
13194 error = show_rebase_merge_conflict(
13195 hle->commit_id, repo);
13199 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13203 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
13205 error = got_object_id_str(&id_str, hle->commit_id);
13208 printf("Stopping histedit for amending commit %s\n",
13211 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13212 error = got_worktree_histedit_postpone(worktree,
13215 } else if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
13216 error = histedit_skip_commit(hle, worktree, repo);
13220 } else if (hle->cmd->code == GOT_HISTEDIT_MESG) {
13221 error = histedit_edit_logmsg(hle, editor, repo);
13226 error = histedit_commit(&merged_paths, worktree, fileindex,
13227 tmp_branch, hle, committer, allow_conflict, editor, repo);
13228 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13233 if (upa.conflicts > 0 || upa.missing > 0 ||
13234 upa.not_deleted > 0 || upa.unversioned > 0) {
13235 error = got_worktree_histedit_postpone(worktree, fileindex);
13238 if (upa.conflicts > 0 && upa.missing == 0 &&
13239 upa.not_deleted == 0 && upa.unversioned == 0) {
13240 error = got_error_msg(GOT_ERR_CONFLICTS,
13241 "conflicts must be resolved before histedit "
13243 } else if (upa.conflicts > 0) {
13244 error = got_error_msg(GOT_ERR_CONFLICTS,
13245 "conflicts must be resolved before histedit "
13246 "can continue; changes destined for some "
13247 "files were not yet merged and should be "
13248 "merged manually if required before the "
13249 "histedit operation is continued");
13251 error = got_error_msg(GOT_ERR_CONFLICTS,
13252 "changes destined for some files were not "
13253 "yet merged and should be merged manually "
13254 "if required before the histedit operation "
13258 error = histedit_complete(worktree, fileindex, tmp_branch,
13264 free(gitconfig_path);
13265 got_object_id_queue_free(&commits);
13266 histedit_free_list(&histedit_cmds);
13267 free(head_commit_id);
13268 free(base_commit_id);
13269 free(resume_commit_id);
13271 got_object_commit_close(commit);
13273 got_ref_close(branch);
13275 got_ref_close(tmp_branch);
13277 got_worktree_close(worktree);
13279 const struct got_error *close_err = got_repo_close(repo);
13284 const struct got_error *pack_err =
13285 got_repo_pack_fds_close(pack_fds);
13293 usage_integrate(void)
13295 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
13299 static const struct got_error *
13300 cmd_integrate(int argc, char *argv[])
13302 const struct got_error *error = NULL;
13303 struct got_repository *repo = NULL;
13304 struct got_worktree *worktree = NULL;
13305 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
13306 const char *branch_arg = NULL;
13307 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
13308 struct got_fileindex *fileindex = NULL;
13309 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
13311 struct got_update_progress_arg upa;
13312 int *pack_fds = NULL;
13315 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13316 "unveil", NULL) == -1)
13320 while ((ch = getopt(argc, argv, "")) != -1) {
13333 branch_arg = argv[0];
13335 cwd = getcwd(NULL, 0);
13337 error = got_error_from_errno("getcwd");
13341 error = got_repo_pack_fds_open(&pack_fds);
13345 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13347 if (error->code == GOT_ERR_NOT_WORKTREE)
13348 error = wrap_not_worktree_error(error, "integrate",
13353 error = check_rebase_or_histedit_in_progress(worktree);
13357 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13362 error = apply_unveil(got_repo_get_path(repo), 0,
13363 got_worktree_get_root_path(worktree));
13367 error = check_merge_in_progress(worktree, repo);
13371 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
13372 error = got_error_from_errno("asprintf");
13376 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
13377 &base_branch_ref, worktree, refname, repo);
13381 refname = strdup(got_ref_get_name(branch_ref));
13382 if (refname == NULL) {
13383 error = got_error_from_errno("strdup");
13384 got_worktree_integrate_abort(worktree, fileindex, repo,
13385 branch_ref, base_branch_ref);
13388 base_refname = strdup(got_ref_get_name(base_branch_ref));
13389 if (base_refname == NULL) {
13390 error = got_error_from_errno("strdup");
13391 got_worktree_integrate_abort(worktree, fileindex, repo,
13392 branch_ref, base_branch_ref);
13395 if (strncmp(base_refname, "refs/heads/", 11) != 0) {
13396 error = got_error(GOT_ERR_INTEGRATE_BRANCH);
13397 got_worktree_integrate_abort(worktree, fileindex, repo,
13398 branch_ref, base_branch_ref);
13402 error = got_ref_resolve(&commit_id, repo, branch_ref);
13406 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
13410 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
13411 error = got_error_msg(GOT_ERR_SAME_BRANCH,
13412 "specified branch has already been integrated");
13413 got_worktree_integrate_abort(worktree, fileindex, repo,
13414 branch_ref, base_branch_ref);
13418 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
13420 if (error->code == GOT_ERR_ANCESTRY)
13421 error = got_error(GOT_ERR_REBASE_REQUIRED);
13422 got_worktree_integrate_abort(worktree, fileindex, repo,
13423 branch_ref, base_branch_ref);
13427 memset(&upa, 0, sizeof(upa));
13428 error = got_worktree_integrate_continue(worktree, fileindex, repo,
13429 branch_ref, base_branch_ref, update_progress, &upa,
13430 check_cancelled, NULL);
13434 printf("Integrated %s into %s\n", refname, base_refname);
13435 print_update_progress_stats(&upa);
13438 const struct got_error *close_err = got_repo_close(repo);
13443 got_worktree_close(worktree);
13445 const struct got_error *pack_err =
13446 got_repo_pack_fds_close(pack_fds);
13451 free(base_commit_id);
13454 free(base_refname);
13461 fprintf(stderr, "usage: %s merge [-aCcn] [branch]\n", getprogname());
13465 static const struct got_error *
13466 cmd_merge(int argc, char *argv[])
13468 const struct got_error *error = NULL;
13469 struct got_worktree *worktree = NULL;
13470 struct got_repository *repo = NULL;
13471 struct got_fileindex *fileindex = NULL;
13472 char *cwd = NULL, *id_str = NULL, *author = NULL;
13473 char *gitconfig_path = NULL;
13474 struct got_reference *branch = NULL, *wt_branch = NULL;
13475 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
13476 struct got_object_id *wt_branch_tip = NULL;
13477 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
13478 int allow_conflict = 0, prefer_fast_forward = 1, interrupt_merge = 0;
13479 struct got_update_progress_arg upa;
13480 struct got_object_id *merge_commit_id = NULL;
13481 char *branch_name = NULL;
13482 int *pack_fds = NULL;
13484 memset(&upa, 0, sizeof(upa));
13487 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13488 "unveil", NULL) == -1)
13492 while ((ch = getopt(argc, argv, "aCcMn")) != -1) {
13498 allow_conflict = 1;
13501 continue_merge = 1;
13504 prefer_fast_forward = 0;
13507 interrupt_merge = 1;
13519 if (continue_merge)
13520 option_conflict('a', 'c');
13521 if (!prefer_fast_forward)
13522 option_conflict('a', 'M');
13523 if (interrupt_merge)
13524 option_conflict('a', 'n');
13525 } else if (continue_merge) {
13526 if (!prefer_fast_forward)
13527 option_conflict('c', 'M');
13528 if (interrupt_merge)
13529 option_conflict('c', 'n');
13531 if (allow_conflict) {
13532 if (!continue_merge)
13533 errx(1, "-C option requires -c");
13535 if (abort_merge || continue_merge) {
13538 } else if (argc != 1)
13541 cwd = getcwd(NULL, 0);
13543 error = got_error_from_errno("getcwd");
13547 error = got_repo_pack_fds_open(&pack_fds);
13551 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13553 if (error->code == GOT_ERR_NOT_WORKTREE)
13554 error = wrap_not_worktree_error(error,
13559 error = get_gitconfig_path(&gitconfig_path);
13562 error = got_repo_open(&repo,
13563 worktree ? got_worktree_get_repo_path(worktree) : cwd,
13564 gitconfig_path, pack_fds);
13568 if (worktree != NULL) {
13569 error = worktree_has_logmsg_ref("merge", worktree, repo);
13574 error = apply_unveil(got_repo_get_path(repo), 0,
13575 worktree ? got_worktree_get_root_path(worktree) : NULL);
13579 error = check_rebase_or_histedit_in_progress(worktree);
13583 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
13588 if (merge_in_progress && !(abort_merge || continue_merge)) {
13589 error = got_error(GOT_ERR_MERGE_BUSY);
13593 if (!merge_in_progress && (abort_merge || continue_merge)) {
13594 error = got_error(GOT_ERR_NOT_MERGING);
13599 error = got_worktree_merge_continue(&branch_name,
13600 &branch_tip, &fileindex, worktree, repo);
13603 error = got_worktree_merge_abort(worktree, fileindex, repo,
13604 abort_progress, &upa);
13607 printf("Merge of %s aborted\n", branch_name);
13608 goto done; /* nothing else to do */
13611 if (strncmp(got_worktree_get_head_ref_name(worktree),
13612 "refs/heads/", 11) != 0) {
13613 error = got_error_fmt(GOT_ERR_COMMIT_BRANCH,
13614 "work tree's current branch %s is outside the "
13615 "\"refs/heads/\" reference namespace; "
13616 "update -b required",
13617 got_worktree_get_head_ref_name(worktree));
13621 error = get_author(&author, repo, worktree);
13625 error = got_ref_open(&wt_branch, repo,
13626 got_worktree_get_head_ref_name(worktree), 0);
13629 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
13633 if (continue_merge) {
13634 struct got_object_id *base_commit_id;
13635 base_commit_id = got_worktree_get_base_commit_id(worktree);
13636 if (got_object_id_cmp(wt_branch_tip, base_commit_id) != 0) {
13637 error = got_error(GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
13640 error = got_worktree_merge_continue(&branch_name,
13641 &branch_tip, &fileindex, worktree, repo);
13645 error = got_ref_open(&branch, repo, argv[0], 0);
13648 branch_name = strdup(got_ref_get_name(branch));
13649 if (branch_name == NULL) {
13650 error = got_error_from_errno("strdup");
13653 error = got_ref_resolve(&branch_tip, repo, branch);
13658 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
13659 wt_branch_tip, branch_tip, 0, 0, repo,
13660 check_cancelled, NULL);
13661 if (error && error->code != GOT_ERR_ANCESTRY)
13664 if (!continue_merge) {
13665 error = check_path_prefix(wt_branch_tip, branch_tip,
13666 got_worktree_get_path_prefix(worktree),
13667 GOT_ERR_MERGE_PATH, repo);
13670 error = got_worktree_merge_prepare(&fileindex, worktree, repo);
13673 if (prefer_fast_forward && yca_id &&
13674 got_object_id_cmp(wt_branch_tip, yca_id) == 0) {
13675 struct got_pathlist_head paths;
13676 if (interrupt_merge) {
13677 error = got_error_fmt(GOT_ERR_BAD_OPTION,
13678 "there are no changes to merge since %s "
13679 "is already based on %s; merge cannot be "
13680 "interrupted for amending; -n",
13681 branch_name, got_ref_get_name(wt_branch));
13684 printf("Forwarding %s to %s\n",
13685 got_ref_get_name(wt_branch), branch_name);
13686 error = got_ref_change_ref(wt_branch, branch_tip);
13689 error = got_ref_write(wt_branch, repo);
13692 error = got_worktree_set_base_commit_id(worktree, repo,
13696 TAILQ_INIT(&paths);
13697 error = got_pathlist_append(&paths, "", NULL);
13700 error = got_worktree_checkout_files(worktree,
13701 &paths, repo, update_progress, &upa,
13702 check_cancelled, NULL);
13703 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
13706 if (upa.did_something) {
13708 error = got_object_id_str(&id_str, branch_tip);
13711 printf("Updated to commit %s\n", id_str);
13714 printf("Already up-to-date\n");
13715 print_update_progress_stats(&upa);
13718 error = got_worktree_merge_write_refs(worktree, branch, repo);
13722 error = got_worktree_merge_branch(worktree, fileindex,
13723 yca_id, branch_tip, repo, update_progress, &upa,
13724 check_cancelled, NULL);
13727 print_merge_progress_stats(&upa);
13728 if (!upa.did_something) {
13729 error = got_worktree_merge_abort(worktree, fileindex,
13730 repo, abort_progress, &upa);
13733 printf("Already up-to-date\n");
13738 if (interrupt_merge) {
13739 error = got_worktree_merge_postpone(worktree, fileindex);
13742 printf("Merge of %s interrupted on request\n", branch_name);
13743 } else if (upa.conflicts > 0 || upa.missing > 0 ||
13744 upa.not_deleted > 0 || upa.unversioned > 0) {
13745 error = got_worktree_merge_postpone(worktree, fileindex);
13748 if (upa.conflicts > 0 && upa.missing == 0 &&
13749 upa.not_deleted == 0 && upa.unversioned == 0) {
13750 error = got_error_msg(GOT_ERR_CONFLICTS,
13751 "conflicts must be resolved before merging "
13753 } else if (upa.conflicts > 0) {
13754 error = got_error_msg(GOT_ERR_CONFLICTS,
13755 "conflicts must be resolved before merging "
13756 "can continue; changes destined for some "
13757 "files were not yet merged and "
13758 "should be merged manually if required before the "
13759 "merge operation is continued");
13761 error = got_error_msg(GOT_ERR_CONFLICTS,
13762 "changes destined for some "
13763 "files were not yet merged and should be "
13764 "merged manually if required before the "
13765 "merge operation is continued");
13769 error = got_worktree_merge_commit(&merge_commit_id, worktree,
13770 fileindex, author, NULL, 1, branch_tip, branch_name,
13771 allow_conflict, repo, continue_merge ? print_status : NULL,
13775 error = got_worktree_merge_complete(worktree, fileindex, repo);
13778 error = got_object_id_str(&id_str, merge_commit_id);
13781 printf("Merged %s into %s: %s\n", branch_name,
13782 got_worktree_get_head_ref_name(worktree),
13787 free(gitconfig_path);
13789 free(merge_commit_id);
13795 got_ref_close(branch);
13797 got_ref_close(wt_branch);
13799 got_worktree_close(worktree);
13801 const struct got_error *close_err = got_repo_close(repo);
13806 const struct got_error *pack_err =
13807 got_repo_pack_fds_close(pack_fds);
13817 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
13818 "[path ...]\n", getprogname());
13822 static const struct got_error *
13823 print_stage(void *arg, unsigned char status, unsigned char staged_status,
13824 const char *path, struct got_object_id *blob_id,
13825 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
13826 int dirfd, const char *de_name)
13828 const struct got_error *err = NULL;
13829 char *id_str = NULL;
13831 if (staged_status != GOT_STATUS_ADD &&
13832 staged_status != GOT_STATUS_MODIFY &&
13833 staged_status != GOT_STATUS_DELETE)
13836 if (staged_status == GOT_STATUS_ADD ||
13837 staged_status == GOT_STATUS_MODIFY)
13838 err = got_object_id_str(&id_str, staged_blob_id);
13840 err = got_object_id_str(&id_str, blob_id);
13844 printf("%s %c %s\n", id_str, staged_status, path);
13849 static const struct got_error *
13850 cmd_stage(int argc, char *argv[])
13852 const struct got_error *error = NULL;
13853 struct got_repository *repo = NULL;
13854 struct got_worktree *worktree = NULL;
13856 struct got_pathlist_head paths;
13857 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
13858 FILE *patch_script_file = NULL;
13859 const char *patch_script_path = NULL;
13860 struct choose_patch_arg cpa;
13861 int *pack_fds = NULL;
13863 TAILQ_INIT(&paths);
13866 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13867 "unveil", NULL) == -1)
13871 while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
13874 patch_script_path = optarg;
13883 allow_bad_symlinks = 1;
13894 if (list_stage && (pflag || patch_script_path))
13895 errx(1, "-l option cannot be used with other options");
13896 if (patch_script_path && !pflag)
13897 errx(1, "-F option can only be used together with -p option");
13899 cwd = getcwd(NULL, 0);
13901 error = got_error_from_errno("getcwd");
13905 error = got_repo_pack_fds_open(&pack_fds);
13909 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13911 if (error->code == GOT_ERR_NOT_WORKTREE)
13912 error = wrap_not_worktree_error(error, "stage", cwd);
13916 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13921 if (patch_script_path) {
13922 patch_script_file = fopen(patch_script_path, "re");
13923 if (patch_script_file == NULL) {
13924 error = got_error_from_errno2("fopen",
13925 patch_script_path);
13929 error = apply_unveil(got_repo_get_path(repo), 0,
13930 got_worktree_get_root_path(worktree));
13934 error = check_merge_in_progress(worktree, repo);
13938 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13943 error = got_worktree_status(worktree, &paths, repo, 0,
13944 print_stage, NULL, check_cancelled, NULL);
13946 cpa.patch_script_file = patch_script_file;
13947 cpa.action = "stage";
13948 error = got_worktree_stage(worktree, &paths,
13949 pflag ? NULL : print_status, NULL,
13950 pflag ? choose_patch : NULL, &cpa,
13951 allow_bad_symlinks, repo);
13954 if (patch_script_file && fclose(patch_script_file) == EOF &&
13956 error = got_error_from_errno2("fclose", patch_script_path);
13958 const struct got_error *close_err = got_repo_close(repo);
13963 got_worktree_close(worktree);
13965 const struct got_error *pack_err =
13966 got_repo_pack_fds_close(pack_fds);
13970 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13976 usage_unstage(void)
13978 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
13979 "[path ...]\n", getprogname());
13984 static const struct got_error *
13985 cmd_unstage(int argc, char *argv[])
13987 const struct got_error *error = NULL;
13988 struct got_repository *repo = NULL;
13989 struct got_worktree *worktree = NULL;
13991 struct got_pathlist_head paths;
13993 struct got_update_progress_arg upa;
13994 FILE *patch_script_file = NULL;
13995 const char *patch_script_path = NULL;
13996 struct choose_patch_arg cpa;
13997 int *pack_fds = NULL;
13999 TAILQ_INIT(&paths);
14002 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
14003 "unveil", NULL) == -1)
14007 while ((ch = getopt(argc, argv, "F:p")) != -1) {
14010 patch_script_path = optarg;
14024 if (patch_script_path && !pflag)
14025 errx(1, "-F option can only be used together with -p option");
14027 cwd = getcwd(NULL, 0);
14029 error = got_error_from_errno("getcwd");
14033 error = got_repo_pack_fds_open(&pack_fds);
14037 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14039 if (error->code == GOT_ERR_NOT_WORKTREE)
14040 error = wrap_not_worktree_error(error, "unstage", cwd);
14044 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
14049 if (patch_script_path) {
14050 patch_script_file = fopen(patch_script_path, "re");
14051 if (patch_script_file == NULL) {
14052 error = got_error_from_errno2("fopen",
14053 patch_script_path);
14058 error = apply_unveil(got_repo_get_path(repo), 0,
14059 got_worktree_get_root_path(worktree));
14063 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
14067 cpa.patch_script_file = patch_script_file;
14068 cpa.action = "unstage";
14069 memset(&upa, 0, sizeof(upa));
14070 error = got_worktree_unstage(worktree, &paths, update_progress,
14071 &upa, pflag ? choose_patch : NULL, &cpa, repo);
14073 print_merge_progress_stats(&upa);
14075 if (patch_script_file && fclose(patch_script_file) == EOF &&
14077 error = got_error_from_errno2("fclose", patch_script_path);
14079 const struct got_error *close_err = got_repo_close(repo);
14084 got_worktree_close(worktree);
14086 const struct got_error *pack_err =
14087 got_repo_pack_fds_close(pack_fds);
14091 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
14099 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
14100 "arg ...\n", getprogname());
14104 static const struct got_error *
14105 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14107 const struct got_error *err;
14108 struct got_blob_object *blob;
14111 fd = got_opentempfd();
14113 return got_error_from_errno("got_opentempfd");
14115 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
14119 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
14121 if (fd != -1 && close(fd) == -1 && err == NULL)
14122 err = got_error_from_errno("close");
14124 got_object_blob_close(blob);
14128 static const struct got_error *
14129 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14131 const struct got_error *err;
14132 struct got_tree_object *tree;
14135 err = got_object_open_as_tree(&tree, repo, id);
14139 nentries = got_object_tree_get_nentries(tree);
14140 for (i = 0; i < nentries; i++) {
14141 struct got_tree_entry *te;
14143 if (sigint_received || sigpipe_received)
14145 te = got_object_tree_get_entry(tree, i);
14146 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
14149 fprintf(outfile, "%s %.7o %s\n", id_str,
14150 got_tree_entry_get_mode(te),
14151 got_tree_entry_get_name(te));
14155 got_object_tree_close(tree);
14159 static const struct got_error *
14160 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14162 const struct got_error *err;
14163 struct got_commit_object *commit;
14164 const struct got_object_id_queue *parent_ids;
14165 struct got_object_qid *pid;
14166 char *id_str = NULL;
14167 const char *logmsg = NULL;
14170 err = got_object_open_as_commit(&commit, repo, id);
14174 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
14178 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
14179 parent_ids = got_object_commit_get_parent_ids(commit);
14180 fprintf(outfile, "numparents %d\n",
14181 got_object_commit_get_nparents(commit));
14182 STAILQ_FOREACH(pid, parent_ids, entry) {
14184 err = got_object_id_str(&pid_str, &pid->id);
14187 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
14190 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14191 got_object_commit_get_author_gmtoff(commit));
14192 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
14193 got_object_commit_get_author(commit),
14194 (long long)got_object_commit_get_author_time(commit),
14197 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14198 got_object_commit_get_committer_gmtoff(commit));
14199 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
14200 got_object_commit_get_committer(commit),
14201 (long long)got_object_commit_get_committer_time(commit),
14204 logmsg = got_object_commit_get_logmsg_raw(commit);
14205 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
14206 fprintf(outfile, "%s", logmsg);
14209 got_object_commit_close(commit);
14213 static const struct got_error *
14214 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14216 const struct got_error *err;
14217 struct got_tag_object *tag;
14218 char *id_str = NULL;
14219 const char *tagmsg = NULL;
14222 err = got_object_open_as_tag(&tag, repo, id);
14226 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
14230 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
14232 switch (got_object_tag_get_object_type(tag)) {
14233 case GOT_OBJ_TYPE_BLOB:
14234 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14235 GOT_OBJ_LABEL_BLOB);
14237 case GOT_OBJ_TYPE_TREE:
14238 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14239 GOT_OBJ_LABEL_TREE);
14241 case GOT_OBJ_TYPE_COMMIT:
14242 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14243 GOT_OBJ_LABEL_COMMIT);
14245 case GOT_OBJ_TYPE_TAG:
14246 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14247 GOT_OBJ_LABEL_TAG);
14253 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
14254 got_object_tag_get_name(tag));
14256 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14257 got_object_tag_get_tagger_gmtoff(tag));
14258 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
14259 got_object_tag_get_tagger(tag),
14260 (long long)got_object_tag_get_tagger_time(tag),
14263 tagmsg = got_object_tag_get_message(tag);
14264 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
14265 fprintf(outfile, "%s", tagmsg);
14268 got_object_tag_close(tag);
14272 static const struct got_error *
14273 cmd_cat(int argc, char *argv[])
14275 const struct got_error *error;
14276 struct got_repository *repo = NULL;
14277 struct got_worktree *worktree = NULL;
14278 char *cwd = NULL, *repo_path = NULL, *label = NULL;
14279 char *keyword_idstr = NULL;
14280 const char *commit_id_str = NULL;
14281 struct got_object_id *id = NULL, *commit_id = NULL;
14282 struct got_commit_object *commit = NULL;
14283 int ch, obj_type, i, force_path = 0;
14284 struct got_reflist_head refs;
14285 int *pack_fds = NULL;
14290 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14295 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
14298 commit_id_str = optarg;
14304 repo_path = realpath(optarg, NULL);
14305 if (repo_path == NULL)
14306 return got_error_from_errno2("realpath",
14308 got_path_strip_trailing_slashes(repo_path);
14319 cwd = getcwd(NULL, 0);
14321 error = got_error_from_errno("getcwd");
14325 error = got_repo_pack_fds_open(&pack_fds);
14329 if (repo_path == NULL) {
14330 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14331 if (error && error->code != GOT_ERR_NOT_WORKTREE)
14334 repo_path = strdup(
14335 got_worktree_get_repo_path(worktree));
14336 if (repo_path == NULL) {
14337 error = got_error_from_errno("strdup");
14341 if (commit_id_str == NULL) {
14342 /* Release work tree lock. */
14343 got_worktree_close(worktree);
14349 if (repo_path == NULL) {
14350 repo_path = strdup(cwd);
14351 if (repo_path == NULL)
14352 return got_error_from_errno("strdup");
14355 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
14360 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
14364 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
14368 if (commit_id_str != NULL) {
14369 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
14373 if (keyword_idstr != NULL)
14374 commit_id_str = keyword_idstr;
14375 if (worktree != NULL) {
14376 got_worktree_close(worktree);
14380 commit_id_str = GOT_REF_HEAD;
14381 error = got_repo_match_object_id(&commit_id, NULL,
14382 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
14386 error = got_object_open_as_commit(&commit, repo, commit_id);
14390 for (i = 0; i < argc; i++) {
14392 error = got_object_id_by_path(&id, repo, commit,
14397 error = got_repo_match_object_id(&id, &label, argv[i],
14398 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
14401 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
14402 error->code != GOT_ERR_NOT_REF)
14404 error = got_object_id_by_path(&id, repo,
14411 error = got_object_get_type(&obj_type, repo, id);
14415 switch (obj_type) {
14416 case GOT_OBJ_TYPE_BLOB:
14417 error = cat_blob(id, repo, stdout);
14419 case GOT_OBJ_TYPE_TREE:
14420 error = cat_tree(id, repo, stdout);
14422 case GOT_OBJ_TYPE_COMMIT:
14423 error = cat_commit(id, repo, stdout);
14425 case GOT_OBJ_TYPE_TAG:
14426 error = cat_tag(id, repo, stdout);
14429 error = got_error(GOT_ERR_OBJ_TYPE);
14443 free(keyword_idstr);
14445 got_object_commit_close(commit);
14447 got_worktree_close(worktree);
14449 const struct got_error *close_err = got_repo_close(repo);
14454 const struct got_error *pack_err =
14455 got_repo_pack_fds_close(pack_fds);
14460 got_ref_list_free(&refs);
14467 fprintf(stderr, "usage: %s info [path ...]\n",
14472 static const struct got_error *
14473 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
14474 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
14475 struct got_object_id *commit_id)
14477 const struct got_error *err = NULL;
14478 char *id_str = NULL;
14480 struct tm mytm, *tm;
14481 struct got_pathlist_head *paths = arg;
14482 struct got_pathlist_entry *pe;
14485 * Clear error indication from any of the path arguments which
14486 * would cause this file index entry to be displayed.
14488 TAILQ_FOREACH(pe, paths, entry) {
14489 if (got_path_cmp(path, pe->path, strlen(path),
14490 pe->path_len) == 0 ||
14491 got_path_is_child(path, pe->path, pe->path_len))
14492 pe->data = NULL; /* no error */
14495 printf(GOT_COMMIT_SEP_STR);
14497 printf("symlink: %s\n", path);
14498 else if (S_ISREG(mode)) {
14499 printf("file: %s\n", path);
14500 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
14501 } else if (S_ISDIR(mode))
14502 printf("directory: %s\n", path);
14504 printf("something: %s\n", path);
14506 tm = localtime_r(&mtime, &mytm);
14509 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
14510 return got_error(GOT_ERR_NO_SPACE);
14511 printf("timestamp: %s\n", datebuf);
14514 err = got_object_id_str(&id_str, blob_id);
14517 printf("based on blob: %s\n", id_str);
14521 if (staged_blob_id) {
14522 err = got_object_id_str(&id_str, staged_blob_id);
14525 printf("based on staged blob: %s\n", id_str);
14530 err = got_object_id_str(&id_str, commit_id);
14533 printf("based on commit: %s\n", id_str);
14540 static const struct got_error *
14541 cmd_info(int argc, char *argv[])
14543 const struct got_error *error = NULL;
14544 struct got_worktree *worktree = NULL;
14545 char *cwd = NULL, *id_str = NULL;
14546 struct got_pathlist_head paths;
14547 char *uuidstr = NULL;
14548 int ch, show_files = 0;
14550 TAILQ_INIT(&paths);
14553 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14558 while ((ch = getopt(argc, argv, "")) != -1) {
14569 cwd = getcwd(NULL, 0);
14571 error = got_error_from_errno("getcwd");
14575 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14577 if (error->code == GOT_ERR_NOT_WORKTREE)
14578 error = wrap_not_worktree_error(error, "info", cwd);
14583 /* Remove "wpath cpath proc exec sendfd" promises. */
14584 if (pledge("stdio rpath flock unveil", NULL) == -1)
14587 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
14592 error = get_worktree_paths_from_argv(&paths, argc, argv,
14599 error = got_object_id_str(&id_str,
14600 got_worktree_get_base_commit_id(worktree));
14604 error = got_worktree_get_uuid(&uuidstr, worktree);
14608 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
14609 printf("work tree base commit: %s\n", id_str);
14610 printf("work tree path prefix: %s\n",
14611 got_worktree_get_path_prefix(worktree));
14612 printf("work tree branch reference: %s\n",
14613 got_worktree_get_head_ref_name(worktree));
14614 printf("work tree UUID: %s\n", uuidstr);
14615 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
14618 struct got_pathlist_entry *pe;
14619 TAILQ_FOREACH(pe, &paths, entry) {
14620 if (pe->path_len == 0)
14623 * Assume this path will fail. This will be corrected
14624 * in print_path_info() in case the path does suceeed.
14626 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
14628 error = got_worktree_path_info(worktree, &paths,
14629 print_path_info, &paths, check_cancelled, NULL);
14632 TAILQ_FOREACH(pe, &paths, entry) {
14633 if (pe->data != NULL) {
14634 const struct got_error *perr;
14637 error = got_error_fmt(perr->code, "%s",
14645 got_worktree_close(worktree);
14646 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);