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 "got_compat.h"
21 #include <sys/queue.h>
23 #include <sys/types.h>
44 #include "got_version.h"
45 #include "got_error.h"
46 #include "got_object.h"
47 #include "got_reference.h"
48 #include "got_repository.h"
50 #include "got_cancel.h"
51 #include "got_worktree.h"
53 #include "got_commit_graph.h"
54 #include "got_fetch.h"
56 #include "got_blame.h"
57 #include "got_privsep.h"
58 #include "got_opentemp.h"
59 #include "got_gotconfig.h"
61 #include "got_patch.h"
64 #include "got_keyword.h"
67 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
70 static volatile sig_atomic_t sigint_received;
71 static volatile sig_atomic_t sigpipe_received;
74 catch_sigint(int signo)
80 catch_sigpipe(int signo)
88 const struct got_error *(*cmd_main)(int, char *[]);
89 void (*cmd_usage)(void);
90 const char *cmd_alias;
93 __dead static void usage(int, int);
94 __dead static void usage_import(void);
95 __dead static void usage_clone(void);
96 __dead static void usage_fetch(void);
97 __dead static void usage_checkout(void);
98 __dead static void usage_update(void);
99 __dead static void usage_log(void);
100 __dead static void usage_diff(void);
101 __dead static void usage_blame(void);
102 __dead static void usage_tree(void);
103 __dead static void usage_status(void);
104 __dead static void usage_ref(void);
105 __dead static void usage_branch(void);
106 __dead static void usage_tag(void);
107 __dead static void usage_add(void);
108 __dead static void usage_remove(void);
109 __dead static void usage_patch(void);
110 __dead static void usage_revert(void);
111 __dead static void usage_commit(void);
112 __dead static void usage_send(void);
113 __dead static void usage_cherrypick(void);
114 __dead static void usage_backout(void);
115 __dead static void usage_rebase(void);
116 __dead static void usage_histedit(void);
117 __dead static void usage_integrate(void);
118 __dead static void usage_merge(void);
119 __dead static void usage_stage(void);
120 __dead static void usage_unstage(void);
121 __dead static void usage_cat(void);
122 __dead static void usage_info(void);
124 static const struct got_error* cmd_import(int, char *[]);
125 static const struct got_error* cmd_clone(int, char *[]);
126 static const struct got_error* cmd_fetch(int, char *[]);
127 static const struct got_error* cmd_checkout(int, char *[]);
128 static const struct got_error* cmd_update(int, char *[]);
129 static const struct got_error* cmd_log(int, char *[]);
130 static const struct got_error* cmd_diff(int, char *[]);
131 static const struct got_error* cmd_blame(int, char *[]);
132 static const struct got_error* cmd_tree(int, char *[]);
133 static const struct got_error* cmd_status(int, char *[]);
134 static const struct got_error* cmd_ref(int, char *[]);
135 static const struct got_error* cmd_branch(int, char *[]);
136 static const struct got_error* cmd_tag(int, char *[]);
137 static const struct got_error* cmd_add(int, char *[]);
138 static const struct got_error* cmd_remove(int, char *[]);
139 static const struct got_error* cmd_patch(int, char *[]);
140 static const struct got_error* cmd_revert(int, char *[]);
141 static const struct got_error* cmd_commit(int, char *[]);
142 static const struct got_error* cmd_send(int, char *[]);
143 static const struct got_error* cmd_cherrypick(int, char *[]);
144 static const struct got_error* cmd_backout(int, char *[]);
145 static const struct got_error* cmd_rebase(int, char *[]);
146 static const struct got_error* cmd_histedit(int, char *[]);
147 static const struct got_error* cmd_integrate(int, char *[]);
148 static const struct got_error* cmd_merge(int, char *[]);
149 static const struct got_error* cmd_stage(int, char *[]);
150 static const struct got_error* cmd_unstage(int, char *[]);
151 static const struct got_error* cmd_cat(int, char *[]);
152 static const struct got_error* cmd_info(int, char *[]);
154 static const struct got_cmd got_commands[] = {
155 { "import", cmd_import, usage_import, "im" },
156 { "clone", cmd_clone, usage_clone, "cl" },
157 { "fetch", cmd_fetch, usage_fetch, "fe" },
158 { "checkout", cmd_checkout, usage_checkout, "co" },
159 { "update", cmd_update, usage_update, "up" },
160 { "log", cmd_log, usage_log, "" },
161 { "diff", cmd_diff, usage_diff, "di" },
162 { "blame", cmd_blame, usage_blame, "bl" },
163 { "tree", cmd_tree, usage_tree, "tr" },
164 { "status", cmd_status, usage_status, "st" },
165 { "ref", cmd_ref, usage_ref, "" },
166 { "branch", cmd_branch, usage_branch, "br" },
167 { "tag", cmd_tag, usage_tag, "" },
168 { "add", cmd_add, usage_add, "" },
169 { "remove", cmd_remove, usage_remove, "rm" },
170 { "patch", cmd_patch, usage_patch, "pa" },
171 { "revert", cmd_revert, usage_revert, "rv" },
172 { "commit", cmd_commit, usage_commit, "ci" },
173 { "send", cmd_send, usage_send, "se" },
174 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
175 { "backout", cmd_backout, usage_backout, "bo" },
176 { "rebase", cmd_rebase, usage_rebase, "rb" },
177 { "histedit", cmd_histedit, usage_histedit, "he" },
178 { "integrate", cmd_integrate, usage_integrate,"ig" },
179 { "merge", cmd_merge, usage_merge, "mg" },
180 { "stage", cmd_stage, usage_stage, "sg" },
181 { "unstage", cmd_unstage, usage_unstage, "ug" },
182 { "cat", cmd_cat, usage_cat, "" },
183 { "info", cmd_info, usage_info, "" },
187 list_commands(FILE *fp)
191 fprintf(fp, "commands:");
192 for (i = 0; i < nitems(got_commands); i++) {
193 const struct got_cmd *cmd = &got_commands[i];
194 fprintf(fp, " %s", cmd->cmd_name);
200 option_conflict(char a, char b)
202 errx(1, "-%c and -%c options are mutually exclusive", a, b);
206 main(int argc, char *argv[])
208 const struct got_cmd *cmd;
211 int hflag = 0, Vflag = 0;
212 static const struct option longopts[] = {
213 { "version", no_argument, NULL, 'V' },
217 setlocale(LC_CTYPE, "");
219 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
239 got_version_print_str();
244 usage(hflag, hflag ? 0 : 1);
246 signal(SIGINT, catch_sigint);
247 signal(SIGPIPE, catch_sigpipe);
249 for (i = 0; i < nitems(got_commands); i++) {
250 const struct got_error *error;
252 cmd = &got_commands[i];
254 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
255 strcmp(cmd->cmd_alias, argv[0]) != 0)
261 error = cmd->cmd_main(argc, argv);
262 if (error && error->code != GOT_ERR_CANCELLED &&
263 error->code != GOT_ERR_PRIVSEP_EXIT &&
264 !(sigpipe_received &&
265 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
267 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
269 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
276 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
277 list_commands(stderr);
282 usage(int hflag, int status)
284 FILE *fp = (status == 0) ? stdout : stderr;
286 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
293 static const struct got_error *
294 get_editor(char **abspath)
296 const struct got_error *err = NULL;
301 editor = getenv("VISUAL");
303 editor = getenv("EDITOR");
306 err = got_path_find_prog(abspath, editor);
311 if (*abspath == NULL) {
312 *abspath = strdup("/usr/bin/vi");
313 if (*abspath == NULL)
314 return got_error_from_errno("strdup");
320 static const struct got_error *
321 apply_unveil(const char *repo_path, int repo_read_only,
322 const char *worktree_path)
324 const struct got_error *err;
327 if (unveil("gmon.out", "rwc") != 0)
328 return got_error_from_errno2("unveil", "gmon.out");
330 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
331 return got_error_from_errno2("unveil", repo_path);
333 if (worktree_path && unveil(worktree_path, "rwc") != 0)
334 return got_error_from_errno2("unveil", worktree_path);
336 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
337 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
339 err = got_privsep_unveil_exec_helpers();
343 if (unveil(NULL, NULL) != 0)
344 return got_error_from_errno("unveil");
352 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
353 "[-r repository-path] directory\n", getprogname());
358 spawn_editor(const char *editor, const char *file)
361 sig_t sighup, sigint, sigquit;
364 sighup = signal(SIGHUP, SIG_IGN);
365 sigint = signal(SIGINT, SIG_IGN);
366 sigquit = signal(SIGQUIT, SIG_IGN);
368 switch (pid = fork()) {
372 execl(editor, editor, file, (char *)NULL);
376 while (waitpid(pid, &st, 0) == -1)
381 (void)signal(SIGHUP, sighup);
382 (void)signal(SIGINT, sigint);
383 (void)signal(SIGQUIT, sigquit);
385 if (!WIFEXITED(st)) {
390 return WEXITSTATUS(st);
393 static const struct got_error *
394 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
396 const struct got_error *err = NULL;
403 if (fseeko(fp, 0L, SEEK_SET) == -1)
404 return got_error_from_errno("fseeko");
406 *logmsg = malloc(filesize + 1);
408 return got_error_from_errno("malloc");
411 while (getline(&line, &linesize, fp) != -1) {
412 if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
413 continue; /* remove comments and leading empty lines */
414 *len = strlcat(*logmsg, line, filesize + 1);
415 if (*len >= filesize + 1) {
416 err = got_error(GOT_ERR_NO_SPACE);
421 err = got_ferror(fp, GOT_ERR_IO);
425 while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
426 (*logmsg)[*len - 1] = '\0';
439 static const struct got_error *
440 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
441 const char *initial_content, size_t initial_content_len,
442 int require_modification)
444 const struct got_error *err = NULL;
451 if (stat(logmsg_path, &st) == -1)
452 return got_error_from_errno2("stat", logmsg_path);
454 if (spawn_editor(editor, logmsg_path) == -1)
455 return got_error_from_errno("failed spawning editor");
457 if (require_modification) {
458 struct timespec timeout;
462 nanosleep(&timeout, NULL);
465 if (stat(logmsg_path, &st2) == -1)
466 return got_error_from_errno2("stat", logmsg_path);
468 if (require_modification && st.st_size == st2.st_size &&
469 timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
470 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
471 "no changes made to commit message, aborting");
473 fp = fopen(logmsg_path, "re");
475 err = got_error_from_errno("fopen");
479 /* strip comments and leading/trailing newlines */
480 err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
483 if (logmsg_len == 0) {
484 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
485 "commit message cannot be empty, aborting");
489 if (fp && fclose(fp) == EOF && err == NULL)
490 err = got_error_from_errno("fclose");
498 static const struct got_error *
499 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
500 const char *path_dir, const char *branch_name)
502 char *initial_content = NULL;
503 const struct got_error *err = NULL;
504 int initial_content_len;
507 initial_content_len = asprintf(&initial_content,
508 "\n# %s to be imported to branch %s\n", path_dir,
510 if (initial_content_len == -1)
511 return got_error_from_errno("asprintf");
513 err = got_opentemp_named_fd(logmsg_path, &fd,
514 GOT_TMPDIR_STR "/got-importmsg", "");
518 if (write(fd, initial_content, initial_content_len) == -1) {
519 err = got_error_from_errno2("write", *logmsg_path);
522 if (close(fd) == -1) {
523 err = got_error_from_errno2("close", *logmsg_path);
528 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
529 initial_content_len, 1);
531 if (fd != -1 && close(fd) == -1 && err == NULL)
532 err = got_error_from_errno2("close", *logmsg_path);
533 free(initial_content);
541 static const struct got_error *
542 import_progress(void *arg, const char *path)
544 printf("A %s\n", path);
548 static const struct got_error *
549 valid_author(const char *author)
551 const char *email = author;
554 * Git' expects the author (or committer) to be in the form
555 * "name <email>", which are mostly free form (see the
556 * "committer" description in git-fast-import(1)). We're only
557 * doing this to avoid git's object parser breaking on commits
561 while (*author && *author != '\n' && *author != '<' && *author != '>')
563 if (author != email && *author == '<' && *(author - 1) != ' ')
564 return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
565 "between author name and email required", email);
566 if (*author++ != '<')
567 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
568 while (*author && *author != '\n' && *author != '<' && *author != '>')
570 if (strcmp(author, ">") != 0)
571 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
575 static const struct got_error *
576 get_author(char **author, struct got_repository *repo,
577 struct got_worktree *worktree)
579 const struct got_error *err = NULL;
580 const char *got_author = NULL, *name, *email;
581 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
586 worktree_conf = got_worktree_get_gotconfig(worktree);
587 repo_conf = got_repo_get_gotconfig(repo);
590 * Priority of potential author information sources, from most
591 * significant to least significant:
592 * 1) work tree's .got/got.conf file
593 * 2) repository's got.conf file
594 * 3) repository's git config file
595 * 4) environment variables
596 * 5) global git config files (in user's home directory or /etc)
600 got_author = got_gotconfig_get_author(worktree_conf);
601 if (got_author == NULL)
602 got_author = got_gotconfig_get_author(repo_conf);
603 if (got_author == NULL) {
604 name = got_repo_get_gitconfig_author_name(repo);
605 email = got_repo_get_gitconfig_author_email(repo);
607 if (asprintf(author, "%s <%s>", name, email) == -1)
608 return got_error_from_errno("asprintf");
612 got_author = getenv("GOT_AUTHOR");
613 if (got_author == NULL) {
614 name = got_repo_get_global_gitconfig_author_name(repo);
615 email = got_repo_get_global_gitconfig_author_email(
618 if (asprintf(author, "%s <%s>", name, email)
620 return got_error_from_errno("asprintf");
623 /* TODO: Look up user in password database? */
624 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
628 *author = strdup(got_author);
630 return got_error_from_errno("strdup");
632 err = valid_author(*author);
640 static const struct got_error *
641 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
642 struct got_worktree *worktree)
644 const char *got_allowed_signers = NULL;
645 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
647 *allowed_signers = NULL;
650 worktree_conf = got_worktree_get_gotconfig(worktree);
651 repo_conf = got_repo_get_gotconfig(repo);
654 * Priority of potential author information sources, from most
655 * significant to least significant:
656 * 1) work tree's .got/got.conf file
657 * 2) repository's got.conf file
661 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
663 if (got_allowed_signers == NULL)
664 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
667 if (got_allowed_signers) {
668 *allowed_signers = strdup(got_allowed_signers);
669 if (*allowed_signers == NULL)
670 return got_error_from_errno("strdup");
675 static const struct got_error *
676 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
677 struct got_worktree *worktree)
679 const char *got_revoked_signers = NULL;
680 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
682 *revoked_signers = NULL;
685 worktree_conf = got_worktree_get_gotconfig(worktree);
686 repo_conf = got_repo_get_gotconfig(repo);
689 * Priority of potential author information sources, from most
690 * significant to least significant:
691 * 1) work tree's .got/got.conf file
692 * 2) repository's got.conf file
696 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
698 if (got_revoked_signers == NULL)
699 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
702 if (got_revoked_signers) {
703 *revoked_signers = strdup(got_revoked_signers);
704 if (*revoked_signers == NULL)
705 return got_error_from_errno("strdup");
711 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
713 const char *got_signer_id = NULL;
714 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
717 worktree_conf = got_worktree_get_gotconfig(worktree);
718 repo_conf = got_repo_get_gotconfig(repo);
721 * Priority of potential author information sources, from most
722 * significant to least significant:
723 * 1) work tree's .got/got.conf file
724 * 2) repository's got.conf file
728 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
729 if (got_signer_id == NULL)
730 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
732 return got_signer_id;
735 static const struct got_error *
736 get_gitconfig_path(char **gitconfig_path)
738 const char *homedir = getenv("HOME");
740 *gitconfig_path = NULL;
742 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
743 return got_error_from_errno("asprintf");
749 static const struct got_error *
750 cmd_import(int argc, char *argv[])
752 const struct got_error *error = NULL;
753 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
754 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
755 const char *branch_name = NULL;
756 char *id_str = NULL, *logmsg_path = NULL;
757 char refname[PATH_MAX] = "refs/heads/";
758 struct got_repository *repo = NULL;
759 struct got_reference *branch_ref = NULL, *head_ref = NULL;
760 struct got_object_id *new_commit_id = NULL;
762 struct got_pathlist_head ignores;
763 struct got_pathlist_entry *pe;
764 int preserve_logmsg = 0;
765 int *pack_fds = NULL;
767 TAILQ_INIT(&ignores);
770 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
776 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
779 branch_name = optarg;
782 if (optarg[0] == '\0')
784 error = got_pathlist_insert(&pe, &ignores, optarg,
790 logmsg = strdup(optarg);
791 if (logmsg == NULL) {
792 error = got_error_from_errno("strdup");
797 repo_path = realpath(optarg, NULL);
798 if (repo_path == NULL) {
799 error = got_error_from_errno2("realpath",
816 if (repo_path == NULL) {
817 repo_path = getcwd(NULL, 0);
818 if (repo_path == NULL)
819 return got_error_from_errno("getcwd");
821 got_path_strip_trailing_slashes(repo_path);
822 error = get_gitconfig_path(&gitconfig_path);
825 error = got_repo_pack_fds_open(&pack_fds);
828 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
832 error = get_author(&author, repo, NULL);
837 * Don't let the user create a branch name with a leading '-'.
838 * While technically a valid reference name, this case is usually
839 * an unintended typo.
841 if (branch_name && branch_name[0] == '-')
842 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
844 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
845 if (error && error->code != GOT_ERR_NOT_REF)
849 n = strlcat(refname, branch_name, sizeof(refname));
850 else if (head_ref && got_ref_is_symbolic(head_ref))
851 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
854 n = strlcat(refname, "main", sizeof(refname));
855 if (n >= sizeof(refname)) {
856 error = got_error(GOT_ERR_NO_SPACE);
860 error = got_ref_open(&branch_ref, repo, refname, 0);
862 if (error->code != GOT_ERR_NOT_REF)
865 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
866 "import target branch already exists");
870 path_dir = realpath(argv[0], NULL);
871 if (path_dir == NULL) {
872 error = got_error_from_errno2("realpath", argv[0]);
875 got_path_strip_trailing_slashes(path_dir);
878 * unveil(2) traverses exec(2); if an editor is used we have
879 * to apply unveil after the log message has been written.
881 if (logmsg == NULL || *logmsg == '\0') {
882 error = get_editor(&editor);
886 error = collect_import_msg(&logmsg, &logmsg_path, editor,
889 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
896 if (unveil(path_dir, "r") != 0) {
897 error = got_error_from_errno2("unveil", path_dir);
903 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
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) {
1651 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1652 "sendfd unveil", NULL) == -1)
1655 } else if (strcmp(proto, "http") == 0 ||
1656 strcmp(proto, "git+http") == 0) {
1657 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
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);
1701 if (!list_refs_only) {
1702 error = got_repo_init(repo_path, NULL);
1705 error = got_repo_pack_fds_open(&pack_fds);
1708 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1713 fpa.last_scaled_size[0] = '\0';
1714 fpa.last_p_indexed = -1;
1715 fpa.last_p_resolved = -1;
1716 fpa.verbosity = verbosity;
1717 fpa.create_configs = 1;
1718 fpa.configs_created = 0;
1720 fpa.config_info.symrefs = &symrefs;
1721 fpa.config_info.wanted_branches = &wanted_branches;
1722 fpa.config_info.wanted_refs = &wanted_refs;
1723 fpa.config_info.proto = proto;
1724 fpa.config_info.host = host;
1725 fpa.config_info.port = port;
1726 fpa.config_info.remote_repo_path = server_path;
1727 fpa.config_info.git_url = git_url;
1728 fpa.config_info.fetch_all_branches = fetch_all_branches;
1729 fpa.config_info.mirror_references = mirror_references;
1730 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1731 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1732 fetch_all_branches, &wanted_branches, &wanted_refs,
1733 list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1734 fetch_progress, &fpa);
1738 if (list_refs_only) {
1739 error = list_remote_refs(&symrefs, &refs);
1743 if (pack_hash == NULL) {
1744 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1745 "server sent an empty pack file");
1748 error = got_object_id_str(&id_str, pack_hash);
1752 printf("\nFetched %s.pack\n", id_str);
1755 /* Set up references provided with the pack file. */
1756 TAILQ_FOREACH(pe, &refs, entry) {
1757 const char *refname = pe->path;
1758 struct got_object_id *id = pe->data;
1759 char *remote_refname;
1761 if (is_wanted_ref(&wanted_refs, refname) &&
1762 !mirror_references) {
1763 error = create_wanted_ref(refname, id,
1764 GOT_FETCH_DEFAULT_REMOTE_NAME,
1765 verbosity - 1, repo);
1771 error = create_ref(refname, id, verbosity - 1, repo);
1775 if (mirror_references)
1778 if (strncmp("refs/heads/", refname, 11) != 0)
1781 if (asprintf(&remote_refname,
1782 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1783 refname + 11) == -1) {
1784 error = got_error_from_errno("asprintf");
1787 error = create_ref(remote_refname, id, verbosity - 1, repo);
1788 free(remote_refname);
1793 /* Set the HEAD reference if the server provided one. */
1794 TAILQ_FOREACH(pe, &symrefs, entry) {
1795 struct got_reference *target_ref;
1796 const char *refname = pe->path;
1797 const char *target = pe->data;
1798 char *remote_refname = NULL, *remote_target = NULL;
1800 if (strcmp(refname, GOT_REF_HEAD) != 0)
1803 error = got_ref_open(&target_ref, repo, target, 0);
1805 if (error->code == GOT_ERR_NOT_REF) {
1812 error = create_symref(refname, target_ref, verbosity, repo);
1813 got_ref_close(target_ref);
1817 if (mirror_references)
1820 if (strncmp("refs/heads/", target, 11) != 0)
1823 if (asprintf(&remote_refname,
1824 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1826 error = got_error_from_errno("asprintf");
1829 if (asprintf(&remote_target,
1830 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1831 target + 11) == -1) {
1832 error = got_error_from_errno("asprintf");
1833 free(remote_refname);
1836 error = got_ref_open(&target_ref, repo, remote_target, 0);
1838 free(remote_refname);
1839 free(remote_target);
1840 if (error->code == GOT_ERR_NOT_REF) {
1846 error = create_symref(remote_refname, target_ref,
1847 verbosity - 1, repo);
1848 free(remote_refname);
1849 free(remote_target);
1850 got_ref_close(target_ref);
1856 * We failed to set the HEAD reference. If we asked for
1857 * a set of wanted branches use the first of one of those
1858 * which could be fetched instead.
1860 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1861 const char *target = pe->path;
1862 struct got_reference *target_ref;
1864 error = got_ref_open(&target_ref, repo, target, 0);
1866 if (error->code == GOT_ERR_NOT_REF) {
1873 error = create_symref(GOT_REF_HEAD, target_ref,
1875 got_ref_close(target_ref);
1881 if (!fpa.configs_created && pe != NULL) {
1882 error = create_config_files(fpa.config_info.proto,
1883 fpa.config_info.host, fpa.config_info.port,
1884 fpa.config_info.remote_repo_path,
1885 fpa.config_info.git_url,
1886 fpa.config_info.fetch_all_branches,
1887 fpa.config_info.mirror_references,
1888 fpa.config_info.symrefs,
1889 fpa.config_info.wanted_branches,
1890 fpa.config_info.wanted_refs, fpa.repo);
1897 printf("Created %s repository '%s'\n",
1898 mirror_references ? "mirrored" : "cloned", repo_path);
1901 const struct got_error *pack_err =
1902 got_repo_pack_fds_close(pack_fds);
1907 if (kill(fetchpid, SIGTERM) == -1)
1908 error = got_error_from_errno("kill");
1909 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1910 error = got_error_from_errno("waitpid");
1912 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1913 error = got_error_from_errno("close");
1915 const struct got_error *close_err = got_repo_close(repo);
1919 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1920 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1921 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1922 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1929 free(default_destdir);
1934 static const struct got_error *
1935 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1936 int replace_tags, int verbosity, struct got_repository *repo)
1938 const struct got_error *err = NULL;
1939 char *new_id_str = NULL;
1940 struct got_object_id *old_id = NULL;
1942 err = got_object_id_str(&new_id_str, new_id);
1946 if (!replace_tags &&
1947 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1948 err = got_ref_resolve(&old_id, repo, ref);
1951 if (got_object_id_cmp(old_id, new_id) == 0)
1953 if (verbosity >= 0) {
1954 printf("Rejecting update of existing tag %s: %s\n",
1955 got_ref_get_name(ref), new_id_str);
1960 if (got_ref_is_symbolic(ref)) {
1961 if (verbosity >= 0) {
1962 printf("Replacing reference %s: %s\n",
1963 got_ref_get_name(ref),
1964 got_ref_get_symref_target(ref));
1966 err = got_ref_change_symref_to_ref(ref, new_id);
1969 err = got_ref_write(ref, repo);
1973 err = got_ref_resolve(&old_id, repo, ref);
1976 if (got_object_id_cmp(old_id, new_id) == 0)
1979 err = got_ref_change_ref(ref, new_id);
1982 err = got_ref_write(ref, repo);
1988 printf("Updated %s: %s\n", got_ref_get_name(ref),
1996 static const struct got_error *
1997 update_symref(const char *refname, struct got_reference *target_ref,
1998 int verbosity, struct got_repository *repo)
2000 const struct got_error *err = NULL, *unlock_err;
2001 struct got_reference *symref;
2002 int symref_is_locked = 0;
2004 err = got_ref_open(&symref, repo, refname, 1);
2006 if (err->code != GOT_ERR_NOT_REF)
2008 err = got_ref_alloc_symref(&symref, refname, target_ref);
2012 err = got_ref_write(symref, repo);
2017 printf("Created reference %s: %s\n",
2018 got_ref_get_name(symref),
2019 got_ref_get_symref_target(symref));
2021 symref_is_locked = 1;
2023 if (strcmp(got_ref_get_symref_target(symref),
2024 got_ref_get_name(target_ref)) == 0)
2027 err = got_ref_change_symref(symref,
2028 got_ref_get_name(target_ref));
2032 err = got_ref_write(symref, repo);
2037 printf("Updated %s: %s\n", got_ref_get_name(symref),
2038 got_ref_get_symref_target(symref));
2042 if (symref_is_locked) {
2043 unlock_err = got_ref_unlock(symref);
2044 if (unlock_err && err == NULL)
2047 got_ref_close(symref);
2054 fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2055 "[-R reference] [-r repository-path] [remote-repository]\n",
2060 static const struct got_error *
2061 delete_missing_ref(struct got_reference *ref,
2062 int verbosity, struct got_repository *repo)
2064 const struct got_error *err = NULL;
2065 struct got_object_id *id = NULL;
2066 char *id_str = NULL;
2068 if (got_ref_is_symbolic(ref)) {
2069 err = got_ref_delete(ref, repo);
2072 if (verbosity >= 0) {
2073 printf("Deleted %s: %s\n",
2074 got_ref_get_name(ref),
2075 got_ref_get_symref_target(ref));
2078 err = got_ref_resolve(&id, repo, ref);
2081 err = got_object_id_str(&id_str, id);
2085 err = got_ref_delete(ref, repo);
2088 if (verbosity >= 0) {
2089 printf("Deleted %s: %s\n",
2090 got_ref_get_name(ref), id_str);
2099 static const struct got_error *
2100 delete_missing_refs(struct got_pathlist_head *their_refs,
2101 struct got_pathlist_head *their_symrefs,
2102 const struct got_remote_repo *remote,
2103 int verbosity, struct got_repository *repo)
2105 const struct got_error *err = NULL, *unlock_err;
2106 struct got_reflist_head my_refs;
2107 struct got_reflist_entry *re;
2108 struct got_pathlist_entry *pe;
2109 char *remote_namespace = NULL;
2110 char *local_refname = NULL;
2112 TAILQ_INIT(&my_refs);
2114 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2116 return got_error_from_errno("asprintf");
2118 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2122 TAILQ_FOREACH(re, &my_refs, entry) {
2123 const char *refname = got_ref_get_name(re->ref);
2124 const char *their_refname;
2126 if (remote->mirror_references) {
2127 their_refname = refname;
2129 if (strncmp(refname, remote_namespace,
2130 strlen(remote_namespace)) == 0) {
2131 if (strcmp(refname + strlen(remote_namespace),
2134 if (asprintf(&local_refname, "refs/heads/%s",
2135 refname + strlen(remote_namespace)) == -1) {
2136 err = got_error_from_errno("asprintf");
2139 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2142 their_refname = local_refname;
2145 TAILQ_FOREACH(pe, their_refs, entry) {
2146 if (strcmp(their_refname, pe->path) == 0)
2152 TAILQ_FOREACH(pe, their_symrefs, entry) {
2153 if (strcmp(their_refname, pe->path) == 0)
2159 err = delete_missing_ref(re->ref, verbosity, repo);
2163 if (local_refname) {
2164 struct got_reference *ref;
2165 err = got_ref_open(&ref, repo, local_refname, 1);
2167 if (err->code != GOT_ERR_NOT_REF)
2169 free(local_refname);
2170 local_refname = NULL;
2173 err = delete_missing_ref(ref, verbosity, repo);
2176 unlock_err = got_ref_unlock(ref);
2178 if (unlock_err && err == NULL) {
2183 free(local_refname);
2184 local_refname = NULL;
2188 got_ref_list_free(&my_refs);
2189 free(remote_namespace);
2190 free(local_refname);
2194 static const struct got_error *
2195 update_wanted_ref(const char *refname, struct got_object_id *id,
2196 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2198 const struct got_error *err, *unlock_err;
2199 char *remote_refname;
2200 struct got_reference *ref;
2202 if (strncmp("refs/", refname, 5) == 0)
2205 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2206 remote_repo_name, refname) == -1)
2207 return got_error_from_errno("asprintf");
2209 err = got_ref_open(&ref, repo, remote_refname, 1);
2211 if (err->code != GOT_ERR_NOT_REF)
2213 err = create_ref(remote_refname, id, verbosity, repo);
2215 err = update_ref(ref, id, 0, verbosity, repo);
2216 unlock_err = got_ref_unlock(ref);
2217 if (unlock_err && err == NULL)
2222 free(remote_refname);
2226 static const struct got_error *
2227 delete_ref(struct got_repository *repo, struct got_reference *ref)
2229 const struct got_error *err = NULL;
2230 struct got_object_id *id = NULL;
2231 char *id_str = NULL;
2234 if (got_ref_is_symbolic(ref)) {
2235 target = got_ref_get_symref_target(ref);
2237 err = got_ref_resolve(&id, repo, ref);
2240 err = got_object_id_str(&id_str, id);
2246 err = got_ref_delete(ref, repo);
2250 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2257 static const struct got_error *
2258 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2260 const struct got_error *err = NULL;
2261 struct got_reflist_head refs;
2262 struct got_reflist_entry *re;
2267 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2268 err = got_error_from_errno("asprintf");
2271 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2275 TAILQ_FOREACH(re, &refs, entry)
2276 delete_ref(repo, re->ref);
2278 got_ref_list_free(&refs);
2282 static const struct got_error *
2283 cmd_fetch(int argc, char *argv[])
2285 const struct got_error *error = NULL, *unlock_err;
2286 char *cwd = NULL, *repo_path = NULL;
2287 const char *remote_name;
2288 char *proto = NULL, *host = NULL, *port = NULL;
2289 char *repo_name = NULL, *server_path = NULL;
2290 const struct got_remote_repo *remotes, *remote = NULL;
2292 char *id_str = NULL;
2293 struct got_repository *repo = NULL;
2294 struct got_worktree *worktree = NULL;
2295 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2296 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2297 struct got_pathlist_entry *pe;
2298 struct got_reflist_head remote_refs;
2299 struct got_reflist_entry *re;
2300 struct got_object_id *pack_hash = NULL;
2301 int i, ch, fetchfd = -1, fetchstatus;
2302 pid_t fetchpid = -1;
2303 struct got_fetch_progress_arg fpa;
2304 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2305 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2306 int *pack_fds = NULL, have_bflag = 0;
2307 const char *remote_head = NULL, *worktree_branch = NULL;
2310 TAILQ_INIT(&symrefs);
2311 TAILQ_INIT(&remote_refs);
2312 TAILQ_INIT(&wanted_branches);
2313 TAILQ_INIT(&wanted_refs);
2315 while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2318 fetch_all_branches = 1;
2321 error = got_pathlist_append(&wanted_branches,
2337 error = got_pathlist_append(&wanted_refs,
2343 repo_path = realpath(optarg, NULL);
2344 if (repo_path == NULL)
2345 return got_error_from_errno2("realpath",
2347 got_path_strip_trailing_slashes(repo_path);
2355 else if (verbosity < 3)
2369 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2370 option_conflict('a', 'b');
2371 if (list_refs_only) {
2372 if (!TAILQ_EMPTY(&wanted_branches))
2373 option_conflict('l', 'b');
2374 if (fetch_all_branches)
2375 option_conflict('l', 'a');
2377 option_conflict('l', 'd');
2379 option_conflict('l', 'X');
2381 if (delete_remote) {
2382 if (fetch_all_branches)
2383 option_conflict('X', 'a');
2384 if (!TAILQ_EMPTY(&wanted_branches))
2385 option_conflict('X', 'b');
2387 option_conflict('X', 'd');
2389 option_conflict('X', 't');
2390 if (!TAILQ_EMPTY(&wanted_refs))
2391 option_conflict('X', 'R');
2396 errx(1, "-X option requires a remote name");
2397 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2398 } else if (argc == 1)
2399 remote_name = argv[0];
2403 cwd = getcwd(NULL, 0);
2405 error = got_error_from_errno("getcwd");
2409 error = got_repo_pack_fds_open(&pack_fds);
2413 if (repo_path == NULL) {
2414 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
2415 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2421 strdup(got_worktree_get_repo_path(worktree));
2422 if (repo_path == NULL)
2423 error = got_error_from_errno("strdup");
2427 repo_path = strdup(cwd);
2428 if (repo_path == NULL) {
2429 error = got_error_from_errno("strdup");
2435 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2439 if (delete_remote) {
2440 error = delete_refs_for_remote(repo, remote_name);
2441 goto done; /* nothing else to do */
2445 worktree_conf = got_worktree_get_gotconfig(worktree);
2446 if (worktree_conf) {
2447 got_gotconfig_get_remotes(&nremotes, &remotes,
2449 for (i = 0; i < nremotes; i++) {
2450 if (strcmp(remotes[i].name, remote_name) == 0) {
2451 remote = &remotes[i];
2457 if (remote == NULL) {
2458 repo_conf = got_repo_get_gotconfig(repo);
2460 got_gotconfig_get_remotes(&nremotes, &remotes,
2462 for (i = 0; i < nremotes; i++) {
2463 if (strcmp(remotes[i].name, remote_name) == 0) {
2464 remote = &remotes[i];
2470 if (remote == NULL) {
2471 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2472 for (i = 0; i < nremotes; i++) {
2473 if (strcmp(remotes[i].name, remote_name) == 0) {
2474 remote = &remotes[i];
2479 if (remote == NULL) {
2480 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2484 if (TAILQ_EMPTY(&wanted_branches)) {
2485 if (!fetch_all_branches)
2486 fetch_all_branches = remote->fetch_all_branches;
2487 for (i = 0; i < remote->nfetch_branches; i++) {
2488 error = got_pathlist_append(&wanted_branches,
2489 remote->fetch_branches[i], NULL);
2494 if (TAILQ_EMPTY(&wanted_refs)) {
2495 for (i = 0; i < remote->nfetch_refs; i++) {
2496 error = got_pathlist_append(&wanted_refs,
2497 remote->fetch_refs[i], NULL);
2503 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2504 &repo_name, remote->fetch_url);
2508 if (strcmp(proto, "git") == 0) {
2510 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2511 "sendfd dns inet unveil", NULL) == -1)
2514 } else if (strcmp(proto, "git+ssh") == 0 ||
2515 strcmp(proto, "ssh") == 0) {
2517 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2518 "sendfd unveil", NULL) == -1)
2521 } else if (strcmp(proto, "http") == 0 ||
2522 strcmp(proto, "git+http") == 0) {
2523 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2526 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2530 error = got_dial_apply_unveil(proto);
2534 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2538 if (verbosity >= 0) {
2539 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2540 remote->name, proto, host,
2541 port ? ":" : "", port ? port : "",
2542 *server_path == '/' ? "" : "/", server_path);
2545 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2546 server_path, verbosity);
2552 * If set, get this remote's HEAD ref target so
2553 * if it has changed on the server we can fetch it.
2555 error = got_ref_list(&remote_refs, repo, "refs/remotes",
2556 got_ref_cmp_by_name, repo);
2560 TAILQ_FOREACH(re, &remote_refs, entry) {
2561 const char *remote_refname, *remote_target;
2562 size_t remote_name_len;
2564 if (!got_ref_is_symbolic(re->ref))
2567 remote_name_len = strlen(remote->name);
2568 remote_refname = got_ref_get_name(re->ref);
2570 /* we only want refs/remotes/$remote->name/HEAD */
2571 if (strncmp(remote_refname + 13, remote->name,
2572 remote_name_len) != 0)
2575 if (strcmp(remote_refname + remote_name_len + 14,
2580 * Take the name itself because we already
2581 * only match with refs/heads/ in fetch_pack().
2583 remote_target = got_ref_get_symref_target(re->ref);
2584 remote_head = remote_target + remote_name_len + 14;
2589 const char *refname;
2591 refname = got_worktree_get_head_ref_name(worktree);
2592 if (strncmp(refname, "refs/heads/", 11) == 0)
2593 worktree_branch = refname;
2597 fpa.last_scaled_size[0] = '\0';
2598 fpa.last_p_indexed = -1;
2599 fpa.last_p_resolved = -1;
2600 fpa.verbosity = verbosity;
2602 fpa.create_configs = 0;
2603 fpa.configs_created = 0;
2604 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2606 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2607 remote->mirror_references, fetch_all_branches, &wanted_branches,
2608 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2609 worktree_branch, remote_head, have_bflag, fetch_progress, &fpa);
2613 if (list_refs_only) {
2614 error = list_remote_refs(&symrefs, &refs);
2618 if (pack_hash == NULL) {
2620 printf("Already up-to-date\n");
2621 } else if (verbosity >= 0) {
2622 error = got_object_id_str(&id_str, pack_hash);
2625 printf("\nFetched %s.pack\n", id_str);
2630 /* Update references provided with the pack file. */
2631 TAILQ_FOREACH(pe, &refs, entry) {
2632 const char *refname = pe->path;
2633 struct got_object_id *id = pe->data;
2634 struct got_reference *ref;
2635 char *remote_refname;
2637 if (is_wanted_ref(&wanted_refs, refname) &&
2638 !remote->mirror_references) {
2639 error = update_wanted_ref(refname, id,
2640 remote->name, verbosity, repo);
2646 if (remote->mirror_references ||
2647 strncmp("refs/tags/", refname, 10) == 0) {
2648 error = got_ref_open(&ref, repo, refname, 1);
2650 if (error->code != GOT_ERR_NOT_REF)
2652 error = create_ref(refname, id, verbosity,
2657 error = update_ref(ref, id, replace_tags,
2659 unlock_err = got_ref_unlock(ref);
2660 if (unlock_err && error == NULL)
2666 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2667 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2668 remote_name, refname + 11) == -1) {
2669 error = got_error_from_errno("asprintf");
2673 error = got_ref_open(&ref, repo, remote_refname, 1);
2675 if (error->code != GOT_ERR_NOT_REF)
2677 error = create_ref(remote_refname, id,
2682 error = update_ref(ref, id, replace_tags,
2684 unlock_err = got_ref_unlock(ref);
2685 if (unlock_err && error == NULL)
2692 /* Also create a local branch if none exists yet. */
2693 error = got_ref_open(&ref, repo, refname, 1);
2695 if (error->code != GOT_ERR_NOT_REF)
2697 error = create_ref(refname, id, verbosity,
2702 unlock_err = got_ref_unlock(ref);
2703 if (unlock_err && error == NULL)
2710 error = delete_missing_refs(&refs, &symrefs, remote,
2716 if (!remote->mirror_references) {
2717 /* Update remote HEAD reference if the server provided one. */
2718 TAILQ_FOREACH(pe, &symrefs, entry) {
2719 struct got_reference *target_ref;
2720 const char *refname = pe->path;
2721 const char *target = pe->data;
2722 char *remote_refname = NULL, *remote_target = NULL;
2724 if (strcmp(refname, GOT_REF_HEAD) != 0)
2727 if (strncmp("refs/heads/", target, 11) != 0)
2730 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2731 remote->name, refname) == -1) {
2732 error = got_error_from_errno("asprintf");
2735 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2736 remote->name, target + 11) == -1) {
2737 error = got_error_from_errno("asprintf");
2738 free(remote_refname);
2742 error = got_ref_open(&target_ref, repo, remote_target,
2745 free(remote_refname);
2746 free(remote_target);
2747 if (error->code == GOT_ERR_NOT_REF) {
2753 error = update_symref(remote_refname, target_ref,
2755 free(remote_refname);
2756 free(remote_target);
2757 got_ref_close(target_ref);
2764 if (kill(fetchpid, SIGTERM) == -1)
2765 error = got_error_from_errno("kill");
2766 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2767 error = got_error_from_errno("waitpid");
2769 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2770 error = got_error_from_errno("close");
2772 const struct got_error *close_err = got_repo_close(repo);
2777 got_worktree_close(worktree);
2779 const struct got_error *pack_err =
2780 got_repo_pack_fds_close(pack_fds);
2784 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
2785 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
2786 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2787 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2788 got_ref_list_free(&remote_refs);
2803 usage_checkout(void)
2805 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2806 "[-p path-prefix] repository-path [work-tree-path]\n",
2812 show_worktree_base_ref_warning(void)
2814 fprintf(stderr, "%s: warning: could not create a reference "
2815 "to the work tree's base commit; the commit could be "
2816 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2817 "repository writable and running 'got update' will prevent this\n",
2821 struct got_checkout_progress_arg {
2822 const char *worktree_path;
2823 int had_base_commit_ref_error;
2827 static const struct got_error *
2828 checkout_progress(void *arg, unsigned char status, const char *path)
2830 struct got_checkout_progress_arg *a = arg;
2832 /* Base commit bump happens silently. */
2833 if (status == GOT_STATUS_BUMP_BASE)
2836 if (status == GOT_STATUS_BASE_REF_ERR) {
2837 a->had_base_commit_ref_error = 1;
2841 while (path[0] == '/')
2844 if (a->verbosity >= 0)
2845 printf("%c %s/%s\n", status, a->worktree_path, path);
2850 static const struct got_error *
2851 check_cancelled(void *arg)
2853 if (sigint_received || sigpipe_received)
2854 return got_error(GOT_ERR_CANCELLED);
2858 static const struct got_error *
2859 check_linear_ancestry(struct got_object_id *commit_id,
2860 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2861 struct got_repository *repo)
2863 const struct got_error *err = NULL;
2864 struct got_object_id *yca_id;
2866 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2867 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2872 return got_error(GOT_ERR_ANCESTRY);
2875 * Require a straight line of history between the target commit
2876 * and the work tree's base commit.
2878 * Non-linear situations such as this require a rebase:
2880 * (commit) D F (base_commit)
2888 * 'got update' only handles linear cases:
2889 * Update forwards in time: A (base/yca) - B - C - D (commit)
2890 * Update backwards in time: D (base) - C - B - A (commit/yca)
2892 if (allow_forwards_in_time_only) {
2893 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2894 return got_error(GOT_ERR_ANCESTRY);
2895 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2896 got_object_id_cmp(base_commit_id, yca_id) != 0)
2897 return got_error(GOT_ERR_ANCESTRY);
2903 static const struct got_error *
2904 check_same_branch(struct got_object_id *commit_id,
2905 struct got_reference *head_ref, struct got_repository *repo)
2907 const struct got_error *err = NULL;
2908 struct got_commit_graph *graph = NULL;
2909 struct got_object_id *head_commit_id = NULL;
2911 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2915 if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2918 err = got_commit_graph_open(&graph, "/", 1);
2922 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2923 check_cancelled, NULL);
2928 struct got_object_id id;
2930 err = got_commit_graph_iter_next(&id, graph, repo,
2931 check_cancelled, NULL);
2933 if (err->code == GOT_ERR_ITER_COMPLETED)
2934 err = got_error(GOT_ERR_ANCESTRY);
2938 if (got_object_id_cmp(&id, commit_id) == 0)
2943 got_commit_graph_close(graph);
2944 free(head_commit_id);
2948 static const struct got_error *
2949 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2951 static char msg[512];
2952 const char *branch_name;
2954 if (got_ref_is_symbolic(ref))
2955 branch_name = got_ref_get_symref_target(ref);
2957 branch_name = got_ref_get_name(ref);
2959 if (strncmp("refs/heads/", branch_name, 11) == 0)
2962 snprintf(msg, sizeof(msg),
2963 "target commit is not contained in branch '%s'; "
2964 "the branch to use must be specified with -b; "
2965 "if necessary a new branch can be created for "
2966 "this commit with 'got branch -c %s BRANCH_NAME'",
2967 branch_name, commit_id_str);
2969 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2972 static const struct got_error *
2973 cmd_checkout(int argc, char *argv[])
2975 const struct got_error *error = NULL;
2976 struct got_repository *repo = NULL;
2977 struct got_reference *head_ref = NULL, *ref = NULL;
2978 struct got_worktree *worktree = NULL;
2979 char *repo_path = NULL;
2980 char *worktree_path = NULL;
2981 const char *path_prefix = "";
2982 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2983 char *commit_id_str = NULL, *keyword_idstr = NULL;
2984 struct got_object_id *commit_id = NULL;
2986 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2987 struct got_pathlist_head paths;
2988 struct got_checkout_progress_arg cpa;
2989 int *pack_fds = NULL;
2994 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2995 "unveil", NULL) == -1)
2999 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
3002 branch_name = optarg;
3005 commit_id_str = strdup(optarg);
3006 if (commit_id_str == NULL)
3007 return got_error_from_errno("strdup");
3013 path_prefix = optarg;
3028 char *base, *dotgit;
3030 repo_path = realpath(argv[0], NULL);
3031 if (repo_path == NULL)
3032 return got_error_from_errno2("realpath", argv[0]);
3033 cwd = getcwd(NULL, 0);
3035 error = got_error_from_errno("getcwd");
3042 error = got_path_basename(&base, path);
3045 dotgit = strstr(base, ".git");
3048 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3049 error = got_error_from_errno("asprintf");
3054 } else if (argc == 2) {
3055 repo_path = realpath(argv[0], NULL);
3056 if (repo_path == NULL) {
3057 error = got_error_from_errno2("realpath", argv[0]);
3060 worktree_path = realpath(argv[1], NULL);
3061 if (worktree_path == NULL) {
3062 if (errno != ENOENT) {
3063 error = got_error_from_errno2("realpath",
3067 worktree_path = strdup(argv[1]);
3068 if (worktree_path == NULL) {
3069 error = got_error_from_errno("strdup");
3076 got_path_strip_trailing_slashes(repo_path);
3077 got_path_strip_trailing_slashes(worktree_path);
3079 error = got_repo_pack_fds_open(&pack_fds);
3083 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3087 /* Pre-create work tree path for unveil(2) */
3088 error = got_path_mkdir(worktree_path);
3090 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3091 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3093 if (!allow_nonempty &&
3094 !got_path_dir_is_empty(worktree_path)) {
3095 error = got_error_path(worktree_path,
3096 GOT_ERR_DIR_NOT_EMPTY);
3101 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3105 error = got_ref_open(&head_ref, repo, branch_name, 0);
3109 error = got_worktree_init(worktree_path, head_ref, path_prefix,
3110 GOT_WORKTREE_GOT_DIR, repo);
3111 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3114 error = got_worktree_open(&worktree, worktree_path,
3115 GOT_WORKTREE_GOT_DIR);
3119 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3123 if (!same_path_prefix) {
3124 error = got_error(GOT_ERR_PATH_PREFIX);
3128 if (commit_id_str) {
3129 struct got_reflist_head refs;
3131 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3136 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3140 if (keyword_idstr != NULL) {
3141 free(commit_id_str);
3142 commit_id_str = keyword_idstr;
3145 error = got_repo_match_object_id(&commit_id, NULL,
3146 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3147 got_ref_list_free(&refs);
3150 error = check_linear_ancestry(commit_id,
3151 got_worktree_get_base_commit_id(worktree), 0, repo);
3152 if (error != NULL) {
3153 if (error->code == GOT_ERR_ANCESTRY) {
3154 error = checkout_ancestry_error(
3155 head_ref, commit_id_str);
3159 error = check_same_branch(commit_id, head_ref, repo);
3161 if (error->code == GOT_ERR_ANCESTRY) {
3162 error = checkout_ancestry_error(
3163 head_ref, commit_id_str);
3167 error = got_worktree_set_base_commit_id(worktree, repo,
3171 /* Expand potentially abbreviated commit ID string. */
3172 free(commit_id_str);
3173 error = got_object_id_str(&commit_id_str, commit_id);
3177 commit_id = got_object_id_dup(
3178 got_worktree_get_base_commit_id(worktree));
3179 if (commit_id == NULL) {
3180 error = got_error_from_errno("got_object_id_dup");
3183 error = got_object_id_str(&commit_id_str, commit_id);
3188 error = got_pathlist_append(&paths, "", NULL);
3191 cpa.worktree_path = worktree_path;
3192 cpa.had_base_commit_ref_error = 0;
3193 cpa.verbosity = verbosity;
3194 error = got_worktree_checkout_files(worktree, &paths, repo,
3195 checkout_progress, &cpa, check_cancelled, NULL);
3199 if (got_ref_is_symbolic(head_ref)) {
3200 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3203 refname = got_ref_get_name(ref);
3205 refname = got_ref_get_name(head_ref);
3206 printf("Checked out %s: %s\n", refname, commit_id_str);
3207 printf("Now shut up and hack\n");
3208 if (cpa.had_base_commit_ref_error)
3209 show_worktree_base_ref_warning();
3212 const struct got_error *pack_err =
3213 got_repo_pack_fds_close(pack_fds);
3218 got_ref_close(head_ref);
3222 const struct got_error *close_err = got_repo_close(repo);
3226 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
3227 free(commit_id_str);
3230 free(worktree_path);
3235 struct got_update_progress_arg {
3247 print_update_progress_stats(struct got_update_progress_arg *upa)
3249 if (!upa->did_something)
3252 if (upa->conflicts > 0)
3253 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3254 if (upa->obstructed > 0)
3255 printf("File paths obstructed by a non-regular file: %d\n",
3257 if (upa->not_updated > 0)
3258 printf("Files not updated because of existing merge "
3259 "conflicts: %d\n", upa->not_updated);
3263 * The meaning of some status codes differs between merge-style operations and
3264 * update operations. For example, the ! status code means "file was missing"
3265 * if changes were merged into the work tree, and "missing file was restored"
3266 * if the work tree was updated. This function should be used by any operation
3267 * which merges changes into the work tree without updating the work tree.
3270 print_merge_progress_stats(struct got_update_progress_arg *upa)
3272 if (!upa->did_something)
3275 if (upa->conflicts > 0)
3276 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3277 if (upa->obstructed > 0)
3278 printf("File paths obstructed by a non-regular file: %d\n",
3280 if (upa->missing > 0)
3281 printf("Files which had incoming changes but could not be "
3282 "found in the work tree: %d\n", upa->missing);
3283 if (upa->not_deleted > 0)
3284 printf("Files not deleted due to differences in deleted "
3285 "content: %d\n", upa->not_deleted);
3286 if (upa->unversioned > 0)
3287 printf("Files not merged because an unversioned file was "
3288 "found in the work tree: %d\n", upa->unversioned);
3294 fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3295 "[path ...]\n", getprogname());
3299 static const struct got_error *
3300 update_progress(void *arg, unsigned char status, const char *path)
3302 struct got_update_progress_arg *upa = arg;
3304 if (status == GOT_STATUS_EXISTS ||
3305 status == GOT_STATUS_BASE_REF_ERR)
3308 upa->did_something = 1;
3310 /* Base commit bump happens silently. */
3311 if (status == GOT_STATUS_BUMP_BASE)
3314 if (status == GOT_STATUS_CONFLICT)
3316 if (status == GOT_STATUS_OBSTRUCTED)
3318 if (status == GOT_STATUS_CANNOT_UPDATE)
3320 if (status == GOT_STATUS_MISSING)
3322 if (status == GOT_STATUS_CANNOT_DELETE)
3324 if (status == GOT_STATUS_UNVERSIONED)
3327 while (path[0] == '/')
3329 if (upa->verbosity >= 0)
3330 printf("%c %s\n", status, path);
3335 static const struct got_error *
3336 switch_head_ref(struct got_reference *head_ref,
3337 struct got_object_id *commit_id, struct got_worktree *worktree,
3338 struct got_repository *repo)
3340 const struct got_error *err = NULL;
3342 int ref_has_moved = 0;
3344 /* Trivial case: switching between two different references. */
3345 if (strcmp(got_ref_get_name(head_ref),
3346 got_worktree_get_head_ref_name(worktree)) != 0) {
3347 printf("Switching work tree from %s to %s\n",
3348 got_worktree_get_head_ref_name(worktree),
3349 got_ref_get_name(head_ref));
3350 return got_worktree_set_head_ref(worktree, head_ref);
3353 err = check_linear_ancestry(commit_id,
3354 got_worktree_get_base_commit_id(worktree), 0, repo);
3356 if (err->code != GOT_ERR_ANCESTRY)
3363 /* Switching to a rebased branch with the same reference name. */
3364 err = got_object_id_str(&base_id_str,
3365 got_worktree_get_base_commit_id(worktree));
3368 printf("Reference %s now points at a different branch\n",
3369 got_worktree_get_head_ref_name(worktree));
3370 printf("Switching work tree from %s to %s\n", base_id_str,
3371 got_worktree_get_head_ref_name(worktree));
3375 static const struct got_error *
3376 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3378 const struct got_error *err;
3381 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3385 return got_error(GOT_ERR_REBASING);
3387 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3391 return got_error(GOT_ERR_HISTEDIT_BUSY);
3396 static const struct got_error *
3397 check_merge_in_progress(struct got_worktree *worktree,
3398 struct got_repository *repo)
3400 const struct got_error *err;
3403 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3407 return got_error(GOT_ERR_MERGE_BUSY);
3412 static const struct got_error *
3413 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3414 char *argv[], struct got_worktree *worktree)
3416 const struct got_error *err = NULL;
3418 struct got_pathlist_entry *new;
3424 return got_error_from_errno("strdup");
3425 return got_pathlist_append(paths, path, NULL);
3428 for (i = 0; i < argc; i++) {
3429 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3432 err = got_pathlist_insert(&new, paths, path, NULL);
3433 if (err || new == NULL /* duplicate */) {
3443 static const struct got_error *
3444 wrap_not_worktree_error(const struct got_error *orig_err,
3445 const char *cmdname, const char *path)
3447 const struct got_error *err;
3448 struct got_repository *repo;
3449 static char msg[512];
3450 int *pack_fds = NULL;
3452 err = got_repo_pack_fds_open(&pack_fds);
3456 err = got_repo_open(&repo, path, NULL, pack_fds);
3460 snprintf(msg, sizeof(msg),
3461 "'got %s' needs a work tree in addition to a git repository\n"
3462 "Work trees can be checked out from this Git repository with "
3464 "The got(1) manual page contains more information.", cmdname);
3465 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3467 const struct got_error *close_err = got_repo_close(repo);
3472 const struct got_error *pack_err =
3473 got_repo_pack_fds_close(pack_fds);
3480 static const struct got_error *
3481 cmd_update(int argc, char *argv[])
3483 const struct got_error *error = NULL;
3484 struct got_repository *repo = NULL;
3485 struct got_worktree *worktree = NULL;
3486 char *worktree_path = NULL;
3487 struct got_object_id *commit_id = NULL;
3488 char *commit_id_str = NULL;
3489 const char *branch_name = NULL;
3490 struct got_reference *head_ref = NULL;
3491 struct got_pathlist_head paths;
3492 struct got_pathlist_entry *pe;
3493 int ch, verbosity = 0;
3494 struct got_update_progress_arg upa;
3495 int *pack_fds = NULL;
3500 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3501 "unveil", NULL) == -1)
3505 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3508 branch_name = optarg;
3511 commit_id_str = strdup(optarg);
3512 if (commit_id_str == NULL)
3513 return got_error_from_errno("strdup");
3527 worktree_path = getcwd(NULL, 0);
3528 if (worktree_path == NULL) {
3529 error = got_error_from_errno("getcwd");
3533 error = got_repo_pack_fds_open(&pack_fds);
3537 error = got_worktree_open(&worktree, worktree_path,
3538 GOT_WORKTREE_GOT_DIR);
3540 if (error->code == GOT_ERR_NOT_WORKTREE)
3541 error = wrap_not_worktree_error(error, "update",
3546 error = check_rebase_or_histedit_in_progress(worktree);
3550 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3555 error = apply_unveil(got_repo_get_path(repo), 0,
3556 got_worktree_get_root_path(worktree));
3560 error = check_merge_in_progress(worktree, repo);
3564 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3568 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3569 got_worktree_get_head_ref_name(worktree), 0);
3572 if (commit_id_str == NULL) {
3573 error = got_ref_resolve(&commit_id, repo, head_ref);
3576 error = got_object_id_str(&commit_id_str, commit_id);
3580 struct got_reflist_head refs;
3581 char *keyword_idstr = NULL;
3585 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3590 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3594 if (keyword_idstr != NULL) {
3595 free(commit_id_str);
3596 commit_id_str = keyword_idstr;
3599 error = got_repo_match_object_id(&commit_id, NULL,
3600 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3601 got_ref_list_free(&refs);
3602 free(commit_id_str);
3603 commit_id_str = NULL;
3606 error = got_object_id_str(&commit_id_str, commit_id);
3612 struct got_object_id *head_commit_id;
3613 TAILQ_FOREACH(pe, &paths, entry) {
3614 if (pe->path_len == 0)
3616 error = got_error_msg(GOT_ERR_BAD_PATH,
3617 "switching between branches requires that "
3618 "the entire work tree gets updated");
3621 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3624 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3626 free(head_commit_id);
3629 error = check_same_branch(commit_id, head_ref, repo);
3632 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3636 error = check_linear_ancestry(commit_id,
3637 got_worktree_get_base_commit_id(worktree), 0, repo);
3638 if (error != NULL) {
3639 if (error->code == GOT_ERR_ANCESTRY)
3640 error = got_error(GOT_ERR_BRANCH_MOVED);
3643 error = check_same_branch(commit_id, head_ref, repo);
3648 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3650 error = got_worktree_set_base_commit_id(worktree, repo,
3656 memset(&upa, 0, sizeof(upa));
3657 upa.verbosity = verbosity;
3658 error = got_worktree_checkout_files(worktree, &paths, repo,
3659 update_progress, &upa, check_cancelled, NULL);
3663 if (upa.did_something) {
3664 printf("Updated to %s: %s\n",
3665 got_worktree_get_head_ref_name(worktree), commit_id_str);
3667 printf("Already up-to-date\n");
3669 print_update_progress_stats(&upa);
3672 const struct got_error *pack_err =
3673 got_repo_pack_fds_close(pack_fds);
3678 const struct got_error *close_err = got_repo_close(repo);
3682 if (head_ref != NULL)
3683 got_ref_close(head_ref);
3684 free(worktree_path);
3685 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3687 free(commit_id_str);
3691 static const struct got_error *
3692 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3693 const char *path, int diff_context, int ignore_whitespace,
3694 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3695 struct got_repository *repo, FILE *outfile)
3697 const struct got_error *err = NULL;
3698 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3699 FILE *f1 = NULL, *f2 = NULL;
3700 int fd1 = -1, fd2 = -1;
3702 fd1 = got_opentempfd();
3704 return got_error_from_errno("got_opentempfd");
3705 fd2 = got_opentempfd();
3707 err = got_error_from_errno("got_opentempfd");
3712 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3718 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3722 f1 = got_opentemp();
3724 err = got_error_from_errno("got_opentemp");
3727 f2 = got_opentemp();
3729 err = got_error_from_errno("got_opentemp");
3733 while (path[0] == '/')
3735 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3736 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3737 force_text_diff, dsa, outfile);
3739 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3740 err = got_error_from_errno("close");
3742 got_object_blob_close(blob1);
3743 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3744 err = got_error_from_errno("close");
3746 got_object_blob_close(blob2);
3747 if (f1 && fclose(f1) == EOF && err == NULL)
3748 err = got_error_from_errno("fclose");
3749 if (f2 && fclose(f2) == EOF && err == NULL)
3750 err = got_error_from_errno("fclose");
3754 static const struct got_error *
3755 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3756 const char *path, int diff_context, int ignore_whitespace,
3757 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3758 struct got_repository *repo, FILE *outfile)
3760 const struct got_error *err = NULL;
3761 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3762 struct got_diff_blob_output_unidiff_arg arg;
3763 FILE *f1 = NULL, *f2 = NULL;
3764 int fd1 = -1, fd2 = -1;
3767 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3770 fd1 = got_opentempfd();
3772 err = got_error_from_errno("got_opentempfd");
3777 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3781 f1 = got_opentemp();
3783 err = got_error_from_errno("got_opentemp");
3787 f2 = got_opentemp();
3789 err = got_error_from_errno("got_opentemp");
3792 fd2 = got_opentempfd();
3794 err = got_error_from_errno("got_opentempfd");
3797 arg.diff_context = diff_context;
3798 arg.ignore_whitespace = ignore_whitespace;
3799 arg.force_text_diff = force_text_diff;
3801 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3802 arg.outfile = outfile;
3805 while (path[0] == '/')
3807 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3808 got_diff_blob_output_unidiff, &arg, 1);
3811 got_object_tree_close(tree1);
3813 got_object_tree_close(tree2);
3814 if (f1 && fclose(f1) == EOF && err == NULL)
3815 err = got_error_from_errno("fclose");
3816 if (f2 && fclose(f2) == EOF && err == NULL)
3817 err = got_error_from_errno("fclose");
3818 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3819 err = got_error_from_errno("close");
3820 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3821 err = got_error_from_errno("close");
3825 static const struct got_error *
3826 get_changed_paths(struct got_pathlist_head *paths,
3827 struct got_commit_object *commit, struct got_repository *repo,
3828 struct got_diffstat_cb_arg *dsa)
3830 const struct got_error *err = NULL;
3831 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3832 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3833 struct got_object_qid *qid;
3834 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3835 FILE *f1 = NULL, *f2 = NULL;
3836 int fd1 = -1, fd2 = -1;
3839 cb = got_diff_tree_compute_diffstat;
3841 f1 = got_opentemp();
3843 err = got_error_from_errno("got_opentemp");
3846 f2 = got_opentemp();
3848 err = got_error_from_errno("got_opentemp");
3851 fd1 = got_opentempfd();
3853 err = got_error_from_errno("got_opentempfd");
3856 fd2 = got_opentempfd();
3858 err = got_error_from_errno("got_opentempfd");
3863 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3865 struct got_commit_object *pcommit;
3866 err = got_object_open_as_commit(&pcommit, repo,
3871 tree_id1 = got_object_id_dup(
3872 got_object_commit_get_tree_id(pcommit));
3873 if (tree_id1 == NULL) {
3874 got_object_commit_close(pcommit);
3875 return got_error_from_errno("got_object_id_dup");
3877 got_object_commit_close(pcommit);
3882 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3887 tree_id2 = got_object_commit_get_tree_id(commit);
3888 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3892 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3893 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3896 got_object_tree_close(tree1);
3898 got_object_tree_close(tree2);
3899 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3900 err = got_error_from_errno("close");
3901 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3902 err = got_error_from_errno("close");
3903 if (f1 && fclose(f1) == EOF && err == NULL)
3904 err = got_error_from_errno("fclose");
3905 if (f2 && fclose(f2) == EOF && err == NULL)
3906 err = got_error_from_errno("fclose");
3911 static const struct got_error *
3912 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3913 const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3914 struct got_repository *repo, FILE *outfile)
3916 const struct got_error *err = NULL;
3917 struct got_commit_object *pcommit = NULL;
3918 char *id_str1 = NULL, *id_str2 = NULL;
3919 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3920 struct got_object_qid *qid;
3922 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3924 err = got_object_open_as_commit(&pcommit, repo,
3928 err = got_object_id_str(&id_str1, &qid->id);
3933 err = got_object_id_str(&id_str2, id);
3937 if (path && path[0] != '\0') {
3939 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3943 err = got_object_id_by_path(&obj_id1, repo,
3946 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3952 err = got_object_get_type(&obj_type, repo, obj_id2);
3958 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3959 fprintf(outfile, "commit - %s\n",
3960 id_str1 ? id_str1 : "/dev/null");
3961 fprintf(outfile, "commit + %s\n", id_str2);
3963 case GOT_OBJ_TYPE_BLOB:
3964 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3965 0, 0, dsa, repo, outfile);
3967 case GOT_OBJ_TYPE_TREE:
3968 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3969 0, 0, dsa, repo, outfile);
3972 err = got_error(GOT_ERR_OBJ_TYPE);
3978 obj_id2 = got_object_commit_get_tree_id(commit);
3980 obj_id1 = got_object_commit_get_tree_id(pcommit);
3982 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3983 fprintf(outfile, "commit - %s\n",
3984 id_str1 ? id_str1 : "/dev/null");
3985 fprintf(outfile, "commit + %s\n", id_str2);
3986 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3987 dsa, repo, outfile);
3993 got_object_commit_close(pcommit);
3998 get_datestr(time_t *time, char *datebuf)
4000 struct tm mytm, *tm;
4003 tm = gmtime_r(time, &mytm);
4006 s = asctime_r(tm, datebuf);
4009 p = strchr(s, '\n');
4015 static const struct got_error *
4016 match_commit(int *have_match, struct got_object_id *id,
4017 struct got_commit_object *commit, regex_t *regex)
4019 const struct got_error *err = NULL;
4020 regmatch_t regmatch;
4021 char *id_str = NULL, *logmsg = NULL;
4025 err = got_object_id_str(&id_str, id);
4029 err = got_object_commit_get_logmsg(&logmsg, commit);
4033 if (regexec(regex, got_object_commit_get_author(commit), 1,
4034 ®match, 0) == 0 ||
4035 regexec(regex, got_object_commit_get_committer(commit), 1,
4036 ®match, 0) == 0 ||
4037 regexec(regex, id_str, 1, ®match, 0) == 0 ||
4038 regexec(regex, logmsg, 1, ®match, 0) == 0)
4047 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
4050 regmatch_t regmatch;
4051 struct got_pathlist_entry *pe;
4055 TAILQ_FOREACH(pe, changed_paths, entry) {
4056 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
4063 static const struct got_error *
4064 match_patch(int *have_match, struct got_commit_object *commit,
4065 struct got_object_id *id, const char *path, int diff_context,
4066 struct got_repository *repo, regex_t *regex, FILE *f)
4068 const struct got_error *err = NULL;
4070 size_t linesize = 0;
4071 regmatch_t regmatch;
4075 err = got_opentemp_truncate(f);
4079 err = print_patch(commit, id, path, diff_context, NULL, repo, f);
4083 if (fseeko(f, 0L, SEEK_SET) == -1) {
4084 err = got_error_from_errno("fseeko");
4088 while (getline(&line, &linesize, f) != -1) {
4089 if (regexec(regex, line, 1, ®match, 0) == 0) {
4099 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
4101 static const struct got_error*
4102 build_refs_str(char **refs_str, struct got_reflist_head *refs,
4103 struct got_object_id *id, struct got_repository *repo,
4106 static const struct got_error *err = NULL;
4107 struct got_reflist_entry *re;
4113 TAILQ_FOREACH(re, refs, entry) {
4114 struct got_tag_object *tag = NULL;
4115 struct got_object_id *ref_id;
4118 name = got_ref_get_name(re->ref);
4119 if (strcmp(name, GOT_REF_HEAD) == 0)
4121 if (strncmp(name, "refs/", 5) == 0)
4123 if (strncmp(name, "got/", 4) == 0)
4125 if (strncmp(name, "heads/", 6) == 0)
4127 if (strncmp(name, "remotes/", 8) == 0) {
4131 s = strstr(name, "/" GOT_REF_HEAD);
4132 if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
4135 err = got_ref_resolve(&ref_id, repo, re->ref);
4138 if (strncmp(name, "tags/", 5) == 0) {
4139 err = got_object_open_as_tag(&tag, repo, ref_id);
4141 if (err->code != GOT_ERR_OBJ_TYPE) {
4145 /* Ref points at something other than a tag. */
4150 cmp = got_object_id_cmp(tag ?
4151 got_object_tag_get_object_id(tag) : ref_id, id);
4154 got_object_tag_close(tag);
4158 if (asprintf(refs_str, "%s%s%s", s ? s : "",
4159 s ? ", " : "", name) == -1) {
4160 err = got_error_from_errno("asprintf");
4171 static const struct got_error *
4172 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4173 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4175 const struct got_error *err = NULL;
4176 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4177 char *comma, *s, *nl;
4178 struct got_reflist_head *refs;
4179 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4181 time_t committer_time;
4183 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4185 err = build_refs_str(&ref_str, refs, id, repo, 1);
4189 /* Display the first matching ref only. */
4190 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4194 if (ref_str == NULL) {
4195 err = got_object_id_str(&id_str, id);
4200 committer_time = got_object_commit_get_committer_time(commit);
4201 if (gmtime_r(&committer_time, &tm) == NULL) {
4202 err = got_error_from_errno("gmtime_r");
4205 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4206 err = got_error(GOT_ERR_NO_SPACE);
4210 err = got_object_commit_get_logmsg(&logmsg0, commit);
4215 while (isspace((unsigned char)s[0]))
4218 nl = strchr(s, '\n');
4224 printf("%s%-7s %s\n", datebuf, ref_str, s);
4226 printf("%s%.7s %s\n", datebuf, id_str, s);
4228 if (fflush(stdout) != 0 && err == NULL)
4229 err = got_error_from_errno("fflush");
4237 static const struct got_error *
4238 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
4240 struct got_pathlist_entry *pe;
4243 printf("%s\n", header);
4245 TAILQ_FOREACH(pe, dsa->paths, entry) {
4246 struct got_diff_changed_path *cp = pe->data;
4247 int pad = dsa->max_path_len - pe->path_len + 1;
4249 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
4250 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
4252 printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
4253 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
4254 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
4256 if (fflush(stdout) != 0)
4257 return got_error_from_errno("fflush");
4262 static const struct got_error *
4268 if (fseeko(f, 0L, SEEK_SET) == -1)
4269 return got_error_from_errno("fseek");
4272 r = fread(buf, 1, sizeof(buf), f);
4275 return got_error_from_errno("fread");
4279 if (fwrite(buf, 1, r, stdout) != r)
4280 return got_ferror(stdout, GOT_ERR_IO);
4286 static const struct got_error *
4287 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4288 struct got_repository *repo, const char *path,
4289 struct got_pathlist_head *changed_paths,
4290 struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
4291 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
4294 const struct got_error *err = NULL;
4296 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4298 time_t committer_time;
4299 const char *author, *committer;
4300 char *refs_str = NULL;
4302 err = got_object_id_str(&id_str, id);
4306 if (custom_refs_str == NULL) {
4307 struct got_reflist_head *refs;
4308 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4310 err = build_refs_str(&refs_str, refs, id, repo, 0);
4316 printf(GOT_COMMIT_SEP_STR);
4317 if (custom_refs_str)
4318 printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
4321 printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
4322 refs_str ? " (" : "", refs_str ? refs_str : "",
4323 refs_str ? ")" : "");
4328 printf("from: %s\n", got_object_commit_get_author(commit));
4329 author = got_object_commit_get_author(commit);
4330 committer = got_object_commit_get_committer(commit);
4331 if (strcmp(author, committer) != 0)
4332 printf("via: %s\n", committer);
4333 committer_time = got_object_commit_get_committer_time(commit);
4334 datestr = get_datestr(&committer_time, datebuf);
4336 printf("date: %s UTC\n", datestr);
4337 if (got_object_commit_get_nparents(commit) > 1) {
4338 const struct got_object_id_queue *parent_ids;
4339 struct got_object_qid *qid;
4341 parent_ids = got_object_commit_get_parent_ids(commit);
4342 STAILQ_FOREACH(qid, parent_ids, entry) {
4343 err = got_object_id_str(&id_str, &qid->id);
4346 printf("parent %d: %s\n", n++, id_str);
4352 err = got_object_commit_get_logmsg(&logmsg0, commit);
4358 line = strsep(&logmsg, "\n");
4360 printf(" %s\n", line);
4364 if (changed_paths && diffstat == NULL) {
4365 struct got_pathlist_entry *pe;
4367 TAILQ_FOREACH(pe, changed_paths, entry) {
4368 struct got_diff_changed_path *cp = pe->data;
4370 printf(" %c %s\n", cp->status, pe->path);
4378 err = got_error_from_errno("got_opentemp");
4383 err = print_patch(commit, id, path, diff_context, diffstat,
4384 repo, diffstat == NULL ? stdout : f);
4389 err = print_diffstat(diffstat, NULL);
4401 if (fflush(stdout) != 0 && err == NULL)
4402 err = got_error_from_errno("fflush");
4404 if (f && fclose(f) == EOF && err == NULL)
4405 err = got_error_from_errno("fclose");
4411 static const struct got_error *
4412 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4413 struct got_repository *repo, const char *path, int show_changed_paths,
4414 int show_diffstat, int show_patch, const char *search_pattern,
4415 int diff_context, int limit, int log_branches, int reverse_display_order,
4416 struct got_reflist_object_id_map *refs_idmap, int one_line,
4419 const struct got_error *err;
4420 struct got_commit_graph *graph;
4423 struct got_object_id_queue reversed_commits;
4424 struct got_object_qid *qid;
4425 struct got_commit_object *commit;
4426 struct got_pathlist_head changed_paths;
4428 STAILQ_INIT(&reversed_commits);
4429 TAILQ_INIT(&changed_paths);
4431 if (search_pattern && regcomp(®ex, search_pattern,
4432 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4433 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4435 err = got_commit_graph_open(&graph, path, !log_branches);
4438 err = got_commit_graph_iter_start(graph, root_id, repo,
4439 check_cancelled, NULL);
4443 struct got_object_id id;
4444 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4445 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4447 if (sigint_received || sigpipe_received)
4450 err = got_commit_graph_iter_next(&id, graph, repo,
4451 check_cancelled, NULL);
4453 if (err->code == GOT_ERR_ITER_COMPLETED)
4458 err = got_object_open_as_commit(&commit, repo, &id);
4462 if ((show_changed_paths || (show_diffstat && !show_patch))
4463 && !reverse_display_order) {
4464 err = get_changed_paths(&changed_paths, commit, repo,
4465 show_diffstat ? &dsa : NULL);
4470 if (search_pattern) {
4471 err = match_commit(&have_match, &id, commit, ®ex);
4473 got_object_commit_close(commit);
4476 if (have_match == 0 && show_changed_paths)
4477 match_changed_paths(&have_match,
4478 &changed_paths, ®ex);
4479 if (have_match == 0 && show_patch) {
4480 err = match_patch(&have_match, commit, &id,
4481 path, diff_context, repo, ®ex, tmpfile);
4485 if (have_match == 0) {
4486 got_object_commit_close(commit);
4487 got_pathlist_free(&changed_paths,
4488 GOT_PATHLIST_FREE_ALL);
4493 if (reverse_display_order) {
4494 err = got_object_qid_alloc(&qid, &id);
4497 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4498 got_object_commit_close(commit);
4501 err = print_commit_oneline(commit, &id,
4504 err = print_commit(commit, &id, repo, path,
4505 (show_changed_paths || show_diffstat) ?
4506 &changed_paths : NULL,
4507 show_diffstat ? &dsa : NULL, show_patch,
4508 diff_context, refs_idmap, NULL, NULL);
4509 got_object_commit_close(commit);
4513 if ((limit && --limit == 0) ||
4514 (end_id && got_object_id_cmp(&id, end_id) == 0))
4517 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4519 if (reverse_display_order) {
4520 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4521 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4522 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4524 err = got_object_open_as_commit(&commit, repo,
4528 if (show_changed_paths ||
4529 (show_diffstat && !show_patch)) {
4530 err = get_changed_paths(&changed_paths, commit,
4531 repo, show_diffstat ? &dsa : NULL);
4536 err = print_commit_oneline(commit, &qid->id,
4539 err = print_commit(commit, &qid->id, repo, path,
4540 (show_changed_paths || show_diffstat) ?
4541 &changed_paths : NULL,
4542 show_diffstat ? &dsa : NULL, show_patch,
4543 diff_context, refs_idmap, NULL, NULL);
4544 got_object_commit_close(commit);
4547 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4551 while (!STAILQ_EMPTY(&reversed_commits)) {
4552 qid = STAILQ_FIRST(&reversed_commits);
4553 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4554 got_object_qid_free(qid);
4556 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4559 got_commit_graph_close(graph);
4566 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
4567 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4568 "[path]\n", getprogname());
4573 get_default_log_limit(void)
4575 const char *got_default_log_limit;
4579 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4580 if (got_default_log_limit == NULL)
4582 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4588 static const struct got_error *
4589 cmd_log(int argc, char *argv[])
4591 const struct got_error *error;
4592 struct got_repository *repo = NULL;
4593 struct got_worktree *worktree = NULL;
4594 struct got_object_id *start_id = NULL, *end_id = NULL;
4595 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4596 const char *start_commit = NULL, *end_commit = NULL;
4597 const char *search_pattern = NULL;
4598 int diff_context = -1, ch;
4599 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4600 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4602 struct got_reflist_head refs;
4603 struct got_reflist_object_id_map *refs_idmap = NULL;
4604 FILE *tmpfile = NULL;
4605 int *pack_fds = NULL;
4610 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4616 limit = get_default_log_limit();
4618 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
4624 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4627 errx(1, "number of context lines is %s: %s",
4631 start_commit = optarg;
4637 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4639 errx(1, "number of commits is %s: %s",
4643 show_changed_paths = 1;
4649 reverse_display_order = 1;
4652 repo_path = realpath(optarg, NULL);
4653 if (repo_path == NULL)
4654 return got_error_from_errno2("realpath",
4656 got_path_strip_trailing_slashes(repo_path);
4659 search_pattern = optarg;
4665 end_commit = optarg;
4676 if (diff_context == -1)
4678 else if (!show_patch)
4679 errx(1, "-C requires -p");
4681 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4682 errx(1, "cannot use -s with -d, -p or -P");
4684 cwd = getcwd(NULL, 0);
4686 error = got_error_from_errno("getcwd");
4690 error = got_repo_pack_fds_open(&pack_fds);
4694 if (repo_path == NULL) {
4695 error = got_worktree_open(&worktree, cwd,
4696 GOT_WORKTREE_GOT_DIR);
4697 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4704 error = got_worktree_resolve_path(&path, worktree,
4709 path = strdup(argv[0]);
4711 error = got_error_from_errno("strdup");
4715 } else if (argc != 0)
4718 if (repo_path == NULL) {
4719 repo_path = worktree ?
4720 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4722 if (repo_path == NULL) {
4723 error = got_error_from_errno("strdup");
4727 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4731 error = apply_unveil(got_repo_get_path(repo), 1,
4732 worktree ? got_worktree_get_root_path(worktree) : NULL);
4736 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4740 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4744 if (start_commit == NULL) {
4745 struct got_reference *head_ref;
4746 struct got_commit_object *commit = NULL;
4747 error = got_ref_open(&head_ref, repo,
4748 worktree ? got_worktree_get_head_ref_name(worktree)
4752 error = got_ref_resolve(&start_id, repo, head_ref);
4753 got_ref_close(head_ref);
4756 error = got_object_open_as_commit(&commit, repo,
4760 got_object_commit_close(commit);
4762 char *keyword_idstr = NULL;
4764 error = got_keyword_to_idstr(&keyword_idstr, start_commit,
4768 if (keyword_idstr != NULL)
4769 start_commit = keyword_idstr;
4771 error = got_repo_match_object_id(&start_id, NULL,
4772 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4773 free(keyword_idstr);
4777 if (end_commit != NULL) {
4778 error = got_repo_match_object_id(&end_id, NULL,
4779 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4786 * If a path was specified on the command line it was resolved
4787 * to a path in the work tree above. Prepend the work tree's
4788 * path prefix to obtain the corresponding in-repository path.
4792 prefix = got_worktree_get_path_prefix(worktree);
4793 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4794 (path[0] != '\0') ? "/" : "", path) == -1) {
4795 error = got_error_from_errno("asprintf");
4800 error = got_repo_map_path(&in_repo_path, repo,
4806 path = in_repo_path;
4810 /* Release work tree lock. */
4811 got_worktree_close(worktree);
4815 if (search_pattern && show_patch) {
4816 tmpfile = got_opentemp();
4817 if (tmpfile == NULL) {
4818 error = got_error_from_errno("got_opentemp");
4823 error = print_commits(start_id, end_id, repo, path ? path : "",
4824 show_changed_paths, show_diffstat, show_patch, search_pattern,
4825 diff_context, limit, log_branches, reverse_display_order,
4826 refs_idmap, one_line, tmpfile);
4834 got_worktree_close(worktree);
4836 const struct got_error *close_err = got_repo_close(repo);
4841 const struct got_error *pack_err =
4842 got_repo_pack_fds_close(pack_fds);
4847 got_reflist_object_id_map_free(refs_idmap);
4848 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4849 error = got_error_from_errno("fclose");
4850 got_ref_list_free(&refs);
4857 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4858 "[-r repository-path] [object1 object2 | path ...]\n",
4863 struct print_diff_arg {
4864 struct got_repository *repo;
4865 struct got_worktree *worktree;
4866 struct got_diffstat_cb_arg *diffstat;
4871 enum got_diff_algorithm diff_algo;
4872 int ignore_whitespace;
4873 int force_text_diff;
4880 * Create a file which contains the target path of a symlink so we can feed
4881 * it as content to the diff engine.
4883 static const struct got_error *
4884 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4885 const char *abspath)
4887 const struct got_error *err = NULL;
4888 char target_path[PATH_MAX];
4889 ssize_t target_len, outlen;
4894 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4895 if (target_len == -1)
4896 return got_error_from_errno2("readlinkat", abspath);
4898 target_len = readlink(abspath, target_path, PATH_MAX);
4899 if (target_len == -1)
4900 return got_error_from_errno2("readlink", abspath);
4903 *fd = got_opentempfd();
4905 return got_error_from_errno("got_opentempfd");
4907 outlen = write(*fd, target_path, target_len);
4909 err = got_error_from_errno("got_opentempfd");
4913 if (lseek(*fd, 0, SEEK_SET) == -1) {
4914 err = got_error_from_errno2("lseek", abspath);
4925 static const struct got_error *
4926 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4927 const char *path, struct got_object_id *blob_id,
4928 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4929 int dirfd, const char *de_name)
4931 struct print_diff_arg *a = arg;
4932 const struct got_error *err = NULL;
4933 struct got_blob_object *blob1 = NULL;
4934 int fd = -1, fd1 = -1, fd2 = -1;
4936 char *abspath = NULL, *label1 = NULL;
4941 memset(&sb, 0, sizeof(sb));
4943 if (a->diff_staged) {
4944 if (staged_status != GOT_STATUS_MODIFY &&
4945 staged_status != GOT_STATUS_ADD &&
4946 staged_status != GOT_STATUS_DELETE)
4949 if (staged_status == GOT_STATUS_DELETE)
4951 if (status == GOT_STATUS_NONEXISTENT)
4952 return got_error_set_errno(ENOENT, path);
4953 if (status != GOT_STATUS_MODIFY &&
4954 status != GOT_STATUS_ADD &&
4955 status != GOT_STATUS_DELETE &&
4956 status != GOT_STATUS_CONFLICT)
4960 err = got_opentemp_truncate(a->f1);
4962 return got_error_from_errno("got_opentemp_truncate");
4963 err = got_opentemp_truncate(a->f2);
4965 return got_error_from_errno("got_opentemp_truncate");
4967 if (!a->header_shown) {
4968 if (fprintf(a->outfile, "diff %s%s\n",
4969 a->diff_staged ? "-s " : "",
4970 got_worktree_get_root_path(a->worktree)) < 0) {
4971 err = got_error_from_errno("fprintf");
4974 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4975 err = got_error_from_errno("fprintf");
4978 if (fprintf(a->outfile, "path + %s%s\n",
4979 got_worktree_get_root_path(a->worktree),
4980 a->diff_staged ? " (staged changes)" : "") < 0) {
4981 err = got_error_from_errno("fprintf");
4984 a->header_shown = 1;
4987 if (a->diff_staged) {
4988 const char *label1 = NULL, *label2 = NULL;
4989 switch (staged_status) {
4990 case GOT_STATUS_MODIFY:
4994 case GOT_STATUS_ADD:
4997 case GOT_STATUS_DELETE:
5001 return got_error(GOT_ERR_FILE_STATUS);
5003 fd1 = got_opentempfd();
5005 err = got_error_from_errno("got_opentempfd");
5008 fd2 = got_opentempfd();
5010 err = got_error_from_errno("got_opentempfd");
5013 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
5014 fd1, fd2, blob_id, staged_blob_id, label1, label2,
5015 a->diff_algo, a->diff_context, a->ignore_whitespace,
5016 a->force_text_diff, a->diffstat, a->repo, a->outfile);
5020 fd1 = got_opentempfd();
5022 err = got_error_from_errno("got_opentempfd");
5026 if (staged_status == GOT_STATUS_ADD ||
5027 staged_status == GOT_STATUS_MODIFY) {
5029 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
5033 err = got_object_id_str(&id_str, staged_blob_id);
5036 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
5037 err = got_error_from_errno("asprintf");
5042 } else if (status != GOT_STATUS_ADD) {
5043 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
5049 if (status != GOT_STATUS_DELETE) {
5050 if (asprintf(&abspath, "%s/%s",
5051 got_worktree_get_root_path(a->worktree), path) == -1) {
5052 err = got_error_from_errno("asprintf");
5057 fd = openat(dirfd, de_name,
5058 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5060 if (!got_err_open_nofollow_on_symlink()) {
5061 err = got_error_from_errno2("openat",
5065 err = get_symlink_target_file(&fd, dirfd,
5071 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5073 if (!got_err_open_nofollow_on_symlink()) {
5074 err = got_error_from_errno2("open",
5078 err = get_symlink_target_file(&fd, dirfd,
5084 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
5085 err = got_error_from_errno2("fstatat", abspath);
5088 f2 = fdopen(fd, "r");
5090 err = got_error_from_errno2("fdopen", abspath);
5098 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5104 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
5105 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
5106 a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
5108 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5109 err = got_error_from_errno("close");
5110 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5111 err = got_error_from_errno("close");
5113 got_object_blob_close(blob1);
5114 if (fd != -1 && close(fd) == -1 && err == NULL)
5115 err = got_error_from_errno("close");
5116 if (f2 && fclose(f2) == EOF && err == NULL)
5117 err = got_error_from_errno("fclose");
5122 static const struct got_error *
5123 cmd_diff(int argc, char *argv[])
5125 const struct got_error *error;
5126 struct got_repository *repo = NULL;
5127 struct got_worktree *worktree = NULL;
5128 char *cwd = NULL, *repo_path = NULL;
5129 const char *commit_args[2] = { NULL, NULL };
5130 int ncommit_args = 0;
5131 struct got_object_id *ids[2] = { NULL, NULL };
5132 char *labels[2] = { NULL, NULL };
5133 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5134 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5135 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5137 struct got_reflist_head refs;
5138 struct got_pathlist_head diffstat_paths, paths;
5139 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5140 int fd1 = -1, fd2 = -1;
5141 int *pack_fds = NULL;
5142 struct got_diffstat_cb_arg dsa;
5144 memset(&dsa, 0, sizeof(dsa));
5148 TAILQ_INIT(&diffstat_paths);
5151 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5156 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5159 force_text_diff = 1;
5162 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5165 errx(1, "number of context lines is %s: %s",
5169 if (ncommit_args >= 2)
5170 errx(1, "too many -c options used");
5171 commit_args[ncommit_args++] = optarg;
5180 repo_path = realpath(optarg, NULL);
5181 if (repo_path == NULL)
5182 return got_error_from_errno2("realpath",
5184 got_path_strip_trailing_slashes(repo_path);
5191 ignore_whitespace = 1;
5202 cwd = getcwd(NULL, 0);
5204 error = got_error_from_errno("getcwd");
5208 error = got_repo_pack_fds_open(&pack_fds);
5212 if (repo_path == NULL) {
5213 error = got_worktree_open(&worktree, cwd,
5214 GOT_WORKTREE_GOT_DIR);
5215 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5221 strdup(got_worktree_get_repo_path(worktree));
5222 if (repo_path == NULL) {
5223 error = got_error_from_errno("strdup");
5227 repo_path = strdup(cwd);
5228 if (repo_path == NULL) {
5229 error = got_error_from_errno("strdup");
5235 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5240 if (show_diffstat) {
5241 dsa.paths = &diffstat_paths;
5242 dsa.force_text = force_text_diff;
5243 dsa.ignore_ws = ignore_whitespace;
5244 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5247 if (rflag || worktree == NULL || ncommit_args > 0) {
5249 error = got_error_msg(GOT_ERR_NOT_IMPL,
5250 "-P option can only be used when diffing "
5255 error = got_error_msg(GOT_ERR_NOT_IMPL,
5256 "-s option can only be used when diffing "
5262 error = apply_unveil(got_repo_get_path(repo), 1,
5263 worktree ? got_worktree_get_root_path(worktree) : NULL);
5267 if ((!force_path && argc == 2) || ncommit_args > 0) {
5268 int obj_type = (ncommit_args > 0 ?
5269 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5270 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5274 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5276 char *keyword_idstr = NULL;
5278 if (ncommit_args > 0)
5279 arg = commit_args[i];
5283 error = got_keyword_to_idstr(&keyword_idstr, arg,
5287 if (keyword_idstr != NULL)
5288 arg = keyword_idstr;
5290 error = got_repo_match_object_id(&ids[i], &labels[i],
5291 arg, obj_type, &refs, repo);
5292 free(keyword_idstr);
5294 if (error->code != GOT_ERR_NOT_REF &&
5295 error->code != GOT_ERR_NO_OBJ)
5297 if (ncommit_args > 0)
5305 f1 = got_opentemp();
5307 error = got_error_from_errno("got_opentemp");
5311 f2 = got_opentemp();
5313 error = got_error_from_errno("got_opentemp");
5317 outfile = got_opentemp();
5318 if (outfile == NULL) {
5319 error = got_error_from_errno("got_opentemp");
5323 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5324 struct print_diff_arg arg;
5327 if (worktree == NULL) {
5328 if (argc == 2 && ids[0] == NULL) {
5329 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5331 } else if (argc == 2 && ids[1] == NULL) {
5332 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5334 } else if (argc > 0) {
5335 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5336 "%s", "specified paths cannot be resolved");
5339 error = got_error(GOT_ERR_NOT_WORKTREE);
5344 error = get_worktree_paths_from_argv(&paths, argc, argv,
5349 error = got_object_id_str(&id_str,
5350 got_worktree_get_base_commit_id(worktree));
5354 arg.worktree = worktree;
5355 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5356 arg.diff_context = diff_context;
5357 arg.id_str = id_str;
5358 arg.header_shown = 0;
5359 arg.diff_staged = diff_staged;
5360 arg.ignore_whitespace = ignore_whitespace;
5361 arg.force_text_diff = force_text_diff;
5362 arg.diffstat = show_diffstat ? &dsa : NULL;
5365 arg.outfile = outfile;
5367 error = got_worktree_status(worktree, &paths, repo, 0,
5368 print_diff, &arg, check_cancelled, NULL);
5373 if (show_diffstat && dsa.nfiles > 0) {
5376 if (asprintf(&header, "diffstat %s%s",
5377 diff_staged ? "-s " : "",
5378 got_worktree_get_root_path(worktree)) == -1) {
5379 error = got_error_from_errno("asprintf");
5383 error = print_diffstat(&dsa, header);
5389 error = printfile(outfile);
5393 if (ncommit_args == 1) {
5394 struct got_commit_object *commit;
5395 error = got_object_open_as_commit(&commit, repo, ids[0]);
5399 labels[1] = labels[0];
5401 if (got_object_commit_get_nparents(commit) > 0) {
5402 const struct got_object_id_queue *pids;
5403 struct got_object_qid *pid;
5404 pids = got_object_commit_get_parent_ids(commit);
5405 pid = STAILQ_FIRST(pids);
5406 ids[0] = got_object_id_dup(&pid->id);
5407 if (ids[0] == NULL) {
5408 error = got_error_from_errno(
5409 "got_object_id_dup");
5410 got_object_commit_close(commit);
5413 error = got_object_id_str(&labels[0], ids[0]);
5415 got_object_commit_close(commit);
5420 labels[0] = strdup("/dev/null");
5421 if (labels[0] == NULL) {
5422 error = got_error_from_errno("strdup");
5423 got_object_commit_close(commit);
5428 got_object_commit_close(commit);
5431 if (ncommit_args == 0 && argc > 2) {
5432 error = got_error_msg(GOT_ERR_BAD_PATH,
5433 "path arguments cannot be used when diffing two objects");
5438 error = got_object_get_type(&type1, repo, ids[0]);
5443 error = got_object_get_type(&type2, repo, ids[1]);
5446 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5447 error = got_error(GOT_ERR_OBJ_TYPE);
5450 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5451 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5452 "path arguments cannot be used when diffing blobs");
5456 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5458 struct got_pathlist_entry *new;
5462 error = got_worktree_resolve_path(&p, worktree,
5466 prefix = got_worktree_get_path_prefix(worktree);
5467 while (prefix[0] == '/')
5469 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5470 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5472 error = got_error_from_errno("asprintf");
5478 char *mapped_path, *s;
5479 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5485 in_repo_path = strdup(s);
5486 if (in_repo_path == NULL) {
5487 error = got_error_from_errno("asprintf");
5494 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5495 if (error || new == NULL /* duplicate */)
5502 /* Release work tree lock. */
5503 got_worktree_close(worktree);
5507 fd1 = got_opentempfd();
5509 error = got_error_from_errno("got_opentempfd");
5513 fd2 = got_opentempfd();
5515 error = got_error_from_errno("got_opentempfd");
5519 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5520 case GOT_OBJ_TYPE_BLOB:
5521 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5522 fd1, fd2, ids[0], ids[1], NULL, NULL,
5523 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5524 ignore_whitespace, force_text_diff,
5525 show_diffstat ? &dsa : NULL, repo, outfile);
5527 case GOT_OBJ_TYPE_TREE:
5528 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5529 ids[0], ids[1], &paths, "", "",
5530 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5531 ignore_whitespace, force_text_diff,
5532 show_diffstat ? &dsa : NULL, repo, outfile);
5534 case GOT_OBJ_TYPE_COMMIT:
5535 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5536 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5537 fd1, fd2, ids[0], ids[1], &paths,
5538 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5539 ignore_whitespace, force_text_diff,
5540 show_diffstat ? &dsa : NULL, repo, outfile);
5543 error = got_error(GOT_ERR_OBJ_TYPE);
5548 if (show_diffstat && dsa.nfiles > 0) {
5549 char *header = NULL;
5551 if (asprintf(&header, "diffstat %s %s",
5552 labels[0], labels[1]) == -1) {
5553 error = got_error_from_errno("asprintf");
5557 error = print_diffstat(&dsa, header);
5563 error = printfile(outfile);
5571 got_worktree_close(worktree);
5573 const struct got_error *close_err = got_repo_close(repo);
5578 const struct got_error *pack_err =
5579 got_repo_pack_fds_close(pack_fds);
5583 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5584 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5585 got_ref_list_free(&refs);
5586 if (outfile && fclose(outfile) == EOF && error == NULL)
5587 error = got_error_from_errno("fclose");
5588 if (f1 && fclose(f1) == EOF && error == NULL)
5589 error = got_error_from_errno("fclose");
5590 if (f2 && fclose(f2) == EOF && error == NULL)
5591 error = got_error_from_errno("fclose");
5592 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5593 error = got_error_from_errno("close");
5594 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5595 error = got_error_from_errno("close");
5603 "usage: %s blame [-c commit] [-r repository-path] path\n",
5612 char datebuf[11]; /* YYYY-MM-DD + NUL */
5615 struct blame_cb_args {
5616 struct blame_line *lines;
5620 off_t *line_offsets;
5622 struct got_repository *repo;
5625 static const struct got_error *
5626 blame_cb(void *arg, int nlines, int lineno,
5627 struct got_commit_object *commit, struct got_object_id *id)
5629 const struct got_error *err = NULL;
5630 struct blame_cb_args *a = arg;
5631 struct blame_line *bline;
5633 size_t linesize = 0;
5636 time_t committer_time;
5638 if (nlines != a->nlines ||
5639 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5640 return got_error(GOT_ERR_RANGE);
5642 if (sigint_received)
5643 return got_error(GOT_ERR_ITER_COMPLETED);
5646 return NULL; /* no change in this commit */
5648 /* Annotate this line. */
5649 bline = &a->lines[lineno - 1];
5650 if (bline->annotated)
5652 err = got_object_id_str(&bline->id_str, id);
5656 bline->committer = strdup(got_object_commit_get_committer(commit));
5657 if (bline->committer == NULL) {
5658 err = got_error_from_errno("strdup");
5662 committer_time = got_object_commit_get_committer_time(commit);
5663 if (gmtime_r(&committer_time, &tm) == NULL)
5664 return got_error_from_errno("gmtime_r");
5665 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5667 err = got_error(GOT_ERR_NO_SPACE);
5670 bline->annotated = 1;
5672 /* Print lines annotated so far. */
5673 bline = &a->lines[a->lineno_cur - 1];
5674 if (!bline->annotated)
5677 offset = a->line_offsets[a->lineno_cur - 1];
5678 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5679 err = got_error_from_errno("fseeko");
5683 while (a->lineno_cur <= a->nlines && bline->annotated) {
5684 char *smallerthan, *at, *nl, *committer;
5687 if (getline(&line, &linesize, a->f) == -1) {
5689 err = got_error_from_errno("getline");
5693 committer = bline->committer;
5694 smallerthan = strchr(committer, '<');
5695 if (smallerthan && smallerthan[1] != '\0')
5696 committer = smallerthan + 1;
5697 at = strchr(committer, '@');
5700 len = strlen(committer);
5702 committer[8] = '\0';
5704 nl = strchr(line, '\n');
5707 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5708 bline->id_str, bline->datebuf, committer, line);
5711 bline = &a->lines[a->lineno_cur - 1];
5718 static const struct got_error *
5719 cmd_blame(int argc, char *argv[])
5721 const struct got_error *error;
5722 struct got_repository *repo = NULL;
5723 struct got_worktree *worktree = NULL;
5724 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5725 char *link_target = NULL;
5726 struct got_object_id *obj_id = NULL;
5727 struct got_object_id *commit_id = NULL;
5728 struct got_commit_object *commit = NULL;
5729 struct got_blob_object *blob = NULL;
5730 char *commit_id_str = NULL, *keyword_idstr = NULL;
5731 struct blame_cb_args bca;
5732 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5734 int *pack_fds = NULL;
5735 FILE *f1 = NULL, *f2 = NULL;
5737 fd1 = got_opentempfd();
5739 return got_error_from_errno("got_opentempfd");
5741 memset(&bca, 0, sizeof(bca));
5744 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5749 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5752 commit_id_str = optarg;
5755 repo_path = realpath(optarg, NULL);
5756 if (repo_path == NULL)
5757 return got_error_from_errno2("realpath",
5759 got_path_strip_trailing_slashes(repo_path);
5775 cwd = getcwd(NULL, 0);
5777 error = got_error_from_errno("getcwd");
5781 error = got_repo_pack_fds_open(&pack_fds);
5785 if (repo_path == NULL) {
5786 error = got_worktree_open(&worktree, cwd,
5787 GOT_WORKTREE_GOT_DIR);
5788 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5794 strdup(got_worktree_get_repo_path(worktree));
5795 if (repo_path == NULL) {
5796 error = got_error_from_errno("strdup");
5801 repo_path = strdup(cwd);
5802 if (repo_path == NULL) {
5803 error = got_error_from_errno("strdup");
5809 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5814 const char *prefix = got_worktree_get_path_prefix(worktree);
5817 error = got_worktree_resolve_path(&p, worktree, path);
5820 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5821 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5823 error = got_error_from_errno("asprintf");
5828 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5830 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5833 error = got_repo_map_path(&in_repo_path, repo, path);
5838 if (commit_id_str == NULL) {
5839 struct got_reference *head_ref;
5840 error = got_ref_open(&head_ref, repo, worktree ?
5841 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5844 error = got_ref_resolve(&commit_id, repo, head_ref);
5845 got_ref_close(head_ref);
5849 struct got_reflist_head refs;
5852 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5857 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
5861 if (keyword_idstr != NULL)
5862 commit_id_str = keyword_idstr;
5864 error = got_repo_match_object_id(&commit_id, NULL,
5865 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5866 got_ref_list_free(&refs);
5872 /* Release work tree lock. */
5873 got_worktree_close(worktree);
5877 error = got_object_open_as_commit(&commit, repo, commit_id);
5881 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5886 error = got_object_id_by_path(&obj_id, repo, commit,
5887 link_target ? link_target : in_repo_path);
5891 error = got_object_get_type(&obj_type, repo, obj_id);
5895 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5896 error = got_error_path(link_target ? link_target : in_repo_path,
5901 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5904 bca.f = got_opentemp();
5905 if (bca.f == NULL) {
5906 error = got_error_from_errno("got_opentemp");
5909 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5910 &bca.line_offsets, bca.f, blob);
5911 if (error || bca.nlines == 0)
5914 /* Don't include \n at EOF in the blame line count. */
5915 if (bca.line_offsets[bca.nlines - 1] == filesize)
5918 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5919 if (bca.lines == NULL) {
5920 error = got_error_from_errno("calloc");
5924 bca.nlines_prec = 0;
5932 fd2 = got_opentempfd();
5934 error = got_error_from_errno("got_opentempfd");
5937 fd3 = got_opentempfd();
5939 error = got_error_from_errno("got_opentempfd");
5942 f1 = got_opentemp();
5944 error = got_error_from_errno("got_opentemp");
5947 f2 = got_opentemp();
5949 error = got_error_from_errno("got_opentemp");
5952 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5953 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5954 check_cancelled, NULL, fd2, fd3, f1, f2);
5956 free(keyword_idstr);
5964 got_object_commit_close(commit);
5966 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5967 error = got_error_from_errno("close");
5968 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5969 error = got_error_from_errno("close");
5970 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5971 error = got_error_from_errno("close");
5972 if (f1 && fclose(f1) == EOF && error == NULL)
5973 error = got_error_from_errno("fclose");
5974 if (f2 && fclose(f2) == EOF && error == NULL)
5975 error = got_error_from_errno("fclose");
5978 got_object_blob_close(blob);
5980 got_worktree_close(worktree);
5982 const struct got_error *close_err = got_repo_close(repo);
5987 const struct got_error *pack_err =
5988 got_repo_pack_fds_close(pack_fds);
5993 for (i = 0; i < bca.nlines; i++) {
5994 struct blame_line *bline = &bca.lines[i];
5995 free(bline->id_str);
5996 free(bline->committer);
6000 free(bca.line_offsets);
6001 if (bca.f && fclose(bca.f) == EOF && error == NULL)
6002 error = got_error_from_errno("fclose");
6009 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
6010 "[path]\n", getprogname());
6014 static const struct got_error *
6015 print_entry(struct got_tree_entry *te, const char *id, const char *path,
6016 const char *root_path, struct got_repository *repo)
6018 const struct got_error *err = NULL;
6019 int is_root_path = (strcmp(path, root_path) == 0);
6020 const char *modestr = "";
6021 mode_t mode = got_tree_entry_get_mode(te);
6022 char *link_target = NULL;
6024 path += strlen(root_path);
6025 while (path[0] == '/')
6028 if (got_object_tree_entry_is_submodule(te))
6030 else if (S_ISLNK(mode)) {
6033 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
6036 for (i = 0; link_target[i] != '\0'; i++) {
6037 if (!isprint((unsigned char)link_target[i]))
6038 link_target[i] = '?';
6043 else if (S_ISDIR(mode))
6045 else if (mode & S_IXUSR)
6048 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
6049 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
6050 link_target ? " -> ": "", link_target ? link_target : "");
6056 static const struct got_error *
6057 print_tree(const char *path, struct got_commit_object *commit,
6058 int show_ids, int recurse, const char *root_path,
6059 struct got_repository *repo)
6061 const struct got_error *err = NULL;
6062 struct got_object_id *tree_id = NULL;
6063 struct got_tree_object *tree = NULL;
6066 err = got_object_id_by_path(&tree_id, repo, commit, path);
6070 err = got_object_open_as_tree(&tree, repo, tree_id);
6073 nentries = got_object_tree_get_nentries(tree);
6074 for (i = 0; i < nentries; i++) {
6075 struct got_tree_entry *te;
6078 if (sigint_received || sigpipe_received)
6081 te = got_object_tree_get_entry(tree, i);
6084 err = got_object_id_str(&id_str,
6085 got_tree_entry_get_id(te));
6088 if (asprintf(&id, "%s ", id_str) == -1) {
6089 err = got_error_from_errno("asprintf");
6095 err = print_entry(te, id, path, root_path, repo);
6100 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
6102 if (asprintf(&child_path, "%s%s%s", path,
6103 path[0] == '/' && path[1] == '\0' ? "" : "/",
6104 got_tree_entry_get_name(te)) == -1) {
6105 err = got_error_from_errno("asprintf");
6108 err = print_tree(child_path, commit, show_ids, 1,
6117 got_object_tree_close(tree);
6122 static const struct got_error *
6123 cmd_tree(int argc, char *argv[])
6125 const struct got_error *error;
6126 struct got_repository *repo = NULL;
6127 struct got_worktree *worktree = NULL;
6128 const char *path, *refname = NULL;
6129 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6130 struct got_object_id *commit_id = NULL;
6131 struct got_commit_object *commit = NULL;
6132 char *commit_id_str = NULL, *keyword_idstr = NULL;
6133 int show_ids = 0, recurse = 0;
6135 int *pack_fds = NULL;
6138 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6143 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6146 commit_id_str = optarg;
6155 repo_path = realpath(optarg, NULL);
6156 if (repo_path == NULL)
6157 return got_error_from_errno2("realpath",
6159 got_path_strip_trailing_slashes(repo_path);
6177 cwd = getcwd(NULL, 0);
6179 error = got_error_from_errno("getcwd");
6183 error = got_repo_pack_fds_open(&pack_fds);
6187 if (repo_path == NULL) {
6188 error = got_worktree_open(&worktree, cwd,
6189 GOT_WORKTREE_GOT_DIR);
6190 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6196 strdup(got_worktree_get_repo_path(worktree));
6197 if (repo_path == NULL)
6198 error = got_error_from_errno("strdup");
6202 repo_path = strdup(cwd);
6203 if (repo_path == NULL) {
6204 error = got_error_from_errno("strdup");
6210 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6215 const char *prefix = got_worktree_get_path_prefix(worktree);
6218 if (path == NULL || got_path_is_root_dir(path))
6220 error = got_worktree_resolve_path(&p, worktree, path);
6223 if (asprintf(&in_repo_path, "%s%s%s", prefix,
6224 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
6226 error = got_error_from_errno("asprintf");
6231 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6235 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6240 error = got_repo_map_path(&in_repo_path, repo, path);
6245 if (commit_id_str == NULL) {
6246 struct got_reference *head_ref;
6248 refname = got_worktree_get_head_ref_name(worktree);
6250 refname = GOT_REF_HEAD;
6251 error = got_ref_open(&head_ref, repo, refname, 0);
6254 error = got_ref_resolve(&commit_id, repo, head_ref);
6255 got_ref_close(head_ref);
6259 struct got_reflist_head refs;
6262 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6267 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
6271 if (keyword_idstr != NULL)
6272 commit_id_str = keyword_idstr;
6274 error = got_repo_match_object_id(&commit_id, NULL,
6275 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6276 got_ref_list_free(&refs);
6282 /* Release work tree lock. */
6283 got_worktree_close(worktree);
6287 error = got_object_open_as_commit(&commit, repo, commit_id);
6291 error = print_tree(in_repo_path, commit, show_ids, recurse,
6292 in_repo_path, repo);
6294 free(keyword_idstr);
6300 got_object_commit_close(commit);
6302 got_worktree_close(worktree);
6304 const struct got_error *close_err = got_repo_close(repo);
6309 const struct got_error *pack_err =
6310 got_repo_pack_fds_close(pack_fds);
6320 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6321 "[-s status-codes] [path ...]\n", getprogname());
6325 struct got_status_arg {
6330 static const struct got_error *
6331 print_status(void *arg, unsigned char status, unsigned char staged_status,
6332 const char *path, struct got_object_id *blob_id,
6333 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6334 int dirfd, const char *de_name)
6336 struct got_status_arg *st = arg;
6338 if (status == staged_status && (status == GOT_STATUS_DELETE))
6339 status = GOT_STATUS_NO_CHANGE;
6340 if (st != NULL && st->status_codes) {
6341 size_t ncodes = strlen(st->status_codes);
6344 for (i = 0; i < ncodes ; i++) {
6346 if (status == st->status_codes[i] ||
6347 staged_status == st->status_codes[i]) {
6352 if (status == st->status_codes[i] ||
6353 staged_status == st->status_codes[i])
6358 if (st->suppress && j == 0)
6365 printf("%c%c %s\n", status, staged_status, path);
6369 static const struct got_error *
6370 cmd_status(int argc, char *argv[])
6372 const struct got_error *error = NULL;
6373 struct got_repository *repo = NULL;
6374 struct got_worktree *worktree = NULL;
6375 struct got_status_arg st;
6377 struct got_pathlist_head paths;
6378 int ch, i, no_ignores = 0;
6379 int *pack_fds = NULL;
6383 memset(&st, 0, sizeof(st));
6384 st.status_codes = NULL;
6388 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6393 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6399 if (st.status_codes != NULL && st.suppress == 0)
6400 option_conflict('S', 's');
6404 for (i = 0; optarg[i] != '\0'; i++) {
6405 switch (optarg[i]) {
6406 case GOT_STATUS_MODIFY:
6407 case GOT_STATUS_ADD:
6408 case GOT_STATUS_DELETE:
6409 case GOT_STATUS_CONFLICT:
6410 case GOT_STATUS_MISSING:
6411 case GOT_STATUS_OBSTRUCTED:
6412 case GOT_STATUS_UNVERSIONED:
6413 case GOT_STATUS_MODE_CHANGE:
6414 case GOT_STATUS_NONEXISTENT:
6417 errx(1, "invalid status code '%c'",
6421 if (ch == 's' && st.suppress)
6422 option_conflict('s', 'S');
6423 st.status_codes = optarg;
6434 cwd = getcwd(NULL, 0);
6436 error = got_error_from_errno("getcwd");
6440 error = got_repo_pack_fds_open(&pack_fds);
6444 error = got_worktree_open(&worktree, cwd,
6445 GOT_WORKTREE_GOT_DIR);
6447 if (error->code == GOT_ERR_NOT_WORKTREE)
6448 error = wrap_not_worktree_error(error, "status", cwd);
6452 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6457 error = apply_unveil(got_repo_get_path(repo), 1,
6458 got_worktree_get_root_path(worktree));
6462 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6466 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6467 print_status, &st, check_cancelled, NULL);
6470 const struct got_error *pack_err =
6471 got_repo_pack_fds_close(pack_fds);
6476 const struct got_error *close_err = got_repo_close(repo);
6481 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6489 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6490 "[-s reference] [name]\n", getprogname());
6494 static const struct got_error *
6495 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6497 static const struct got_error *err = NULL;
6498 struct got_reflist_head refs;
6499 struct got_reflist_entry *re;
6502 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6503 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6508 TAILQ_FOREACH(re, &refs, entry) {
6510 refstr = got_ref_to_str(re->ref);
6511 if (refstr == NULL) {
6512 err = got_error_from_errno("got_ref_to_str");
6515 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6519 got_ref_list_free(&refs);
6523 static const struct got_error *
6524 delete_ref_by_name(struct got_repository *repo, const char *refname)
6526 const struct got_error *err;
6527 struct got_reference *ref;
6529 err = got_ref_open(&ref, repo, refname, 0);
6533 err = delete_ref(repo, ref);
6538 static const struct got_error *
6539 add_ref(struct got_repository *repo, const char *refname, const char *target)
6541 const struct got_error *err = NULL;
6542 struct got_object_id *id = NULL;
6543 struct got_reference *ref = NULL;
6544 struct got_reflist_head refs;
6547 * Don't let the user create a reference name with a leading '-'.
6548 * While technically a valid reference name, this case is usually
6549 * an unintended typo.
6551 if (refname[0] == '-')
6552 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6555 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6558 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6560 got_ref_list_free(&refs);
6564 err = got_ref_alloc(&ref, refname, id);
6568 err = got_ref_write(ref, repo);
6576 static const struct got_error *
6577 add_symref(struct got_repository *repo, const char *refname, const char *target)
6579 const struct got_error *err = NULL;
6580 struct got_reference *ref = NULL;
6581 struct got_reference *target_ref = NULL;
6584 * Don't let the user create a reference name with a leading '-'.
6585 * While technically a valid reference name, this case is usually
6586 * an unintended typo.
6588 if (refname[0] == '-')
6589 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6591 err = got_ref_open(&target_ref, repo, target, 0);
6595 err = got_ref_alloc_symref(&ref, refname, target_ref);
6599 err = got_ref_write(ref, repo);
6602 got_ref_close(target_ref);
6608 static const struct got_error *
6609 cmd_ref(int argc, char *argv[])
6611 const struct got_error *error = NULL;
6612 struct got_repository *repo = NULL;
6613 struct got_worktree *worktree = NULL;
6614 char *cwd = NULL, *repo_path = NULL;
6615 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6616 const char *obj_arg = NULL, *symref_target= NULL;
6617 char *refname = NULL, *keyword_idstr = NULL;
6618 int *pack_fds = NULL;
6621 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6622 "sendfd unveil", NULL) == -1)
6626 while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6638 repo_path = realpath(optarg, NULL);
6639 if (repo_path == NULL)
6640 return got_error_from_errno2("realpath",
6642 got_path_strip_trailing_slashes(repo_path);
6645 symref_target = optarg;
6656 if (obj_arg && do_list)
6657 option_conflict('c', 'l');
6658 if (obj_arg && do_delete)
6659 option_conflict('c', 'd');
6660 if (obj_arg && symref_target)
6661 option_conflict('c', 's');
6662 if (symref_target && do_delete)
6663 option_conflict('s', 'd');
6664 if (symref_target && do_list)
6665 option_conflict('s', 'l');
6666 if (do_delete && do_list)
6667 option_conflict('d', 'l');
6668 if (sort_by_time && !do_list)
6669 errx(1, "-t option requires -l option");
6675 if (argc != 0 && argc != 1)
6678 refname = strdup(argv[0]);
6679 if (refname == NULL) {
6680 error = got_error_from_errno("strdup");
6687 refname = strdup(argv[0]);
6688 if (refname == NULL) {
6689 error = got_error_from_errno("strdup");
6695 got_path_strip_trailing_slashes(refname);
6697 cwd = getcwd(NULL, 0);
6699 error = got_error_from_errno("getcwd");
6703 error = got_repo_pack_fds_open(&pack_fds);
6707 if (repo_path == NULL) {
6708 error = got_worktree_open(&worktree, cwd,
6709 GOT_WORKTREE_GOT_DIR);
6710 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6716 strdup(got_worktree_get_repo_path(worktree));
6717 if (repo_path == NULL)
6718 error = got_error_from_errno("strdup");
6722 repo_path = strdup(cwd);
6723 if (repo_path == NULL) {
6724 error = got_error_from_errno("strdup");
6730 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6736 /* Remove "cpath" promise. */
6737 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6743 error = apply_unveil(got_repo_get_path(repo), do_list,
6744 worktree ? got_worktree_get_root_path(worktree) : NULL);
6749 error = list_refs(repo, refname, sort_by_time);
6751 error = delete_ref_by_name(repo, refname);
6752 else if (symref_target)
6753 error = add_symref(repo, refname, symref_target);
6755 if (obj_arg == NULL)
6758 error = got_keyword_to_idstr(&keyword_idstr, obj_arg,
6762 if (keyword_idstr != NULL)
6763 obj_arg = keyword_idstr;
6765 error = add_ref(repo, refname, obj_arg);
6770 const struct got_error *close_err = got_repo_close(repo);
6775 got_worktree_close(worktree);
6777 const struct got_error *pack_err =
6778 got_repo_pack_fds_close(pack_fds);
6784 free(keyword_idstr);
6791 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6792 "[-r repository-path] [name]\n", getprogname());
6796 static const struct got_error *
6797 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6798 struct got_reference *ref)
6800 const struct got_error *err = NULL;
6801 const char *refname;
6805 refname = got_ref_get_name(ref);
6806 if (worktree && strcmp(refname,
6807 got_worktree_get_head_ref_name(worktree)) == 0) {
6808 err = got_worktree_get_state(&marker, repo, worktree);
6813 if (strncmp(refname, "refs/heads/", 11) == 0)
6815 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6817 if (strncmp(refname, "refs/remotes/", 13) == 0)
6820 refstr = got_ref_to_str(ref);
6822 return got_error_from_errno("got_ref_to_str");
6824 printf("%c %s: %s\n", marker, refname, refstr);
6829 static const struct got_error *
6830 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6832 const char *refname;
6834 if (worktree == NULL)
6835 return got_error(GOT_ERR_NOT_WORKTREE);
6837 refname = got_worktree_get_head_ref_name(worktree);
6839 if (strncmp(refname, "refs/heads/", 11) == 0)
6841 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6844 printf("%s\n", refname);
6849 static const struct got_error *
6850 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6853 static const struct got_error *err = NULL;
6854 struct got_reflist_head refs;
6855 struct got_reflist_entry *re;
6856 struct got_reference *temp_ref = NULL;
6857 int rebase_in_progress, histedit_in_progress;
6862 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6867 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6872 if (rebase_in_progress || histedit_in_progress) {
6873 err = got_ref_open(&temp_ref, repo,
6874 got_worktree_get_head_ref_name(worktree), 0);
6877 list_branch(repo, worktree, temp_ref);
6878 got_ref_close(temp_ref);
6882 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6883 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6888 TAILQ_FOREACH(re, &refs, entry)
6889 list_branch(repo, worktree, re->ref);
6891 got_ref_list_free(&refs);
6893 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6894 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6899 TAILQ_FOREACH(re, &refs, entry)
6900 list_branch(repo, worktree, re->ref);
6902 got_ref_list_free(&refs);
6907 static const struct got_error *
6908 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6909 const char *branch_name)
6911 const struct got_error *err = NULL;
6912 struct got_reference *ref = NULL;
6913 char *refname, *remote_refname = NULL;
6915 if (strncmp(branch_name, "refs/", 5) == 0)
6917 if (strncmp(branch_name, "heads/", 6) == 0)
6919 else if (strncmp(branch_name, "remotes/", 8) == 0)
6922 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6923 return got_error_from_errno("asprintf");
6925 if (asprintf(&remote_refname, "refs/remotes/%s",
6926 branch_name) == -1) {
6927 err = got_error_from_errno("asprintf");
6931 err = got_ref_open(&ref, repo, refname, 0);
6933 const struct got_error *err2;
6934 if (err->code != GOT_ERR_NOT_REF)
6937 * Keep 'err' intact such that if neither branch exists
6938 * we report "refs/heads" rather than "refs/remotes" in
6939 * our error message.
6941 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6948 strcmp(got_worktree_get_head_ref_name(worktree),
6949 got_ref_get_name(ref)) == 0) {
6950 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6951 "will not delete this work tree's current branch");
6955 err = delete_ref(repo, ref);
6960 free(remote_refname);
6964 static const struct got_error *
6965 add_branch(struct got_repository *repo, const char *branch_name,
6966 struct got_object_id *base_commit_id)
6968 const struct got_error *err = NULL;
6969 struct got_reference *ref = NULL;
6970 char *refname = NULL;
6973 * Don't let the user create a branch name with a leading '-'.
6974 * While technically a valid reference name, this case is usually
6975 * an unintended typo.
6977 if (branch_name[0] == '-')
6978 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6980 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6983 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6984 err = got_error_from_errno("asprintf");
6988 err = got_ref_open(&ref, repo, refname, 0);
6990 err = got_error(GOT_ERR_BRANCH_EXISTS);
6992 } else if (err->code != GOT_ERR_NOT_REF)
6995 err = got_ref_alloc(&ref, refname, base_commit_id);
6999 err = got_ref_write(ref, repo);
7007 static const struct got_error *
7008 cmd_branch(int argc, char *argv[])
7010 const struct got_error *error = NULL;
7011 struct got_repository *repo = NULL;
7012 struct got_worktree *worktree = NULL;
7013 char *cwd = NULL, *repo_path = NULL;
7014 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
7015 const char *delref = NULL, *commit_id_arg = NULL;
7016 struct got_reference *ref = NULL;
7017 struct got_pathlist_head paths;
7018 struct got_object_id *commit_id = NULL;
7019 char *commit_id_str = NULL, *keyword_idstr = NULL;;
7020 int *pack_fds = NULL;
7025 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7026 "sendfd unveil", NULL) == -1)
7030 while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
7033 commit_id_arg = optarg;
7045 repo_path = realpath(optarg, NULL);
7046 if (repo_path == NULL)
7047 return got_error_from_errno2("realpath",
7049 got_path_strip_trailing_slashes(repo_path);
7060 if (do_list && delref)
7061 option_conflict('l', 'd');
7062 if (sort_by_time && !do_list)
7063 errx(1, "-t option requires -l option");
7068 if (!do_list && !delref && argc == 0)
7071 if ((do_list || delref || do_show) && commit_id_arg != NULL)
7072 errx(1, "-c option can only be used when creating a branch");
7074 if (do_list || delref) {
7077 } else if (!do_show && argc != 1)
7080 cwd = getcwd(NULL, 0);
7082 error = got_error_from_errno("getcwd");
7086 error = got_repo_pack_fds_open(&pack_fds);
7090 if (repo_path == NULL) {
7091 error = got_worktree_open(&worktree, cwd,
7092 GOT_WORKTREE_GOT_DIR);
7093 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7099 strdup(got_worktree_get_repo_path(worktree));
7100 if (repo_path == NULL)
7101 error = got_error_from_errno("strdup");
7105 repo_path = strdup(cwd);
7106 if (repo_path == NULL) {
7107 error = got_error_from_errno("strdup");
7113 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7118 if (do_list || do_show) {
7119 /* Remove "cpath" promise. */
7120 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7126 error = apply_unveil(got_repo_get_path(repo), do_list,
7127 worktree ? got_worktree_get_root_path(worktree) : NULL);
7132 error = show_current_branch(repo, worktree);
7134 error = list_branches(repo, worktree, sort_by_time);
7136 error = delete_branch(repo, worktree, delref);
7138 struct got_reflist_head refs;
7140 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
7144 if (commit_id_arg == NULL)
7145 commit_id_arg = worktree ?
7146 got_worktree_get_head_ref_name(worktree) :
7149 error = got_keyword_to_idstr(&keyword_idstr,
7150 commit_id_arg, repo, worktree);
7153 if (keyword_idstr != NULL)
7154 commit_id_arg = keyword_idstr;
7156 error = got_repo_match_object_id(&commit_id, NULL,
7157 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
7158 got_ref_list_free(&refs);
7161 error = add_branch(repo, argv[0], commit_id);
7164 if (worktree && do_update) {
7165 struct got_update_progress_arg upa;
7166 char *branch_refname = NULL;
7168 error = got_object_id_str(&commit_id_str, commit_id);
7171 error = get_worktree_paths_from_argv(&paths, 0, NULL,
7175 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7177 error = got_error_from_errno("asprintf");
7180 error = got_ref_open(&ref, repo, branch_refname, 0);
7181 free(branch_refname);
7184 error = switch_head_ref(ref, commit_id, worktree,
7188 error = got_worktree_set_base_commit_id(worktree, repo,
7192 memset(&upa, 0, sizeof(upa));
7193 error = got_worktree_checkout_files(worktree, &paths,
7194 repo, update_progress, &upa, check_cancelled,
7198 if (upa.did_something) {
7199 printf("Updated to %s: %s\n",
7200 got_worktree_get_head_ref_name(worktree),
7203 print_update_progress_stats(&upa);
7207 free(keyword_idstr);
7211 const struct got_error *close_err = got_repo_close(repo);
7216 got_worktree_close(worktree);
7218 const struct got_error *pack_err =
7219 got_repo_pack_fds_close(pack_fds);
7226 free(commit_id_str);
7227 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7235 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7236 "[-r repository-path] [-s signer-id] name\n", getprogname());
7241 static const struct got_error *
7242 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7244 const struct got_error *err = NULL;
7245 struct got_reflist_entry *re, *se, *new;
7246 struct got_object_id *re_id, *se_id;
7247 struct got_tag_object *re_tag, *se_tag;
7248 time_t re_time, se_time;
7250 STAILQ_FOREACH(re, tags, entry) {
7251 se = STAILQ_FIRST(sorted);
7253 err = got_reflist_entry_dup(&new, re);
7256 STAILQ_INSERT_HEAD(sorted, new, entry);
7259 err = got_ref_resolve(&re_id, repo, re->ref);
7262 err = got_object_open_as_tag(&re_tag, repo, re_id);
7266 re_time = got_object_tag_get_tagger_time(re_tag);
7267 got_object_tag_close(re_tag);
7271 err = got_ref_resolve(&se_id, repo, re->ref);
7274 err = got_object_open_as_tag(&se_tag, repo, se_id);
7278 se_time = got_object_tag_get_tagger_time(se_tag);
7279 got_object_tag_close(se_tag);
7281 if (se_time > re_time) {
7282 err = got_reflist_entry_dup(&new, re);
7285 STAILQ_INSERT_AFTER(sorted, se, new, entry);
7288 se = STAILQ_NEXT(se, entry);
7297 static const struct got_error *
7298 get_tag_refname(char **refname, const char *tag_name)
7300 const struct got_error *err;
7302 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7303 *refname = strdup(tag_name);
7304 if (*refname == NULL)
7305 return got_error_from_errno("strdup");
7306 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7307 err = got_error_from_errno("asprintf");
7315 static const struct got_error *
7316 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7317 const char *allowed_signers, const char *revoked_signers, int verbosity)
7319 static const struct got_error *err = NULL;
7320 struct got_reflist_head refs;
7321 struct got_reflist_entry *re;
7322 char *wanted_refname = NULL;
7327 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7332 struct got_reference *ref;
7333 err = get_tag_refname(&wanted_refname, tag_name);
7336 /* Wanted tag reference should exist. */
7337 err = got_ref_open(&ref, repo, wanted_refname, 0);
7343 TAILQ_FOREACH(re, &refs, entry) {
7344 const char *refname;
7345 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7347 const char *tagger, *ssh_sig = NULL;
7348 char *sig_msg = NULL;
7350 struct got_object_id *id;
7351 struct got_tag_object *tag;
7352 struct got_commit_object *commit = NULL;
7354 refname = got_ref_get_name(re->ref);
7355 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7356 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7359 refstr = got_ref_to_str(re->ref);
7360 if (refstr == NULL) {
7361 err = got_error_from_errno("got_ref_to_str");
7365 err = got_ref_resolve(&id, repo, re->ref);
7368 err = got_object_open_as_tag(&tag, repo, id);
7370 if (err->code != GOT_ERR_OBJ_TYPE) {
7374 /* "lightweight" tag */
7375 err = got_object_open_as_commit(&commit, repo, id);
7380 tagger = got_object_commit_get_committer(commit);
7382 got_object_commit_get_committer_time(commit);
7383 err = got_object_id_str(&id_str, id);
7389 tagger = got_object_tag_get_tagger(tag);
7390 tagger_time = got_object_tag_get_tagger_time(tag);
7391 err = got_object_id_str(&id_str,
7392 got_object_tag_get_object_id(tag));
7397 if (tag && verify_tags) {
7398 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7399 got_object_tag_get_message(tag));
7400 if (ssh_sig && allowed_signers == NULL) {
7401 err = got_error_msg(
7402 GOT_ERR_VERIFY_TAG_SIGNATURE,
7403 "SSH signature verification requires "
7404 "setting allowed_signers in "
7410 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7412 printf("from: %s\n", tagger);
7413 datestr = get_datestr(&tagger_time, datebuf);
7415 printf("date: %s UTC\n", datestr);
7417 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7419 switch (got_object_tag_get_object_type(tag)) {
7420 case GOT_OBJ_TYPE_BLOB:
7421 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7424 case GOT_OBJ_TYPE_TREE:
7425 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7428 case GOT_OBJ_TYPE_COMMIT:
7429 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7432 case GOT_OBJ_TYPE_TAG:
7433 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7443 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7444 allowed_signers, revoked_signers, verbosity);
7445 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7449 printf("signature: %s", sig_msg);
7455 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7458 got_object_commit_close(commit);
7460 tagmsg0 = strdup(got_object_tag_get_message(tag));
7461 got_object_tag_close(tag);
7462 if (tagmsg0 == NULL) {
7463 err = got_error_from_errno("strdup");
7470 line = strsep(&tagmsg, "\n");
7472 printf(" %s\n", line);
7477 got_ref_list_free(&refs);
7478 free(wanted_refname);
7480 if (err == NULL && bad_sigs)
7481 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7485 static const struct got_error *
7486 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7487 const char *tag_name, const char *repo_path)
7489 const struct got_error *err = NULL;
7490 char *template = NULL, *initial_content = NULL;
7491 char *editor = NULL;
7492 int initial_content_len;
7495 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7496 err = got_error_from_errno("asprintf");
7500 initial_content_len = asprintf(&initial_content,
7501 "\n# tagging commit %s as %s\n",
7502 commit_id_str, tag_name);
7503 if (initial_content_len == -1) {
7504 err = got_error_from_errno("asprintf");
7508 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7512 if (write(fd, initial_content, initial_content_len) == -1) {
7513 err = got_error_from_errno2("write", *tagmsg_path);
7516 if (close(fd) == -1) {
7517 err = got_error_from_errno2("close", *tagmsg_path);
7522 err = get_editor(&editor);
7525 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7526 initial_content_len, 1);
7528 free(initial_content);
7532 if (fd != -1 && close(fd) == -1 && err == NULL)
7533 err = got_error_from_errno2("close", *tagmsg_path);
7542 static const struct got_error *
7543 add_tag(struct got_repository *repo, const char *tagger,
7544 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7545 const char *signer_id, int verbosity)
7547 const struct got_error *err = NULL;
7548 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7549 char *label = NULL, *commit_id_str = NULL;
7550 struct got_reference *ref = NULL;
7551 char *refname = NULL, *tagmsg = NULL;
7552 char *tagmsg_path = NULL, *tag_id_str = NULL;
7553 int preserve_tagmsg = 0;
7554 struct got_reflist_head refs;
7559 * Don't let the user create a tag name with a leading '-'.
7560 * While technically a valid reference name, this case is usually
7561 * an unintended typo.
7563 if (tag_name[0] == '-')
7564 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7566 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7570 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7571 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7575 err = got_object_id_str(&commit_id_str, commit_id);
7579 err = get_tag_refname(&refname, tag_name);
7582 if (strncmp("refs/tags/", tag_name, 10) == 0)
7585 err = got_ref_open(&ref, repo, refname, 0);
7587 err = got_error(GOT_ERR_TAG_EXISTS);
7589 } else if (err->code != GOT_ERR_NOT_REF)
7592 if (tagmsg_arg == NULL) {
7593 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7594 tag_name, got_repo_get_path(repo));
7596 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7597 tagmsg_path != NULL)
7598 preserve_tagmsg = 1;
7601 /* Editor is done; we can now apply unveil(2) */
7602 err = got_sigs_apply_unveil();
7605 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
7610 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7611 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7615 preserve_tagmsg = 1;
7619 err = got_ref_alloc(&ref, refname, tag_id);
7622 preserve_tagmsg = 1;
7626 err = got_ref_write(ref, repo);
7629 preserve_tagmsg = 1;
7633 err = got_object_id_str(&tag_id_str, tag_id);
7636 preserve_tagmsg = 1;
7639 printf("Created tag %s\n", tag_id_str);
7641 if (preserve_tagmsg) {
7642 fprintf(stderr, "%s: tag message preserved in %s\n",
7643 getprogname(), tagmsg_path);
7644 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7645 err = got_error_from_errno2("unlink", tagmsg_path);
7650 free(commit_id_str);
7654 got_ref_list_free(&refs);
7658 static const struct got_error *
7659 cmd_tag(int argc, char *argv[])
7661 const struct got_error *error = NULL;
7662 struct got_repository *repo = NULL;
7663 struct got_worktree *worktree = NULL;
7664 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7665 char *gitconfig_path = NULL, *tagger = NULL, *keyword_idstr = NULL;
7666 char *allowed_signers = NULL, *revoked_signers = NULL;
7667 const char *signer_id = NULL;
7668 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7669 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7670 int *pack_fds = NULL;
7673 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7674 "sendfd unveil", NULL) == -1)
7678 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7681 commit_id_arg = optarg;
7690 repo_path = realpath(optarg, NULL);
7691 if (repo_path == NULL) {
7692 error = got_error_from_errno2("realpath",
7696 got_path_strip_trailing_slashes(repo_path);
7707 else if (verbosity < 3)
7719 if (do_list || verify_tags) {
7720 if (commit_id_arg != NULL)
7722 "-c option can only be used when creating a tag");
7725 option_conflict('l', 'm');
7727 option_conflict('V', 'm');
7731 option_conflict('l', 's');
7733 option_conflict('V', 's');
7737 } else if (argc != 1)
7743 cwd = getcwd(NULL, 0);
7745 error = got_error_from_errno("getcwd");
7749 error = got_repo_pack_fds_open(&pack_fds);
7753 if (repo_path == NULL) {
7754 error = got_worktree_open(&worktree, cwd,
7755 GOT_WORKTREE_GOT_DIR);
7756 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7762 strdup(got_worktree_get_repo_path(worktree));
7763 if (repo_path == NULL)
7764 error = got_error_from_errno("strdup");
7768 repo_path = strdup(cwd);
7769 if (repo_path == NULL) {
7770 error = got_error_from_errno("strdup");
7776 if (do_list || verify_tags) {
7777 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7780 error = get_allowed_signers(&allowed_signers, repo, worktree);
7783 error = get_revoked_signers(&revoked_signers, repo, worktree);
7787 /* Release work tree lock. */
7788 got_worktree_close(worktree);
7793 * Remove "cpath" promise unless needed for signature tmpfile
7797 got_sigs_apply_unveil();
7800 if (pledge("stdio rpath wpath flock proc exec sendfd "
7801 "unveil", NULL) == -1)
7805 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7808 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7809 revoked_signers, verbosity);
7811 error = get_gitconfig_path(&gitconfig_path);
7814 error = got_repo_open(&repo, repo_path, gitconfig_path,
7819 error = get_author(&tagger, repo, worktree);
7822 if (signer_id == NULL)
7823 signer_id = get_signer_id(repo, worktree);
7827 error = got_sigs_apply_unveil();
7831 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7836 if (commit_id_arg == NULL) {
7837 struct got_reference *head_ref;
7838 struct got_object_id *commit_id;
7839 error = got_ref_open(&head_ref, repo,
7840 worktree ? got_worktree_get_head_ref_name(worktree)
7844 error = got_ref_resolve(&commit_id, repo, head_ref);
7845 got_ref_close(head_ref);
7848 error = got_object_id_str(&commit_id_str, commit_id);
7853 error = got_keyword_to_idstr(&keyword_idstr,
7854 commit_id_arg, repo, worktree);
7857 commit_id_str = keyword_idstr;
7861 /* Release work tree lock. */
7862 got_worktree_close(worktree);
7866 error = add_tag(repo, tagger, tag_name,
7867 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7868 signer_id, verbosity);
7872 const struct got_error *close_err = got_repo_close(repo);
7877 got_worktree_close(worktree);
7879 const struct got_error *pack_err =
7880 got_repo_pack_fds_close(pack_fds);
7886 free(gitconfig_path);
7887 free(commit_id_str);
7889 free(allowed_signers);
7890 free(revoked_signers);
7897 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
7901 static const struct got_error *
7902 add_progress(void *arg, unsigned char status, const char *path)
7904 while (path[0] == '/')
7906 printf("%c %s\n", status, path);
7910 static const struct got_error *
7911 cmd_add(int argc, char *argv[])
7913 const struct got_error *error = NULL;
7914 struct got_repository *repo = NULL;
7915 struct got_worktree *worktree = NULL;
7917 struct got_pathlist_head paths;
7918 struct got_pathlist_entry *pe;
7919 int ch, can_recurse = 0, no_ignores = 0;
7920 int *pack_fds = NULL;
7925 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7930 while ((ch = getopt(argc, argv, "IR")) != -1) {
7950 cwd = getcwd(NULL, 0);
7952 error = got_error_from_errno("getcwd");
7956 error = got_repo_pack_fds_open(&pack_fds);
7960 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
7962 if (error->code == GOT_ERR_NOT_WORKTREE)
7963 error = wrap_not_worktree_error(error, "add", cwd);
7967 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7972 error = apply_unveil(got_repo_get_path(repo), 1,
7973 got_worktree_get_root_path(worktree));
7977 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7984 TAILQ_FOREACH(pe, &paths, entry) {
7985 if (asprintf(&ondisk_path, "%s/%s",
7986 got_worktree_get_root_path(worktree),
7988 error = got_error_from_errno("asprintf");
7991 if (lstat(ondisk_path, &sb) == -1) {
7992 if (errno == ENOENT) {
7996 error = got_error_from_errno2("lstat",
8002 if (S_ISDIR(sb.st_mode)) {
8003 error = got_error_msg(GOT_ERR_BAD_PATH,
8004 "adding directories requires -R option");
8010 error = got_worktree_schedule_add(worktree, &paths, add_progress,
8011 NULL, repo, no_ignores);
8014 const struct got_error *close_err = got_repo_close(repo);
8019 got_worktree_close(worktree);
8021 const struct got_error *pack_err =
8022 got_repo_pack_fds_close(pack_fds);
8026 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8034 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
8039 static const struct got_error *
8040 print_remove_status(void *arg, unsigned char status,
8041 unsigned char staged_status, const char *path)
8043 while (path[0] == '/')
8045 if (status == GOT_STATUS_NONEXISTENT)
8047 if (status == staged_status && (status == GOT_STATUS_DELETE))
8048 status = GOT_STATUS_NO_CHANGE;
8049 printf("%c%c %s\n", status, staged_status, path);
8053 static const struct got_error *
8054 cmd_remove(int argc, char *argv[])
8056 const struct got_error *error = NULL;
8057 struct got_worktree *worktree = NULL;
8058 struct got_repository *repo = NULL;
8059 const char *status_codes = NULL;
8061 struct got_pathlist_head paths;
8062 struct got_pathlist_entry *pe;
8063 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
8064 int ignore_missing_paths = 0;
8065 int *pack_fds = NULL;
8070 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8075 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
8078 delete_local_mods = 1;
8079 ignore_missing_paths = 1;
8088 for (i = 0; optarg[i] != '\0'; i++) {
8089 switch (optarg[i]) {
8090 case GOT_STATUS_MODIFY:
8091 delete_local_mods = 1;
8093 case GOT_STATUS_MISSING:
8094 ignore_missing_paths = 1;
8097 errx(1, "invalid status code '%c'",
8101 status_codes = optarg;
8115 cwd = getcwd(NULL, 0);
8117 error = got_error_from_errno("getcwd");
8121 error = got_repo_pack_fds_open(&pack_fds);
8125 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8127 if (error->code == GOT_ERR_NOT_WORKTREE)
8128 error = wrap_not_worktree_error(error, "remove", cwd);
8132 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8137 error = apply_unveil(got_repo_get_path(repo), 1,
8138 got_worktree_get_root_path(worktree));
8142 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8149 TAILQ_FOREACH(pe, &paths, entry) {
8150 if (asprintf(&ondisk_path, "%s/%s",
8151 got_worktree_get_root_path(worktree),
8153 error = got_error_from_errno("asprintf");
8156 if (lstat(ondisk_path, &sb) == -1) {
8157 if (errno == ENOENT) {
8161 error = got_error_from_errno2("lstat",
8167 if (S_ISDIR(sb.st_mode)) {
8168 error = got_error_msg(GOT_ERR_BAD_PATH,
8169 "removing directories requires -R option");
8175 error = got_worktree_schedule_delete(worktree, &paths,
8176 delete_local_mods, status_codes, print_remove_status, NULL,
8177 repo, keep_on_disk, ignore_missing_paths);
8180 const struct got_error *close_err = got_repo_close(repo);
8185 got_worktree_close(worktree);
8187 const struct got_error *pack_err =
8188 got_repo_pack_fds_close(pack_fds);
8192 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8200 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8201 "[patchfile]\n", getprogname());
8205 static const struct got_error *
8206 patch_from_stdin(int *patchfd)
8208 const struct got_error *err = NULL;
8211 sig_t sighup, sigint, sigquit;
8213 *patchfd = got_opentempfd();
8215 return got_error_from_errno("got_opentempfd");
8217 sighup = signal(SIGHUP, SIG_DFL);
8218 sigint = signal(SIGINT, SIG_DFL);
8219 sigquit = signal(SIGQUIT, SIG_DFL);
8222 r = read(0, buf, sizeof(buf));
8224 err = got_error_from_errno("read");
8229 if (write(*patchfd, buf, r) == -1) {
8230 err = got_error_from_errno("write");
8235 signal(SIGHUP, sighup);
8236 signal(SIGINT, sigint);
8237 signal(SIGQUIT, sigquit);
8239 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8240 err = got_error_from_errno("lseek");
8250 struct got_patch_progress_arg {
8256 static const struct got_error *
8257 patch_progress(void *arg, const char *old, const char *new,
8258 unsigned char status, const struct got_error *error, int old_from,
8259 int old_lines, int new_from, int new_lines, int offset,
8260 int ws_mangled, const struct got_error *hunk_err)
8262 const char *path = new == NULL ? old : new;
8263 struct got_patch_progress_arg *a = arg;
8265 while (*path == '/')
8268 if (status != GOT_STATUS_NO_CHANGE &&
8269 status != 0 /* per-hunk progress */) {
8270 printf("%c %s\n", status, path);
8271 a->did_something = 1;
8274 if (hunk_err == NULL) {
8275 if (status == GOT_STATUS_CANNOT_UPDATE)
8277 else if (status == GOT_STATUS_CONFLICT)
8282 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8284 if (offset != 0 || hunk_err != NULL || ws_mangled) {
8285 printf("@@ -%d,%d +%d,%d @@ ", old_from,
8286 old_lines, new_from, new_lines);
8287 if (hunk_err != NULL)
8288 printf("%s\n", hunk_err->msg);
8289 else if (offset != 0)
8290 printf("applied with offset %d\n", offset);
8292 printf("hunk contains mangled whitespace\n");
8299 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
8301 if (!ppa->did_something)
8304 if (ppa->conflicts > 0)
8305 printf("Files with merge conflicts: %d\n", ppa->conflicts);
8307 if (ppa->rejects > 0) {
8308 printf("Files where patch failed to apply: %d\n",
8313 static const struct got_error *
8314 cmd_patch(int argc, char *argv[])
8316 const struct got_error *error = NULL, *close_error = NULL;
8317 struct got_worktree *worktree = NULL;
8318 struct got_repository *repo = NULL;
8319 struct got_reflist_head refs;
8320 struct got_object_id *commit_id = NULL;
8321 const char *commit_id_str = NULL;
8324 char *cwd = NULL, *keyword_idstr = NULL;
8325 int ch, nop = 0, strip = -1, reverse = 0;
8327 int *pack_fds = NULL;
8328 struct got_patch_progress_arg ppa;
8333 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8334 "unveil", NULL) == -1)
8338 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8341 commit_id_str = optarg;
8347 strip = strtonum(optarg, 0, INT_MAX, &errstr);
8349 errx(1, "pathname strip count is %s: %s",
8365 error = patch_from_stdin(&patchfd);
8368 } else if (argc == 1) {
8369 patchfd = open(argv[0], O_RDONLY);
8370 if (patchfd == -1) {
8371 error = got_error_from_errno2("open", argv[0]);
8374 if (fstat(patchfd, &sb) == -1) {
8375 error = got_error_from_errno2("fstat", argv[0]);
8378 if (!S_ISREG(sb.st_mode)) {
8379 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8385 if ((cwd = getcwd(NULL, 0)) == NULL) {
8386 error = got_error_from_errno("getcwd");
8390 error = got_repo_pack_fds_open(&pack_fds);
8394 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8398 const char *repo_path = got_worktree_get_repo_path(worktree);
8399 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8403 error = apply_unveil(got_repo_get_path(repo), 0,
8404 got_worktree_get_root_path(worktree));
8408 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8412 if (commit_id_str != NULL) {
8413 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
8418 error = got_repo_match_object_id(&commit_id, NULL,
8419 keyword_idstr != NULL ? keyword_idstr : commit_id_str,
8420 GOT_OBJ_TYPE_COMMIT, &refs, repo);
8425 memset(&ppa, 0, sizeof(ppa));
8426 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8427 commit_id, patch_progress, &ppa, check_cancelled, NULL);
8428 print_patch_progress_stats(&ppa);
8430 got_ref_list_free(&refs);
8431 free(keyword_idstr);
8434 close_error = got_repo_close(repo);
8436 error = close_error;
8438 if (worktree != NULL) {
8439 close_error = got_worktree_close(worktree);
8441 error = close_error;
8444 const struct got_error *pack_err =
8445 got_repo_pack_fds_close(pack_fds);
8456 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8461 static const struct got_error *
8462 revert_progress(void *arg, unsigned char status, const char *path)
8464 if (status == GOT_STATUS_UNVERSIONED)
8467 while (path[0] == '/')
8469 printf("%c %s\n", status, path);
8473 struct choose_patch_arg {
8474 FILE *patch_script_file;
8478 static const struct got_error *
8479 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8480 int nchanges, const char *action)
8482 const struct got_error *err;
8484 size_t linesize = 0;
8488 case GOT_STATUS_ADD:
8489 printf("A %s\n%s this addition? [y/n] ", path, action);
8491 case GOT_STATUS_DELETE:
8492 printf("D %s\n%s this deletion? [y/n] ", path, action);
8494 case GOT_STATUS_MODIFY:
8495 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8496 return got_error_from_errno("fseek");
8497 printf(GOT_COMMIT_SEP_STR);
8498 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8500 if (linelen == -1 && ferror(patch_file)) {
8501 err = got_error_from_errno("getline");
8506 printf(GOT_COMMIT_SEP_STR);
8507 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8508 path, n, nchanges, action);
8511 return got_error_path(path, GOT_ERR_FILE_STATUS);
8518 static const struct got_error *
8519 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8520 FILE *patch_file, int n, int nchanges)
8522 const struct got_error *err = NULL;
8524 size_t linesize = 0;
8527 struct choose_patch_arg *a = arg;
8529 *choice = GOT_PATCH_CHOICE_NONE;
8531 if (a->patch_script_file) {
8533 err = show_change(status, path, patch_file, n, nchanges,
8537 linelen = getline(&line, &linesize, a->patch_script_file);
8538 if (linelen == -1) {
8539 if (ferror(a->patch_script_file))
8540 return got_error_from_errno("getline");
8543 nl = strchr(line, '\n');
8546 if (strcmp(line, "y") == 0) {
8547 *choice = GOT_PATCH_CHOICE_YES;
8549 } else if (strcmp(line, "n") == 0) {
8550 *choice = GOT_PATCH_CHOICE_NO;
8552 } else if (strcmp(line, "q") == 0 &&
8553 status == GOT_STATUS_MODIFY) {
8554 *choice = GOT_PATCH_CHOICE_QUIT;
8557 printf("invalid response '%s'\n", line);
8562 while (resp != 'y' && resp != 'n' && resp != 'q') {
8563 err = show_change(status, path, patch_file, n, nchanges,
8570 if (status == GOT_STATUS_MODIFY) {
8571 if (resp != 'y' && resp != 'n' && resp != 'q') {
8572 printf("invalid response '%c'\n", resp);
8575 } else if (resp != 'y' && resp != 'n') {
8576 printf("invalid response '%c'\n", resp);
8582 *choice = GOT_PATCH_CHOICE_YES;
8583 else if (resp == 'n')
8584 *choice = GOT_PATCH_CHOICE_NO;
8585 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8586 *choice = GOT_PATCH_CHOICE_QUIT;
8591 struct wt_commitable_path_arg {
8592 struct got_pathlist_head *commit_paths;
8597 * Shortcut work tree status callback to determine if the set of paths scanned
8598 * has at least one versioned path that is being modified and, if not NULL, is
8599 * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
8600 * soon as a path is passed with a status that satisfies this criteria.
8602 static const struct got_error *
8603 worktree_has_commitable_path(void *arg, unsigned char status,
8604 unsigned char staged_status, const char *path,
8605 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8606 struct got_object_id *commit_id, int dirfd, const char *de_name)
8608 struct wt_commitable_path_arg *a = arg;
8610 if (status == staged_status && (status == GOT_STATUS_DELETE))
8611 status = GOT_STATUS_NO_CHANGE;
8613 if (!(status == GOT_STATUS_NO_CHANGE ||
8614 status == GOT_STATUS_UNVERSIONED) ||
8615 staged_status != GOT_STATUS_NO_CHANGE) {
8616 if (a->commit_paths != NULL) {
8617 struct got_pathlist_entry *pe;
8619 TAILQ_FOREACH(pe, a->commit_paths, entry) {
8620 if (strncmp(path, pe->path,
8621 pe->path_len) == 0) {
8622 *a->has_changes = 1;
8627 *a->has_changes = 1;
8629 if (*a->has_changes)
8630 return got_error(GOT_ERR_FILE_MODIFIED);
8637 * Check that the changeset of the commit identified by id is
8638 * comprised of at least one modified path that is being committed.
8640 static const struct got_error *
8641 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
8642 struct got_object_id *id, struct got_worktree *worktree,
8643 struct got_repository *repo)
8645 const struct got_error *err;
8646 struct got_pathlist_head paths;
8647 struct got_commit_object *commit = NULL, *pcommit = NULL;
8648 struct got_tree_object *tree = NULL, *ptree = NULL;
8649 struct got_object_qid *pid;
8653 err = got_object_open_as_commit(&commit, repo, id);
8657 err = got_object_open_as_tree(&tree, repo,
8658 got_object_commit_get_tree_id(commit));
8662 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8664 err = got_object_open_as_commit(&pcommit, repo, &pid->id);
8668 err = got_object_open_as_tree(&ptree, repo,
8669 got_object_commit_get_tree_id(pcommit));
8674 err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
8675 got_diff_tree_collect_changed_paths, &paths, 0);
8679 err = got_worktree_status(worktree, &paths, repo, 0,
8680 worktree_has_commitable_path, wcpa, check_cancelled, NULL);
8681 if (err && err->code == GOT_ERR_FILE_MODIFIED) {
8683 * At least one changed path in the referenced commit is
8684 * modified in the work tree, that's all we need to know!
8690 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8692 got_object_commit_close(commit);
8694 got_object_commit_close(pcommit);
8696 got_object_tree_close(tree);
8698 got_object_tree_close(ptree);
8703 * Remove any "logmsg" reference comprised entirely of paths that have
8704 * been reverted in this work tree. If any path in the logmsg ref changeset
8705 * remains in a changed state in the worktree, do not remove the reference.
8707 static const struct got_error *
8708 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
8710 const struct got_error *err;
8711 struct got_reflist_head refs;
8712 struct got_reflist_entry *re;
8713 struct got_commit_object *commit = NULL;
8714 struct got_object_id *commit_id = NULL;
8715 struct wt_commitable_path_arg wcpa;
8716 char *uuidstr = NULL;
8720 err = got_worktree_get_uuid(&uuidstr, worktree);
8724 err = got_ref_list(&refs, repo, "refs/got/worktree",
8725 got_ref_cmp_by_name, repo);
8729 TAILQ_FOREACH(re, &refs, entry) {
8730 const char *refname;
8731 int has_changes = 0;
8733 refname = got_ref_get_name(re->ref);
8735 if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8736 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
8737 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
8738 else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8739 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
8740 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
8744 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
8745 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8749 err = got_repo_match_object_id(&commit_id, NULL, refname,
8750 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8754 err = got_object_open_as_commit(&commit, repo, commit_id);
8758 wcpa.commit_paths = NULL;
8759 wcpa.has_changes = &has_changes;
8761 err = commit_path_changed_in_worktree(&wcpa, commit_id,
8767 err = got_ref_delete(re->ref, repo);
8772 got_object_commit_close(commit);
8781 got_ref_list_free(&refs);
8783 got_object_commit_close(commit);
8787 static const struct got_error *
8788 cmd_revert(int argc, char *argv[])
8790 const struct got_error *error = NULL;
8791 struct got_worktree *worktree = NULL;
8792 struct got_repository *repo = NULL;
8793 char *cwd = NULL, *path = NULL;
8794 struct got_pathlist_head paths;
8795 struct got_pathlist_entry *pe;
8796 int ch, can_recurse = 0, pflag = 0;
8797 FILE *patch_script_file = NULL;
8798 const char *patch_script_path = NULL;
8799 struct choose_patch_arg cpa;
8800 int *pack_fds = NULL;
8805 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8806 "unveil", NULL) == -1)
8810 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8813 patch_script_path = optarg;
8832 if (patch_script_path && !pflag)
8833 errx(1, "-F option can only be used together with -p option");
8835 cwd = getcwd(NULL, 0);
8837 error = got_error_from_errno("getcwd");
8841 error = got_repo_pack_fds_open(&pack_fds);
8845 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8847 if (error->code == GOT_ERR_NOT_WORKTREE)
8848 error = wrap_not_worktree_error(error, "revert", cwd);
8852 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8857 if (patch_script_path) {
8858 patch_script_file = fopen(patch_script_path, "re");
8859 if (patch_script_file == NULL) {
8860 error = got_error_from_errno2("fopen",
8867 * XXX "c" perm needed on repo dir to delete merge references.
8869 error = apply_unveil(got_repo_get_path(repo), 0,
8870 got_worktree_get_root_path(worktree));
8874 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8881 TAILQ_FOREACH(pe, &paths, entry) {
8882 if (asprintf(&ondisk_path, "%s/%s",
8883 got_worktree_get_root_path(worktree),
8885 error = got_error_from_errno("asprintf");
8888 if (lstat(ondisk_path, &sb) == -1) {
8889 if (errno == ENOENT) {
8893 error = got_error_from_errno2("lstat",
8899 if (S_ISDIR(sb.st_mode)) {
8900 error = got_error_msg(GOT_ERR_BAD_PATH,
8901 "reverting directories requires -R option");
8907 cpa.patch_script_file = patch_script_file;
8908 cpa.action = "revert";
8909 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8910 pflag ? choose_patch : NULL, &cpa, repo);
8912 error = rm_logmsg_ref(worktree, repo);
8914 if (patch_script_file && fclose(patch_script_file) == EOF &&
8916 error = got_error_from_errno2("fclose", patch_script_path);
8918 const struct got_error *close_err = got_repo_close(repo);
8923 got_worktree_close(worktree);
8925 const struct got_error *pack_err =
8926 got_repo_pack_fds_close(pack_fds);
8930 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8939 fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
8940 "[-m message] [path ...]\n", getprogname());
8944 struct collect_commit_logmsg_arg {
8945 const char *cmdline_log;
8946 const char *prepared_log;
8947 const char *merged_log;
8948 int non_interactive;
8950 const char *worktree_path;
8951 const char *branch_name;
8952 const char *repo_path;
8957 static const struct got_error *
8958 read_prepared_logmsg(char **logmsg, const char *path)
8960 const struct got_error *err = NULL;
8966 memset(&sb, 0, sizeof(sb));
8968 f = fopen(path, "re");
8970 return got_error_from_errno2("fopen", path);
8972 if (fstat(fileno(f), &sb) == -1) {
8973 err = got_error_from_errno2("fstat", path);
8976 if (sb.st_size == 0) {
8977 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8981 *logmsg = malloc(sb.st_size + 1);
8982 if (*logmsg == NULL) {
8983 err = got_error_from_errno("malloc");
8987 r = fread(*logmsg, 1, sb.st_size, f);
8988 if (r != sb.st_size) {
8990 err = got_error_from_errno2("fread", path);
8992 err = got_error(GOT_ERR_IO);
8995 (*logmsg)[sb.st_size] = '\0';
8997 if (fclose(f) == EOF && err == NULL)
8998 err = got_error_from_errno2("fclose", path);
9006 static const struct got_error *
9007 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
9008 const char *diff_path, char **logmsg, void *arg)
9010 char *initial_content = NULL;
9011 struct got_pathlist_entry *pe;
9012 const struct got_error *err = NULL;
9013 char *template = NULL;
9014 char *prepared_msg = NULL, *merged_msg = NULL;
9015 struct collect_commit_logmsg_arg *a = arg;
9016 int initial_content_len;
9020 /* if a message was specified on the command line, just use it */
9021 if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
9022 len = strlen(a->cmdline_log) + 1;
9023 *logmsg = malloc(len + 1);
9024 if (*logmsg == NULL)
9025 return got_error_from_errno("malloc");
9026 strlcpy(*logmsg, a->cmdline_log, len);
9028 } else if (a->prepared_log != NULL && a->non_interactive)
9029 return read_prepared_logmsg(logmsg, a->prepared_log);
9031 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
9032 return got_error_from_errno("asprintf");
9034 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
9038 if (a->prepared_log) {
9039 err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
9042 } else if (a->merged_log) {
9043 err = read_prepared_logmsg(&merged_msg, a->merged_log);
9048 initial_content_len = asprintf(&initial_content,
9049 "%s%s\n# changes to be committed on branch %s:\n",
9050 prepared_msg ? prepared_msg : "",
9051 merged_msg ? merged_msg : "", a->branch_name);
9052 if (initial_content_len == -1) {
9053 err = got_error_from_errno("asprintf");
9057 if (write(fd, initial_content, initial_content_len) == -1) {
9058 err = got_error_from_errno2("write", a->logmsg_path);
9062 TAILQ_FOREACH(pe, commitable_paths, entry) {
9063 struct got_commitable *ct = pe->data;
9064 dprintf(fd, "# %c %s\n",
9065 got_commitable_get_status(ct),
9066 got_commitable_get_path(ct));
9070 dprintf(fd, "# detailed changes can be viewed in %s\n",
9074 if (close(fd) == -1) {
9075 err = got_error_from_errno2("close", a->logmsg_path);
9080 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
9081 initial_content_len, a->prepared_log ? 0 : 1);
9083 free(initial_content);
9088 if (fd != -1 && close(fd) == -1 && err == NULL)
9089 err = got_error_from_errno2("close", a->logmsg_path);
9091 /* Editor is done; we can now apply unveil(2) */
9093 err = apply_unveil(a->repo_path, 0, a->worktree_path);
9101 static const struct got_error *
9102 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
9103 const char *type, int has_content)
9105 const struct got_error *err = NULL;
9106 char *logmsg = NULL;
9108 err = got_object_commit_get_logmsg(&logmsg, commit);
9112 if (fprintf(f, "%s# log message of %s commit %s:%s",
9113 has_content ? "\n" : "", type, idstr, logmsg) < 0)
9114 err = got_ferror(f, GOT_ERR_IO);
9121 * Lookup "logmsg" references of backed-out and cherrypicked commits
9122 * belonging to the current work tree. If found, and the worktree has
9123 * at least one modified file that was changed in the referenced commit,
9124 * add its log message to a new temporary file at *logmsg_path.
9125 * Add all refs found to matched_refs to be scheduled for removal on
9126 * successful commit.
9128 static const struct got_error *
9129 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
9130 struct got_reflist_head *matched_refs, struct got_worktree *worktree,
9131 struct got_repository *repo)
9133 const struct got_error *err;
9134 struct got_commit_object *commit = NULL;
9135 struct got_object_id *id = NULL;
9136 struct got_reflist_head refs;
9137 struct got_reflist_entry *re, *re_match;
9139 char *uuidstr = NULL;
9140 int added_logmsg = 0;
9144 *logmsg_path = NULL;
9146 err = got_worktree_get_uuid(&uuidstr, worktree);
9150 err = got_ref_list(&refs, repo, "refs/got/worktree",
9151 got_ref_cmp_by_name, repo);
9155 TAILQ_FOREACH(re, &refs, entry) {
9156 const char *refname, *type;
9157 struct wt_commitable_path_arg wcpa;
9160 refname = got_ref_get_name(re->ref);
9162 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
9163 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
9164 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
9165 type = "cherrypicked";
9166 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
9167 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
9168 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
9169 type = "backed-out";
9173 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
9174 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
9178 err = got_repo_match_object_id(&id, NULL, refname,
9179 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9183 err = got_object_open_as_commit(&commit, repo, id);
9187 wcpa.commit_paths = paths;
9188 wcpa.has_changes = &add_logmsg;
9190 err = commit_path_changed_in_worktree(&wcpa, id,
9197 err = got_opentemp_named(logmsg_path, &f,
9198 "got-commit-logmsg", "");
9202 err = cat_logmsg(f, commit, refname, type,
9209 err = got_reflist_entry_dup(&re_match, re);
9212 TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
9215 got_object_commit_close(commit);
9224 got_ref_list_free(&refs);
9226 got_object_commit_close(commit);
9227 if (f && fclose(f) == EOF && err == NULL)
9228 err = got_error_from_errno("fclose");
9229 if (!added_logmsg) {
9230 if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
9231 err = got_error_from_errno2("unlink", *logmsg_path);
9232 *logmsg_path = NULL;
9237 static const struct got_error *
9238 cmd_commit(int argc, char *argv[])
9240 const struct got_error *error = NULL;
9241 struct got_worktree *worktree = NULL;
9242 struct got_repository *repo = NULL;
9243 char *cwd = NULL, *id_str = NULL;
9244 struct got_object_id *id = NULL;
9245 const char *logmsg = NULL;
9246 char *prepared_logmsg = NULL, *merged_logmsg = NULL;
9247 struct collect_commit_logmsg_arg cl_arg;
9248 const char *author = NULL;
9249 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
9250 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
9251 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
9252 int show_diff = 1, commit_conflicts = 0;
9253 struct got_pathlist_head paths;
9254 struct got_reflist_head refs;
9255 struct got_reflist_entry *re;
9256 int *pack_fds = NULL;
9260 cl_arg.logmsg_path = NULL;
9263 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9264 "unveil", NULL) == -1)
9268 while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
9272 error = valid_author(author);
9277 commit_conflicts = 1;
9281 option_conflict('F', 'm');
9282 prepared_logmsg = realpath(optarg, NULL);
9283 if (prepared_logmsg == NULL)
9284 return got_error_from_errno2("realpath",
9288 if (prepared_logmsg)
9289 option_conflict('m', 'F');
9293 non_interactive = 1;
9299 allow_bad_symlinks = 1;
9310 cwd = getcwd(NULL, 0);
9312 error = got_error_from_errno("getcwd");
9316 error = got_repo_pack_fds_open(&pack_fds);
9320 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9322 if (error->code == GOT_ERR_NOT_WORKTREE)
9323 error = wrap_not_worktree_error(error, "commit", cwd);
9327 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9330 if (rebase_in_progress) {
9331 error = got_error(GOT_ERR_REBASING);
9335 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9340 error = get_gitconfig_path(&gitconfig_path);
9343 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9344 gitconfig_path, pack_fds);
9348 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
9351 if (merge_in_progress) {
9352 error = got_error(GOT_ERR_MERGE_BUSY);
9356 error = get_author(&committer, repo, worktree);
9364 * unveil(2) traverses exec(2); if an editor is used we have
9365 * to apply unveil after the log message has been written.
9367 if (logmsg == NULL || strlen(logmsg) == 0)
9368 error = get_editor(&editor);
9370 error = apply_unveil(got_repo_get_path(repo), 0,
9371 got_worktree_get_root_path(worktree));
9375 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9379 if (prepared_logmsg == NULL) {
9380 error = lookup_logmsg_ref(&merged_logmsg,
9381 argc > 0 ? &paths : NULL, &refs, worktree, repo);
9386 cl_arg.editor = editor;
9387 cl_arg.cmdline_log = logmsg;
9388 cl_arg.prepared_log = prepared_logmsg;
9389 cl_arg.merged_log = merged_logmsg;
9390 cl_arg.non_interactive = non_interactive;
9391 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
9392 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
9393 if (!histedit_in_progress) {
9394 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
9395 error = got_error(GOT_ERR_COMMIT_BRANCH);
9398 cl_arg.branch_name += 11;
9400 cl_arg.repo_path = got_repo_get_path(repo);
9401 error = got_worktree_commit(&id, worktree, &paths, author, committer,
9402 allow_bad_symlinks, show_diff, commit_conflicts,
9403 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
9405 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
9406 cl_arg.logmsg_path != NULL)
9407 preserve_logmsg = 1;
9411 error = got_object_id_str(&id_str, id);
9414 printf("Created commit %s\n", id_str);
9416 TAILQ_FOREACH(re, &refs, entry) {
9417 error = got_ref_delete(re->ref, repo);
9423 if (preserve_logmsg) {
9424 fprintf(stderr, "%s: log message preserved in %s\n",
9425 getprogname(), cl_arg.logmsg_path);
9426 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
9428 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
9429 free(cl_arg.logmsg_path);
9430 if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
9431 error = got_error_from_errno2("unlink", merged_logmsg);
9432 free(merged_logmsg);
9434 const struct got_error *close_err = got_repo_close(repo);
9439 got_worktree_close(worktree);
9441 const struct got_error *pack_err =
9442 got_repo_pack_fds_close(pack_fds);
9446 got_ref_list_free(&refs);
9447 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9450 free(gitconfig_path);
9453 free(prepared_logmsg);
9460 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
9461 "[-r repository-path] [-t tag] [remote-repository]\n",
9467 print_load_info(int print_colored, int print_found, int print_trees,
9468 int ncolored, int nfound, int ntrees)
9470 if (print_colored) {
9471 printf("%d commit%s colored", ncolored,
9472 ncolored == 1 ? "" : "s");
9475 printf("%s%d object%s found",
9476 ncolored > 0 ? "; " : "",
9477 nfound, nfound == 1 ? "" : "s");
9480 printf("; %d tree%s scanned", ntrees,
9481 ntrees == 1 ? "" : "s");
9485 struct got_send_progress_arg {
9486 char last_scaled_packsize[FMT_SCALED_STRSIZE];
9493 int last_nobj_total;
9497 int printed_something;
9499 struct got_pathlist_head *delete_branches;
9502 static const struct got_error *
9503 send_progress(void *arg, int ncolored, int nfound, int ntrees,
9504 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
9505 int nobj_written, off_t bytes_sent, const char *refname,
9506 const char *errmsg, int success)
9508 struct got_send_progress_arg *a = arg;
9509 char scaled_packsize[FMT_SCALED_STRSIZE];
9510 char scaled_sent[FMT_SCALED_STRSIZE];
9511 int p_deltify = 0, p_written = 0, p_sent = 0;
9512 int print_colored = 0, print_found = 0, print_trees = 0;
9513 int print_searching = 0, print_total = 0;
9514 int print_deltify = 0, print_written = 0, print_sent = 0;
9516 if (a->verbosity < 0)
9520 const char *status = success ? "accepted" : "rejected";
9523 struct got_pathlist_entry *pe;
9524 TAILQ_FOREACH(pe, a->delete_branches, entry) {
9525 const char *branchname = pe->path;
9526 if (got_path_cmp(branchname, refname,
9527 strlen(branchname), strlen(refname)) == 0) {
9529 a->sent_something = 1;
9535 if (a->printed_something)
9537 printf("Server has %s %s", status, refname);
9539 printf(": %s", errmsg);
9540 a->printed_something = 1;
9544 if (a->last_ncolored != ncolored) {
9546 a->last_ncolored = ncolored;
9549 if (a->last_nfound != nfound) {
9552 a->last_nfound = nfound;
9555 if (a->last_ntrees != ntrees) {
9559 a->last_ntrees = ntrees;
9562 if ((print_colored || print_found || print_trees) &&
9565 print_load_info(print_colored, print_found, print_trees,
9566 ncolored, nfound, ntrees);
9567 a->printed_something = 1;
9570 } else if (!a->loading_done) {
9572 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
9574 a->loading_done = 1;
9577 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
9578 return got_error_from_errno("fmt_scaled");
9579 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
9580 return got_error_from_errno("fmt_scaled");
9582 if (a->last_ncommits != ncommits) {
9583 print_searching = 1;
9584 a->last_ncommits = ncommits;
9587 if (a->last_nobj_total != nobj_total) {
9588 print_searching = 1;
9590 a->last_nobj_total = nobj_total;
9593 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9594 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9595 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9596 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9597 return got_error(GOT_ERR_NO_SPACE);
9600 if (nobj_deltify > 0 || nobj_written > 0) {
9601 if (nobj_deltify > 0) {
9602 p_deltify = (nobj_deltify * 100) / nobj_total;
9603 if (p_deltify != a->last_p_deltify) {
9604 a->last_p_deltify = p_deltify;
9605 print_searching = 1;
9610 if (nobj_written > 0) {
9611 p_written = (nobj_written * 100) / nobj_total;
9612 if (p_written != a->last_p_written) {
9613 a->last_p_written = p_written;
9614 print_searching = 1;
9622 if (bytes_sent > 0) {
9623 p_sent = (bytes_sent * 100) / packfile_size;
9624 if (p_sent != a->last_p_sent) {
9625 a->last_p_sent = p_sent;
9626 print_searching = 1;
9632 a->sent_something = 1;
9635 if (print_searching || print_total || print_deltify || print_written ||
9638 if (print_searching)
9639 printf("packing %d reference%s", ncommits,
9640 ncommits == 1 ? "" : "s");
9642 printf("; %d object%s", nobj_total,
9643 nobj_total == 1 ? "" : "s");
9645 printf("; deltify: %d%%", p_deltify);
9647 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9648 scaled_packsize, p_sent);
9649 else if (print_written)
9650 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9651 scaled_packsize, p_written);
9652 if (print_searching || print_total || print_deltify ||
9653 print_written || print_sent) {
9654 a->printed_something = 1;
9660 static const struct got_error *
9661 cmd_send(int argc, char *argv[])
9663 const struct got_error *error = NULL;
9664 char *cwd = NULL, *repo_path = NULL;
9665 const char *remote_name;
9666 char *proto = NULL, *host = NULL, *port = NULL;
9667 char *repo_name = NULL, *server_path = NULL;
9668 const struct got_remote_repo *remotes, *remote = NULL;
9669 int nremotes, nbranches = 0, ndelete_branches = 0;
9670 struct got_repository *repo = NULL;
9671 struct got_worktree *worktree = NULL;
9672 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9673 struct got_pathlist_head branches;
9674 struct got_pathlist_head tags;
9675 struct got_reflist_head all_branches;
9676 struct got_reflist_head all_tags;
9677 struct got_pathlist_head delete_args;
9678 struct got_pathlist_head delete_branches;
9679 struct got_reflist_entry *re;
9680 struct got_pathlist_entry *pe;
9681 int i, ch, sendfd = -1, sendstatus;
9683 struct got_send_progress_arg spa;
9684 int verbosity = 0, overwrite_refs = 0;
9685 int send_all_branches = 0, send_all_tags = 0;
9686 struct got_reference *ref = NULL;
9687 int *pack_fds = NULL;
9689 TAILQ_INIT(&branches);
9691 TAILQ_INIT(&all_branches);
9692 TAILQ_INIT(&all_tags);
9693 TAILQ_INIT(&delete_args);
9694 TAILQ_INIT(&delete_branches);
9696 while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9699 send_all_branches = 1;
9702 error = got_pathlist_append(&branches, optarg, NULL);
9708 error = got_pathlist_append(&delete_args, optarg, NULL);
9719 repo_path = realpath(optarg, NULL);
9720 if (repo_path == NULL)
9721 return got_error_from_errno2("realpath",
9723 got_path_strip_trailing_slashes(repo_path);
9729 error = got_pathlist_append(&tags, optarg, NULL);
9736 else if (verbosity < 3)
9747 if (send_all_branches && !TAILQ_EMPTY(&branches))
9748 option_conflict('a', 'b');
9749 if (send_all_tags && !TAILQ_EMPTY(&tags))
9750 option_conflict('T', 't');
9754 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9756 remote_name = argv[0];
9760 cwd = getcwd(NULL, 0);
9762 error = got_error_from_errno("getcwd");
9766 error = got_repo_pack_fds_open(&pack_fds);
9770 if (repo_path == NULL) {
9771 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9772 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9778 strdup(got_worktree_get_repo_path(worktree));
9779 if (repo_path == NULL)
9780 error = got_error_from_errno("strdup");
9784 repo_path = strdup(cwd);
9785 if (repo_path == NULL) {
9786 error = got_error_from_errno("strdup");
9792 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9797 worktree_conf = got_worktree_get_gotconfig(worktree);
9798 if (worktree_conf) {
9799 got_gotconfig_get_remotes(&nremotes, &remotes,
9801 for (i = 0; i < nremotes; i++) {
9802 if (strcmp(remotes[i].name, remote_name) == 0) {
9803 remote = &remotes[i];
9809 if (remote == NULL) {
9810 repo_conf = got_repo_get_gotconfig(repo);
9812 got_gotconfig_get_remotes(&nremotes, &remotes,
9814 for (i = 0; i < nremotes; i++) {
9815 if (strcmp(remotes[i].name, remote_name) == 0) {
9816 remote = &remotes[i];
9822 if (remote == NULL) {
9823 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9824 for (i = 0; i < nremotes; i++) {
9825 if (strcmp(remotes[i].name, remote_name) == 0) {
9826 remote = &remotes[i];
9831 if (remote == NULL) {
9832 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9836 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9837 &repo_name, remote->send_url);
9841 if (strcmp(proto, "git") == 0) {
9843 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9844 "sendfd dns inet unveil", NULL) == -1)
9847 } else if (strcmp(proto, "git+ssh") == 0 ||
9848 strcmp(proto, "ssh") == 0) {
9850 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9851 "sendfd unveil", NULL) == -1)
9854 } else if (strcmp(proto, "http") == 0 ||
9855 strcmp(proto, "git+http") == 0) {
9856 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9859 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9863 error = got_dial_apply_unveil(proto);
9867 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9871 if (send_all_branches) {
9872 error = got_ref_list(&all_branches, repo, "refs/heads",
9873 got_ref_cmp_by_name, NULL);
9876 TAILQ_FOREACH(re, &all_branches, entry) {
9877 const char *branchname = got_ref_get_name(re->ref);
9878 error = got_pathlist_append(&branches,
9884 } else if (nbranches == 0) {
9885 for (i = 0; i < remote->nsend_branches; i++) {
9886 error = got_pathlist_append(&branches,
9887 remote->send_branches[i], NULL);
9893 if (send_all_tags) {
9894 error = got_ref_list(&all_tags, repo, "refs/tags",
9895 got_ref_cmp_by_name, NULL);
9898 TAILQ_FOREACH(re, &all_tags, entry) {
9899 const char *tagname = got_ref_get_name(re->ref);
9900 error = got_pathlist_append(&tags,
9908 * To prevent accidents only branches in refs/heads/ can be deleted
9909 * with 'got send -d'.
9910 * Deleting anything else requires local repository access or Git.
9912 TAILQ_FOREACH(pe, &delete_args, entry) {
9913 const char *branchname = pe->path;
9915 struct got_pathlist_entry *new;
9916 if (strncmp(branchname, "refs/heads/", 11) == 0) {
9917 s = strdup(branchname);
9919 error = got_error_from_errno("strdup");
9923 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
9924 error = got_error_from_errno("asprintf");
9928 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
9929 if (error || new == NULL /* duplicate */)
9936 if (nbranches == 0 && ndelete_branches == 0) {
9937 struct got_reference *head_ref;
9939 error = got_ref_open(&head_ref, repo,
9940 got_worktree_get_head_ref_name(worktree), 0);
9942 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
9945 if (got_ref_is_symbolic(head_ref)) {
9946 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
9947 got_ref_close(head_ref);
9952 error = got_pathlist_append(&branches, got_ref_get_name(ref),
9959 if (verbosity >= 0) {
9960 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
9961 remote->name, proto, host,
9962 port ? ":" : "", port ? port : "",
9963 *server_path == '/' ? "" : "/", server_path);
9966 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
9967 server_path, verbosity);
9971 memset(&spa, 0, sizeof(spa));
9972 spa.last_scaled_packsize[0] = '\0';
9973 spa.last_p_deltify = -1;
9974 spa.last_p_written = -1;
9975 spa.verbosity = verbosity;
9976 spa.delete_branches = &delete_branches;
9977 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
9978 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
9979 check_cancelled, NULL);
9980 if (spa.printed_something)
9984 if (!spa.sent_something && verbosity >= 0)
9985 printf("Already up-to-date\n");
9988 if (kill(sendpid, SIGTERM) == -1)
9989 error = got_error_from_errno("kill");
9990 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
9991 error = got_error_from_errno("waitpid");
9993 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
9994 error = got_error_from_errno("close");
9996 const struct got_error *close_err = got_repo_close(repo);
10001 got_worktree_close(worktree);
10003 const struct got_error *pack_err =
10004 got_repo_pack_fds_close(pack_fds);
10009 got_ref_close(ref);
10010 got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
10011 got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
10012 got_ref_list_free(&all_branches);
10013 got_ref_list_free(&all_tags);
10014 got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
10015 got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
10027 * Print and if delete is set delete all ref_prefix references.
10028 * If wanted_ref is not NULL, only print or delete this reference.
10030 static const struct got_error *
10031 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
10032 const char *wanted_ref, int delete, struct got_worktree *worktree,
10033 struct got_repository *repo)
10035 const struct got_error *err;
10036 struct got_pathlist_head paths;
10037 struct got_reflist_head refs;
10038 struct got_reflist_entry *re;
10039 struct got_reflist_object_id_map *refs_idmap = NULL;
10040 struct got_commit_object *commit = NULL;
10041 struct got_object_id *id = NULL;
10042 const char *header_prefix;
10043 char *uuidstr = NULL;
10047 TAILQ_INIT(&paths);
10049 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
10053 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10057 if (worktree != NULL) {
10058 err = got_worktree_get_uuid(&uuidstr, worktree);
10064 if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
10068 if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
10069 header_prefix = "backout";
10071 header_prefix = "cherrypick";
10073 TAILQ_FOREACH(re, &refs, entry) {
10074 const char *refname, *wt;
10076 refname = got_ref_get_name(re->ref);
10078 err = check_cancelled(NULL);
10082 if (strncmp(refname, ref_prefix, prefix_len) == 0)
10083 refname += prefix_len + 1; /* skip '-' delimiter */
10089 if (worktree == NULL || strncmp(refname, uuidstr,
10090 GOT_WORKTREE_UUID_STRLEN) == 0)
10091 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
10095 err = got_repo_match_object_id(&id, NULL, refname,
10096 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10100 err = got_object_open_as_commit(&commit, repo, id);
10105 found = strncmp(wanted_ref, refname,
10106 strlen(wanted_ref)) == 0;
10107 if (wanted_ref && !found) {
10108 struct got_reflist_head *ci_refs;
10110 ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
10114 char *refs_str = NULL;
10115 char const *r = NULL;
10117 err = build_refs_str(&refs_str, ci_refs, id,
10124 if (strncmp(r, wanted_ref,
10125 strlen(wanted_ref)) == 0) {
10129 r = strchr(r, ' ');
10137 if (wanted_ref == NULL || found) {
10139 err = got_ref_delete(re->ref, repo);
10142 printf("Deleted: ");
10143 err = print_commit_oneline(commit, id, repo,
10147 * Print paths modified by commit to help
10148 * associate commits with worktree changes.
10150 err = get_changed_paths(&paths, commit,
10155 err = print_commit(commit, id, repo, NULL,
10156 &paths, NULL, 0, 0, refs_idmap, NULL,
10158 got_pathlist_free(&paths,
10159 GOT_PATHLIST_FREE_ALL);
10161 if (worktree == NULL)
10162 printf("work tree: %.*s\n\n",
10163 GOT_WORKTREE_UUID_STRLEN, wt);
10169 got_object_commit_close(commit);
10175 if (wanted_ref != NULL && !found)
10176 err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
10181 got_ref_list_free(&refs);
10182 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
10184 got_reflist_object_id_map_free(refs_idmap);
10186 got_object_commit_close(commit);
10191 * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
10192 * identified by id for log messages to prepopulate the editor on commit.
10194 static const struct got_error *
10195 logmsg_ref(struct got_object_id *id, const char *prefix,
10196 struct got_worktree *worktree, struct got_repository *repo)
10198 const struct got_error *err = NULL;
10199 char *idstr, *ref = NULL, *refname = NULL;
10200 int histedit_in_progress;
10201 int rebase_in_progress, merge_in_progress;
10204 * Silenty refuse to create merge reference if any histedit, merge,
10205 * or rebase operation is in progress.
10207 err = got_worktree_histedit_in_progress(&histedit_in_progress,
10211 if (histedit_in_progress)
10214 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10217 if (rebase_in_progress)
10220 err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10224 if (merge_in_progress)
10227 err = got_object_id_str(&idstr, id);
10231 err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
10235 if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
10236 err = got_error_from_errno("asprintf");
10240 err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
10250 usage_cherrypick(void)
10252 fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
10257 static const struct got_error *
10258 cmd_cherrypick(int argc, char *argv[])
10260 const struct got_error *error = NULL;
10261 struct got_worktree *worktree = NULL;
10262 struct got_repository *repo = NULL;
10263 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10264 struct got_object_id *commit_id = NULL;
10265 struct got_commit_object *commit = NULL;
10266 struct got_object_qid *pid;
10267 int ch, list_refs = 0, remove_refs = 0;
10268 struct got_update_progress_arg upa;
10269 int *pack_fds = NULL;
10272 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10273 "unveil", NULL) == -1)
10277 while ((ch = getopt(argc, argv, "lX")) != -1) {
10286 usage_cherrypick();
10294 if (list_refs || remove_refs) {
10295 if (argc != 0 && argc != 1)
10296 usage_cherrypick();
10297 } else if (argc != 1)
10298 usage_cherrypick();
10299 if (list_refs && remove_refs)
10300 option_conflict('l', 'X');
10302 cwd = getcwd(NULL, 0);
10304 error = got_error_from_errno("getcwd");
10308 error = got_repo_pack_fds_open(&pack_fds);
10312 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10314 if (list_refs || remove_refs) {
10315 if (error->code != GOT_ERR_NOT_WORKTREE)
10318 if (error->code == GOT_ERR_NOT_WORKTREE)
10319 error = wrap_not_worktree_error(error,
10320 "cherrypick", cwd);
10325 error = got_repo_open(&repo,
10326 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10331 error = apply_unveil(got_repo_get_path(repo), 0,
10332 worktree ? got_worktree_get_root_path(worktree) : NULL);
10336 if (list_refs || remove_refs) {
10337 error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
10338 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
10339 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10343 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10347 error = got_repo_match_object_id(&commit_id, NULL,
10348 keyword_idstr != NULL ? keyword_idstr : argv[0],
10349 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10352 error = got_object_id_str(&commit_id_str, commit_id);
10356 error = got_object_open_as_commit(&commit, repo, commit_id);
10359 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10360 memset(&upa, 0, sizeof(upa));
10361 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
10362 commit_id, repo, update_progress, &upa, check_cancelled,
10367 if (upa.did_something) {
10368 error = logmsg_ref(commit_id,
10369 GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
10372 printf("Merged commit %s\n", commit_id_str);
10374 print_merge_progress_stats(&upa);
10377 free(keyword_idstr);
10379 got_object_commit_close(commit);
10380 free(commit_id_str);
10382 got_worktree_close(worktree);
10384 const struct got_error *close_err = got_repo_close(repo);
10389 const struct got_error *pack_err =
10390 got_repo_pack_fds_close(pack_fds);
10399 usage_backout(void)
10401 fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
10405 static const struct got_error *
10406 cmd_backout(int argc, char *argv[])
10408 const struct got_error *error = NULL;
10409 struct got_worktree *worktree = NULL;
10410 struct got_repository *repo = NULL;
10411 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10412 struct got_object_id *commit_id = NULL;
10413 struct got_commit_object *commit = NULL;
10414 struct got_object_qid *pid;
10415 int ch, list_refs = 0, remove_refs = 0;
10416 struct got_update_progress_arg upa;
10417 int *pack_fds = NULL;
10420 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10421 "unveil", NULL) == -1)
10425 while ((ch = getopt(argc, argv, "lX")) != -1) {
10442 if (list_refs || remove_refs) {
10443 if (argc != 0 && argc != 1)
10445 } else if (argc != 1)
10447 if (list_refs && remove_refs)
10448 option_conflict('l', 'X');
10450 cwd = getcwd(NULL, 0);
10452 error = got_error_from_errno("getcwd");
10456 error = got_repo_pack_fds_open(&pack_fds);
10460 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10462 if (list_refs || remove_refs) {
10463 if (error->code != GOT_ERR_NOT_WORKTREE)
10466 if (error->code == GOT_ERR_NOT_WORKTREE)
10467 error = wrap_not_worktree_error(error,
10473 error = got_repo_open(&repo,
10474 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10479 error = apply_unveil(got_repo_get_path(repo), 0,
10480 worktree ? got_worktree_get_root_path(worktree) : NULL);
10484 if (list_refs || remove_refs) {
10485 error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
10486 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
10487 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10491 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10495 error = got_repo_match_object_id(&commit_id, NULL,
10496 keyword_idstr != NULL ? keyword_idstr : argv[0],
10497 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10500 error = got_object_id_str(&commit_id_str, commit_id);
10504 error = got_object_open_as_commit(&commit, repo, commit_id);
10507 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10509 error = got_error(GOT_ERR_ROOT_COMMIT);
10513 memset(&upa, 0, sizeof(upa));
10514 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
10515 repo, update_progress, &upa, check_cancelled, NULL);
10519 if (upa.did_something) {
10520 error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
10524 printf("Backed out 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);
10552 fprintf(stderr, "usage: %s rebase [-aCclX] [branch]\n", getprogname());
10557 trim_logmsg(char *logmsg, int limit)
10562 len = strlen(logmsg);
10565 logmsg[len] = '\0';
10566 nl = strchr(logmsg, '\n');
10571 static const struct got_error *
10572 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
10574 const struct got_error *err;
10575 char *logmsg0 = NULL;
10578 err = got_object_commit_get_logmsg(&logmsg0, commit);
10583 while (isspace((unsigned char)s[0]))
10586 *logmsg = strdup(s);
10587 if (*logmsg == NULL) {
10588 err = got_error_from_errno("strdup");
10592 trim_logmsg(*logmsg, limit);
10598 static const struct got_error *
10599 show_rebase_merge_conflict(struct got_object_id *id,
10600 struct got_repository *repo)
10602 const struct got_error *err;
10603 struct got_commit_object *commit = NULL;
10604 char *id_str = NULL, *logmsg = NULL;
10606 err = got_object_open_as_commit(&commit, repo, id);
10610 err = got_object_id_str(&id_str, id);
10616 err = get_short_logmsg(&logmsg, 42, commit);
10620 printf("%s -> merge conflict: %s\n", id_str, logmsg);
10623 got_object_commit_close(commit);
10628 static const struct got_error *
10629 show_rebase_progress(struct got_commit_object *commit,
10630 struct got_object_id *old_id, struct got_object_id *new_id)
10632 const struct got_error *err;
10633 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10635 err = got_object_id_str(&old_id_str, old_id);
10640 err = got_object_id_str(&new_id_str, new_id);
10645 old_id_str[12] = '\0';
10647 new_id_str[12] = '\0';
10649 err = get_short_logmsg(&logmsg, 42, commit);
10653 printf("%s -> %s: %s\n", old_id_str,
10654 new_id_str ? new_id_str : "no-op change", logmsg);
10662 static const struct got_error *
10663 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
10664 struct got_reference *branch, struct got_reference *tmp_branch,
10665 struct got_repository *repo, int create_backup)
10667 printf("Switching work tree to %s\n", got_ref_get_name(branch));
10668 return got_worktree_rebase_complete(worktree, fileindex,
10669 tmp_branch, branch, repo, create_backup);
10672 static const struct got_error *
10673 rebase_commit(struct got_pathlist_head *merged_paths,
10674 struct got_worktree *worktree, struct got_fileindex *fileindex,
10675 struct got_reference *tmp_branch, const char *committer,
10676 struct got_object_id *commit_id, int allow_conflict,
10677 struct got_repository *repo)
10679 const struct got_error *error;
10680 struct got_commit_object *commit;
10681 struct got_object_id *new_commit_id;
10683 error = got_object_open_as_commit(&commit, repo, commit_id);
10687 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
10688 worktree, fileindex, tmp_branch, committer, commit, commit_id,
10689 allow_conflict, repo);
10691 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
10693 error = show_rebase_progress(commit, commit_id, NULL);
10695 error = show_rebase_progress(commit, commit_id, new_commit_id);
10696 free(new_commit_id);
10699 got_object_commit_close(commit);
10703 struct check_path_prefix_arg {
10704 const char *path_prefix;
10709 static const struct got_error *
10710 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
10711 struct got_blob_object *blob2, FILE *f1, FILE *f2,
10712 struct got_object_id *id1, struct got_object_id *id2,
10713 const char *path1, const char *path2,
10714 mode_t mode1, mode_t mode2, struct got_repository *repo)
10716 struct check_path_prefix_arg *a = arg;
10718 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
10719 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
10720 return got_error(a->errcode);
10725 static const struct got_error *
10726 check_path_prefix(struct got_object_id *parent_id,
10727 struct got_object_id *commit_id, const char *path_prefix,
10728 int errcode, struct got_repository *repo)
10730 const struct got_error *err;
10731 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
10732 struct got_commit_object *commit = NULL, *parent_commit = NULL;
10733 struct check_path_prefix_arg cpp_arg;
10735 if (got_path_is_root_dir(path_prefix))
10738 err = got_object_open_as_commit(&commit, repo, commit_id);
10742 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
10746 err = got_object_open_as_tree(&tree1, repo,
10747 got_object_commit_get_tree_id(parent_commit));
10751 err = got_object_open_as_tree(&tree2, repo,
10752 got_object_commit_get_tree_id(commit));
10756 cpp_arg.path_prefix = path_prefix;
10757 while (cpp_arg.path_prefix[0] == '/')
10758 cpp_arg.path_prefix++;
10759 cpp_arg.len = strlen(cpp_arg.path_prefix);
10760 cpp_arg.errcode = errcode;
10761 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
10762 check_path_prefix_in_diff, &cpp_arg, 0);
10765 got_object_tree_close(tree1);
10767 got_object_tree_close(tree2);
10769 got_object_commit_close(commit);
10771 got_object_commit_close(parent_commit);
10775 static const struct got_error *
10776 collect_commits(struct got_object_id_queue *commits,
10777 struct got_object_id *initial_commit_id,
10778 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
10779 const char *path_prefix, int path_prefix_errcode,
10780 struct got_repository *repo)
10782 const struct got_error *err = NULL;
10783 struct got_commit_graph *graph = NULL;
10784 struct got_object_id parent_id, commit_id;
10785 struct got_object_qid *qid;
10787 err = got_commit_graph_open(&graph, "/", 1);
10791 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
10792 check_cancelled, NULL);
10796 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
10797 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
10798 err = got_commit_graph_iter_next(&parent_id, graph, repo,
10799 check_cancelled, NULL);
10801 if (err->code == GOT_ERR_ITER_COMPLETED) {
10802 err = got_error_msg(GOT_ERR_ANCESTRY,
10803 "ran out of commits to rebase before "
10804 "youngest common ancestor commit has "
10805 "been reached?!?");
10809 err = check_path_prefix(&parent_id, &commit_id,
10810 path_prefix, path_prefix_errcode, repo);
10814 err = got_object_qid_alloc(&qid, &commit_id);
10817 STAILQ_INSERT_HEAD(commits, qid, entry);
10819 memcpy(&commit_id, &parent_id, sizeof(commit_id));
10823 got_commit_graph_close(graph);
10827 static const struct got_error *
10828 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
10830 const struct got_error *err = NULL;
10831 time_t committer_time;
10833 char datebuf[11]; /* YYYY-MM-DD + NUL */
10834 char *author0 = NULL, *author, *smallerthan;
10835 char *logmsg0 = NULL, *logmsg, *newline;
10837 committer_time = got_object_commit_get_committer_time(commit);
10838 if (gmtime_r(&committer_time, &tm) == NULL)
10839 return got_error_from_errno("gmtime_r");
10840 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
10841 return got_error(GOT_ERR_NO_SPACE);
10843 author0 = strdup(got_object_commit_get_author(commit));
10844 if (author0 == NULL)
10845 return got_error_from_errno("strdup");
10847 smallerthan = strchr(author, '<');
10848 if (smallerthan && smallerthan[1] != '\0')
10849 author = smallerthan + 1;
10850 author[strcspn(author, "@>")] = '\0';
10852 err = got_object_commit_get_logmsg(&logmsg0, commit);
10856 while (*logmsg == '\n')
10858 newline = strchr(logmsg, '\n');
10862 if (asprintf(brief_str, "%s %s %s",
10863 datebuf, author, logmsg) == -1)
10864 err = got_error_from_errno("asprintf");
10871 static const struct got_error *
10872 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
10873 struct got_repository *repo)
10875 const struct got_error *err;
10878 err = got_object_id_str(&id_str, id);
10882 err = got_ref_delete(ref, repo);
10886 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
10892 static const struct got_error *
10893 print_backup_ref(const char *branch_name, const char *new_id_str,
10894 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
10895 struct got_reflist_object_id_map *refs_idmap,
10896 struct got_repository *repo)
10898 const struct got_error *err = NULL;
10899 struct got_reflist_head *refs;
10900 char *refs_str = NULL;
10901 struct got_object_id *new_commit_id = NULL;
10902 struct got_commit_object *new_commit = NULL;
10903 char *new_commit_brief_str = NULL;
10904 struct got_object_id *yca_id = NULL;
10905 struct got_commit_object *yca_commit = NULL;
10906 char *yca_id_str = NULL, *yca_brief_str = NULL;
10907 char *custom_refs_str;
10909 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
10910 return got_error_from_errno("asprintf");
10912 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
10913 0, 0, refs_idmap, custom_refs_str, NULL);
10917 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
10921 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
10923 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
10928 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
10932 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
10936 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10937 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
10941 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
10942 refs_str ? " (" : "", refs_str ? refs_str : "",
10943 refs_str ? ")" : "", new_commit_brief_str);
10944 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
10945 got_object_id_cmp(yca_id, old_commit_id) != 0) {
10949 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
10953 err = get_commit_brief_str(&yca_brief_str, yca_commit);
10957 err = got_object_id_str(&yca_id_str, yca_id);
10961 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
10963 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
10967 printf("history forked at %s%s%s%s\n %s\n",
10969 refs_str ? " (" : "", refs_str ? refs_str : "",
10970 refs_str ? ")" : "", yca_brief_str);
10973 free(custom_refs_str);
10974 free(new_commit_id);
10978 free(yca_brief_str);
10980 got_object_commit_close(new_commit);
10982 got_object_commit_close(yca_commit);
10987 static const struct got_error *
10988 worktree_has_logmsg_ref(const char *caller, struct got_worktree *worktree,
10989 struct got_repository *repo)
10991 const struct got_error *err;
10992 struct got_reflist_head refs;
10993 struct got_reflist_entry *re;
10994 char *uuidstr = NULL;
10995 static char msg[160];
10999 err = got_worktree_get_uuid(&uuidstr, worktree);
11003 err = got_ref_list(&refs, repo, "refs/got/worktree",
11004 got_ref_cmp_by_name, repo);
11008 TAILQ_FOREACH(re, &refs, entry) {
11009 const char *cmd, *refname, *type;
11011 refname = got_ref_get_name(re->ref);
11013 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
11014 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
11015 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
11016 cmd = "cherrypick";
11017 type = "cherrypicked";
11018 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
11019 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
11020 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
11022 type = "backed-out";
11026 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) != 0)
11029 snprintf(msg, sizeof(msg),
11030 "work tree has references created by %s commits which "
11031 "must be removed with 'got %s -X' before running the %s "
11032 "command", type, cmd, caller);
11033 err = got_error_msg(GOT_ERR_WORKTREE_META, msg);
11039 got_ref_list_free(&refs);
11043 static const struct got_error *
11044 process_backup_refs(const char *backup_ref_prefix,
11045 const char *wanted_branch_name,
11046 int delete, struct got_repository *repo)
11048 const struct got_error *err;
11049 struct got_reflist_head refs, backup_refs;
11050 struct got_reflist_entry *re;
11051 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
11052 struct got_object_id *old_commit_id = NULL;
11053 char *branch_name = NULL;
11054 struct got_commit_object *old_commit = NULL;
11055 struct got_reflist_object_id_map *refs_idmap = NULL;
11056 int wanted_branch_found = 0;
11059 TAILQ_INIT(&backup_refs);
11061 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11065 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
11069 if (wanted_branch_name) {
11070 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
11071 wanted_branch_name += 11;
11074 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
11075 got_ref_cmp_by_commit_timestamp_descending, repo);
11079 TAILQ_FOREACH(re, &backup_refs, entry) {
11080 const char *refname = got_ref_get_name(re->ref);
11083 err = check_cancelled(NULL);
11087 err = got_ref_resolve(&old_commit_id, repo, re->ref);
11091 err = got_object_open_as_commit(&old_commit, repo,
11096 if (strncmp(backup_ref_prefix, refname,
11097 backup_ref_prefix_len) == 0)
11098 refname += backup_ref_prefix_len;
11100 while (refname[0] == '/')
11103 branch_name = strdup(refname);
11104 if (branch_name == NULL) {
11105 err = got_error_from_errno("strdup");
11108 slash = strrchr(branch_name, '/');
11111 refname += strlen(branch_name) + 1;
11114 if (wanted_branch_name == NULL ||
11115 strcmp(wanted_branch_name, branch_name) == 0) {
11116 wanted_branch_found = 1;
11118 err = delete_backup_ref(re->ref,
11119 old_commit_id, repo);
11121 err = print_backup_ref(branch_name, refname,
11122 old_commit_id, old_commit, refs_idmap,
11129 free(old_commit_id);
11130 old_commit_id = NULL;
11132 branch_name = NULL;
11133 got_object_commit_close(old_commit);
11137 if (wanted_branch_name && !wanted_branch_found) {
11138 err = got_error_fmt(GOT_ERR_NOT_REF,
11139 "%s/%s/", backup_ref_prefix, wanted_branch_name);
11143 got_reflist_object_id_map_free(refs_idmap);
11144 got_ref_list_free(&refs);
11145 got_ref_list_free(&backup_refs);
11146 free(old_commit_id);
11149 got_object_commit_close(old_commit);
11153 static const struct got_error *
11154 abort_progress(void *arg, unsigned char status, const char *path)
11157 * Unversioned files should not clutter progress output when
11158 * an operation is aborted.
11160 if (status == GOT_STATUS_UNVERSIONED)
11163 return update_progress(arg, status, path);
11166 static const struct got_error *
11167 cmd_rebase(int argc, char *argv[])
11169 const struct got_error *error = NULL;
11170 struct got_worktree *worktree = NULL;
11171 struct got_repository *repo = NULL;
11172 struct got_fileindex *fileindex = NULL;
11173 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11174 struct got_reference *branch = NULL;
11175 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
11176 struct got_object_id *commit_id = NULL, *parent_id = NULL;
11177 struct got_object_id *resume_commit_id = NULL;
11178 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
11179 struct got_object_id *head_commit_id = NULL;
11180 struct got_reference *head_ref = NULL;
11181 struct got_commit_object *commit = NULL;
11182 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
11183 int histedit_in_progress = 0, merge_in_progress = 0;
11184 int create_backup = 1, list_backups = 0, delete_backups = 0;
11185 int allow_conflict = 0;
11186 struct got_object_id_queue commits;
11187 struct got_pathlist_head merged_paths;
11188 const struct got_object_id_queue *parent_ids;
11189 struct got_object_qid *qid, *pid;
11190 struct got_update_progress_arg upa;
11191 int *pack_fds = NULL;
11193 STAILQ_INIT(&commits);
11194 TAILQ_INIT(&merged_paths);
11195 memset(&upa, 0, sizeof(upa));
11198 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11199 "unveil", NULL) == -1)
11203 while ((ch = getopt(argc, argv, "aCclX")) != -1) {
11209 allow_conflict = 1;
11212 continue_rebase = 1;
11218 delete_backups = 1;
11229 if (list_backups) {
11231 option_conflict('l', 'a');
11232 if (allow_conflict)
11233 option_conflict('l', 'C');
11234 if (continue_rebase)
11235 option_conflict('l', 'c');
11236 if (delete_backups)
11237 option_conflict('l', 'X');
11238 if (argc != 0 && argc != 1)
11240 } else if (delete_backups) {
11242 option_conflict('X', 'a');
11243 if (allow_conflict)
11244 option_conflict('X', 'C');
11245 if (continue_rebase)
11246 option_conflict('X', 'c');
11248 option_conflict('l', 'X');
11249 if (argc != 0 && argc != 1)
11251 } else if (allow_conflict) {
11253 option_conflict('C', 'a');
11254 if (!continue_rebase)
11255 errx(1, "-C option requires -c");
11257 if (abort_rebase && continue_rebase)
11259 else if (abort_rebase || continue_rebase) {
11262 } else if (argc != 1)
11266 cwd = getcwd(NULL, 0);
11268 error = got_error_from_errno("getcwd");
11272 error = got_repo_pack_fds_open(&pack_fds);
11276 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
11278 if (list_backups || delete_backups) {
11279 if (error->code != GOT_ERR_NOT_WORKTREE)
11282 if (error->code == GOT_ERR_NOT_WORKTREE)
11283 error = wrap_not_worktree_error(error,
11289 error = get_gitconfig_path(&gitconfig_path);
11292 error = got_repo_open(&repo,
11293 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11294 gitconfig_path, pack_fds);
11298 if (worktree != NULL && !list_backups && !delete_backups) {
11299 error = worktree_has_logmsg_ref("rebase", worktree, repo);
11304 error = get_author(&committer, repo, worktree);
11305 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
11308 error = apply_unveil(got_repo_get_path(repo), 0,
11309 worktree ? got_worktree_get_root_path(worktree) : NULL);
11313 if (list_backups || delete_backups) {
11314 error = process_backup_refs(
11315 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
11316 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11317 goto done; /* nothing else to do */
11320 error = got_worktree_histedit_in_progress(&histedit_in_progress,
11324 if (histedit_in_progress) {
11325 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11329 error = got_worktree_merge_in_progress(&merge_in_progress,
11333 if (merge_in_progress) {
11334 error = got_error(GOT_ERR_MERGE_BUSY);
11338 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11342 if (abort_rebase) {
11343 if (!rebase_in_progress) {
11344 error = got_error(GOT_ERR_NOT_REBASING);
11347 error = got_worktree_rebase_continue(&resume_commit_id,
11348 &new_base_branch, &tmp_branch, &branch, &fileindex,
11352 printf("Switching work tree to %s\n",
11353 got_ref_get_symref_target(new_base_branch));
11354 error = got_worktree_rebase_abort(worktree, fileindex, repo,
11355 new_base_branch, abort_progress, &upa);
11358 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
11359 print_merge_progress_stats(&upa);
11360 goto done; /* nothing else to do */
11363 if (continue_rebase) {
11364 if (!rebase_in_progress) {
11365 error = got_error(GOT_ERR_NOT_REBASING);
11368 error = got_worktree_rebase_continue(&resume_commit_id,
11369 &new_base_branch, &tmp_branch, &branch, &fileindex,
11374 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
11375 committer, resume_commit_id, allow_conflict, repo);
11379 yca_id = got_object_id_dup(resume_commit_id);
11380 if (yca_id == NULL) {
11381 error = got_error_from_errno("got_object_id_dup");
11385 error = got_ref_open(&branch, repo, argv[0], 0);
11388 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11389 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11390 "will not rebase a branch which lives outside "
11391 "the \"refs/heads/\" reference namespace");
11396 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
11400 if (!continue_rebase) {
11401 struct got_object_id *base_commit_id;
11403 error = got_ref_open(&head_ref, repo,
11404 got_worktree_get_head_ref_name(worktree), 0);
11407 error = got_ref_resolve(&head_commit_id, repo, head_ref);
11410 base_commit_id = got_worktree_get_base_commit_id(worktree);
11411 if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
11412 error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
11416 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11417 base_commit_id, branch_head_commit_id, 1, repo,
11418 check_cancelled, NULL);
11420 if (error->code == GOT_ERR_ANCESTRY) {
11421 error = got_error_msg(GOT_ERR_ANCESTRY,
11422 "specified branch shares no common "
11423 "ancestry with work tree's branch");
11428 if (got_object_id_cmp(base_commit_id, yca_id) == 0) {
11429 struct got_pathlist_head paths;
11430 printf("%s is already based on %s\n",
11431 got_ref_get_name(branch),
11432 got_worktree_get_head_ref_name(worktree));
11433 error = switch_head_ref(branch, branch_head_commit_id,
11437 error = got_worktree_set_base_commit_id(worktree, repo,
11438 branch_head_commit_id);
11441 TAILQ_INIT(&paths);
11442 error = got_pathlist_append(&paths, "", NULL);
11445 error = got_worktree_checkout_files(worktree,
11446 &paths, repo, update_progress, &upa,
11447 check_cancelled, NULL);
11448 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
11451 if (upa.did_something) {
11453 error = got_object_id_str(&id_str,
11454 branch_head_commit_id);
11457 printf("Updated to %s: %s\n",
11458 got_worktree_get_head_ref_name(worktree),
11462 printf("Already up-to-date\n");
11463 print_update_progress_stats(&upa);
11468 commit_id = branch_head_commit_id;
11469 error = got_object_open_as_commit(&commit, repo, commit_id);
11473 parent_ids = got_object_commit_get_parent_ids(commit);
11474 pid = STAILQ_FIRST(parent_ids);
11476 error = collect_commits(&commits, commit_id, &pid->id,
11477 yca_id, got_worktree_get_path_prefix(worktree),
11478 GOT_ERR_REBASE_PATH, repo);
11483 got_object_commit_close(commit);
11486 if (!continue_rebase) {
11487 error = got_worktree_rebase_prepare(&new_base_branch,
11488 &tmp_branch, &fileindex, worktree, branch, repo);
11493 if (STAILQ_EMPTY(&commits)) {
11494 if (continue_rebase) {
11495 error = rebase_complete(worktree, fileindex,
11496 branch, tmp_branch, repo, create_backup);
11499 /* Fast-forward the reference of the branch. */
11500 struct got_object_id *new_head_commit_id;
11502 error = got_ref_resolve(&new_head_commit_id, repo,
11506 error = got_object_id_str(&id_str, new_head_commit_id);
11509 printf("Forwarding %s to commit %s\n",
11510 got_ref_get_name(branch), id_str);
11512 error = got_ref_change_ref(branch,
11513 new_head_commit_id);
11516 /* No backup needed since objects did not change. */
11522 STAILQ_FOREACH(qid, &commits, entry) {
11524 commit_id = &qid->id;
11525 parent_id = pid ? &pid->id : yca_id;
11528 memset(&upa, 0, sizeof(upa));
11529 error = got_worktree_rebase_merge_files(&merged_paths,
11530 worktree, fileindex, parent_id, commit_id, repo,
11531 update_progress, &upa, check_cancelled, NULL);
11535 print_merge_progress_stats(&upa);
11536 if (upa.conflicts > 0 || upa.missing > 0 ||
11537 upa.not_deleted > 0 || upa.unversioned > 0) {
11538 if (upa.conflicts > 0) {
11539 error = show_rebase_merge_conflict(&qid->id,
11544 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11548 error = rebase_commit(&merged_paths, worktree, fileindex,
11549 tmp_branch, committer, commit_id, 0, repo);
11550 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11555 if (upa.conflicts > 0 || upa.missing > 0 ||
11556 upa.not_deleted > 0 || upa.unversioned > 0) {
11557 error = got_worktree_rebase_postpone(worktree, fileindex);
11560 if (upa.conflicts > 0 && upa.missing == 0 &&
11561 upa.not_deleted == 0 && upa.unversioned == 0) {
11562 error = got_error_msg(GOT_ERR_CONFLICTS,
11563 "conflicts must be resolved before rebasing "
11565 } else if (upa.conflicts > 0) {
11566 error = got_error_msg(GOT_ERR_CONFLICTS,
11567 "conflicts must be resolved before rebasing "
11568 "can continue; changes destined for some "
11569 "files were not yet merged and should be "
11570 "merged manually if required before the "
11571 "rebase operation is continued");
11573 error = got_error_msg(GOT_ERR_CONFLICTS,
11574 "changes destined for some files were not "
11575 "yet merged and should be merged manually "
11576 "if required before the rebase operation "
11580 error = rebase_complete(worktree, fileindex, branch,
11581 tmp_branch, repo, create_backup);
11585 free(gitconfig_path);
11586 got_object_id_queue_free(&commits);
11587 free(branch_head_commit_id);
11588 free(resume_commit_id);
11589 free(head_commit_id);
11592 got_object_commit_close(commit);
11594 got_ref_close(branch);
11595 if (new_base_branch)
11596 got_ref_close(new_base_branch);
11598 got_ref_close(tmp_branch);
11600 got_ref_close(head_ref);
11602 got_worktree_close(worktree);
11604 const struct got_error *close_err = got_repo_close(repo);
11609 const struct got_error *pack_err =
11610 got_repo_pack_fds_close(pack_fds);
11618 usage_histedit(void)
11620 fprintf(stderr, "usage: %s histedit [-aCcdeflmX] [-F histedit-script] "
11621 "[branch]\n", getprogname());
11625 #define GOT_HISTEDIT_PICK 'p'
11626 #define GOT_HISTEDIT_EDIT 'e'
11627 #define GOT_HISTEDIT_FOLD 'f'
11628 #define GOT_HISTEDIT_DROP 'd'
11629 #define GOT_HISTEDIT_MESG 'm'
11631 static const struct got_histedit_cmd {
11632 unsigned char code;
11635 } got_histedit_cmds[] = {
11636 { GOT_HISTEDIT_PICK, "pick", "use commit" },
11637 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
11638 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
11640 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
11641 { GOT_HISTEDIT_MESG, "mesg",
11642 "single-line log message for commit above (open editor if empty)" },
11645 struct got_histedit_list_entry {
11646 TAILQ_ENTRY(got_histedit_list_entry) entry;
11647 struct got_object_id *commit_id;
11648 const struct got_histedit_cmd *cmd;
11651 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
11653 static const struct got_error *
11654 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
11655 FILE *f, struct got_repository *repo)
11657 const struct got_error *err = NULL;
11658 char *logmsg = NULL, *id_str = NULL;
11659 struct got_commit_object *commit = NULL;
11662 err = got_object_open_as_commit(&commit, repo, commit_id);
11666 err = get_short_logmsg(&logmsg, 34, commit);
11670 err = got_object_id_str(&id_str, commit_id);
11674 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
11676 err = got_ferror(f, GOT_ERR_IO);
11679 got_object_commit_close(commit);
11685 static const struct got_error *
11686 histedit_write_commit_list(struct got_object_id_queue *commits,
11687 FILE *f, int edit_logmsg_only, int fold_only, int drop_only,
11688 int edit_only, struct got_repository *repo)
11690 const struct got_error *err = NULL;
11691 struct got_object_qid *qid;
11692 const char *histedit_cmd = NULL;
11694 if (STAILQ_EMPTY(commits))
11695 return got_error(GOT_ERR_EMPTY_HISTEDIT);
11697 STAILQ_FOREACH(qid, commits, entry) {
11698 histedit_cmd = got_histedit_cmds[0].name;
11700 histedit_cmd = "drop";
11701 else if (edit_only)
11702 histedit_cmd = "edit";
11703 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
11704 histedit_cmd = "fold";
11705 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
11708 if (edit_logmsg_only) {
11709 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
11711 err = got_ferror(f, GOT_ERR_IO);
11720 static const struct got_error *
11721 write_cmd_list(FILE *f, const char *branch_name,
11722 struct got_object_id_queue *commits)
11724 const struct got_error *err = NULL;
11728 struct got_object_qid *qid;
11730 qid = STAILQ_FIRST(commits);
11731 err = got_object_id_str(&id_str, &qid->id);
11736 "# Editing the history of branch '%s' starting at\n"
11738 "# Commits will be processed in order from top to "
11739 "bottom of this file.\n", branch_name, id_str);
11741 err = got_ferror(f, GOT_ERR_IO);
11745 n = fprintf(f, "# Available histedit commands:\n");
11747 err = got_ferror(f, GOT_ERR_IO);
11751 for (i = 0; i < nitems(got_histedit_cmds); i++) {
11752 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
11753 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
11756 err = got_ferror(f, GOT_ERR_IO);
11765 static const struct got_error *
11766 histedit_syntax_error(int lineno)
11768 static char msg[42];
11771 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
11773 if (ret < 0 || (size_t)ret >= sizeof(msg))
11774 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
11776 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
11779 static const struct got_error *
11780 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
11781 char *logmsg, struct got_repository *repo)
11783 const struct got_error *err;
11784 struct got_commit_object *folded_commit = NULL;
11785 char *id_str, *folded_logmsg = NULL;
11787 err = got_object_id_str(&id_str, hle->commit_id);
11791 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
11795 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
11798 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
11799 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
11800 folded_logmsg) == -1) {
11801 err = got_error_from_errno("asprintf");
11805 got_object_commit_close(folded_commit);
11807 free(folded_logmsg);
11811 static struct got_histedit_list_entry *
11812 get_folded_commits(struct got_histedit_list_entry *hle)
11814 struct got_histedit_list_entry *prev, *folded = NULL;
11816 prev = TAILQ_PREV(hle, got_histedit_list, entry);
11817 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
11818 prev->cmd->code == GOT_HISTEDIT_DROP)) {
11819 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
11821 prev = TAILQ_PREV(prev, got_histedit_list, entry);
11827 static const struct got_error *
11828 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
11829 struct got_repository *repo)
11831 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
11832 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
11833 const struct got_error *err = NULL;
11834 struct got_commit_object *commit = NULL;
11837 struct got_histedit_list_entry *folded = NULL;
11839 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
11843 folded = get_folded_commits(hle);
11845 while (folded != hle) {
11846 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
11847 folded = TAILQ_NEXT(folded, entry);
11850 err = append_folded_commit_msg(&new_msg, folded,
11856 folded = TAILQ_NEXT(folded, entry);
11860 err = got_object_id_str(&id_str, hle->commit_id);
11863 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
11866 logmsg_len = asprintf(&new_msg,
11867 "%s\n# original log message of commit %s: %s",
11868 logmsg ? logmsg : "", id_str, orig_logmsg);
11869 if (logmsg_len == -1) {
11870 err = got_error_from_errno("asprintf");
11876 err = got_object_id_str(&id_str, hle->commit_id);
11880 err = got_opentemp_named_fd(&logmsg_path, &fd,
11881 GOT_TMPDIR_STR "/got-logmsg", "");
11885 if (write(fd, logmsg, logmsg_len) == -1) {
11886 err = got_error_from_errno2("write", logmsg_path);
11889 if (close(fd) == -1) {
11890 err = got_error_from_errno2("close", logmsg_path);
11895 err = get_editor(&editor);
11899 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
11902 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
11905 hle->logmsg = strdup(new_msg);
11906 if (hle->logmsg == NULL)
11907 err = got_error_from_errno("strdup");
11910 if (fd != -1 && close(fd) == -1 && err == NULL)
11911 err = got_error_from_errno2("close", logmsg_path);
11912 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
11913 err = got_error_from_errno2("unlink", logmsg_path);
11919 got_object_commit_close(commit);
11923 static const struct got_error *
11924 histedit_parse_list(struct got_histedit_list *histedit_cmds,
11925 FILE *f, struct got_repository *repo)
11927 const struct got_error *err = NULL;
11928 char *line = NULL, *p, *end;
11929 size_t i, linesize = 0;
11931 int lineno = 0, lastcmd = -1;
11932 const struct got_histedit_cmd *cmd;
11933 struct got_object_id *commit_id = NULL;
11934 struct got_histedit_list_entry *hle = NULL;
11937 linelen = getline(&line, &linesize, f);
11938 if (linelen == -1) {
11939 const struct got_error *getline_err;
11942 getline_err = got_error_from_errno("getline");
11943 err = got_ferror(f, getline_err->code);
11948 while (isspace((unsigned char)p[0]))
11950 if (p[0] == '#' || p[0] == '\0')
11953 for (i = 0; i < nitems(got_histedit_cmds); i++) {
11954 cmd = &got_histedit_cmds[i];
11955 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
11956 isspace((unsigned char)p[strlen(cmd->name)])) {
11957 p += strlen(cmd->name);
11960 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
11965 if (i == nitems(got_histedit_cmds)) {
11966 err = histedit_syntax_error(lineno);
11969 while (isspace((unsigned char)p[0]))
11971 if (cmd->code == GOT_HISTEDIT_MESG) {
11972 if (lastcmd != GOT_HISTEDIT_PICK &&
11973 lastcmd != GOT_HISTEDIT_EDIT) {
11974 err = got_error(GOT_ERR_HISTEDIT_CMD);
11977 if (p[0] == '\0') {
11978 err = histedit_edit_logmsg(hle, repo);
11982 hle->logmsg = strdup(p);
11983 if (hle->logmsg == NULL) {
11984 err = got_error_from_errno("strdup");
11988 lastcmd = cmd->code;
11992 while (end[0] && !isspace((unsigned char)end[0]))
11996 err = got_object_resolve_id_str(&commit_id, repo, p);
11998 /* override error code */
11999 err = histedit_syntax_error(lineno);
12003 hle = malloc(sizeof(*hle));
12005 err = got_error_from_errno("malloc");
12009 hle->commit_id = commit_id;
12010 hle->logmsg = NULL;
12012 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
12013 lastcmd = cmd->code;
12021 static const struct got_error *
12022 histedit_check_script(struct got_histedit_list *histedit_cmds,
12023 struct got_object_id_queue *commits, struct got_repository *repo)
12025 const struct got_error *err = NULL;
12026 struct got_object_qid *qid;
12027 struct got_histedit_list_entry *hle;
12028 static char msg[92];
12031 if (TAILQ_EMPTY(histedit_cmds))
12032 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12033 "histedit script contains no commands");
12034 if (STAILQ_EMPTY(commits))
12035 return got_error(GOT_ERR_EMPTY_HISTEDIT);
12037 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12038 struct got_histedit_list_entry *hle2;
12039 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
12042 if (got_object_id_cmp(hle->commit_id,
12043 hle2->commit_id) != 0)
12045 err = got_object_id_str(&id_str, hle->commit_id);
12048 snprintf(msg, sizeof(msg), "commit %s is listed "
12049 "more than once in histedit script", id_str);
12051 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12055 STAILQ_FOREACH(qid, commits, entry) {
12056 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12057 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
12061 err = got_object_id_str(&id_str, &qid->id);
12064 snprintf(msg, sizeof(msg),
12065 "commit %s missing from histedit script", id_str);
12067 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12071 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
12072 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
12073 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
12074 "last commit in histedit script cannot be folded");
12079 static const struct got_error *
12080 histedit_run_editor(struct got_histedit_list *histedit_cmds,
12081 const char *path, struct got_object_id_queue *commits,
12082 struct got_repository *repo)
12084 const struct got_error *err = NULL;
12085 struct stat st, st2;
12086 struct timespec timeout;
12090 err = get_editor(&editor);
12094 if (stat(path, &st) == -1) {
12095 err = got_error_from_errno2("stat", path);
12099 if (spawn_editor(editor, path) == -1) {
12100 err = got_error_from_errno("failed spawning editor");
12104 timeout.tv_sec = 0;
12105 timeout.tv_nsec = 1;
12106 nanosleep(&timeout, NULL);
12108 if (stat(path, &st2) == -1) {
12109 err = got_error_from_errno2("stat", path);
12113 if (st.st_size == st2.st_size &&
12114 timespeccmp(&st.st_mtim, &st2.st_mtim, ==)) {
12115 err = got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12116 "no changes made to histedit script, aborting");
12120 f = fopen(path, "re");
12122 err = got_error_from_errno("fopen");
12125 err = histedit_parse_list(histedit_cmds, f, repo);
12129 err = histedit_check_script(histedit_cmds, commits, repo);
12131 if (f && fclose(f) == EOF && err == NULL)
12132 err = got_error_from_errno("fclose");
12137 static const struct got_error *
12138 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
12139 struct got_object_id_queue *, const char *, const char *,
12140 struct got_repository *);
12142 static const struct got_error *
12143 histedit_edit_script(struct got_histedit_list *histedit_cmds,
12144 struct got_object_id_queue *commits, const char *branch_name,
12145 int edit_logmsg_only, int fold_only, int drop_only, int edit_only,
12146 struct got_repository *repo)
12148 const struct got_error *err;
12152 err = got_opentemp_named(&path, &f, "got-histedit", "");
12156 err = write_cmd_list(f, branch_name, commits);
12160 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
12161 fold_only, drop_only, edit_only, repo);
12165 if (drop_only || edit_logmsg_only || fold_only || edit_only) {
12167 err = histedit_parse_list(histedit_cmds, f, repo);
12169 if (fclose(f) == EOF) {
12170 err = got_error_from_errno("fclose");
12174 err = histedit_run_editor(histedit_cmds, path, commits, repo);
12176 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12177 err->code != GOT_ERR_HISTEDIT_CMD)
12179 err = histedit_edit_list_retry(histedit_cmds, err,
12180 commits, path, branch_name, repo);
12184 if (f && fclose(f) == EOF && err == NULL)
12185 err = got_error_from_errno("fclose");
12186 if (path && unlink(path) != 0 && err == NULL)
12187 err = got_error_from_errno2("unlink", path);
12192 static const struct got_error *
12193 histedit_save_list(struct got_histedit_list *histedit_cmds,
12194 struct got_worktree *worktree, struct got_repository *repo)
12196 const struct got_error *err = NULL;
12199 struct got_histedit_list_entry *hle;
12200 struct got_commit_object *commit = NULL;
12202 err = got_worktree_get_histedit_script_path(&path, worktree);
12206 f = fopen(path, "we");
12208 err = got_error_from_errno2("fopen", path);
12211 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12212 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
12218 int n = fprintf(f, "%c %s\n",
12219 GOT_HISTEDIT_MESG, hle->logmsg);
12221 err = got_ferror(f, GOT_ERR_IO);
12227 if (f && fclose(f) == EOF && err == NULL)
12228 err = got_error_from_errno("fclose");
12231 got_object_commit_close(commit);
12236 histedit_free_list(struct got_histedit_list *histedit_cmds)
12238 struct got_histedit_list_entry *hle;
12240 while ((hle = TAILQ_FIRST(histedit_cmds))) {
12241 TAILQ_REMOVE(histedit_cmds, hle, entry);
12246 static const struct got_error *
12247 histedit_load_list(struct got_histedit_list *histedit_cmds,
12248 const char *path, struct got_repository *repo)
12250 const struct got_error *err = NULL;
12253 f = fopen(path, "re");
12255 err = got_error_from_errno2("fopen", path);
12259 err = histedit_parse_list(histedit_cmds, f, repo);
12261 if (f && fclose(f) == EOF && err == NULL)
12262 err = got_error_from_errno("fclose");
12266 static const struct got_error *
12267 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
12268 const struct got_error *edit_err, struct got_object_id_queue *commits,
12269 const char *path, const char *branch_name, struct got_repository *repo)
12271 const struct got_error *err = NULL, *prev_err = edit_err;
12274 while (resp != 'c' && resp != 'r' && resp != 'a') {
12275 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
12276 "or (a)bort: ", getprogname(), prev_err->msg);
12281 histedit_free_list(histedit_cmds);
12282 err = histedit_run_editor(histedit_cmds, path, commits,
12285 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12286 err->code != GOT_ERR_HISTEDIT_CMD)
12293 } else if (resp == 'r') {
12294 histedit_free_list(histedit_cmds);
12295 err = histedit_edit_script(histedit_cmds,
12296 commits, branch_name, 0, 0, 0, 0, repo);
12298 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12299 err->code != GOT_ERR_HISTEDIT_CMD)
12306 } else if (resp == 'a') {
12307 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
12310 printf("invalid response '%c'\n", resp);
12316 static const struct got_error *
12317 histedit_complete(struct got_worktree *worktree,
12318 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
12319 struct got_reference *branch, struct got_repository *repo)
12321 printf("Switching work tree to %s\n",
12322 got_ref_get_symref_target(branch));
12323 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
12327 static const struct got_error *
12328 show_histedit_progress(struct got_commit_object *commit,
12329 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
12331 const struct got_error *err;
12332 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
12334 err = got_object_id_str(&old_id_str, hle->commit_id);
12339 err = got_object_id_str(&new_id_str, new_id);
12344 old_id_str[12] = '\0';
12346 new_id_str[12] = '\0';
12349 logmsg = strdup(hle->logmsg);
12350 if (logmsg == NULL) {
12351 err = got_error_from_errno("strdup");
12354 trim_logmsg(logmsg, 42);
12356 err = get_short_logmsg(&logmsg, 42, commit);
12361 switch (hle->cmd->code) {
12362 case GOT_HISTEDIT_PICK:
12363 case GOT_HISTEDIT_EDIT:
12364 printf("%s -> %s: %s\n", old_id_str,
12365 new_id_str ? new_id_str : "no-op change", logmsg);
12367 case GOT_HISTEDIT_DROP:
12368 case GOT_HISTEDIT_FOLD:
12369 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
12381 static const struct got_error *
12382 histedit_commit(struct got_pathlist_head *merged_paths,
12383 struct got_worktree *worktree, struct got_fileindex *fileindex,
12384 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
12385 const char *committer, int allow_conflict, struct got_repository *repo)
12387 const struct got_error *err;
12388 struct got_commit_object *commit;
12389 struct got_object_id *new_commit_id;
12391 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
12392 && hle->logmsg == NULL) {
12393 err = histedit_edit_logmsg(hle, repo);
12398 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12402 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
12403 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
12404 hle->logmsg, allow_conflict, repo);
12406 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
12408 err = show_histedit_progress(commit, hle, NULL);
12410 err = show_histedit_progress(commit, hle, new_commit_id);
12411 free(new_commit_id);
12414 got_object_commit_close(commit);
12418 static const struct got_error *
12419 histedit_skip_commit(struct got_histedit_list_entry *hle,
12420 struct got_worktree *worktree, struct got_repository *repo)
12422 const struct got_error *error;
12423 struct got_commit_object *commit;
12425 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
12430 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
12434 error = show_histedit_progress(commit, hle, NULL);
12435 got_object_commit_close(commit);
12439 static const struct got_error *
12440 check_local_changes(void *arg, unsigned char status,
12441 unsigned char staged_status, const char *path,
12442 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12443 struct got_object_id *commit_id, int dirfd, const char *de_name)
12445 int *have_local_changes = arg;
12448 case GOT_STATUS_ADD:
12449 case GOT_STATUS_DELETE:
12450 case GOT_STATUS_MODIFY:
12451 case GOT_STATUS_CONFLICT:
12452 *have_local_changes = 1;
12453 return got_error(GOT_ERR_CANCELLED);
12458 switch (staged_status) {
12459 case GOT_STATUS_ADD:
12460 case GOT_STATUS_DELETE:
12461 case GOT_STATUS_MODIFY:
12462 *have_local_changes = 1;
12463 return got_error(GOT_ERR_CANCELLED);
12471 static const struct got_error *
12472 cmd_histedit(int argc, char *argv[])
12474 const struct got_error *error = NULL;
12475 struct got_worktree *worktree = NULL;
12476 struct got_fileindex *fileindex = NULL;
12477 struct got_repository *repo = NULL;
12478 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
12479 struct got_reference *branch = NULL;
12480 struct got_reference *tmp_branch = NULL;
12481 struct got_object_id *resume_commit_id = NULL;
12482 struct got_object_id *base_commit_id = NULL;
12483 struct got_object_id *head_commit_id = NULL;
12484 struct got_commit_object *commit = NULL;
12485 int ch, rebase_in_progress = 0, merge_in_progress = 0;
12486 struct got_update_progress_arg upa;
12487 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
12488 int drop_only = 0, edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
12489 int allow_conflict = 0, list_backups = 0, delete_backups = 0;
12490 const char *edit_script_path = NULL;
12491 struct got_object_id_queue commits;
12492 struct got_pathlist_head merged_paths;
12493 const struct got_object_id_queue *parent_ids;
12494 struct got_object_qid *pid;
12495 struct got_histedit_list histedit_cmds;
12496 struct got_histedit_list_entry *hle;
12497 int *pack_fds = NULL;
12499 STAILQ_INIT(&commits);
12500 TAILQ_INIT(&histedit_cmds);
12501 TAILQ_INIT(&merged_paths);
12502 memset(&upa, 0, sizeof(upa));
12505 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12506 "unveil", NULL) == -1)
12510 while ((ch = getopt(argc, argv, "aCcdeF:flmX")) != -1) {
12516 allow_conflict = 1;
12528 edit_script_path = optarg;
12537 edit_logmsg_only = 1;
12540 delete_backups = 1;
12551 if (abort_edit && allow_conflict)
12552 option_conflict('a', 'C');
12553 if (abort_edit && continue_edit)
12554 option_conflict('a', 'c');
12555 if (edit_script_path && allow_conflict)
12556 option_conflict('F', 'C');
12557 if (edit_script_path && edit_logmsg_only)
12558 option_conflict('F', 'm');
12559 if (abort_edit && edit_logmsg_only)
12560 option_conflict('a', 'm');
12561 if (edit_logmsg_only && allow_conflict)
12562 option_conflict('m', 'C');
12563 if (continue_edit && edit_logmsg_only)
12564 option_conflict('c', 'm');
12565 if (abort_edit && fold_only)
12566 option_conflict('a', 'f');
12567 if (fold_only && allow_conflict)
12568 option_conflict('f', 'C');
12569 if (continue_edit && fold_only)
12570 option_conflict('c', 'f');
12571 if (fold_only && edit_logmsg_only)
12572 option_conflict('f', 'm');
12573 if (edit_script_path && fold_only)
12574 option_conflict('F', 'f');
12575 if (abort_edit && edit_only)
12576 option_conflict('a', 'e');
12577 if (continue_edit && edit_only)
12578 option_conflict('c', 'e');
12579 if (edit_only && edit_logmsg_only)
12580 option_conflict('e', 'm');
12581 if (edit_script_path && edit_only)
12582 option_conflict('F', 'e');
12583 if (fold_only && edit_only)
12584 option_conflict('f', 'e');
12585 if (drop_only && abort_edit)
12586 option_conflict('d', 'a');
12587 if (drop_only && allow_conflict)
12588 option_conflict('d', 'C');
12589 if (drop_only && continue_edit)
12590 option_conflict('d', 'c');
12591 if (drop_only && edit_logmsg_only)
12592 option_conflict('d', 'm');
12593 if (drop_only && edit_only)
12594 option_conflict('d', 'e');
12595 if (drop_only && edit_script_path)
12596 option_conflict('d', 'F');
12597 if (drop_only && fold_only)
12598 option_conflict('d', 'f');
12599 if (list_backups) {
12601 option_conflict('l', 'a');
12602 if (allow_conflict)
12603 option_conflict('l', 'C');
12605 option_conflict('l', 'c');
12606 if (edit_script_path)
12607 option_conflict('l', 'F');
12608 if (edit_logmsg_only)
12609 option_conflict('l', 'm');
12611 option_conflict('l', 'd');
12613 option_conflict('l', 'f');
12615 option_conflict('l', 'e');
12616 if (delete_backups)
12617 option_conflict('l', 'X');
12618 if (argc != 0 && argc != 1)
12620 } else if (delete_backups) {
12622 option_conflict('X', 'a');
12623 if (allow_conflict)
12624 option_conflict('X', 'C');
12626 option_conflict('X', 'c');
12628 option_conflict('X', 'd');
12629 if (edit_script_path)
12630 option_conflict('X', 'F');
12631 if (edit_logmsg_only)
12632 option_conflict('X', 'm');
12634 option_conflict('X', 'f');
12636 option_conflict('X', 'e');
12638 option_conflict('X', 'l');
12639 if (argc != 0 && argc != 1)
12641 } else if (allow_conflict && !continue_edit)
12642 errx(1, "-C option requires -c");
12643 else if (argc != 0)
12647 * This command cannot apply unveil(2) in all cases because the
12648 * user may choose to run an editor to edit the histedit script
12649 * and to edit individual commit log messages.
12650 * unveil(2) traverses exec(2); if an editor is used we have to
12651 * apply unveil after edit script and log messages have been written.
12652 * XXX TODO: Make use of unveil(2) where possible.
12655 cwd = getcwd(NULL, 0);
12657 error = got_error_from_errno("getcwd");
12661 error = got_repo_pack_fds_open(&pack_fds);
12665 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
12667 if (list_backups || delete_backups) {
12668 if (error->code != GOT_ERR_NOT_WORKTREE)
12671 if (error->code == GOT_ERR_NOT_WORKTREE)
12672 error = wrap_not_worktree_error(error,
12678 if (list_backups || delete_backups) {
12679 error = got_repo_open(&repo,
12680 worktree ? got_worktree_get_repo_path(worktree) : cwd,
12684 error = apply_unveil(got_repo_get_path(repo), 0,
12685 worktree ? got_worktree_get_root_path(worktree) : NULL);
12688 error = process_backup_refs(
12689 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
12690 argc == 1 ? argv[0] : NULL, delete_backups, repo);
12691 goto done; /* nothing else to do */
12694 error = get_gitconfig_path(&gitconfig_path);
12697 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12698 gitconfig_path, pack_fds);
12702 if (worktree != NULL && !list_backups && !delete_backups) {
12703 error = worktree_has_logmsg_ref("histedit", worktree, repo);
12708 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
12711 if (rebase_in_progress) {
12712 error = got_error(GOT_ERR_REBASING);
12716 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12720 if (merge_in_progress) {
12721 error = got_error(GOT_ERR_MERGE_BUSY);
12725 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
12729 if (edit_in_progress && edit_logmsg_only) {
12730 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12731 "histedit operation is in progress in this "
12732 "work tree and must be continued or aborted "
12733 "before the -m option can be used");
12736 if (edit_in_progress && drop_only) {
12737 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12738 "histedit operation is in progress in this "
12739 "work tree and must be continued or aborted "
12740 "before the -d option can be used");
12743 if (edit_in_progress && fold_only) {
12744 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12745 "histedit operation is in progress in this "
12746 "work tree and must be continued or aborted "
12747 "before the -f option can be used");
12750 if (edit_in_progress && edit_only) {
12751 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12752 "histedit operation is in progress in this "
12753 "work tree and must be continued or aborted "
12754 "before the -e option can be used");
12758 if (edit_in_progress && abort_edit) {
12759 error = got_worktree_histedit_continue(&resume_commit_id,
12760 &tmp_branch, &branch, &base_commit_id, &fileindex,
12764 printf("Switching work tree to %s\n",
12765 got_ref_get_symref_target(branch));
12766 error = got_worktree_histedit_abort(worktree, fileindex, repo,
12767 branch, base_commit_id, abort_progress, &upa);
12770 printf("Histedit of %s aborted\n",
12771 got_ref_get_symref_target(branch));
12772 print_merge_progress_stats(&upa);
12773 goto done; /* nothing else to do */
12774 } else if (abort_edit) {
12775 error = got_error(GOT_ERR_NOT_HISTEDIT);
12779 error = get_author(&committer, repo, worktree);
12783 if (continue_edit) {
12786 if (!edit_in_progress) {
12787 error = got_error(GOT_ERR_NOT_HISTEDIT);
12791 error = got_worktree_get_histedit_script_path(&path, worktree);
12795 error = histedit_load_list(&histedit_cmds, path, repo);
12800 error = got_worktree_histedit_continue(&resume_commit_id,
12801 &tmp_branch, &branch, &base_commit_id, &fileindex,
12806 error = got_ref_resolve(&head_commit_id, repo, branch);
12810 error = got_object_open_as_commit(&commit, repo,
12814 parent_ids = got_object_commit_get_parent_ids(commit);
12815 pid = STAILQ_FIRST(parent_ids);
12817 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12820 error = collect_commits(&commits, head_commit_id, &pid->id,
12821 base_commit_id, got_worktree_get_path_prefix(worktree),
12822 GOT_ERR_HISTEDIT_PATH, repo);
12823 got_object_commit_close(commit);
12828 if (edit_in_progress) {
12829 error = got_error(GOT_ERR_HISTEDIT_BUSY);
12833 error = got_ref_open(&branch, repo,
12834 got_worktree_get_head_ref_name(worktree), 0);
12838 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
12839 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
12840 "will not edit commit history of a branch outside "
12841 "the \"refs/heads/\" reference namespace");
12845 error = got_ref_resolve(&head_commit_id, repo, branch);
12846 got_ref_close(branch);
12851 error = got_object_open_as_commit(&commit, repo,
12855 parent_ids = got_object_commit_get_parent_ids(commit);
12856 pid = STAILQ_FIRST(parent_ids);
12858 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12861 error = collect_commits(&commits, head_commit_id, &pid->id,
12862 got_worktree_get_base_commit_id(worktree),
12863 got_worktree_get_path_prefix(worktree),
12864 GOT_ERR_HISTEDIT_PATH, repo);
12865 got_object_commit_close(commit);
12870 if (STAILQ_EMPTY(&commits)) {
12871 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12875 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
12876 &base_commit_id, &fileindex, worktree, repo);
12880 if (edit_script_path) {
12881 error = histedit_load_list(&histedit_cmds,
12882 edit_script_path, repo);
12884 got_worktree_histedit_abort(worktree, fileindex,
12885 repo, branch, base_commit_id,
12886 abort_progress, &upa);
12887 print_merge_progress_stats(&upa);
12891 const char *branch_name;
12892 branch_name = got_ref_get_symref_target(branch);
12893 if (strncmp(branch_name, "refs/heads/", 11) == 0)
12895 error = histedit_edit_script(&histedit_cmds, &commits,
12896 branch_name, edit_logmsg_only, fold_only,
12897 drop_only, edit_only, repo);
12899 got_worktree_histedit_abort(worktree, fileindex,
12900 repo, branch, base_commit_id,
12901 abort_progress, &upa);
12902 print_merge_progress_stats(&upa);
12908 error = histedit_save_list(&histedit_cmds, worktree,
12911 got_worktree_histedit_abort(worktree, fileindex,
12912 repo, branch, base_commit_id,
12913 abort_progress, &upa);
12914 print_merge_progress_stats(&upa);
12920 error = histedit_check_script(&histedit_cmds, &commits, repo);
12924 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
12925 if (resume_commit_id) {
12926 if (got_object_id_cmp(hle->commit_id,
12927 resume_commit_id) != 0)
12930 resume_commit_id = NULL;
12931 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
12932 hle->cmd->code == GOT_HISTEDIT_FOLD) {
12933 error = histedit_skip_commit(hle, worktree,
12938 struct got_pathlist_head paths;
12939 int have_changes = 0;
12941 TAILQ_INIT(&paths);
12942 error = got_pathlist_append(&paths, "", NULL);
12945 error = got_worktree_status(worktree, &paths,
12946 repo, 0, check_local_changes, &have_changes,
12947 check_cancelled, NULL);
12948 got_pathlist_free(&paths,
12949 GOT_PATHLIST_FREE_NONE);
12951 if (error->code != GOT_ERR_CANCELLED)
12953 if (sigint_received || sigpipe_received)
12956 if (have_changes) {
12957 error = histedit_commit(NULL, worktree,
12958 fileindex, tmp_branch, hle,
12959 committer, allow_conflict, repo);
12963 error = got_object_open_as_commit(
12964 &commit, repo, hle->commit_id);
12967 error = show_histedit_progress(commit,
12969 got_object_commit_close(commit);
12978 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
12979 error = histedit_skip_commit(hle, worktree, repo);
12985 error = got_object_open_as_commit(&commit, repo,
12989 parent_ids = got_object_commit_get_parent_ids(commit);
12990 pid = STAILQ_FIRST(parent_ids);
12992 error = got_worktree_histedit_merge_files(&merged_paths,
12993 worktree, fileindex, &pid->id, hle->commit_id, repo,
12994 update_progress, &upa, check_cancelled, NULL);
12997 got_object_commit_close(commit);
13000 print_merge_progress_stats(&upa);
13001 if (upa.conflicts > 0 || upa.missing > 0 ||
13002 upa.not_deleted > 0 || upa.unversioned > 0) {
13003 if (upa.conflicts > 0) {
13004 error = show_rebase_merge_conflict(
13005 hle->commit_id, repo);
13009 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13013 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
13015 error = got_object_id_str(&id_str, hle->commit_id);
13018 printf("Stopping histedit for amending commit %s\n",
13021 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13022 error = got_worktree_histedit_postpone(worktree,
13027 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
13028 error = histedit_skip_commit(hle, worktree, repo);
13034 error = histedit_commit(&merged_paths, worktree, fileindex,
13035 tmp_branch, hle, committer, allow_conflict, repo);
13036 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13041 if (upa.conflicts > 0 || upa.missing > 0 ||
13042 upa.not_deleted > 0 || upa.unversioned > 0) {
13043 error = got_worktree_histedit_postpone(worktree, fileindex);
13046 if (upa.conflicts > 0 && upa.missing == 0 &&
13047 upa.not_deleted == 0 && upa.unversioned == 0) {
13048 error = got_error_msg(GOT_ERR_CONFLICTS,
13049 "conflicts must be resolved before histedit "
13051 } else if (upa.conflicts > 0) {
13052 error = got_error_msg(GOT_ERR_CONFLICTS,
13053 "conflicts must be resolved before histedit "
13054 "can continue; changes destined for some "
13055 "files were not yet merged and should be "
13056 "merged manually if required before the "
13057 "histedit operation is continued");
13059 error = got_error_msg(GOT_ERR_CONFLICTS,
13060 "changes destined for some files were not "
13061 "yet merged and should be merged manually "
13062 "if required before the histedit operation "
13066 error = histedit_complete(worktree, fileindex, tmp_branch,
13071 free(gitconfig_path);
13072 got_object_id_queue_free(&commits);
13073 histedit_free_list(&histedit_cmds);
13074 free(head_commit_id);
13075 free(base_commit_id);
13076 free(resume_commit_id);
13078 got_object_commit_close(commit);
13080 got_ref_close(branch);
13082 got_ref_close(tmp_branch);
13084 got_worktree_close(worktree);
13086 const struct got_error *close_err = got_repo_close(repo);
13091 const struct got_error *pack_err =
13092 got_repo_pack_fds_close(pack_fds);
13100 usage_integrate(void)
13102 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
13106 static const struct got_error *
13107 cmd_integrate(int argc, char *argv[])
13109 const struct got_error *error = NULL;
13110 struct got_repository *repo = NULL;
13111 struct got_worktree *worktree = NULL;
13112 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
13113 const char *branch_arg = NULL;
13114 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
13115 struct got_fileindex *fileindex = NULL;
13116 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
13118 struct got_update_progress_arg upa;
13119 int *pack_fds = NULL;
13122 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13123 "unveil", NULL) == -1)
13127 while ((ch = getopt(argc, argv, "")) != -1) {
13140 branch_arg = argv[0];
13142 cwd = getcwd(NULL, 0);
13144 error = got_error_from_errno("getcwd");
13148 error = got_repo_pack_fds_open(&pack_fds);
13152 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13154 if (error->code == GOT_ERR_NOT_WORKTREE)
13155 error = wrap_not_worktree_error(error, "integrate",
13160 error = check_rebase_or_histedit_in_progress(worktree);
13164 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13169 error = apply_unveil(got_repo_get_path(repo), 0,
13170 got_worktree_get_root_path(worktree));
13174 error = check_merge_in_progress(worktree, repo);
13178 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
13179 error = got_error_from_errno("asprintf");
13183 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
13184 &base_branch_ref, worktree, refname, repo);
13188 refname = strdup(got_ref_get_name(branch_ref));
13189 if (refname == NULL) {
13190 error = got_error_from_errno("strdup");
13191 got_worktree_integrate_abort(worktree, fileindex, repo,
13192 branch_ref, base_branch_ref);
13195 base_refname = strdup(got_ref_get_name(base_branch_ref));
13196 if (base_refname == NULL) {
13197 error = got_error_from_errno("strdup");
13198 got_worktree_integrate_abort(worktree, fileindex, repo,
13199 branch_ref, base_branch_ref);
13202 if (strncmp(base_refname, "refs/heads/", 11) != 0) {
13203 error = got_error(GOT_ERR_INTEGRATE_BRANCH);
13204 got_worktree_integrate_abort(worktree, fileindex, repo,
13205 branch_ref, base_branch_ref);
13209 error = got_ref_resolve(&commit_id, repo, branch_ref);
13213 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
13217 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
13218 error = got_error_msg(GOT_ERR_SAME_BRANCH,
13219 "specified branch has already been integrated");
13220 got_worktree_integrate_abort(worktree, fileindex, repo,
13221 branch_ref, base_branch_ref);
13225 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
13227 if (error->code == GOT_ERR_ANCESTRY)
13228 error = got_error(GOT_ERR_REBASE_REQUIRED);
13229 got_worktree_integrate_abort(worktree, fileindex, repo,
13230 branch_ref, base_branch_ref);
13234 memset(&upa, 0, sizeof(upa));
13235 error = got_worktree_integrate_continue(worktree, fileindex, repo,
13236 branch_ref, base_branch_ref, update_progress, &upa,
13237 check_cancelled, NULL);
13241 printf("Integrated %s into %s\n", refname, base_refname);
13242 print_update_progress_stats(&upa);
13245 const struct got_error *close_err = got_repo_close(repo);
13250 got_worktree_close(worktree);
13252 const struct got_error *pack_err =
13253 got_repo_pack_fds_close(pack_fds);
13258 free(base_commit_id);
13261 free(base_refname);
13268 fprintf(stderr, "usage: %s merge [-aCcn] [branch]\n", getprogname());
13272 static const struct got_error *
13273 cmd_merge(int argc, char *argv[])
13275 const struct got_error *error = NULL;
13276 struct got_worktree *worktree = NULL;
13277 struct got_repository *repo = NULL;
13278 struct got_fileindex *fileindex = NULL;
13279 char *cwd = NULL, *id_str = NULL, *author = NULL;
13280 char *gitconfig_path = NULL;
13281 struct got_reference *branch = NULL, *wt_branch = NULL;
13282 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
13283 struct got_object_id *wt_branch_tip = NULL;
13284 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
13285 int allow_conflict = 0, prefer_fast_forward = 1, interrupt_merge = 0;
13286 struct got_update_progress_arg upa;
13287 struct got_object_id *merge_commit_id = NULL;
13288 char *branch_name = NULL;
13289 int *pack_fds = NULL;
13291 memset(&upa, 0, sizeof(upa));
13294 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13295 "unveil", NULL) == -1)
13299 while ((ch = getopt(argc, argv, "aCcMn")) != -1) {
13305 allow_conflict = 1;
13308 continue_merge = 1;
13311 prefer_fast_forward = 0;
13314 interrupt_merge = 1;
13326 if (continue_merge)
13327 option_conflict('a', 'c');
13328 if (!prefer_fast_forward)
13329 option_conflict('a', 'M');
13330 if (interrupt_merge)
13331 option_conflict('a', 'n');
13332 } else if (continue_merge) {
13333 if (!prefer_fast_forward)
13334 option_conflict('c', 'M');
13335 if (interrupt_merge)
13336 option_conflict('c', 'n');
13338 if (allow_conflict) {
13339 if (!continue_merge)
13340 errx(1, "-C option requires -c");
13342 if (abort_merge || continue_merge) {
13345 } else if (argc != 1)
13348 cwd = getcwd(NULL, 0);
13350 error = got_error_from_errno("getcwd");
13354 error = got_repo_pack_fds_open(&pack_fds);
13358 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13360 if (error->code == GOT_ERR_NOT_WORKTREE)
13361 error = wrap_not_worktree_error(error,
13366 error = get_gitconfig_path(&gitconfig_path);
13369 error = got_repo_open(&repo,
13370 worktree ? got_worktree_get_repo_path(worktree) : cwd,
13371 gitconfig_path, pack_fds);
13375 if (worktree != NULL) {
13376 error = worktree_has_logmsg_ref("merge", worktree, repo);
13381 error = apply_unveil(got_repo_get_path(repo), 0,
13382 worktree ? got_worktree_get_root_path(worktree) : NULL);
13386 error = check_rebase_or_histedit_in_progress(worktree);
13390 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
13395 if (merge_in_progress && !(abort_merge || continue_merge)) {
13396 error = got_error(GOT_ERR_MERGE_BUSY);
13400 if (!merge_in_progress && (abort_merge || continue_merge)) {
13401 error = got_error(GOT_ERR_NOT_MERGING);
13406 error = got_worktree_merge_continue(&branch_name,
13407 &branch_tip, &fileindex, worktree, repo);
13410 error = got_worktree_merge_abort(worktree, fileindex, repo,
13411 abort_progress, &upa);
13414 printf("Merge of %s aborted\n", branch_name);
13415 goto done; /* nothing else to do */
13418 if (strncmp(got_worktree_get_head_ref_name(worktree),
13419 "refs/heads/", 11) != 0) {
13420 error = got_error_fmt(GOT_ERR_COMMIT_BRANCH,
13421 "work tree's current branch %s is outside the "
13422 "\"refs/heads/\" reference namespace; "
13423 "update -b required",
13424 got_worktree_get_head_ref_name(worktree));
13428 error = get_author(&author, repo, worktree);
13432 error = got_ref_open(&wt_branch, repo,
13433 got_worktree_get_head_ref_name(worktree), 0);
13436 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
13440 if (continue_merge) {
13441 struct got_object_id *base_commit_id;
13442 base_commit_id = got_worktree_get_base_commit_id(worktree);
13443 if (got_object_id_cmp(wt_branch_tip, base_commit_id) != 0) {
13444 error = got_error(GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
13447 error = got_worktree_merge_continue(&branch_name,
13448 &branch_tip, &fileindex, worktree, repo);
13452 error = got_ref_open(&branch, repo, argv[0], 0);
13455 branch_name = strdup(got_ref_get_name(branch));
13456 if (branch_name == NULL) {
13457 error = got_error_from_errno("strdup");
13460 error = got_ref_resolve(&branch_tip, repo, branch);
13465 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
13466 wt_branch_tip, branch_tip, 0, repo,
13467 check_cancelled, NULL);
13468 if (error && error->code != GOT_ERR_ANCESTRY)
13471 if (!continue_merge) {
13472 error = check_path_prefix(wt_branch_tip, branch_tip,
13473 got_worktree_get_path_prefix(worktree),
13474 GOT_ERR_MERGE_PATH, repo);
13477 error = got_worktree_merge_prepare(&fileindex, worktree, repo);
13480 if (prefer_fast_forward && yca_id &&
13481 got_object_id_cmp(wt_branch_tip, yca_id) == 0) {
13482 struct got_pathlist_head paths;
13483 if (interrupt_merge) {
13484 error = got_error_fmt(GOT_ERR_BAD_OPTION,
13485 "there are no changes to merge since %s "
13486 "is already based on %s; merge cannot be "
13487 "interrupted for amending; -n",
13488 branch_name, got_ref_get_name(wt_branch));
13491 printf("Forwarding %s to %s\n",
13492 got_ref_get_name(wt_branch), branch_name);
13493 error = got_ref_change_ref(wt_branch, branch_tip);
13496 error = got_ref_write(wt_branch, repo);
13499 error = got_worktree_set_base_commit_id(worktree, repo,
13503 TAILQ_INIT(&paths);
13504 error = got_pathlist_append(&paths, "", NULL);
13507 error = got_worktree_checkout_files(worktree,
13508 &paths, repo, update_progress, &upa,
13509 check_cancelled, NULL);
13510 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
13513 if (upa.did_something) {
13515 error = got_object_id_str(&id_str, branch_tip);
13518 printf("Updated to commit %s\n", id_str);
13521 printf("Already up-to-date\n");
13522 print_update_progress_stats(&upa);
13525 error = got_worktree_merge_write_refs(worktree, branch, repo);
13529 error = got_worktree_merge_branch(worktree, fileindex,
13530 yca_id, branch_tip, repo, update_progress, &upa,
13531 check_cancelled, NULL);
13534 print_merge_progress_stats(&upa);
13535 if (!upa.did_something) {
13536 error = got_worktree_merge_abort(worktree, fileindex,
13537 repo, abort_progress, &upa);
13540 printf("Already up-to-date\n");
13545 if (interrupt_merge) {
13546 error = got_worktree_merge_postpone(worktree, fileindex);
13549 printf("Merge of %s interrupted on request\n", branch_name);
13550 } else if (upa.conflicts > 0 || upa.missing > 0 ||
13551 upa.not_deleted > 0 || upa.unversioned > 0) {
13552 error = got_worktree_merge_postpone(worktree, fileindex);
13555 if (upa.conflicts > 0 && upa.missing == 0 &&
13556 upa.not_deleted == 0 && upa.unversioned == 0) {
13557 error = got_error_msg(GOT_ERR_CONFLICTS,
13558 "conflicts must be resolved before merging "
13560 } else if (upa.conflicts > 0) {
13561 error = got_error_msg(GOT_ERR_CONFLICTS,
13562 "conflicts must be resolved before merging "
13563 "can continue; changes destined for some "
13564 "files were not yet merged and "
13565 "should be merged manually if required before the "
13566 "merge operation is continued");
13568 error = got_error_msg(GOT_ERR_CONFLICTS,
13569 "changes destined for some "
13570 "files were not yet merged and should be "
13571 "merged manually if required before the "
13572 "merge operation is continued");
13576 error = got_worktree_merge_commit(&merge_commit_id, worktree,
13577 fileindex, author, NULL, 1, branch_tip, branch_name,
13578 allow_conflict, repo, continue_merge ? print_status : NULL,
13582 error = got_worktree_merge_complete(worktree, fileindex, repo);
13585 error = got_object_id_str(&id_str, merge_commit_id);
13588 printf("Merged %s into %s: %s\n", branch_name,
13589 got_worktree_get_head_ref_name(worktree),
13594 free(gitconfig_path);
13596 free(merge_commit_id);
13602 got_ref_close(branch);
13604 got_ref_close(wt_branch);
13606 got_worktree_close(worktree);
13608 const struct got_error *close_err = got_repo_close(repo);
13613 const struct got_error *pack_err =
13614 got_repo_pack_fds_close(pack_fds);
13624 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
13625 "[path ...]\n", getprogname());
13629 static const struct got_error *
13630 print_stage(void *arg, unsigned char status, unsigned char staged_status,
13631 const char *path, struct got_object_id *blob_id,
13632 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
13633 int dirfd, const char *de_name)
13635 const struct got_error *err = NULL;
13636 char *id_str = NULL;
13638 if (staged_status != GOT_STATUS_ADD &&
13639 staged_status != GOT_STATUS_MODIFY &&
13640 staged_status != GOT_STATUS_DELETE)
13643 if (staged_status == GOT_STATUS_ADD ||
13644 staged_status == GOT_STATUS_MODIFY)
13645 err = got_object_id_str(&id_str, staged_blob_id);
13647 err = got_object_id_str(&id_str, blob_id);
13651 printf("%s %c %s\n", id_str, staged_status, path);
13656 static const struct got_error *
13657 cmd_stage(int argc, char *argv[])
13659 const struct got_error *error = NULL;
13660 struct got_repository *repo = NULL;
13661 struct got_worktree *worktree = NULL;
13663 struct got_pathlist_head paths;
13664 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
13665 FILE *patch_script_file = NULL;
13666 const char *patch_script_path = NULL;
13667 struct choose_patch_arg cpa;
13668 int *pack_fds = NULL;
13670 TAILQ_INIT(&paths);
13673 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13674 "unveil", NULL) == -1)
13678 while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
13681 patch_script_path = optarg;
13690 allow_bad_symlinks = 1;
13701 if (list_stage && (pflag || patch_script_path))
13702 errx(1, "-l option cannot be used with other options");
13703 if (patch_script_path && !pflag)
13704 errx(1, "-F option can only be used together with -p option");
13706 cwd = getcwd(NULL, 0);
13708 error = got_error_from_errno("getcwd");
13712 error = got_repo_pack_fds_open(&pack_fds);
13716 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13718 if (error->code == GOT_ERR_NOT_WORKTREE)
13719 error = wrap_not_worktree_error(error, "stage", cwd);
13723 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13728 if (patch_script_path) {
13729 patch_script_file = fopen(patch_script_path, "re");
13730 if (patch_script_file == NULL) {
13731 error = got_error_from_errno2("fopen",
13732 patch_script_path);
13736 error = apply_unveil(got_repo_get_path(repo), 0,
13737 got_worktree_get_root_path(worktree));
13741 error = check_merge_in_progress(worktree, repo);
13745 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13750 error = got_worktree_status(worktree, &paths, repo, 0,
13751 print_stage, NULL, check_cancelled, NULL);
13753 cpa.patch_script_file = patch_script_file;
13754 cpa.action = "stage";
13755 error = got_worktree_stage(worktree, &paths,
13756 pflag ? NULL : print_status, NULL,
13757 pflag ? choose_patch : NULL, &cpa,
13758 allow_bad_symlinks, repo);
13761 if (patch_script_file && fclose(patch_script_file) == EOF &&
13763 error = got_error_from_errno2("fclose", patch_script_path);
13765 const struct got_error *close_err = got_repo_close(repo);
13770 got_worktree_close(worktree);
13772 const struct got_error *pack_err =
13773 got_repo_pack_fds_close(pack_fds);
13777 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13783 usage_unstage(void)
13785 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
13786 "[path ...]\n", getprogname());
13791 static const struct got_error *
13792 cmd_unstage(int argc, char *argv[])
13794 const struct got_error *error = NULL;
13795 struct got_repository *repo = NULL;
13796 struct got_worktree *worktree = NULL;
13798 struct got_pathlist_head paths;
13800 struct got_update_progress_arg upa;
13801 FILE *patch_script_file = NULL;
13802 const char *patch_script_path = NULL;
13803 struct choose_patch_arg cpa;
13804 int *pack_fds = NULL;
13806 TAILQ_INIT(&paths);
13809 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13810 "unveil", NULL) == -1)
13814 while ((ch = getopt(argc, argv, "F:p")) != -1) {
13817 patch_script_path = optarg;
13831 if (patch_script_path && !pflag)
13832 errx(1, "-F option can only be used together with -p option");
13834 cwd = getcwd(NULL, 0);
13836 error = got_error_from_errno("getcwd");
13840 error = got_repo_pack_fds_open(&pack_fds);
13844 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13846 if (error->code == GOT_ERR_NOT_WORKTREE)
13847 error = wrap_not_worktree_error(error, "unstage", cwd);
13851 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13856 if (patch_script_path) {
13857 patch_script_file = fopen(patch_script_path, "re");
13858 if (patch_script_file == NULL) {
13859 error = got_error_from_errno2("fopen",
13860 patch_script_path);
13865 error = apply_unveil(got_repo_get_path(repo), 0,
13866 got_worktree_get_root_path(worktree));
13870 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13874 cpa.patch_script_file = patch_script_file;
13875 cpa.action = "unstage";
13876 memset(&upa, 0, sizeof(upa));
13877 error = got_worktree_unstage(worktree, &paths, update_progress,
13878 &upa, pflag ? choose_patch : NULL, &cpa, repo);
13880 print_merge_progress_stats(&upa);
13882 if (patch_script_file && fclose(patch_script_file) == EOF &&
13884 error = got_error_from_errno2("fclose", patch_script_path);
13886 const struct got_error *close_err = got_repo_close(repo);
13891 got_worktree_close(worktree);
13893 const struct got_error *pack_err =
13894 got_repo_pack_fds_close(pack_fds);
13898 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13906 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
13907 "arg ...\n", getprogname());
13911 static const struct got_error *
13912 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13914 const struct got_error *err;
13915 struct got_blob_object *blob;
13918 fd = got_opentempfd();
13920 return got_error_from_errno("got_opentempfd");
13922 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
13926 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
13928 if (fd != -1 && close(fd) == -1 && err == NULL)
13929 err = got_error_from_errno("close");
13931 got_object_blob_close(blob);
13935 static const struct got_error *
13936 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13938 const struct got_error *err;
13939 struct got_tree_object *tree;
13942 err = got_object_open_as_tree(&tree, repo, id);
13946 nentries = got_object_tree_get_nentries(tree);
13947 for (i = 0; i < nentries; i++) {
13948 struct got_tree_entry *te;
13950 if (sigint_received || sigpipe_received)
13952 te = got_object_tree_get_entry(tree, i);
13953 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
13956 fprintf(outfile, "%s %.7o %s\n", id_str,
13957 got_tree_entry_get_mode(te),
13958 got_tree_entry_get_name(te));
13962 got_object_tree_close(tree);
13966 static const struct got_error *
13967 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13969 const struct got_error *err;
13970 struct got_commit_object *commit;
13971 const struct got_object_id_queue *parent_ids;
13972 struct got_object_qid *pid;
13973 char *id_str = NULL;
13974 const char *logmsg = NULL;
13977 err = got_object_open_as_commit(&commit, repo, id);
13981 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
13985 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
13986 parent_ids = got_object_commit_get_parent_ids(commit);
13987 fprintf(outfile, "numparents %d\n",
13988 got_object_commit_get_nparents(commit));
13989 STAILQ_FOREACH(pid, parent_ids, entry) {
13991 err = got_object_id_str(&pid_str, &pid->id);
13994 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
13997 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
13998 got_object_commit_get_author_gmtoff(commit));
13999 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
14000 got_object_commit_get_author(commit),
14001 (long long)got_object_commit_get_author_time(commit),
14004 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14005 got_object_commit_get_committer_gmtoff(commit));
14006 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
14007 got_object_commit_get_committer(commit),
14008 (long long)got_object_commit_get_committer_time(commit),
14011 logmsg = got_object_commit_get_logmsg_raw(commit);
14012 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
14013 fprintf(outfile, "%s", logmsg);
14016 got_object_commit_close(commit);
14020 static const struct got_error *
14021 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14023 const struct got_error *err;
14024 struct got_tag_object *tag;
14025 char *id_str = NULL;
14026 const char *tagmsg = NULL;
14029 err = got_object_open_as_tag(&tag, repo, id);
14033 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
14037 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
14039 switch (got_object_tag_get_object_type(tag)) {
14040 case GOT_OBJ_TYPE_BLOB:
14041 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14042 GOT_OBJ_LABEL_BLOB);
14044 case GOT_OBJ_TYPE_TREE:
14045 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14046 GOT_OBJ_LABEL_TREE);
14048 case GOT_OBJ_TYPE_COMMIT:
14049 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14050 GOT_OBJ_LABEL_COMMIT);
14052 case GOT_OBJ_TYPE_TAG:
14053 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14054 GOT_OBJ_LABEL_TAG);
14060 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
14061 got_object_tag_get_name(tag));
14063 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14064 got_object_tag_get_tagger_gmtoff(tag));
14065 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
14066 got_object_tag_get_tagger(tag),
14067 (long long)got_object_tag_get_tagger_time(tag),
14070 tagmsg = got_object_tag_get_message(tag);
14071 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
14072 fprintf(outfile, "%s", tagmsg);
14075 got_object_tag_close(tag);
14079 static const struct got_error *
14080 cmd_cat(int argc, char *argv[])
14082 const struct got_error *error;
14083 struct got_repository *repo = NULL;
14084 struct got_worktree *worktree = NULL;
14085 char *cwd = NULL, *repo_path = NULL, *label = NULL;
14086 char *keyword_idstr = NULL;
14087 const char *commit_id_str = NULL;
14088 struct got_object_id *id = NULL, *commit_id = NULL;
14089 struct got_commit_object *commit = NULL;
14090 int ch, obj_type, i, force_path = 0;
14091 struct got_reflist_head refs;
14092 int *pack_fds = NULL;
14097 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14102 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
14105 commit_id_str = optarg;
14111 repo_path = realpath(optarg, NULL);
14112 if (repo_path == NULL)
14113 return got_error_from_errno2("realpath",
14115 got_path_strip_trailing_slashes(repo_path);
14126 cwd = getcwd(NULL, 0);
14128 error = got_error_from_errno("getcwd");
14132 error = got_repo_pack_fds_open(&pack_fds);
14136 if (repo_path == NULL) {
14137 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14138 if (error && error->code != GOT_ERR_NOT_WORKTREE)
14141 repo_path = strdup(
14142 got_worktree_get_repo_path(worktree));
14143 if (repo_path == NULL) {
14144 error = got_error_from_errno("strdup");
14148 if (commit_id_str == NULL) {
14149 /* Release work tree lock. */
14150 got_worktree_close(worktree);
14156 if (repo_path == NULL) {
14157 repo_path = strdup(cwd);
14158 if (repo_path == NULL)
14159 return got_error_from_errno("strdup");
14162 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
14167 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
14171 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
14175 if (commit_id_str != NULL) {
14176 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
14180 if (keyword_idstr != NULL)
14181 commit_id_str = keyword_idstr;
14182 if (worktree != NULL) {
14183 got_worktree_close(worktree);
14187 commit_id_str = GOT_REF_HEAD;
14188 error = got_repo_match_object_id(&commit_id, NULL,
14189 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
14193 error = got_object_open_as_commit(&commit, repo, commit_id);
14197 for (i = 0; i < argc; i++) {
14199 error = got_object_id_by_path(&id, repo, commit,
14204 error = got_repo_match_object_id(&id, &label, argv[i],
14205 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
14208 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
14209 error->code != GOT_ERR_NOT_REF)
14211 error = got_object_id_by_path(&id, repo,
14218 error = got_object_get_type(&obj_type, repo, id);
14222 switch (obj_type) {
14223 case GOT_OBJ_TYPE_BLOB:
14224 error = cat_blob(id, repo, stdout);
14226 case GOT_OBJ_TYPE_TREE:
14227 error = cat_tree(id, repo, stdout);
14229 case GOT_OBJ_TYPE_COMMIT:
14230 error = cat_commit(id, repo, stdout);
14232 case GOT_OBJ_TYPE_TAG:
14233 error = cat_tag(id, repo, stdout);
14236 error = got_error(GOT_ERR_OBJ_TYPE);
14250 free(keyword_idstr);
14252 got_object_commit_close(commit);
14254 got_worktree_close(worktree);
14256 const struct got_error *close_err = got_repo_close(repo);
14261 const struct got_error *pack_err =
14262 got_repo_pack_fds_close(pack_fds);
14267 got_ref_list_free(&refs);
14274 fprintf(stderr, "usage: %s info [path ...]\n",
14279 static const struct got_error *
14280 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
14281 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
14282 struct got_object_id *commit_id)
14284 const struct got_error *err = NULL;
14285 char *id_str = NULL;
14287 struct tm mytm, *tm;
14288 struct got_pathlist_head *paths = arg;
14289 struct got_pathlist_entry *pe;
14292 * Clear error indication from any of the path arguments which
14293 * would cause this file index entry to be displayed.
14295 TAILQ_FOREACH(pe, paths, entry) {
14296 if (got_path_cmp(path, pe->path, strlen(path),
14297 pe->path_len) == 0 ||
14298 got_path_is_child(path, pe->path, pe->path_len))
14299 pe->data = NULL; /* no error */
14302 printf(GOT_COMMIT_SEP_STR);
14304 printf("symlink: %s\n", path);
14305 else if (S_ISREG(mode)) {
14306 printf("file: %s\n", path);
14307 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
14308 } else if (S_ISDIR(mode))
14309 printf("directory: %s\n", path);
14311 printf("something: %s\n", path);
14313 tm = localtime_r(&mtime, &mytm);
14316 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
14317 return got_error(GOT_ERR_NO_SPACE);
14318 printf("timestamp: %s\n", datebuf);
14321 err = got_object_id_str(&id_str, blob_id);
14324 printf("based on blob: %s\n", id_str);
14328 if (staged_blob_id) {
14329 err = got_object_id_str(&id_str, staged_blob_id);
14332 printf("based on staged blob: %s\n", id_str);
14337 err = got_object_id_str(&id_str, commit_id);
14340 printf("based on commit: %s\n", id_str);
14347 static const struct got_error *
14348 cmd_info(int argc, char *argv[])
14350 const struct got_error *error = NULL;
14351 struct got_worktree *worktree = NULL;
14352 char *cwd = NULL, *id_str = NULL;
14353 struct got_pathlist_head paths;
14354 char *uuidstr = NULL;
14355 int ch, show_files = 0;
14357 TAILQ_INIT(&paths);
14360 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14365 while ((ch = getopt(argc, argv, "")) != -1) {
14376 cwd = getcwd(NULL, 0);
14378 error = got_error_from_errno("getcwd");
14382 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14384 if (error->code == GOT_ERR_NOT_WORKTREE)
14385 error = wrap_not_worktree_error(error, "info", cwd);
14390 /* Remove "wpath cpath proc exec sendfd" promises. */
14391 if (pledge("stdio rpath flock unveil", NULL) == -1)
14394 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
14399 error = get_worktree_paths_from_argv(&paths, argc, argv,
14406 error = got_object_id_str(&id_str,
14407 got_worktree_get_base_commit_id(worktree));
14411 error = got_worktree_get_uuid(&uuidstr, worktree);
14415 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
14416 printf("work tree base commit: %s\n", id_str);
14417 printf("work tree path prefix: %s\n",
14418 got_worktree_get_path_prefix(worktree));
14419 printf("work tree branch reference: %s\n",
14420 got_worktree_get_head_ref_name(worktree));
14421 printf("work tree UUID: %s\n", uuidstr);
14422 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
14425 struct got_pathlist_entry *pe;
14426 TAILQ_FOREACH(pe, &paths, entry) {
14427 if (pe->path_len == 0)
14430 * Assume this path will fail. This will be corrected
14431 * in print_path_info() in case the path does suceeed.
14433 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
14435 error = got_worktree_path_info(worktree, &paths,
14436 print_path_info, &paths, check_cancelled, NULL);
14439 TAILQ_FOREACH(pe, &paths, entry) {
14440 if (pe->data != NULL) {
14441 const struct got_error *perr;
14444 error = got_error_fmt(perr->code, "%s",
14452 got_worktree_close(worktree);
14453 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);