2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/queue.h>
21 #include <sys/types.h>
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"
66 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
69 static volatile sig_atomic_t sigint_received;
70 static volatile sig_atomic_t sigpipe_received;
73 catch_sigint(int signo)
79 catch_sigpipe(int signo)
87 const struct got_error *(*cmd_main)(int, char *[]);
88 void (*cmd_usage)(void);
89 const char *cmd_alias;
92 __dead static void usage(int, int);
93 __dead static void usage_import(void);
94 __dead static void usage_clone(void);
95 __dead static void usage_fetch(void);
96 __dead static void usage_checkout(void);
97 __dead static void usage_update(void);
98 __dead static void usage_log(void);
99 __dead static void usage_diff(void);
100 __dead static void usage_blame(void);
101 __dead static void usage_tree(void);
102 __dead static void usage_status(void);
103 __dead static void usage_ref(void);
104 __dead static void usage_branch(void);
105 __dead static void usage_tag(void);
106 __dead static void usage_add(void);
107 __dead static void usage_remove(void);
108 __dead static void usage_patch(void);
109 __dead static void usage_revert(void);
110 __dead static void usage_commit(void);
111 __dead static void usage_send(void);
112 __dead static void usage_cherrypick(void);
113 __dead static void usage_backout(void);
114 __dead static void usage_rebase(void);
115 __dead static void usage_histedit(void);
116 __dead static void usage_integrate(void);
117 __dead static void usage_merge(void);
118 __dead static void usage_stage(void);
119 __dead static void usage_unstage(void);
120 __dead static void usage_cat(void);
121 __dead static void usage_info(void);
123 static const struct got_error* cmd_import(int, char *[]);
124 static const struct got_error* cmd_clone(int, char *[]);
125 static const struct got_error* cmd_fetch(int, char *[]);
126 static const struct got_error* cmd_checkout(int, char *[]);
127 static const struct got_error* cmd_update(int, char *[]);
128 static const struct got_error* cmd_log(int, char *[]);
129 static const struct got_error* cmd_diff(int, char *[]);
130 static const struct got_error* cmd_blame(int, char *[]);
131 static const struct got_error* cmd_tree(int, char *[]);
132 static const struct got_error* cmd_status(int, char *[]);
133 static const struct got_error* cmd_ref(int, char *[]);
134 static const struct got_error* cmd_branch(int, char *[]);
135 static const struct got_error* cmd_tag(int, char *[]);
136 static const struct got_error* cmd_add(int, char *[]);
137 static const struct got_error* cmd_remove(int, char *[]);
138 static const struct got_error* cmd_patch(int, char *[]);
139 static const struct got_error* cmd_revert(int, char *[]);
140 static const struct got_error* cmd_commit(int, char *[]);
141 static const struct got_error* cmd_send(int, char *[]);
142 static const struct got_error* cmd_cherrypick(int, char *[]);
143 static const struct got_error* cmd_backout(int, char *[]);
144 static const struct got_error* cmd_rebase(int, char *[]);
145 static const struct got_error* cmd_histedit(int, char *[]);
146 static const struct got_error* cmd_integrate(int, char *[]);
147 static const struct got_error* cmd_merge(int, char *[]);
148 static const struct got_error* cmd_stage(int, char *[]);
149 static const struct got_error* cmd_unstage(int, char *[]);
150 static const struct got_error* cmd_cat(int, char *[]);
151 static const struct got_error* cmd_info(int, char *[]);
153 static const struct got_cmd got_commands[] = {
154 { "import", cmd_import, usage_import, "im" },
155 { "clone", cmd_clone, usage_clone, "cl" },
156 { "fetch", cmd_fetch, usage_fetch, "fe" },
157 { "checkout", cmd_checkout, usage_checkout, "co" },
158 { "update", cmd_update, usage_update, "up" },
159 { "log", cmd_log, usage_log, "" },
160 { "diff", cmd_diff, usage_diff, "di" },
161 { "blame", cmd_blame, usage_blame, "bl" },
162 { "tree", cmd_tree, usage_tree, "tr" },
163 { "status", cmd_status, usage_status, "st" },
164 { "ref", cmd_ref, usage_ref, "" },
165 { "branch", cmd_branch, usage_branch, "br" },
166 { "tag", cmd_tag, usage_tag, "" },
167 { "add", cmd_add, usage_add, "" },
168 { "remove", cmd_remove, usage_remove, "rm" },
169 { "patch", cmd_patch, usage_patch, "pa" },
170 { "revert", cmd_revert, usage_revert, "rv" },
171 { "commit", cmd_commit, usage_commit, "ci" },
172 { "send", cmd_send, usage_send, "se" },
173 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
174 { "backout", cmd_backout, usage_backout, "bo" },
175 { "rebase", cmd_rebase, usage_rebase, "rb" },
176 { "histedit", cmd_histedit, usage_histedit, "he" },
177 { "integrate", cmd_integrate, usage_integrate,"ig" },
178 { "merge", cmd_merge, usage_merge, "mg" },
179 { "stage", cmd_stage, usage_stage, "sg" },
180 { "unstage", cmd_unstage, usage_unstage, "ug" },
181 { "cat", cmd_cat, usage_cat, "" },
182 { "info", cmd_info, usage_info, "" },
186 list_commands(FILE *fp)
190 fprintf(fp, "commands:");
191 for (i = 0; i < nitems(got_commands); i++) {
192 const struct got_cmd *cmd = &got_commands[i];
193 fprintf(fp, " %s", cmd->cmd_name);
199 option_conflict(char a, char b)
201 errx(1, "-%c and -%c options are mutually exclusive", a, b);
205 main(int argc, char *argv[])
207 const struct got_cmd *cmd;
210 int hflag = 0, Vflag = 0;
211 static const struct option longopts[] = {
212 { "version", no_argument, NULL, 'V' },
216 setlocale(LC_CTYPE, "");
218 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
238 got_version_print_str();
243 usage(hflag, hflag ? 0 : 1);
245 signal(SIGINT, catch_sigint);
246 signal(SIGPIPE, catch_sigpipe);
248 for (i = 0; i < nitems(got_commands); i++) {
249 const struct got_error *error;
251 cmd = &got_commands[i];
253 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
254 strcmp(cmd->cmd_alias, argv[0]) != 0)
260 error = cmd->cmd_main(argc, argv);
261 if (error && error->code != GOT_ERR_CANCELLED &&
262 error->code != GOT_ERR_PRIVSEP_EXIT &&
263 !(sigpipe_received &&
264 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
266 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
267 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
274 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
275 list_commands(stderr);
280 usage(int hflag, int status)
282 FILE *fp = (status == 0) ? stdout : stderr;
284 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
291 static const struct got_error *
292 get_editor(char **abspath)
294 const struct got_error *err = NULL;
299 editor = getenv("VISUAL");
301 editor = getenv("EDITOR");
304 err = got_path_find_prog(abspath, editor);
309 if (*abspath == NULL) {
310 *abspath = strdup("/bin/ed");
311 if (*abspath == NULL)
312 return got_error_from_errno("strdup");
318 static const struct got_error *
319 apply_unveil(const char *repo_path, int repo_read_only,
320 const char *worktree_path)
322 const struct got_error *err;
325 if (unveil("gmon.out", "rwc") != 0)
326 return got_error_from_errno2("unveil", "gmon.out");
328 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
329 return got_error_from_errno2("unveil", repo_path);
331 if (worktree_path && unveil(worktree_path, "rwc") != 0)
332 return got_error_from_errno2("unveil", worktree_path);
334 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
335 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
337 err = got_privsep_unveil_exec_helpers();
341 if (unveil(NULL, NULL) != 0)
342 return got_error_from_errno("unveil");
350 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
351 "[-r repository-path] directory\n", getprogname());
356 spawn_editor(const char *editor, const char *file)
359 sig_t sighup, sigint, sigquit;
362 sighup = signal(SIGHUP, SIG_IGN);
363 sigint = signal(SIGINT, SIG_IGN);
364 sigquit = signal(SIGQUIT, SIG_IGN);
366 switch (pid = fork()) {
370 execl(editor, editor, file, (char *)NULL);
374 while (waitpid(pid, &st, 0) == -1)
379 (void)signal(SIGHUP, sighup);
380 (void)signal(SIGINT, sigint);
381 (void)signal(SIGQUIT, sigquit);
383 if (!WIFEXITED(st)) {
388 return WEXITSTATUS(st);
391 static const struct got_error *
392 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
393 const char *initial_content, size_t initial_content_len,
394 int require_modification)
396 const struct got_error *err = NULL;
401 size_t len, logmsg_len;
402 char *initial_content_stripped = NULL, *buf = NULL, *s;
406 if (stat(logmsg_path, &st) == -1)
407 return got_error_from_errno2("stat", logmsg_path);
409 if (spawn_editor(editor, logmsg_path) == -1)
410 return got_error_from_errno("failed spawning editor");
412 if (stat(logmsg_path, &st2) == -1)
413 return got_error_from_errno("stat");
415 if (require_modification &&
416 st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
417 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
418 "no changes made to commit message, aborting");
421 * Set up a stripped version of the initial content without comments
422 * and blank lines. We need this in order to check if the message
423 * has in fact been edited.
425 initial_content_stripped = malloc(initial_content_len + 1);
426 if (initial_content_stripped == NULL)
427 return got_error_from_errno("malloc");
428 initial_content_stripped[0] = '\0';
430 buf = strdup(initial_content);
432 err = got_error_from_errno("strdup");
437 while ((line = strsep(&s, "\n")) != NULL) {
438 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
439 continue; /* remove comments and leading empty lines */
440 len = strlcat(initial_content_stripped, line,
441 initial_content_len + 1);
442 if (len >= initial_content_len + 1) {
443 err = got_error(GOT_ERR_NO_SPACE);
447 while (len > 0 && initial_content_stripped[len - 1] == '\n') {
448 initial_content_stripped[len - 1] = '\0';
452 logmsg_len = st2.st_size;
453 *logmsg = malloc(logmsg_len + 1);
455 return got_error_from_errno("malloc");
458 fp = fopen(logmsg_path, "re");
460 err = got_error_from_errno("fopen");
465 while (getline(&line, &linesize, fp) != -1) {
466 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
467 continue; /* remove comments and leading empty lines */
468 len = strlcat(*logmsg, line, logmsg_len + 1);
469 if (len >= logmsg_len + 1) {
470 err = got_error(GOT_ERR_NO_SPACE);
476 err = got_ferror(fp, GOT_ERR_IO);
479 while (len > 0 && (*logmsg)[len - 1] == '\n') {
480 (*logmsg)[len - 1] = '\0';
485 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
486 "commit message cannot be empty, aborting");
489 if (require_modification &&
490 strcmp(*logmsg, initial_content_stripped) == 0)
491 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
492 "no changes made to commit message, aborting");
494 free(initial_content_stripped);
496 if (fp && fclose(fp) == EOF && err == NULL)
497 err = got_error_from_errno("fclose");
505 static const struct got_error *
506 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
507 const char *path_dir, const char *branch_name)
509 char *initial_content = NULL;
510 const struct got_error *err = NULL;
511 int initial_content_len;
514 initial_content_len = asprintf(&initial_content,
515 "\n# %s to be imported to branch %s\n", path_dir,
517 if (initial_content_len == -1)
518 return got_error_from_errno("asprintf");
520 err = got_opentemp_named_fd(logmsg_path, &fd,
521 GOT_TMPDIR_STR "/got-importmsg", "");
525 if (write(fd, initial_content, initial_content_len) == -1) {
526 err = got_error_from_errno2("write", *logmsg_path);
530 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
531 initial_content_len, 1);
533 if (fd != -1 && close(fd) == -1 && err == NULL)
534 err = got_error_from_errno2("close", *logmsg_path);
535 free(initial_content);
543 static const struct got_error *
544 import_progress(void *arg, const char *path)
546 printf("A %s\n", path);
550 static const struct got_error *
551 valid_author(const char *author)
553 const char *email = author;
556 * Git' expects the author (or committer) to be in the form
557 * "name <email>", which are mostly free form (see the
558 * "committer" description in git-fast-import(1)). We're only
559 * doing this to avoid git's object parser breaking on commits
563 while (*author && *author != '\n' && *author != '<' && *author != '>')
565 if (author != email && *author == '<' && *(author - 1) != ' ')
566 return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
567 "between author name and email required", email);
568 if (*author++ != '<')
569 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
570 while (*author && *author != '\n' && *author != '<' && *author != '>')
572 if (strcmp(author, ">") != 0)
573 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
577 static const struct got_error *
578 get_author(char **author, struct got_repository *repo,
579 struct got_worktree *worktree)
581 const struct got_error *err = NULL;
582 const char *got_author = NULL, *name, *email;
583 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
588 worktree_conf = got_worktree_get_gotconfig(worktree);
589 repo_conf = got_repo_get_gotconfig(repo);
592 * Priority of potential author information sources, from most
593 * significant to least significant:
594 * 1) work tree's .got/got.conf file
595 * 2) repository's got.conf file
596 * 3) repository's git config file
597 * 4) environment variables
598 * 5) global git config files (in user's home directory or /etc)
602 got_author = got_gotconfig_get_author(worktree_conf);
603 if (got_author == NULL)
604 got_author = got_gotconfig_get_author(repo_conf);
605 if (got_author == NULL) {
606 name = got_repo_get_gitconfig_author_name(repo);
607 email = got_repo_get_gitconfig_author_email(repo);
609 if (asprintf(author, "%s <%s>", name, email) == -1)
610 return got_error_from_errno("asprintf");
614 got_author = getenv("GOT_AUTHOR");
615 if (got_author == NULL) {
616 name = got_repo_get_global_gitconfig_author_name(repo);
617 email = got_repo_get_global_gitconfig_author_email(
620 if (asprintf(author, "%s <%s>", name, email)
622 return got_error_from_errno("asprintf");
625 /* TODO: Look up user in password database? */
626 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
630 *author = strdup(got_author);
632 return got_error_from_errno("strdup");
634 err = valid_author(*author);
642 static const struct got_error *
643 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
644 struct got_worktree *worktree)
646 const char *got_allowed_signers = NULL;
647 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
649 *allowed_signers = NULL;
652 worktree_conf = got_worktree_get_gotconfig(worktree);
653 repo_conf = got_repo_get_gotconfig(repo);
656 * Priority of potential author information sources, from most
657 * significant to least significant:
658 * 1) work tree's .got/got.conf file
659 * 2) repository's got.conf file
663 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
665 if (got_allowed_signers == NULL)
666 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
669 if (got_allowed_signers) {
670 *allowed_signers = strdup(got_allowed_signers);
671 if (*allowed_signers == NULL)
672 return got_error_from_errno("strdup");
677 static const struct got_error *
678 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
679 struct got_worktree *worktree)
681 const char *got_revoked_signers = NULL;
682 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
684 *revoked_signers = NULL;
687 worktree_conf = got_worktree_get_gotconfig(worktree);
688 repo_conf = got_repo_get_gotconfig(repo);
691 * Priority of potential author information sources, from most
692 * significant to least significant:
693 * 1) work tree's .got/got.conf file
694 * 2) repository's got.conf file
698 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
700 if (got_revoked_signers == NULL)
701 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
704 if (got_revoked_signers) {
705 *revoked_signers = strdup(got_revoked_signers);
706 if (*revoked_signers == NULL)
707 return got_error_from_errno("strdup");
712 static const struct got_error *
713 get_signer_id(char **signer_id, struct got_repository *repo,
714 struct got_worktree *worktree)
716 const char *got_signer_id = NULL;
717 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
722 worktree_conf = got_worktree_get_gotconfig(worktree);
723 repo_conf = got_repo_get_gotconfig(repo);
726 * Priority of potential author information sources, from most
727 * significant to least significant:
728 * 1) work tree's .got/got.conf file
729 * 2) repository's got.conf file
733 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
734 if (got_signer_id == NULL)
735 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
738 *signer_id = strdup(got_signer_id);
739 if (*signer_id == NULL)
740 return got_error_from_errno("strdup");
745 static const struct got_error *
746 get_gitconfig_path(char **gitconfig_path)
748 const char *homedir = getenv("HOME");
750 *gitconfig_path = NULL;
752 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
753 return got_error_from_errno("asprintf");
759 static const struct got_error *
760 cmd_import(int argc, char *argv[])
762 const struct got_error *error = NULL;
763 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
764 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
765 const char *branch_name = NULL;
766 char *id_str = NULL, *logmsg_path = NULL;
767 char refname[PATH_MAX] = "refs/heads/";
768 struct got_repository *repo = NULL;
769 struct got_reference *branch_ref = NULL, *head_ref = NULL;
770 struct got_object_id *new_commit_id = NULL;
772 struct got_pathlist_head ignores;
773 struct got_pathlist_entry *pe;
774 int preserve_logmsg = 0;
775 int *pack_fds = NULL;
777 TAILQ_INIT(&ignores);
779 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
782 branch_name = optarg;
785 if (optarg[0] == '\0')
787 error = got_pathlist_insert(&pe, &ignores, optarg,
793 logmsg = strdup(optarg);
794 if (logmsg == NULL) {
795 error = got_error_from_errno("strdup");
800 repo_path = realpath(optarg, NULL);
801 if (repo_path == NULL) {
802 error = got_error_from_errno2("realpath",
817 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
825 if (repo_path == NULL) {
826 repo_path = getcwd(NULL, 0);
827 if (repo_path == NULL)
828 return got_error_from_errno("getcwd");
830 got_path_strip_trailing_slashes(repo_path);
831 error = get_gitconfig_path(&gitconfig_path);
834 error = got_repo_pack_fds_open(&pack_fds);
837 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
841 error = get_author(&author, repo, NULL);
846 * Don't let the user create a branch name with a leading '-'.
847 * While technically a valid reference name, this case is usually
848 * an unintended typo.
850 if (branch_name && branch_name[0] == '-')
851 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
853 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
854 if (error && error->code != GOT_ERR_NOT_REF)
858 n = strlcat(refname, branch_name, sizeof(refname));
859 else if (head_ref && got_ref_is_symbolic(head_ref))
860 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
863 n = strlcat(refname, "main", sizeof(refname));
864 if (n >= sizeof(refname)) {
865 error = got_error(GOT_ERR_NO_SPACE);
869 error = got_ref_open(&branch_ref, repo, refname, 0);
871 if (error->code != GOT_ERR_NOT_REF)
874 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
875 "import target branch already exists");
879 path_dir = realpath(argv[0], NULL);
880 if (path_dir == NULL) {
881 error = got_error_from_errno2("realpath", argv[0]);
884 got_path_strip_trailing_slashes(path_dir);
887 * unveil(2) traverses exec(2); if an editor is used we have
888 * to apply unveil after the log message has been written.
890 if (logmsg == NULL || strlen(logmsg) == 0) {
891 error = get_editor(&editor);
895 error = collect_import_msg(&logmsg, &logmsg_path, editor,
898 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
905 if (unveil(path_dir, "r") != 0) {
906 error = got_error_from_errno2("unveil", path_dir);
912 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
919 error = got_repo_import(&new_commit_id, path_dir, logmsg,
920 author, &ignores, repo, import_progress, NULL);
927 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
934 error = got_ref_write(branch_ref, repo);
941 error = got_object_id_str(&id_str, new_commit_id);
948 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
950 if (error->code != GOT_ERR_NOT_REF) {
956 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
964 error = got_ref_write(head_ref, repo);
972 printf("Created branch %s with commit %s\n",
973 got_ref_get_name(branch_ref), id_str);
976 const struct got_error *pack_err =
977 got_repo_pack_fds_close(pack_fds);
981 if (preserve_logmsg) {
982 fprintf(stderr, "%s: log message preserved in %s\n",
983 getprogname(), logmsg_path);
984 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
985 error = got_error_from_errno2("unlink", logmsg_path);
993 free(gitconfig_path);
995 got_ref_close(branch_ref);
997 got_ref_close(head_ref);
1004 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
1005 "repository-URL [directory]\n", getprogname());
1009 struct got_fetch_progress_arg {
1010 char last_scaled_size[FMT_SCALED_STRSIZE];
1012 int last_p_resolved;
1015 struct got_repository *repo;
1018 int configs_created;
1020 struct got_pathlist_head *symrefs;
1021 struct got_pathlist_head *wanted_branches;
1022 struct got_pathlist_head *wanted_refs;
1026 const char *remote_repo_path;
1027 const char *git_url;
1028 int fetch_all_branches;
1029 int mirror_references;
1033 /* XXX forward declaration */
1034 static const struct got_error *
1035 create_config_files(const char *proto, const char *host, const char *port,
1036 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1037 int mirror_references, struct got_pathlist_head *symrefs,
1038 struct got_pathlist_head *wanted_branches,
1039 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1041 static const struct got_error *
1042 fetch_progress(void *arg, const char *message, off_t packfile_size,
1043 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1045 const struct got_error *err = NULL;
1046 struct got_fetch_progress_arg *a = arg;
1047 char scaled_size[FMT_SCALED_STRSIZE];
1048 int p_indexed, p_resolved;
1049 int print_size = 0, print_indexed = 0, print_resolved = 0;
1052 * In order to allow a failed clone to be resumed with 'got fetch'
1053 * we try to create configuration files as soon as possible.
1054 * Once the server has sent information about its default branch
1055 * we have all required information.
1057 if (a->create_configs && !a->configs_created &&
1058 !TAILQ_EMPTY(a->config_info.symrefs)) {
1059 err = create_config_files(a->config_info.proto,
1060 a->config_info.host, a->config_info.port,
1061 a->config_info.remote_repo_path,
1062 a->config_info.git_url,
1063 a->config_info.fetch_all_branches,
1064 a->config_info.mirror_references,
1065 a->config_info.symrefs,
1066 a->config_info.wanted_branches,
1067 a->config_info.wanted_refs, a->repo);
1070 a->configs_created = 1;
1073 if (a->verbosity < 0)
1076 if (message && message[0] != '\0') {
1077 printf("\rserver: %s", message);
1082 if (packfile_size > 0 || nobj_indexed > 0) {
1083 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1084 (a->last_scaled_size[0] == '\0' ||
1085 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1087 if (strlcpy(a->last_scaled_size, scaled_size,
1088 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1089 return got_error(GOT_ERR_NO_SPACE);
1091 if (nobj_indexed > 0) {
1092 p_indexed = (nobj_indexed * 100) / nobj_total;
1093 if (p_indexed != a->last_p_indexed) {
1094 a->last_p_indexed = p_indexed;
1099 if (nobj_resolved > 0) {
1100 p_resolved = (nobj_resolved * 100) /
1101 (nobj_total - nobj_loose);
1102 if (p_resolved != a->last_p_resolved) {
1103 a->last_p_resolved = p_resolved;
1111 if (print_size || print_indexed || print_resolved)
1114 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1116 printf("; indexing %d%%", p_indexed);
1118 printf("; resolving deltas %d%%", p_resolved);
1119 if (print_size || print_indexed || print_resolved)
1125 static const struct got_error *
1126 create_symref(const char *refname, struct got_reference *target_ref,
1127 int verbosity, struct got_repository *repo)
1129 const struct got_error *err;
1130 struct got_reference *head_symref;
1132 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1136 err = got_ref_write(head_symref, repo);
1137 if (err == NULL && verbosity > 0) {
1138 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1139 got_ref_get_name(target_ref));
1141 got_ref_close(head_symref);
1145 static const struct got_error *
1146 list_remote_refs(struct got_pathlist_head *symrefs,
1147 struct got_pathlist_head *refs)
1149 const struct got_error *err;
1150 struct got_pathlist_entry *pe;
1152 TAILQ_FOREACH(pe, symrefs, entry) {
1153 const char *refname = pe->path;
1154 const char *targetref = pe->data;
1156 printf("%s: %s\n", refname, targetref);
1159 TAILQ_FOREACH(pe, refs, entry) {
1160 const char *refname = pe->path;
1161 struct got_object_id *id = pe->data;
1164 err = got_object_id_str(&id_str, id);
1167 printf("%s: %s\n", refname, id_str);
1174 static const struct got_error *
1175 create_ref(const char *refname, struct got_object_id *id,
1176 int verbosity, struct got_repository *repo)
1178 const struct got_error *err = NULL;
1179 struct got_reference *ref;
1182 err = got_object_id_str(&id_str, id);
1186 err = got_ref_alloc(&ref, refname, id);
1190 err = got_ref_write(ref, repo);
1193 if (err == NULL && verbosity >= 0)
1194 printf("Created reference %s: %s\n", refname, id_str);
1201 match_wanted_ref(const char *refname, const char *wanted_ref)
1203 if (strncmp(refname, "refs/", 5) != 0)
1208 * Prevent fetching of references that won't make any
1209 * sense outside of the remote repository's context.
1211 if (strncmp(refname, "got/", 4) == 0)
1213 if (strncmp(refname, "remotes/", 8) == 0)
1216 if (strncmp(wanted_ref, "refs/", 5) == 0)
1219 /* Allow prefix match. */
1220 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1223 /* Allow exact match. */
1224 return (strcmp(refname, wanted_ref) == 0);
1228 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1230 struct got_pathlist_entry *pe;
1232 TAILQ_FOREACH(pe, wanted_refs, entry) {
1233 if (match_wanted_ref(refname, pe->path))
1240 static const struct got_error *
1241 create_wanted_ref(const char *refname, struct got_object_id *id,
1242 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1244 const struct got_error *err;
1245 char *remote_refname;
1247 if (strncmp("refs/", refname, 5) == 0)
1250 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1251 remote_repo_name, refname) == -1)
1252 return got_error_from_errno("asprintf");
1254 err = create_ref(remote_refname, id, verbosity, repo);
1255 free(remote_refname);
1259 static const struct got_error *
1260 create_gotconfig(const char *proto, const char *host, const char *port,
1261 const char *remote_repo_path, const char *default_branch,
1262 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1263 struct got_pathlist_head *wanted_refs, int mirror_references,
1264 struct got_repository *repo)
1266 const struct got_error *err = NULL;
1267 char *gotconfig_path = NULL;
1268 char *gotconfig = NULL;
1269 FILE *gotconfig_file = NULL;
1270 const char *branchname = NULL;
1271 char *branches = NULL, *refs = NULL;
1274 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1275 struct got_pathlist_entry *pe;
1276 TAILQ_FOREACH(pe, wanted_branches, entry) {
1278 branchname = pe->path;
1279 if (strncmp(branchname, "refs/heads/", 11) == 0)
1281 if (asprintf(&s, "%s\"%s\" ",
1282 branches ? branches : "", branchname) == -1) {
1283 err = got_error_from_errno("asprintf");
1289 } else if (!fetch_all_branches && default_branch) {
1290 branchname = default_branch;
1291 if (strncmp(branchname, "refs/heads/", 11) == 0)
1293 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1294 err = got_error_from_errno("asprintf");
1298 if (!TAILQ_EMPTY(wanted_refs)) {
1299 struct got_pathlist_entry *pe;
1300 TAILQ_FOREACH(pe, wanted_refs, entry) {
1302 const char *refname = pe->path;
1303 if (strncmp(refname, "refs/", 5) == 0)
1305 if (asprintf(&s, "%s\"%s\" ",
1306 refs ? refs : "", refname) == -1) {
1307 err = got_error_from_errno("asprintf");
1315 /* Create got.conf(5). */
1316 gotconfig_path = got_repo_get_path_gotconfig(repo);
1317 if (gotconfig_path == NULL) {
1318 err = got_error_from_errno("got_repo_get_path_gotconfig");
1321 gotconfig_file = fopen(gotconfig_path, "ae");
1322 if (gotconfig_file == NULL) {
1323 err = got_error_from_errno2("fopen", gotconfig_path);
1326 if (asprintf(&gotconfig,
1331 "\trepository \"%s\"\n"
1337 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1338 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1339 remote_repo_path, branches ? "\tbranch { " : "",
1340 branches ? branches : "", branches ? "}\n" : "",
1341 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1342 mirror_references ? "\tmirror_references yes\n" : "",
1343 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1344 err = got_error_from_errno("asprintf");
1347 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1348 if (n != strlen(gotconfig)) {
1349 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1354 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1355 err = got_error_from_errno2("fclose", gotconfig_path);
1356 free(gotconfig_path);
1361 static const struct got_error *
1362 create_gitconfig(const char *git_url, const char *default_branch,
1363 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1364 struct got_pathlist_head *wanted_refs, int mirror_references,
1365 struct got_repository *repo)
1367 const struct got_error *err = NULL;
1368 char *gitconfig_path = NULL;
1369 char *gitconfig = NULL;
1370 FILE *gitconfig_file = NULL;
1371 char *branches = NULL, *refs = NULL;
1372 const char *branchname;
1375 /* Create a config file Git can understand. */
1376 gitconfig_path = got_repo_get_path_gitconfig(repo);
1377 if (gitconfig_path == NULL) {
1378 err = got_error_from_errno("got_repo_get_path_gitconfig");
1381 gitconfig_file = fopen(gitconfig_path, "ae");
1382 if (gitconfig_file == NULL) {
1383 err = got_error_from_errno2("fopen", gitconfig_path);
1386 if (fetch_all_branches) {
1387 if (mirror_references) {
1388 if (asprintf(&branches,
1389 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1390 err = got_error_from_errno("asprintf");
1393 } else if (asprintf(&branches,
1394 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1395 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1396 err = got_error_from_errno("asprintf");
1399 } else if (!TAILQ_EMPTY(wanted_branches)) {
1400 struct got_pathlist_entry *pe;
1401 TAILQ_FOREACH(pe, wanted_branches, entry) {
1403 branchname = pe->path;
1404 if (strncmp(branchname, "refs/heads/", 11) == 0)
1406 if (mirror_references) {
1408 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1409 branches ? branches : "",
1410 branchname, branchname) == -1) {
1411 err = got_error_from_errno("asprintf");
1414 } else if (asprintf(&s,
1415 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1416 branches ? branches : "",
1417 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1418 branchname) == -1) {
1419 err = got_error_from_errno("asprintf");
1427 * If the server specified a default branch, use just that one.
1428 * Otherwise fall back to fetching all branches on next fetch.
1430 if (default_branch) {
1431 branchname = default_branch;
1432 if (strncmp(branchname, "refs/heads/", 11) == 0)
1435 branchname = "*"; /* fall back to all branches */
1436 if (mirror_references) {
1437 if (asprintf(&branches,
1438 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1439 branchname, branchname) == -1) {
1440 err = got_error_from_errno("asprintf");
1443 } else if (asprintf(&branches,
1444 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1445 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1446 branchname) == -1) {
1447 err = got_error_from_errno("asprintf");
1451 if (!TAILQ_EMPTY(wanted_refs)) {
1452 struct got_pathlist_entry *pe;
1453 TAILQ_FOREACH(pe, wanted_refs, entry) {
1455 const char *refname = pe->path;
1456 if (strncmp(refname, "refs/", 5) == 0)
1458 if (mirror_references) {
1460 "%s\tfetch = refs/%s:refs/%s\n",
1461 refs ? refs : "", refname, refname) == -1) {
1462 err = got_error_from_errno("asprintf");
1465 } else if (asprintf(&s,
1466 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1468 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1470 err = got_error_from_errno("asprintf");
1478 if (asprintf(&gitconfig,
1483 "\tfetch = refs/tags/*:refs/tags/*\n",
1484 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1485 refs ? refs : "") == -1) {
1486 err = got_error_from_errno("asprintf");
1489 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1490 if (n != strlen(gitconfig)) {
1491 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1495 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1496 err = got_error_from_errno2("fclose", gitconfig_path);
1497 free(gitconfig_path);
1502 static const struct got_error *
1503 create_config_files(const char *proto, const char *host, const char *port,
1504 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1505 int mirror_references, struct got_pathlist_head *symrefs,
1506 struct got_pathlist_head *wanted_branches,
1507 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1509 const struct got_error *err = NULL;
1510 const char *default_branch = NULL;
1511 struct got_pathlist_entry *pe;
1514 * If we asked for a set of wanted branches then use the first
1517 if (!TAILQ_EMPTY(wanted_branches)) {
1518 pe = TAILQ_FIRST(wanted_branches);
1519 default_branch = pe->path;
1521 /* First HEAD ref listed by server is the default branch. */
1522 TAILQ_FOREACH(pe, symrefs, entry) {
1523 const char *refname = pe->path;
1524 const char *target = pe->data;
1526 if (strcmp(refname, GOT_REF_HEAD) != 0)
1529 default_branch = target;
1534 /* Create got.conf(5). */
1535 err = create_gotconfig(proto, host, port, remote_repo_path,
1536 default_branch, fetch_all_branches, wanted_branches,
1537 wanted_refs, mirror_references, repo);
1541 /* Create a config file Git can understand. */
1542 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1543 wanted_branches, wanted_refs, mirror_references, repo);
1546 static const struct got_error *
1547 cmd_clone(int argc, char *argv[])
1549 const struct got_error *error = NULL;
1550 const char *uri, *dirname;
1551 char *proto, *host, *port, *repo_name, *server_path;
1552 char *default_destdir = NULL, *id_str = NULL;
1553 const char *repo_path;
1554 struct got_repository *repo = NULL;
1555 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1556 struct got_pathlist_entry *pe;
1557 struct got_object_id *pack_hash = NULL;
1558 int ch, fetchfd = -1, fetchstatus;
1559 pid_t fetchpid = -1;
1560 struct got_fetch_progress_arg fpa;
1561 char *git_url = NULL;
1562 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1563 int list_refs_only = 0;
1564 int *pack_fds = NULL;
1567 TAILQ_INIT(&symrefs);
1568 TAILQ_INIT(&wanted_branches);
1569 TAILQ_INIT(&wanted_refs);
1571 while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1574 fetch_all_branches = 1;
1577 error = got_pathlist_append(&wanted_branches,
1586 mirror_references = 1;
1592 error = got_pathlist_append(&wanted_refs,
1600 else if (verbosity < 3)
1611 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1612 option_conflict('a', 'b');
1613 if (list_refs_only) {
1614 if (!TAILQ_EMPTY(&wanted_branches))
1615 option_conflict('l', 'b');
1616 if (fetch_all_branches)
1617 option_conflict('l', 'a');
1618 if (mirror_references)
1619 option_conflict('l', 'm');
1620 if (!TAILQ_EMPTY(&wanted_refs))
1621 option_conflict('l', 'R');
1633 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1638 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1639 host, port ? ":" : "", port ? port : "",
1640 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1641 error = got_error_from_errno("asprintf");
1645 if (strcmp(proto, "git") == 0) {
1647 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1648 "sendfd dns inet unveil", NULL) == -1)
1651 } else if (strcmp(proto, "git+ssh") == 0 ||
1652 strcmp(proto, "ssh") == 0) {
1654 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1655 "sendfd unveil", NULL) == -1)
1658 } else if (strcmp(proto, "http") == 0 ||
1659 strcmp(proto, "git+http") == 0) {
1660 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1663 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1666 if (dirname == NULL) {
1667 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1668 error = got_error_from_errno("asprintf");
1671 repo_path = default_destdir;
1673 repo_path = dirname;
1675 if (!list_refs_only) {
1676 error = got_path_mkdir(repo_path);
1678 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1679 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1681 if (!got_path_dir_is_empty(repo_path)) {
1682 error = got_error_path(repo_path,
1683 GOT_ERR_DIR_NOT_EMPTY);
1688 error = got_dial_apply_unveil(proto);
1692 error = apply_unveil(repo_path, 0, NULL);
1697 printf("Connecting to %s\n", git_url);
1699 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1700 server_path, verbosity);
1704 if (!list_refs_only) {
1705 error = got_repo_init(repo_path, NULL);
1708 error = got_repo_pack_fds_open(&pack_fds);
1711 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1716 fpa.last_scaled_size[0] = '\0';
1717 fpa.last_p_indexed = -1;
1718 fpa.last_p_resolved = -1;
1719 fpa.verbosity = verbosity;
1720 fpa.create_configs = 1;
1721 fpa.configs_created = 0;
1723 fpa.config_info.symrefs = &symrefs;
1724 fpa.config_info.wanted_branches = &wanted_branches;
1725 fpa.config_info.wanted_refs = &wanted_refs;
1726 fpa.config_info.proto = proto;
1727 fpa.config_info.host = host;
1728 fpa.config_info.port = port;
1729 fpa.config_info.remote_repo_path = server_path;
1730 fpa.config_info.git_url = git_url;
1731 fpa.config_info.fetch_all_branches = fetch_all_branches;
1732 fpa.config_info.mirror_references = mirror_references;
1733 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1734 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1735 fetch_all_branches, &wanted_branches, &wanted_refs,
1736 list_refs_only, verbosity, fetchfd, repo,
1737 fetch_progress, &fpa);
1741 if (list_refs_only) {
1742 error = list_remote_refs(&symrefs, &refs);
1746 if (pack_hash == NULL) {
1747 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1748 "server sent an empty pack file");
1751 error = got_object_id_str(&id_str, pack_hash);
1755 printf("\nFetched %s.pack\n", id_str);
1758 /* Set up references provided with the pack file. */
1759 TAILQ_FOREACH(pe, &refs, entry) {
1760 const char *refname = pe->path;
1761 struct got_object_id *id = pe->data;
1762 char *remote_refname;
1764 if (is_wanted_ref(&wanted_refs, refname) &&
1765 !mirror_references) {
1766 error = create_wanted_ref(refname, id,
1767 GOT_FETCH_DEFAULT_REMOTE_NAME,
1768 verbosity - 1, repo);
1774 error = create_ref(refname, id, verbosity - 1, repo);
1778 if (mirror_references)
1781 if (strncmp("refs/heads/", refname, 11) != 0)
1784 if (asprintf(&remote_refname,
1785 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1786 refname + 11) == -1) {
1787 error = got_error_from_errno("asprintf");
1790 error = create_ref(remote_refname, id, verbosity - 1, repo);
1791 free(remote_refname);
1796 /* Set the HEAD reference if the server provided one. */
1797 TAILQ_FOREACH(pe, &symrefs, entry) {
1798 struct got_reference *target_ref;
1799 const char *refname = pe->path;
1800 const char *target = pe->data;
1801 char *remote_refname = NULL, *remote_target = NULL;
1803 if (strcmp(refname, GOT_REF_HEAD) != 0)
1806 error = got_ref_open(&target_ref, repo, target, 0);
1808 if (error->code == GOT_ERR_NOT_REF) {
1815 error = create_symref(refname, target_ref, verbosity, repo);
1816 got_ref_close(target_ref);
1820 if (mirror_references)
1823 if (strncmp("refs/heads/", target, 11) != 0)
1826 if (asprintf(&remote_refname,
1827 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1829 error = got_error_from_errno("asprintf");
1832 if (asprintf(&remote_target,
1833 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1834 target + 11) == -1) {
1835 error = got_error_from_errno("asprintf");
1836 free(remote_refname);
1839 error = got_ref_open(&target_ref, repo, remote_target, 0);
1841 free(remote_refname);
1842 free(remote_target);
1843 if (error->code == GOT_ERR_NOT_REF) {
1849 error = create_symref(remote_refname, target_ref,
1850 verbosity - 1, repo);
1851 free(remote_refname);
1852 free(remote_target);
1853 got_ref_close(target_ref);
1859 * We failed to set the HEAD reference. If we asked for
1860 * a set of wanted branches use the first of one of those
1861 * which could be fetched instead.
1863 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1864 const char *target = pe->path;
1865 struct got_reference *target_ref;
1867 error = got_ref_open(&target_ref, repo, target, 0);
1869 if (error->code == GOT_ERR_NOT_REF) {
1876 error = create_symref(GOT_REF_HEAD, target_ref,
1878 got_ref_close(target_ref);
1884 if (!fpa.configs_created && pe != NULL) {
1885 error = create_config_files(fpa.config_info.proto,
1886 fpa.config_info.host, fpa.config_info.port,
1887 fpa.config_info.remote_repo_path,
1888 fpa.config_info.git_url,
1889 fpa.config_info.fetch_all_branches,
1890 fpa.config_info.mirror_references,
1891 fpa.config_info.symrefs,
1892 fpa.config_info.wanted_branches,
1893 fpa.config_info.wanted_refs, fpa.repo);
1900 printf("Created %s repository '%s'\n",
1901 mirror_references ? "mirrored" : "cloned", repo_path);
1904 const struct got_error *pack_err =
1905 got_repo_pack_fds_close(pack_fds);
1910 if (kill(fetchpid, SIGTERM) == -1)
1911 error = got_error_from_errno("kill");
1912 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1913 error = got_error_from_errno("waitpid");
1915 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1916 error = got_error_from_errno("close");
1918 const struct got_error *close_err = got_repo_close(repo);
1922 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1923 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1924 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1925 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1932 free(default_destdir);
1937 static const struct got_error *
1938 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1939 int replace_tags, int verbosity, struct got_repository *repo)
1941 const struct got_error *err = NULL;
1942 char *new_id_str = NULL;
1943 struct got_object_id *old_id = NULL;
1945 err = got_object_id_str(&new_id_str, new_id);
1949 if (!replace_tags &&
1950 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1951 err = got_ref_resolve(&old_id, repo, ref);
1954 if (got_object_id_cmp(old_id, new_id) == 0)
1956 if (verbosity >= 0) {
1957 printf("Rejecting update of existing tag %s: %s\n",
1958 got_ref_get_name(ref), new_id_str);
1963 if (got_ref_is_symbolic(ref)) {
1964 if (verbosity >= 0) {
1965 printf("Replacing reference %s: %s\n",
1966 got_ref_get_name(ref),
1967 got_ref_get_symref_target(ref));
1969 err = got_ref_change_symref_to_ref(ref, new_id);
1972 err = got_ref_write(ref, repo);
1976 err = got_ref_resolve(&old_id, repo, ref);
1979 if (got_object_id_cmp(old_id, new_id) == 0)
1982 err = got_ref_change_ref(ref, new_id);
1985 err = got_ref_write(ref, repo);
1991 printf("Updated %s: %s\n", got_ref_get_name(ref),
1999 static const struct got_error *
2000 update_symref(const char *refname, struct got_reference *target_ref,
2001 int verbosity, struct got_repository *repo)
2003 const struct got_error *err = NULL, *unlock_err;
2004 struct got_reference *symref;
2005 int symref_is_locked = 0;
2007 err = got_ref_open(&symref, repo, refname, 1);
2009 if (err->code != GOT_ERR_NOT_REF)
2011 err = got_ref_alloc_symref(&symref, refname, target_ref);
2015 err = got_ref_write(symref, repo);
2020 printf("Created reference %s: %s\n",
2021 got_ref_get_name(symref),
2022 got_ref_get_symref_target(symref));
2024 symref_is_locked = 1;
2026 if (strcmp(got_ref_get_symref_target(symref),
2027 got_ref_get_name(target_ref)) == 0)
2030 err = got_ref_change_symref(symref,
2031 got_ref_get_name(target_ref));
2035 err = got_ref_write(symref, repo);
2040 printf("Updated %s: %s\n", got_ref_get_name(symref),
2041 got_ref_get_symref_target(symref));
2045 if (symref_is_locked) {
2046 unlock_err = got_ref_unlock(symref);
2047 if (unlock_err && err == NULL)
2050 got_ref_close(symref);
2057 fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2058 "[-R reference] [-r repository-path] [remote-repository]\n",
2063 static const struct got_error *
2064 delete_missing_ref(struct got_reference *ref,
2065 int verbosity, struct got_repository *repo)
2067 const struct got_error *err = NULL;
2068 struct got_object_id *id = NULL;
2069 char *id_str = NULL;
2071 if (got_ref_is_symbolic(ref)) {
2072 err = got_ref_delete(ref, repo);
2075 if (verbosity >= 0) {
2076 printf("Deleted %s: %s\n",
2077 got_ref_get_name(ref),
2078 got_ref_get_symref_target(ref));
2081 err = got_ref_resolve(&id, repo, ref);
2084 err = got_object_id_str(&id_str, id);
2088 err = got_ref_delete(ref, repo);
2091 if (verbosity >= 0) {
2092 printf("Deleted %s: %s\n",
2093 got_ref_get_name(ref), id_str);
2102 static const struct got_error *
2103 delete_missing_refs(struct got_pathlist_head *their_refs,
2104 struct got_pathlist_head *their_symrefs,
2105 const struct got_remote_repo *remote,
2106 int verbosity, struct got_repository *repo)
2108 const struct got_error *err = NULL, *unlock_err;
2109 struct got_reflist_head my_refs;
2110 struct got_reflist_entry *re;
2111 struct got_pathlist_entry *pe;
2112 char *remote_namespace = NULL;
2113 char *local_refname = NULL;
2115 TAILQ_INIT(&my_refs);
2117 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2119 return got_error_from_errno("asprintf");
2121 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2125 TAILQ_FOREACH(re, &my_refs, entry) {
2126 const char *refname = got_ref_get_name(re->ref);
2127 const char *their_refname;
2129 if (remote->mirror_references) {
2130 their_refname = refname;
2132 if (strncmp(refname, remote_namespace,
2133 strlen(remote_namespace)) == 0) {
2134 if (strcmp(refname + strlen(remote_namespace),
2137 if (asprintf(&local_refname, "refs/heads/%s",
2138 refname + strlen(remote_namespace)) == -1) {
2139 err = got_error_from_errno("asprintf");
2142 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2145 their_refname = local_refname;
2148 TAILQ_FOREACH(pe, their_refs, entry) {
2149 if (strcmp(their_refname, pe->path) == 0)
2155 TAILQ_FOREACH(pe, their_symrefs, entry) {
2156 if (strcmp(their_refname, pe->path) == 0)
2162 err = delete_missing_ref(re->ref, verbosity, repo);
2166 if (local_refname) {
2167 struct got_reference *ref;
2168 err = got_ref_open(&ref, repo, local_refname, 1);
2170 if (err->code != GOT_ERR_NOT_REF)
2172 free(local_refname);
2173 local_refname = NULL;
2176 err = delete_missing_ref(ref, verbosity, repo);
2179 unlock_err = got_ref_unlock(ref);
2181 if (unlock_err && err == NULL) {
2186 free(local_refname);
2187 local_refname = NULL;
2191 got_ref_list_free(&my_refs);
2192 free(remote_namespace);
2193 free(local_refname);
2197 static const struct got_error *
2198 update_wanted_ref(const char *refname, struct got_object_id *id,
2199 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2201 const struct got_error *err, *unlock_err;
2202 char *remote_refname;
2203 struct got_reference *ref;
2205 if (strncmp("refs/", refname, 5) == 0)
2208 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2209 remote_repo_name, refname) == -1)
2210 return got_error_from_errno("asprintf");
2212 err = got_ref_open(&ref, repo, remote_refname, 1);
2214 if (err->code != GOT_ERR_NOT_REF)
2216 err = create_ref(remote_refname, id, verbosity, repo);
2218 err = update_ref(ref, id, 0, verbosity, repo);
2219 unlock_err = got_ref_unlock(ref);
2220 if (unlock_err && err == NULL)
2225 free(remote_refname);
2229 static const struct got_error *
2230 delete_ref(struct got_repository *repo, struct got_reference *ref)
2232 const struct got_error *err = NULL;
2233 struct got_object_id *id = NULL;
2234 char *id_str = NULL;
2237 if (got_ref_is_symbolic(ref)) {
2238 target = got_ref_get_symref_target(ref);
2240 err = got_ref_resolve(&id, repo, ref);
2243 err = got_object_id_str(&id_str, id);
2249 err = got_ref_delete(ref, repo);
2253 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2260 static const struct got_error *
2261 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2263 const struct got_error *err = NULL;
2264 struct got_reflist_head refs;
2265 struct got_reflist_entry *re;
2270 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2271 err = got_error_from_errno("asprintf");
2274 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2278 TAILQ_FOREACH(re, &refs, entry)
2279 delete_ref(repo, re->ref);
2281 got_ref_list_free(&refs);
2285 static const struct got_error *
2286 cmd_fetch(int argc, char *argv[])
2288 const struct got_error *error = NULL, *unlock_err;
2289 char *cwd = NULL, *repo_path = NULL;
2290 const char *remote_name;
2291 char *proto = NULL, *host = NULL, *port = NULL;
2292 char *repo_name = NULL, *server_path = NULL;
2293 const struct got_remote_repo *remotes, *remote = NULL;
2295 char *id_str = NULL;
2296 struct got_repository *repo = NULL;
2297 struct got_worktree *worktree = NULL;
2298 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2299 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2300 struct got_pathlist_entry *pe;
2301 struct got_object_id *pack_hash = NULL;
2302 int i, ch, fetchfd = -1, fetchstatus;
2303 pid_t fetchpid = -1;
2304 struct got_fetch_progress_arg fpa;
2305 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2306 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2307 int *pack_fds = NULL;
2310 TAILQ_INIT(&symrefs);
2311 TAILQ_INIT(&wanted_branches);
2312 TAILQ_INIT(&wanted_refs);
2314 while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2317 fetch_all_branches = 1;
2320 error = got_pathlist_append(&wanted_branches,
2335 error = got_pathlist_append(&wanted_refs,
2341 repo_path = realpath(optarg, NULL);
2342 if (repo_path == NULL)
2343 return got_error_from_errno2("realpath",
2345 got_path_strip_trailing_slashes(repo_path);
2353 else if (verbosity < 3)
2367 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2368 option_conflict('a', 'b');
2369 if (list_refs_only) {
2370 if (!TAILQ_EMPTY(&wanted_branches))
2371 option_conflict('l', 'b');
2372 if (fetch_all_branches)
2373 option_conflict('l', 'a');
2375 option_conflict('l', 'd');
2377 option_conflict('l', 'X');
2379 if (delete_remote) {
2380 if (fetch_all_branches)
2381 option_conflict('X', 'a');
2382 if (!TAILQ_EMPTY(&wanted_branches))
2383 option_conflict('X', 'b');
2385 option_conflict('X', 'd');
2387 option_conflict('X', 't');
2388 if (!TAILQ_EMPTY(&wanted_refs))
2389 option_conflict('X', 'R');
2394 errx(1, "-X option requires a remote name");
2395 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2396 } else if (argc == 1)
2397 remote_name = argv[0];
2401 cwd = getcwd(NULL, 0);
2403 error = got_error_from_errno("getcwd");
2407 error = got_repo_pack_fds_open(&pack_fds);
2411 if (repo_path == NULL) {
2412 error = got_worktree_open(&worktree, cwd);
2413 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2419 strdup(got_worktree_get_repo_path(worktree));
2420 if (repo_path == NULL)
2421 error = got_error_from_errno("strdup");
2425 repo_path = strdup(cwd);
2426 if (repo_path == NULL) {
2427 error = got_error_from_errno("strdup");
2433 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2437 if (delete_remote) {
2438 error = delete_refs_for_remote(repo, remote_name);
2439 goto done; /* nothing else to do */
2443 worktree_conf = got_worktree_get_gotconfig(worktree);
2444 if (worktree_conf) {
2445 got_gotconfig_get_remotes(&nremotes, &remotes,
2447 for (i = 0; i < nremotes; i++) {
2448 if (strcmp(remotes[i].name, remote_name) == 0) {
2449 remote = &remotes[i];
2455 if (remote == NULL) {
2456 repo_conf = got_repo_get_gotconfig(repo);
2458 got_gotconfig_get_remotes(&nremotes, &remotes,
2460 for (i = 0; i < nremotes; i++) {
2461 if (strcmp(remotes[i].name, remote_name) == 0) {
2462 remote = &remotes[i];
2468 if (remote == NULL) {
2469 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2470 for (i = 0; i < nremotes; i++) {
2471 if (strcmp(remotes[i].name, remote_name) == 0) {
2472 remote = &remotes[i];
2477 if (remote == NULL) {
2478 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2482 if (TAILQ_EMPTY(&wanted_branches)) {
2483 if (!fetch_all_branches)
2484 fetch_all_branches = remote->fetch_all_branches;
2485 for (i = 0; i < remote->nfetch_branches; i++) {
2486 error = got_pathlist_append(&wanted_branches,
2487 remote->fetch_branches[i], NULL);
2492 if (TAILQ_EMPTY(&wanted_refs)) {
2493 for (i = 0; i < remote->nfetch_refs; i++) {
2494 error = got_pathlist_append(&wanted_refs,
2495 remote->fetch_refs[i], NULL);
2501 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2502 &repo_name, remote->fetch_url);
2506 if (strcmp(proto, "git") == 0) {
2508 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2509 "sendfd dns inet unveil", NULL) == -1)
2512 } else if (strcmp(proto, "git+ssh") == 0 ||
2513 strcmp(proto, "ssh") == 0) {
2515 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2516 "sendfd unveil", NULL) == -1)
2519 } else if (strcmp(proto, "http") == 0 ||
2520 strcmp(proto, "git+http") == 0) {
2521 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2524 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2528 error = got_dial_apply_unveil(proto);
2532 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2536 if (verbosity >= 0) {
2537 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2538 remote->name, proto, host,
2539 port ? ":" : "", port ? port : "",
2540 *server_path == '/' ? "" : "/", server_path);
2543 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2544 server_path, verbosity);
2548 fpa.last_scaled_size[0] = '\0';
2549 fpa.last_p_indexed = -1;
2550 fpa.last_p_resolved = -1;
2551 fpa.verbosity = verbosity;
2553 fpa.create_configs = 0;
2554 fpa.configs_created = 0;
2555 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2556 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2557 remote->mirror_references, fetch_all_branches, &wanted_branches,
2558 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2559 fetch_progress, &fpa);
2563 if (list_refs_only) {
2564 error = list_remote_refs(&symrefs, &refs);
2568 if (pack_hash == NULL) {
2570 printf("Already up-to-date\n");
2571 } else if (verbosity >= 0) {
2572 error = got_object_id_str(&id_str, pack_hash);
2575 printf("\nFetched %s.pack\n", id_str);
2580 /* Update references provided with the pack file. */
2581 TAILQ_FOREACH(pe, &refs, entry) {
2582 const char *refname = pe->path;
2583 struct got_object_id *id = pe->data;
2584 struct got_reference *ref;
2585 char *remote_refname;
2587 if (is_wanted_ref(&wanted_refs, refname) &&
2588 !remote->mirror_references) {
2589 error = update_wanted_ref(refname, id,
2590 remote->name, verbosity, repo);
2596 if (remote->mirror_references ||
2597 strncmp("refs/tags/", refname, 10) == 0) {
2598 error = got_ref_open(&ref, repo, refname, 1);
2600 if (error->code != GOT_ERR_NOT_REF)
2602 error = create_ref(refname, id, verbosity,
2607 error = update_ref(ref, id, replace_tags,
2609 unlock_err = got_ref_unlock(ref);
2610 if (unlock_err && error == NULL)
2616 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2617 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2618 remote_name, refname + 11) == -1) {
2619 error = got_error_from_errno("asprintf");
2623 error = got_ref_open(&ref, repo, remote_refname, 1);
2625 if (error->code != GOT_ERR_NOT_REF)
2627 error = create_ref(remote_refname, id,
2632 error = update_ref(ref, id, replace_tags,
2634 unlock_err = got_ref_unlock(ref);
2635 if (unlock_err && error == NULL)
2642 /* Also create a local branch if none exists yet. */
2643 error = got_ref_open(&ref, repo, refname, 1);
2645 if (error->code != GOT_ERR_NOT_REF)
2647 error = create_ref(refname, id, verbosity,
2652 unlock_err = got_ref_unlock(ref);
2653 if (unlock_err && error == NULL)
2660 error = delete_missing_refs(&refs, &symrefs, remote,
2666 if (!remote->mirror_references) {
2667 /* Update remote HEAD reference if the server provided one. */
2668 TAILQ_FOREACH(pe, &symrefs, entry) {
2669 struct got_reference *target_ref;
2670 const char *refname = pe->path;
2671 const char *target = pe->data;
2672 char *remote_refname = NULL, *remote_target = NULL;
2674 if (strcmp(refname, GOT_REF_HEAD) != 0)
2677 if (strncmp("refs/heads/", target, 11) != 0)
2680 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2681 remote->name, refname) == -1) {
2682 error = got_error_from_errno("asprintf");
2685 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2686 remote->name, target + 11) == -1) {
2687 error = got_error_from_errno("asprintf");
2688 free(remote_refname);
2692 error = got_ref_open(&target_ref, repo, remote_target,
2695 free(remote_refname);
2696 free(remote_target);
2697 if (error->code == GOT_ERR_NOT_REF) {
2703 error = update_symref(remote_refname, target_ref,
2705 free(remote_refname);
2706 free(remote_target);
2707 got_ref_close(target_ref);
2714 if (kill(fetchpid, SIGTERM) == -1)
2715 error = got_error_from_errno("kill");
2716 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2717 error = got_error_from_errno("waitpid");
2719 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2720 error = got_error_from_errno("close");
2722 const struct got_error *close_err = got_repo_close(repo);
2727 got_worktree_close(worktree);
2729 const struct got_error *pack_err =
2730 got_repo_pack_fds_close(pack_fds);
2734 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
2735 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
2736 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2737 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2752 usage_checkout(void)
2754 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2755 "[-p path-prefix] repository-path [work-tree-path]\n",
2761 show_worktree_base_ref_warning(void)
2763 fprintf(stderr, "%s: warning: could not create a reference "
2764 "to the work tree's base commit; the commit could be "
2765 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2766 "repository writable and running 'got update' will prevent this\n",
2770 struct got_checkout_progress_arg {
2771 const char *worktree_path;
2772 int had_base_commit_ref_error;
2776 static const struct got_error *
2777 checkout_progress(void *arg, unsigned char status, const char *path)
2779 struct got_checkout_progress_arg *a = arg;
2781 /* Base commit bump happens silently. */
2782 if (status == GOT_STATUS_BUMP_BASE)
2785 if (status == GOT_STATUS_BASE_REF_ERR) {
2786 a->had_base_commit_ref_error = 1;
2790 while (path[0] == '/')
2793 if (a->verbosity >= 0)
2794 printf("%c %s/%s\n", status, a->worktree_path, path);
2799 static const struct got_error *
2800 check_cancelled(void *arg)
2802 if (sigint_received || sigpipe_received)
2803 return got_error(GOT_ERR_CANCELLED);
2807 static const struct got_error *
2808 check_linear_ancestry(struct got_object_id *commit_id,
2809 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2810 struct got_repository *repo)
2812 const struct got_error *err = NULL;
2813 struct got_object_id *yca_id;
2815 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2816 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2821 return got_error(GOT_ERR_ANCESTRY);
2824 * Require a straight line of history between the target commit
2825 * and the work tree's base commit.
2827 * Non-linear situations such as this require a rebase:
2829 * (commit) D F (base_commit)
2837 * 'got update' only handles linear cases:
2838 * Update forwards in time: A (base/yca) - B - C - D (commit)
2839 * Update backwards in time: D (base) - C - B - A (commit/yca)
2841 if (allow_forwards_in_time_only) {
2842 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2843 return got_error(GOT_ERR_ANCESTRY);
2844 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2845 got_object_id_cmp(base_commit_id, yca_id) != 0)
2846 return got_error(GOT_ERR_ANCESTRY);
2852 static const struct got_error *
2853 check_same_branch(struct got_object_id *commit_id,
2854 struct got_reference *head_ref, struct got_object_id *yca_id,
2855 struct got_repository *repo)
2857 const struct got_error *err = NULL;
2858 struct got_commit_graph *graph = NULL;
2859 struct got_object_id *head_commit_id = NULL;
2860 int is_same_branch = 0;
2862 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2866 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2870 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2875 err = got_commit_graph_open(&graph, "/", 1);
2879 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2880 check_cancelled, NULL);
2885 struct got_object_id id;
2887 err = got_commit_graph_iter_next(&id, graph, repo,
2888 check_cancelled, NULL);
2890 if (err->code == GOT_ERR_ITER_COMPLETED)
2895 if (yca_id && got_object_id_cmp(&id, yca_id) == 0)
2897 if (got_object_id_cmp(&id, commit_id) == 0) {
2904 got_commit_graph_close(graph);
2905 free(head_commit_id);
2906 if (!err && !is_same_branch)
2907 err = got_error(GOT_ERR_ANCESTRY);
2911 static const struct got_error *
2912 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2914 static char msg[512];
2915 const char *branch_name;
2917 if (got_ref_is_symbolic(ref))
2918 branch_name = got_ref_get_symref_target(ref);
2920 branch_name = got_ref_get_name(ref);
2922 if (strncmp("refs/heads/", branch_name, 11) == 0)
2925 snprintf(msg, sizeof(msg),
2926 "target commit is not contained in branch '%s'; "
2927 "the branch to use must be specified with -b; "
2928 "if necessary a new branch can be created for "
2929 "this commit with 'got branch -c %s BRANCH_NAME'",
2930 branch_name, commit_id_str);
2932 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2935 static const struct got_error *
2936 cmd_checkout(int argc, char *argv[])
2938 const struct got_error *error = NULL;
2939 struct got_repository *repo = NULL;
2940 struct got_reference *head_ref = NULL, *ref = NULL;
2941 struct got_worktree *worktree = NULL;
2942 char *repo_path = NULL;
2943 char *worktree_path = NULL;
2944 const char *path_prefix = "";
2945 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2946 char *commit_id_str = NULL;
2947 struct got_object_id *commit_id = NULL;
2949 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2950 struct got_pathlist_head paths;
2951 struct got_checkout_progress_arg cpa;
2952 int *pack_fds = NULL;
2956 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2959 branch_name = optarg;
2962 commit_id_str = strdup(optarg);
2963 if (commit_id_str == NULL)
2964 return got_error_from_errno("strdup");
2970 path_prefix = optarg;
2985 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2986 "unveil", NULL) == -1)
2990 char *base, *dotgit;
2992 repo_path = realpath(argv[0], NULL);
2993 if (repo_path == NULL)
2994 return got_error_from_errno2("realpath", argv[0]);
2995 cwd = getcwd(NULL, 0);
2997 error = got_error_from_errno("getcwd");
3004 error = got_path_basename(&base, path);
3007 dotgit = strstr(base, ".git");
3010 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3011 error = got_error_from_errno("asprintf");
3016 } else if (argc == 2) {
3017 repo_path = realpath(argv[0], NULL);
3018 if (repo_path == NULL) {
3019 error = got_error_from_errno2("realpath", argv[0]);
3022 worktree_path = realpath(argv[1], NULL);
3023 if (worktree_path == NULL) {
3024 if (errno != ENOENT) {
3025 error = got_error_from_errno2("realpath",
3029 worktree_path = strdup(argv[1]);
3030 if (worktree_path == NULL) {
3031 error = got_error_from_errno("strdup");
3038 got_path_strip_trailing_slashes(repo_path);
3039 got_path_strip_trailing_slashes(worktree_path);
3041 error = got_repo_pack_fds_open(&pack_fds);
3045 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3049 /* Pre-create work tree path for unveil(2) */
3050 error = got_path_mkdir(worktree_path);
3052 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3053 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3055 if (!allow_nonempty &&
3056 !got_path_dir_is_empty(worktree_path)) {
3057 error = got_error_path(worktree_path,
3058 GOT_ERR_DIR_NOT_EMPTY);
3063 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3067 error = got_ref_open(&head_ref, repo, branch_name, 0);
3071 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
3072 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3075 error = got_worktree_open(&worktree, worktree_path);
3079 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3083 if (!same_path_prefix) {
3084 error = got_error(GOT_ERR_PATH_PREFIX);
3088 if (commit_id_str) {
3089 struct got_reflist_head refs;
3091 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3095 error = got_repo_match_object_id(&commit_id, NULL,
3096 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3097 got_ref_list_free(&refs);
3100 error = check_linear_ancestry(commit_id,
3101 got_worktree_get_base_commit_id(worktree), 0, repo);
3102 if (error != NULL) {
3103 if (error->code == GOT_ERR_ANCESTRY) {
3104 error = checkout_ancestry_error(
3105 head_ref, commit_id_str);
3109 error = check_same_branch(commit_id, head_ref, NULL, repo);
3111 if (error->code == GOT_ERR_ANCESTRY) {
3112 error = checkout_ancestry_error(
3113 head_ref, commit_id_str);
3117 error = got_worktree_set_base_commit_id(worktree, repo,
3121 /* Expand potentially abbreviated commit ID string. */
3122 free(commit_id_str);
3123 error = got_object_id_str(&commit_id_str, commit_id);
3127 commit_id = got_object_id_dup(
3128 got_worktree_get_base_commit_id(worktree));
3129 if (commit_id == NULL) {
3130 error = got_error_from_errno("got_object_id_dup");
3133 error = got_object_id_str(&commit_id_str, commit_id);
3138 error = got_pathlist_append(&paths, "", NULL);
3141 cpa.worktree_path = worktree_path;
3142 cpa.had_base_commit_ref_error = 0;
3143 cpa.verbosity = verbosity;
3144 error = got_worktree_checkout_files(worktree, &paths, repo,
3145 checkout_progress, &cpa, check_cancelled, NULL);
3149 if (got_ref_is_symbolic(head_ref)) {
3150 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3153 refname = got_ref_get_name(ref);
3155 refname = got_ref_get_name(head_ref);
3156 printf("Checked out %s: %s\n", refname, commit_id_str);
3157 printf("Now shut up and hack\n");
3158 if (cpa.had_base_commit_ref_error)
3159 show_worktree_base_ref_warning();
3162 const struct got_error *pack_err =
3163 got_repo_pack_fds_close(pack_fds);
3168 got_ref_close(head_ref);
3171 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
3172 free(commit_id_str);
3175 free(worktree_path);
3180 struct got_update_progress_arg {
3192 print_update_progress_stats(struct got_update_progress_arg *upa)
3194 if (!upa->did_something)
3197 if (upa->conflicts > 0)
3198 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3199 if (upa->obstructed > 0)
3200 printf("File paths obstructed by a non-regular file: %d\n",
3202 if (upa->not_updated > 0)
3203 printf("Files not updated because of existing merge "
3204 "conflicts: %d\n", upa->not_updated);
3208 * The meaning of some status codes differs between merge-style operations and
3209 * update operations. For example, the ! status code means "file was missing"
3210 * if changes were merged into the work tree, and "missing file was restored"
3211 * if the work tree was updated. This function should be used by any operation
3212 * which merges changes into the work tree without updating the work tree.
3215 print_merge_progress_stats(struct got_update_progress_arg *upa)
3217 if (!upa->did_something)
3220 if (upa->conflicts > 0)
3221 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3222 if (upa->obstructed > 0)
3223 printf("File paths obstructed by a non-regular file: %d\n",
3225 if (upa->missing > 0)
3226 printf("Files which had incoming changes but could not be "
3227 "found in the work tree: %d\n", upa->missing);
3228 if (upa->not_deleted > 0)
3229 printf("Files not deleted due to differences in deleted "
3230 "content: %d\n", upa->not_deleted);
3231 if (upa->unversioned > 0)
3232 printf("Files not merged because an unversioned file was "
3233 "found in the work tree: %d\n", upa->unversioned);
3239 fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3240 "[path ...]\n", getprogname());
3244 static const struct got_error *
3245 update_progress(void *arg, unsigned char status, const char *path)
3247 struct got_update_progress_arg *upa = arg;
3249 if (status == GOT_STATUS_EXISTS ||
3250 status == GOT_STATUS_BASE_REF_ERR)
3253 upa->did_something = 1;
3255 /* Base commit bump happens silently. */
3256 if (status == GOT_STATUS_BUMP_BASE)
3259 if (status == GOT_STATUS_CONFLICT)
3261 if (status == GOT_STATUS_OBSTRUCTED)
3263 if (status == GOT_STATUS_CANNOT_UPDATE)
3265 if (status == GOT_STATUS_MISSING)
3267 if (status == GOT_STATUS_CANNOT_DELETE)
3269 if (status == GOT_STATUS_UNVERSIONED)
3272 while (path[0] == '/')
3274 if (upa->verbosity >= 0)
3275 printf("%c %s\n", status, path);
3280 static const struct got_error *
3281 switch_head_ref(struct got_reference *head_ref,
3282 struct got_object_id *commit_id, struct got_worktree *worktree,
3283 struct got_repository *repo)
3285 const struct got_error *err = NULL;
3287 int ref_has_moved = 0;
3289 /* Trivial case: switching between two different references. */
3290 if (strcmp(got_ref_get_name(head_ref),
3291 got_worktree_get_head_ref_name(worktree)) != 0) {
3292 printf("Switching work tree from %s to %s\n",
3293 got_worktree_get_head_ref_name(worktree),
3294 got_ref_get_name(head_ref));
3295 return got_worktree_set_head_ref(worktree, head_ref);
3298 err = check_linear_ancestry(commit_id,
3299 got_worktree_get_base_commit_id(worktree), 0, repo);
3301 if (err->code != GOT_ERR_ANCESTRY)
3308 /* Switching to a rebased branch with the same reference name. */
3309 err = got_object_id_str(&base_id_str,
3310 got_worktree_get_base_commit_id(worktree));
3313 printf("Reference %s now points at a different branch\n",
3314 got_worktree_get_head_ref_name(worktree));
3315 printf("Switching work tree from %s to %s\n", base_id_str,
3316 got_worktree_get_head_ref_name(worktree));
3320 static const struct got_error *
3321 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3323 const struct got_error *err;
3326 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3330 return got_error(GOT_ERR_REBASING);
3332 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3336 return got_error(GOT_ERR_HISTEDIT_BUSY);
3341 static const struct got_error *
3342 check_merge_in_progress(struct got_worktree *worktree,
3343 struct got_repository *repo)
3345 const struct got_error *err;
3348 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3352 return got_error(GOT_ERR_MERGE_BUSY);
3357 static const struct got_error *
3358 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3359 char *argv[], struct got_worktree *worktree)
3361 const struct got_error *err = NULL;
3363 struct got_pathlist_entry *new;
3369 return got_error_from_errno("strdup");
3370 return got_pathlist_append(paths, path, NULL);
3373 for (i = 0; i < argc; i++) {
3374 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3377 err = got_pathlist_insert(&new, paths, path, NULL);
3378 if (err || new == NULL /* duplicate */) {
3388 static const struct got_error *
3389 wrap_not_worktree_error(const struct got_error *orig_err,
3390 const char *cmdname, const char *path)
3392 const struct got_error *err;
3393 struct got_repository *repo;
3394 static char msg[512];
3395 int *pack_fds = NULL;
3397 err = got_repo_pack_fds_open(&pack_fds);
3401 err = got_repo_open(&repo, path, NULL, pack_fds);
3405 snprintf(msg, sizeof(msg),
3406 "'got %s' needs a work tree in addition to a git repository\n"
3407 "Work trees can be checked out from this Git repository with "
3409 "The got(1) manual page contains more information.", cmdname);
3410 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3411 got_repo_close(repo);
3413 const struct got_error *pack_err =
3414 got_repo_pack_fds_close(pack_fds);
3421 static const struct got_error *
3422 cmd_update(int argc, char *argv[])
3424 const struct got_error *error = NULL;
3425 struct got_repository *repo = NULL;
3426 struct got_worktree *worktree = NULL;
3427 char *worktree_path = NULL;
3428 struct got_object_id *commit_id = NULL;
3429 char *commit_id_str = NULL;
3430 const char *branch_name = NULL;
3431 struct got_reference *head_ref = NULL;
3432 struct got_pathlist_head paths;
3433 struct got_pathlist_entry *pe;
3434 int ch, verbosity = 0;
3435 struct got_update_progress_arg upa;
3436 int *pack_fds = NULL;
3440 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3443 branch_name = optarg;
3446 commit_id_str = strdup(optarg);
3447 if (commit_id_str == NULL)
3448 return got_error_from_errno("strdup");
3463 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3464 "unveil", NULL) == -1)
3467 worktree_path = getcwd(NULL, 0);
3468 if (worktree_path == NULL) {
3469 error = got_error_from_errno("getcwd");
3473 error = got_repo_pack_fds_open(&pack_fds);
3477 error = got_worktree_open(&worktree, worktree_path);
3479 if (error->code == GOT_ERR_NOT_WORKTREE)
3480 error = wrap_not_worktree_error(error, "update",
3485 error = check_rebase_or_histedit_in_progress(worktree);
3489 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3494 error = apply_unveil(got_repo_get_path(repo), 0,
3495 got_worktree_get_root_path(worktree));
3499 error = check_merge_in_progress(worktree, repo);
3503 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3507 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3508 got_worktree_get_head_ref_name(worktree), 0);
3511 if (commit_id_str == NULL) {
3512 error = got_ref_resolve(&commit_id, repo, head_ref);
3515 error = got_object_id_str(&commit_id_str, commit_id);
3519 struct got_reflist_head refs;
3521 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3525 error = got_repo_match_object_id(&commit_id, NULL,
3526 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3527 got_ref_list_free(&refs);
3528 free(commit_id_str);
3529 commit_id_str = NULL;
3532 error = got_object_id_str(&commit_id_str, commit_id);
3538 struct got_object_id *head_commit_id;
3539 TAILQ_FOREACH(pe, &paths, entry) {
3540 if (pe->path_len == 0)
3542 error = got_error_msg(GOT_ERR_BAD_PATH,
3543 "switching between branches requires that "
3544 "the entire work tree gets updated");
3547 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3550 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3552 free(head_commit_id);
3555 error = check_same_branch(commit_id, head_ref, NULL, repo);
3558 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3562 error = check_linear_ancestry(commit_id,
3563 got_worktree_get_base_commit_id(worktree), 0, repo);
3564 if (error != NULL) {
3565 if (error->code == GOT_ERR_ANCESTRY)
3566 error = got_error(GOT_ERR_BRANCH_MOVED);
3569 error = check_same_branch(commit_id, head_ref, NULL, repo);
3574 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3576 error = got_worktree_set_base_commit_id(worktree, repo,
3582 memset(&upa, 0, sizeof(upa));
3583 upa.verbosity = verbosity;
3584 error = got_worktree_checkout_files(worktree, &paths, repo,
3585 update_progress, &upa, check_cancelled, NULL);
3589 if (upa.did_something) {
3590 printf("Updated to %s: %s\n",
3591 got_worktree_get_head_ref_name(worktree), commit_id_str);
3593 printf("Already up-to-date\n");
3595 print_update_progress_stats(&upa);
3598 const struct got_error *pack_err =
3599 got_repo_pack_fds_close(pack_fds);
3603 free(worktree_path);
3604 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3606 free(commit_id_str);
3610 static const struct got_error *
3611 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3612 const char *path, int diff_context, int ignore_whitespace,
3613 int force_text_diff, int show_diffstat, struct got_repository *repo,
3616 const struct got_error *err = NULL;
3617 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3618 FILE *f1 = NULL, *f2 = NULL;
3619 int fd1 = -1, fd2 = -1;
3621 fd1 = got_opentempfd();
3623 return got_error_from_errno("got_opentempfd");
3624 fd2 = got_opentempfd();
3626 err = got_error_from_errno("got_opentempfd");
3631 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3637 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3641 f1 = got_opentemp();
3643 err = got_error_from_errno("got_opentemp");
3646 f2 = got_opentemp();
3648 err = got_error_from_errno("got_opentemp");
3652 while (path[0] == '/')
3654 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3655 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3656 force_text_diff, show_diffstat, NULL, outfile);
3658 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3659 err = got_error_from_errno("close");
3661 got_object_blob_close(blob1);
3662 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3663 err = got_error_from_errno("close");
3664 got_object_blob_close(blob2);
3665 if (f1 && fclose(f1) == EOF && err == NULL)
3666 err = got_error_from_errno("fclose");
3667 if (f2 && fclose(f2) == EOF && err == NULL)
3668 err = got_error_from_errno("fclose");
3672 static const struct got_error *
3673 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3674 const char *path, int diff_context, int ignore_whitespace,
3675 int force_text_diff, struct got_repository *repo, FILE *outfile)
3677 const struct got_error *err = NULL;
3678 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3679 struct got_diff_blob_output_unidiff_arg arg;
3680 FILE *f1 = NULL, *f2 = NULL;
3681 int fd1 = -1, fd2 = -1;
3684 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3687 fd1 = got_opentempfd();
3689 err = got_error_from_errno("got_opentempfd");
3694 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3698 f1 = got_opentemp();
3700 err = got_error_from_errno("got_opentemp");
3704 f2 = got_opentemp();
3706 err = got_error_from_errno("got_opentemp");
3709 fd2 = got_opentempfd();
3711 err = got_error_from_errno("got_opentempfd");
3714 arg.diff_context = diff_context;
3715 arg.ignore_whitespace = ignore_whitespace;
3716 arg.force_text_diff = force_text_diff;
3717 arg.show_diffstat = 0;
3718 arg.diffstat = NULL;
3719 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3720 arg.outfile = outfile;
3723 while (path[0] == '/')
3725 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3726 got_diff_blob_output_unidiff, &arg, 1);
3729 got_object_tree_close(tree1);
3731 got_object_tree_close(tree2);
3732 if (f1 && fclose(f1) == EOF && err == NULL)
3733 err = got_error_from_errno("fclose");
3734 if (f2 && fclose(f2) == EOF && err == NULL)
3735 err = got_error_from_errno("fclose");
3736 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3737 err = got_error_from_errno("close");
3738 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3739 err = got_error_from_errno("close");
3743 static const struct got_error *
3744 get_changed_paths(struct got_pathlist_head *paths,
3745 struct got_commit_object *commit, struct got_repository *repo,
3746 struct got_diffstat_cb_arg *dsa)
3748 const struct got_error *err = NULL;
3749 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3750 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3751 struct got_object_qid *qid;
3752 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3753 FILE *f1 = NULL, *f2 = NULL;
3754 int fd1 = -1, fd2 = -1;
3757 cb = got_diff_tree_compute_diffstat;
3759 f1 = got_opentemp();
3761 err = got_error_from_errno("got_opentemp");
3764 f2 = got_opentemp();
3766 err = got_error_from_errno("got_opentemp");
3769 fd1 = got_opentempfd();
3771 err = got_error_from_errno("got_opentempfd");
3774 fd2 = got_opentempfd();
3776 err = got_error_from_errno("got_opentempfd");
3781 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3783 struct got_commit_object *pcommit;
3784 err = got_object_open_as_commit(&pcommit, repo,
3789 tree_id1 = got_object_id_dup(
3790 got_object_commit_get_tree_id(pcommit));
3791 if (tree_id1 == NULL) {
3792 got_object_commit_close(pcommit);
3793 return got_error_from_errno("got_object_id_dup");
3795 got_object_commit_close(pcommit);
3800 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3805 tree_id2 = got_object_commit_get_tree_id(commit);
3806 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3810 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3811 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3814 got_object_tree_close(tree1);
3816 got_object_tree_close(tree2);
3817 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3818 err = got_error_from_errno("close");
3819 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3820 err = got_error_from_errno("close");
3821 if (f1 && fclose(f1) == EOF && err == NULL)
3822 err = got_error_from_errno("fclose");
3823 if (f2 && fclose(f2) == EOF && err == NULL)
3824 err = got_error_from_errno("fclose");
3829 static const struct got_error *
3830 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3831 const char *path, int diff_context, struct got_repository *repo,
3834 const struct got_error *err = NULL;
3835 struct got_commit_object *pcommit = NULL;
3836 char *id_str1 = NULL, *id_str2 = NULL;
3837 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3838 struct got_object_qid *qid;
3840 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3842 err = got_object_open_as_commit(&pcommit, repo,
3846 err = got_object_id_str(&id_str1, &qid->id);
3851 err = got_object_id_str(&id_str2, id);
3855 if (path && path[0] != '\0') {
3857 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3861 err = got_object_id_by_path(&obj_id1, repo,
3864 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3870 err = got_object_get_type(&obj_type, repo, obj_id2);
3876 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3877 fprintf(outfile, "commit - %s\n",
3878 id_str1 ? id_str1 : "/dev/null");
3879 fprintf(outfile, "commit + %s\n", id_str2);
3881 case GOT_OBJ_TYPE_BLOB:
3882 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3883 0, 0, 0, repo, outfile);
3885 case GOT_OBJ_TYPE_TREE:
3886 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3887 0, 0, repo, outfile);
3890 err = got_error(GOT_ERR_OBJ_TYPE);
3896 obj_id2 = got_object_commit_get_tree_id(commit);
3898 obj_id1 = got_object_commit_get_tree_id(pcommit);
3900 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3901 fprintf(outfile, "commit - %s\n",
3902 id_str1 ? id_str1 : "/dev/null");
3903 fprintf(outfile, "commit + %s\n", id_str2);
3904 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3911 got_object_commit_close(pcommit);
3916 get_datestr(time_t *time, char *datebuf)
3918 struct tm mytm, *tm;
3921 tm = gmtime_r(time, &mytm);
3924 s = asctime_r(tm, datebuf);
3927 p = strchr(s, '\n');
3933 static const struct got_error *
3934 match_commit(int *have_match, struct got_object_id *id,
3935 struct got_commit_object *commit, regex_t *regex)
3937 const struct got_error *err = NULL;
3938 regmatch_t regmatch;
3939 char *id_str = NULL, *logmsg = NULL;
3943 err = got_object_id_str(&id_str, id);
3947 err = got_object_commit_get_logmsg(&logmsg, commit);
3951 if (regexec(regex, got_object_commit_get_author(commit), 1,
3952 ®match, 0) == 0 ||
3953 regexec(regex, got_object_commit_get_committer(commit), 1,
3954 ®match, 0) == 0 ||
3955 regexec(regex, id_str, 1, ®match, 0) == 0 ||
3956 regexec(regex, logmsg, 1, ®match, 0) == 0)
3965 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3968 regmatch_t regmatch;
3969 struct got_pathlist_entry *pe;
3973 TAILQ_FOREACH(pe, changed_paths, entry) {
3974 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3981 static const struct got_error *
3982 match_patch(int *have_match, struct got_commit_object *commit,
3983 struct got_object_id *id, const char *path, int diff_context,
3984 struct got_repository *repo, regex_t *regex, FILE *f)
3986 const struct got_error *err = NULL;
3988 size_t linesize = 0;
3989 regmatch_t regmatch;
3993 err = got_opentemp_truncate(f);
3997 err = print_patch(commit, id, path, diff_context, repo, f);
4001 if (fseeko(f, 0L, SEEK_SET) == -1) {
4002 err = got_error_from_errno("fseeko");
4006 while (getline(&line, &linesize, f) != -1) {
4007 if (regexec(regex, line, 1, ®match, 0) == 0) {
4017 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
4019 static const struct got_error*
4020 build_refs_str(char **refs_str, struct got_reflist_head *refs,
4021 struct got_object_id *id, struct got_repository *repo,
4024 static const struct got_error *err = NULL;
4025 struct got_reflist_entry *re;
4031 TAILQ_FOREACH(re, refs, entry) {
4032 struct got_tag_object *tag = NULL;
4033 struct got_object_id *ref_id;
4036 name = got_ref_get_name(re->ref);
4037 if (strcmp(name, GOT_REF_HEAD) == 0)
4039 if (strncmp(name, "refs/", 5) == 0)
4041 if (strncmp(name, "got/", 4) == 0)
4043 if (strncmp(name, "heads/", 6) == 0)
4045 if (strncmp(name, "remotes/", 8) == 0) {
4049 s = strstr(name, "/" GOT_REF_HEAD);
4050 if (s != NULL && s[strlen(s)] == '\0')
4053 err = got_ref_resolve(&ref_id, repo, re->ref);
4056 if (strncmp(name, "tags/", 5) == 0) {
4057 err = got_object_open_as_tag(&tag, repo, ref_id);
4059 if (err->code != GOT_ERR_OBJ_TYPE) {
4063 /* Ref points at something other than a tag. */
4068 cmp = got_object_id_cmp(tag ?
4069 got_object_tag_get_object_id(tag) : ref_id, id);
4072 got_object_tag_close(tag);
4076 if (asprintf(refs_str, "%s%s%s", s ? s : "",
4077 s ? ", " : "", name) == -1) {
4078 err = got_error_from_errno("asprintf");
4089 static const struct got_error *
4090 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4091 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4093 const struct got_error *err = NULL;
4094 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4095 char *comma, *s, *nl;
4096 struct got_reflist_head *refs;
4097 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4099 time_t committer_time;
4101 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4103 err = build_refs_str(&ref_str, refs, id, repo, 1);
4107 /* Display the first matching ref only. */
4108 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4112 if (ref_str == NULL) {
4113 err = got_object_id_str(&id_str, id);
4118 committer_time = got_object_commit_get_committer_time(commit);
4119 if (gmtime_r(&committer_time, &tm) == NULL) {
4120 err = got_error_from_errno("gmtime_r");
4123 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4124 err = got_error(GOT_ERR_NO_SPACE);
4128 err = got_object_commit_get_logmsg(&logmsg0, commit);
4133 while (isspace((unsigned char)s[0]))
4136 nl = strchr(s, '\n');
4142 printf("%s%-7s %s\n", datebuf, ref_str, s);
4144 printf("%s%.7s %s\n", datebuf, id_str, s);
4146 if (fflush(stdout) != 0 && err == NULL)
4147 err = got_error_from_errno("fflush");
4155 static const struct got_error *
4156 print_diffstat(struct got_diffstat_cb_arg *dsa, struct got_pathlist_head *paths,
4159 struct got_pathlist_entry *pe;
4162 printf("%s\n", header);
4164 TAILQ_FOREACH(pe, paths, entry) {
4165 struct got_diff_changed_path *cp = pe->data;
4166 int pad = dsa->max_path_len - pe->path_len + 1;
4168 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
4169 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
4171 printf("\n%d file%s changed, %d insertions(+), %d deletions(-)\n\n",
4172 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins, dsa->del);
4174 if (fflush(stdout) != 0)
4175 return got_error_from_errno("fflush");
4180 static const struct got_error *
4181 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4182 struct got_repository *repo, const char *path,
4183 struct got_pathlist_head *changed_paths, struct got_diffstat_cb_arg *dsa,
4184 int show_patch, int diff_context,
4185 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str)
4187 const struct got_error *err = NULL;
4188 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4190 time_t committer_time;
4191 const char *author, *committer;
4192 char *refs_str = NULL;
4194 err = got_object_id_str(&id_str, id);
4198 if (custom_refs_str == NULL) {
4199 struct got_reflist_head *refs;
4200 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4202 err = build_refs_str(&refs_str, refs, id, repo, 0);
4208 printf(GOT_COMMIT_SEP_STR);
4209 if (custom_refs_str)
4210 printf("commit %s (%s)\n", id_str, custom_refs_str);
4212 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4213 refs_str ? refs_str : "", refs_str ? ")" : "");
4218 printf("from: %s\n", got_object_commit_get_author(commit));
4219 author = got_object_commit_get_author(commit);
4220 committer = got_object_commit_get_committer(commit);
4221 if (strcmp(author, committer) != 0)
4222 printf("via: %s\n", committer);
4223 committer_time = got_object_commit_get_committer_time(commit);
4224 datestr = get_datestr(&committer_time, datebuf);
4226 printf("date: %s UTC\n", datestr);
4227 if (got_object_commit_get_nparents(commit) > 1) {
4228 const struct got_object_id_queue *parent_ids;
4229 struct got_object_qid *qid;
4231 parent_ids = got_object_commit_get_parent_ids(commit);
4232 STAILQ_FOREACH(qid, parent_ids, entry) {
4233 err = got_object_id_str(&id_str, &qid->id);
4236 printf("parent %d: %s\n", n++, id_str);
4242 err = got_object_commit_get_logmsg(&logmsg0, commit);
4248 line = strsep(&logmsg, "\n");
4250 printf(" %s\n", line);
4254 if (dsa && changed_paths) {
4255 err = print_diffstat(dsa, changed_paths, NULL);
4258 } else if (changed_paths) {
4259 struct got_pathlist_entry *pe;
4261 TAILQ_FOREACH(pe, changed_paths, entry) {
4262 struct got_diff_changed_path *cp = pe->data;
4264 printf(" %c %s\n", cp->status, pe->path);
4269 err = print_patch(commit, id, path, diff_context, repo, stdout);
4274 if (fflush(stdout) != 0 && err == NULL)
4275 err = got_error_from_errno("fflush");
4282 static const struct got_error *
4283 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4284 struct got_repository *repo, const char *path, int show_changed_paths,
4285 int show_diffstat, int show_patch, const char *search_pattern,
4286 int diff_context, int limit, int log_branches, int reverse_display_order,
4287 struct got_reflist_object_id_map *refs_idmap, int one_line,
4290 const struct got_error *err;
4291 struct got_commit_graph *graph;
4294 struct got_object_id_queue reversed_commits;
4295 struct got_object_qid *qid;
4296 struct got_commit_object *commit;
4297 struct got_pathlist_head changed_paths;
4299 STAILQ_INIT(&reversed_commits);
4300 TAILQ_INIT(&changed_paths);
4302 if (search_pattern && regcomp(®ex, search_pattern,
4303 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4304 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4306 err = got_commit_graph_open(&graph, path, !log_branches);
4309 err = got_commit_graph_iter_start(graph, root_id, repo,
4310 check_cancelled, NULL);
4314 struct got_object_id id;
4315 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4316 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4318 if (sigint_received || sigpipe_received)
4321 err = got_commit_graph_iter_next(&id, graph, repo,
4322 check_cancelled, NULL);
4324 if (err->code == GOT_ERR_ITER_COMPLETED)
4329 err = got_object_open_as_commit(&commit, repo, &id);
4333 if ((show_changed_paths || show_diffstat) &&
4334 !reverse_display_order) {
4335 err = get_changed_paths(&changed_paths, commit, repo,
4336 show_diffstat ? &dsa : NULL);
4341 if (search_pattern) {
4342 err = match_commit(&have_match, &id, commit, ®ex);
4344 got_object_commit_close(commit);
4347 if (have_match == 0 && show_changed_paths)
4348 match_changed_paths(&have_match,
4349 &changed_paths, ®ex);
4350 if (have_match == 0 && show_patch) {
4351 err = match_patch(&have_match, commit, &id,
4352 path, diff_context, repo, ®ex,
4357 if (have_match == 0) {
4358 got_object_commit_close(commit);
4359 got_pathlist_free(&changed_paths,
4360 GOT_PATHLIST_FREE_ALL);
4365 if (reverse_display_order) {
4366 err = got_object_qid_alloc(&qid, &id);
4369 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4370 got_object_commit_close(commit);
4373 err = print_commit_oneline(commit, &id,
4376 err = print_commit(commit, &id, repo, path,
4377 (show_changed_paths || show_diffstat) ?
4378 &changed_paths : NULL,
4379 show_diffstat ? &dsa : NULL, show_patch,
4380 diff_context, refs_idmap, NULL);
4381 got_object_commit_close(commit);
4385 if ((limit && --limit == 0) ||
4386 (end_id && got_object_id_cmp(&id, end_id) == 0))
4389 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4391 if (reverse_display_order) {
4392 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4393 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4394 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4396 err = got_object_open_as_commit(&commit, repo,
4400 if (show_changed_paths || show_diffstat) {
4401 err = get_changed_paths(&changed_paths,
4402 commit, repo, show_diffstat ? &dsa : NULL);
4407 err = print_commit_oneline(commit, &qid->id,
4410 err = print_commit(commit, &qid->id, repo, path,
4411 (show_changed_paths || show_diffstat) ?
4412 &changed_paths : NULL,
4413 show_diffstat ? &dsa : NULL, show_patch,
4414 diff_context, refs_idmap, NULL);
4415 got_object_commit_close(commit);
4418 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4422 while (!STAILQ_EMPTY(&reversed_commits)) {
4423 qid = STAILQ_FIRST(&reversed_commits);
4424 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4425 got_object_qid_free(qid);
4427 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4430 got_commit_graph_close(graph);
4437 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
4438 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4439 "[path]\n", getprogname());
4444 get_default_log_limit(void)
4446 const char *got_default_log_limit;
4450 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4451 if (got_default_log_limit == NULL)
4453 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4459 static const struct got_error *
4460 cmd_log(int argc, char *argv[])
4462 const struct got_error *error;
4463 struct got_repository *repo = NULL;
4464 struct got_worktree *worktree = NULL;
4465 struct got_object_id *start_id = NULL, *end_id = NULL;
4466 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4467 const char *start_commit = NULL, *end_commit = NULL;
4468 const char *search_pattern = NULL;
4469 int diff_context = -1, ch;
4470 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4471 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4473 struct got_reflist_head refs;
4474 struct got_reflist_object_id_map *refs_idmap = NULL;
4475 FILE *tmpfile = NULL;
4476 int *pack_fds = NULL;
4481 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4487 limit = get_default_log_limit();
4489 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
4495 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4498 errx(1, "number of context lines is %s: %s",
4502 start_commit = optarg;
4508 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4510 errx(1, "number of commits is %s: %s",
4514 show_changed_paths = 1;
4520 reverse_display_order = 1;
4523 repo_path = realpath(optarg, NULL);
4524 if (repo_path == NULL)
4525 return got_error_from_errno2("realpath",
4527 got_path_strip_trailing_slashes(repo_path);
4530 search_pattern = optarg;
4536 end_commit = optarg;
4547 if (diff_context == -1)
4549 else if (!show_patch)
4550 errx(1, "-C requires -p");
4552 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4553 errx(1, "cannot use -s with -d, -p or -P");
4555 cwd = getcwd(NULL, 0);
4557 error = got_error_from_errno("getcwd");
4561 error = got_repo_pack_fds_open(&pack_fds);
4565 if (repo_path == NULL) {
4566 error = got_worktree_open(&worktree, cwd);
4567 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4574 error = got_worktree_resolve_path(&path, worktree,
4579 path = strdup(argv[0]);
4581 error = got_error_from_errno("strdup");
4585 } else if (argc != 0)
4588 if (repo_path == NULL) {
4589 repo_path = worktree ?
4590 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4592 if (repo_path == NULL) {
4593 error = got_error_from_errno("strdup");
4597 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4601 error = apply_unveil(got_repo_get_path(repo), 1,
4602 worktree ? got_worktree_get_root_path(worktree) : NULL);
4606 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4610 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4614 if (start_commit == NULL) {
4615 struct got_reference *head_ref;
4616 struct got_commit_object *commit = NULL;
4617 error = got_ref_open(&head_ref, repo,
4618 worktree ? got_worktree_get_head_ref_name(worktree)
4622 error = got_ref_resolve(&start_id, repo, head_ref);
4623 got_ref_close(head_ref);
4626 error = got_object_open_as_commit(&commit, repo,
4630 got_object_commit_close(commit);
4632 error = got_repo_match_object_id(&start_id, NULL,
4633 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4637 if (end_commit != NULL) {
4638 error = got_repo_match_object_id(&end_id, NULL,
4639 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4646 * If a path was specified on the command line it was resolved
4647 * to a path in the work tree above. Prepend the work tree's
4648 * path prefix to obtain the corresponding in-repository path.
4652 prefix = got_worktree_get_path_prefix(worktree);
4653 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4654 (path[0] != '\0') ? "/" : "", path) == -1) {
4655 error = got_error_from_errno("asprintf");
4660 error = got_repo_map_path(&in_repo_path, repo,
4666 path = in_repo_path;
4670 /* Release work tree lock. */
4671 got_worktree_close(worktree);
4675 if (search_pattern && show_patch) {
4676 tmpfile = got_opentemp();
4677 if (tmpfile == NULL) {
4678 error = got_error_from_errno("got_opentemp");
4683 error = print_commits(start_id, end_id, repo, path ? path : "",
4684 show_changed_paths, show_diffstat, show_patch, search_pattern,
4685 diff_context, limit, log_branches, reverse_display_order,
4686 refs_idmap, one_line, tmpfile);
4692 got_worktree_close(worktree);
4694 const struct got_error *close_err = got_repo_close(repo);
4699 const struct got_error *pack_err =
4700 got_repo_pack_fds_close(pack_fds);
4705 got_reflist_object_id_map_free(refs_idmap);
4706 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4707 error = got_error_from_errno("fclose");
4708 got_ref_list_free(&refs);
4715 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4716 "[-r repository-path] [object1 object2 | path ...]\n",
4721 struct print_diff_arg {
4722 struct got_repository *repo;
4723 struct got_worktree *worktree;
4724 struct got_diffstat_cb_arg *diffstat;
4729 enum got_diff_algorithm diff_algo;
4730 int ignore_whitespace;
4731 int force_text_diff;
4739 * Create a file which contains the target path of a symlink so we can feed
4740 * it as content to the diff engine.
4742 static const struct got_error *
4743 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4744 const char *abspath)
4746 const struct got_error *err = NULL;
4747 char target_path[PATH_MAX];
4748 ssize_t target_len, outlen;
4753 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4754 if (target_len == -1)
4755 return got_error_from_errno2("readlinkat", abspath);
4757 target_len = readlink(abspath, target_path, PATH_MAX);
4758 if (target_len == -1)
4759 return got_error_from_errno2("readlink", abspath);
4762 *fd = got_opentempfd();
4764 return got_error_from_errno("got_opentempfd");
4766 outlen = write(*fd, target_path, target_len);
4768 err = got_error_from_errno("got_opentempfd");
4772 if (lseek(*fd, 0, SEEK_SET) == -1) {
4773 err = got_error_from_errno2("lseek", abspath);
4784 static const struct got_error *
4785 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4786 const char *path, struct got_object_id *blob_id,
4787 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4788 int dirfd, const char *de_name)
4790 struct print_diff_arg *a = arg;
4791 const struct got_error *err = NULL;
4792 struct got_blob_object *blob1 = NULL;
4793 int fd = -1, fd1 = -1, fd2 = -1;
4795 char *abspath = NULL, *label1 = NULL;
4800 memset(&sb, 0, sizeof(sb));
4802 if (a->diff_staged) {
4803 if (staged_status != GOT_STATUS_MODIFY &&
4804 staged_status != GOT_STATUS_ADD &&
4805 staged_status != GOT_STATUS_DELETE)
4808 if (staged_status == GOT_STATUS_DELETE)
4810 if (status == GOT_STATUS_NONEXISTENT)
4811 return got_error_set_errno(ENOENT, path);
4812 if (status != GOT_STATUS_MODIFY &&
4813 status != GOT_STATUS_ADD &&
4814 status != GOT_STATUS_DELETE &&
4815 status != GOT_STATUS_CONFLICT)
4819 err = got_opentemp_truncate(a->f1);
4821 return got_error_from_errno("got_opentemp_truncate");
4822 err = got_opentemp_truncate(a->f2);
4824 return got_error_from_errno("got_opentemp_truncate");
4826 if (!a->header_shown) {
4827 if (fprintf(a->outfile, "diff %s%s\n",
4828 a->diff_staged ? "-s " : "",
4829 got_worktree_get_root_path(a->worktree)) < 0) {
4830 err = got_error_from_errno("fprintf");
4833 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4834 err = got_error_from_errno("fprintf");
4837 if (fprintf(a->outfile, "path + %s%s\n",
4838 got_worktree_get_root_path(a->worktree),
4839 a->diff_staged ? " (staged changes)" : "") < 0) {
4840 err = got_error_from_errno("fprintf");
4843 a->header_shown = 1;
4846 if (a->diff_staged) {
4847 const char *label1 = NULL, *label2 = NULL;
4848 switch (staged_status) {
4849 case GOT_STATUS_MODIFY:
4853 case GOT_STATUS_ADD:
4856 case GOT_STATUS_DELETE:
4860 return got_error(GOT_ERR_FILE_STATUS);
4862 fd1 = got_opentempfd();
4864 err = got_error_from_errno("got_opentempfd");
4867 fd2 = got_opentempfd();
4869 err = got_error_from_errno("got_opentempfd");
4872 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4873 fd1, fd2, blob_id, staged_blob_id, label1, label2,
4874 a->diff_algo, a->diff_context, a->ignore_whitespace,
4875 a->force_text_diff, a->show_diffstat, a->diffstat, a->repo,
4880 fd1 = got_opentempfd();
4882 err = got_error_from_errno("got_opentempfd");
4886 if (staged_status == GOT_STATUS_ADD ||
4887 staged_status == GOT_STATUS_MODIFY) {
4889 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4893 err = got_object_id_str(&id_str, staged_blob_id);
4896 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4897 err = got_error_from_errno("asprintf");
4902 } else if (status != GOT_STATUS_ADD) {
4903 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4909 if (status != GOT_STATUS_DELETE) {
4910 if (asprintf(&abspath, "%s/%s",
4911 got_worktree_get_root_path(a->worktree), path) == -1) {
4912 err = got_error_from_errno("asprintf");
4917 fd = openat(dirfd, de_name,
4918 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4920 if (!got_err_open_nofollow_on_symlink()) {
4921 err = got_error_from_errno2("openat",
4925 err = get_symlink_target_file(&fd, dirfd,
4931 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4933 if (!got_err_open_nofollow_on_symlink()) {
4934 err = got_error_from_errno2("open",
4938 err = get_symlink_target_file(&fd, dirfd,
4944 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4945 err = got_error_from_errno2("fstatat", abspath);
4948 f2 = fdopen(fd, "r");
4950 err = got_error_from_errno2("fdopen", abspath);
4958 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4964 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4965 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4966 a->ignore_whitespace, a->force_text_diff, a->show_diffstat,
4967 a->diffstat, a->outfile);
4969 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4970 err = got_error_from_errno("close");
4971 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4972 err = got_error_from_errno("close");
4974 got_object_blob_close(blob1);
4975 if (fd != -1 && close(fd) == -1 && err == NULL)
4976 err = got_error_from_errno("close");
4977 if (f2 && fclose(f2) == EOF && err == NULL)
4978 err = got_error_from_errno("fclose");
4983 static const struct got_error *
4989 if (fseeko(f, 0L, SEEK_SET) == -1)
4990 return got_error_from_errno("fseek");
4993 r = fread(buf, 1, sizeof(buf), f);
4996 return got_error_from_errno("fread");
5000 if (fwrite(buf, 1, r, stdout) != r)
5001 return got_ferror(stdout, GOT_ERR_IO);
5007 static const struct got_error *
5008 cmd_diff(int argc, char *argv[])
5010 const struct got_error *error;
5011 struct got_repository *repo = NULL;
5012 struct got_worktree *worktree = NULL;
5013 char *cwd = NULL, *repo_path = NULL;
5014 const char *commit_args[2] = { NULL, NULL };
5015 int ncommit_args = 0;
5016 struct got_object_id *ids[2] = { NULL, NULL };
5017 char *labels[2] = { NULL, NULL };
5018 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5019 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5020 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5022 struct got_reflist_head refs;
5023 struct got_pathlist_head diffstat_paths, paths;
5024 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5025 int fd1 = -1, fd2 = -1;
5026 int *pack_fds = NULL;
5027 struct got_diffstat_cb_arg dsa;
5029 memset(&dsa, 0, sizeof(dsa));
5033 TAILQ_INIT(&diffstat_paths);
5036 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5041 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5044 force_text_diff = 1;
5047 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5050 errx(1, "number of context lines is %s: %s",
5054 if (ncommit_args >= 2)
5055 errx(1, "too many -c options used");
5056 commit_args[ncommit_args++] = optarg;
5065 repo_path = realpath(optarg, NULL);
5066 if (repo_path == NULL)
5067 return got_error_from_errno2("realpath",
5069 got_path_strip_trailing_slashes(repo_path);
5076 ignore_whitespace = 1;
5087 cwd = getcwd(NULL, 0);
5089 error = got_error_from_errno("getcwd");
5093 error = got_repo_pack_fds_open(&pack_fds);
5097 if (repo_path == NULL) {
5098 error = got_worktree_open(&worktree, cwd);
5099 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5105 strdup(got_worktree_get_repo_path(worktree));
5106 if (repo_path == NULL) {
5107 error = got_error_from_errno("strdup");
5111 repo_path = strdup(cwd);
5112 if (repo_path == NULL) {
5113 error = got_error_from_errno("strdup");
5119 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5124 if (show_diffstat) {
5125 dsa.paths = &diffstat_paths;
5126 dsa.force_text = force_text_diff;
5127 dsa.ignore_ws = ignore_whitespace;
5128 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5131 if (rflag || worktree == NULL || ncommit_args > 0) {
5133 error = got_error_msg(GOT_ERR_NOT_IMPL,
5134 "-P option can only be used when diffing "
5139 error = got_error_msg(GOT_ERR_NOT_IMPL,
5140 "-s option can only be used when diffing "
5146 error = apply_unveil(got_repo_get_path(repo), 1,
5147 worktree ? got_worktree_get_root_path(worktree) : NULL);
5151 if ((!force_path && argc == 2) || ncommit_args > 0) {
5152 int obj_type = (ncommit_args > 0 ?
5153 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5154 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5158 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5160 if (ncommit_args > 0)
5161 arg = commit_args[i];
5164 error = got_repo_match_object_id(&ids[i], &labels[i],
5165 arg, obj_type, &refs, repo);
5167 if (error->code != GOT_ERR_NOT_REF &&
5168 error->code != GOT_ERR_NO_OBJ)
5170 if (ncommit_args > 0)
5178 f1 = got_opentemp();
5180 error = got_error_from_errno("got_opentemp");
5184 f2 = got_opentemp();
5186 error = got_error_from_errno("got_opentemp");
5190 outfile = got_opentemp();
5191 if (outfile == NULL) {
5192 error = got_error_from_errno("got_opentemp");
5196 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5197 struct print_diff_arg arg;
5200 if (worktree == NULL) {
5201 if (argc == 2 && ids[0] == NULL) {
5202 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5204 } else if (argc == 2 && ids[1] == NULL) {
5205 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5207 } else if (argc > 0) {
5208 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5209 "%s", "specified paths cannot be resolved");
5212 error = got_error(GOT_ERR_NOT_WORKTREE);
5217 error = get_worktree_paths_from_argv(&paths, argc, argv,
5222 error = got_object_id_str(&id_str,
5223 got_worktree_get_base_commit_id(worktree));
5227 arg.worktree = worktree;
5228 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5229 arg.diff_context = diff_context;
5230 arg.id_str = id_str;
5231 arg.header_shown = 0;
5232 arg.diff_staged = diff_staged;
5233 arg.ignore_whitespace = ignore_whitespace;
5234 arg.force_text_diff = force_text_diff;
5235 arg.show_diffstat = show_diffstat;
5236 arg.diffstat = &dsa;
5239 arg.outfile = outfile;
5241 error = got_worktree_status(worktree, &paths, repo, 0,
5242 print_diff, &arg, check_cancelled, NULL);
5247 if (show_diffstat && dsa.nfiles > 0) {
5250 if (asprintf(&header, "diffstat %s%s",
5251 diff_staged ? "-s " : "",
5252 got_worktree_get_root_path(worktree)) == -1) {
5253 error = got_error_from_errno("asprintf");
5257 error = print_diffstat(&dsa, &diffstat_paths, header);
5263 error = printfile(outfile);
5267 if (ncommit_args == 1) {
5268 struct got_commit_object *commit;
5269 error = got_object_open_as_commit(&commit, repo, ids[0]);
5273 labels[1] = labels[0];
5275 if (got_object_commit_get_nparents(commit) > 0) {
5276 const struct got_object_id_queue *pids;
5277 struct got_object_qid *pid;
5278 pids = got_object_commit_get_parent_ids(commit);
5279 pid = STAILQ_FIRST(pids);
5280 ids[0] = got_object_id_dup(&pid->id);
5281 if (ids[0] == NULL) {
5282 error = got_error_from_errno(
5283 "got_object_id_dup");
5284 got_object_commit_close(commit);
5287 error = got_object_id_str(&labels[0], ids[0]);
5289 got_object_commit_close(commit);
5294 labels[0] = strdup("/dev/null");
5295 if (labels[0] == NULL) {
5296 error = got_error_from_errno("strdup");
5297 got_object_commit_close(commit);
5302 got_object_commit_close(commit);
5305 if (ncommit_args == 0 && argc > 2) {
5306 error = got_error_msg(GOT_ERR_BAD_PATH,
5307 "path arguments cannot be used when diffing two objects");
5312 error = got_object_get_type(&type1, repo, ids[0]);
5317 error = got_object_get_type(&type2, repo, ids[1]);
5320 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5321 error = got_error(GOT_ERR_OBJ_TYPE);
5324 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5325 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5326 "path arguments cannot be used when diffing blobs");
5330 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5332 struct got_pathlist_entry *new;
5336 error = got_worktree_resolve_path(&p, worktree,
5340 prefix = got_worktree_get_path_prefix(worktree);
5341 while (prefix[0] == '/')
5343 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5344 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5346 error = got_error_from_errno("asprintf");
5352 char *mapped_path, *s;
5353 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5359 in_repo_path = strdup(s);
5360 if (in_repo_path == NULL) {
5361 error = got_error_from_errno("asprintf");
5368 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5369 if (error || new == NULL /* duplicate */)
5376 /* Release work tree lock. */
5377 got_worktree_close(worktree);
5381 fd1 = got_opentempfd();
5383 error = got_error_from_errno("got_opentempfd");
5387 fd2 = got_opentempfd();
5389 error = got_error_from_errno("got_opentempfd");
5393 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5394 case GOT_OBJ_TYPE_BLOB:
5395 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5396 fd1, fd2, ids[0], ids[1], NULL, NULL,
5397 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5398 ignore_whitespace, force_text_diff, show_diffstat,
5399 show_diffstat ? &dsa : NULL, repo, outfile);
5401 case GOT_OBJ_TYPE_TREE:
5402 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5403 ids[0], ids[1], &paths, "", "",
5404 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5405 ignore_whitespace, force_text_diff, show_diffstat,
5406 show_diffstat ? &dsa : NULL, repo, outfile);
5408 case GOT_OBJ_TYPE_COMMIT:
5409 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5410 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5411 fd1, fd2, ids[0], ids[1], &paths,
5412 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5413 ignore_whitespace, force_text_diff, show_diffstat,
5414 show_diffstat ? &dsa : NULL, repo, outfile);
5417 error = got_error(GOT_ERR_OBJ_TYPE);
5422 if (show_diffstat && dsa.nfiles > 0) {
5423 char *header = NULL;
5425 if (asprintf(&header, "diffstat %s %s",
5426 labels[0], labels[1]) == -1) {
5427 error = got_error_from_errno("asprintf");
5431 error = print_diffstat(&dsa, &diffstat_paths, header);
5437 error = printfile(outfile);
5445 got_worktree_close(worktree);
5447 const struct got_error *close_err = got_repo_close(repo);
5452 const struct got_error *pack_err =
5453 got_repo_pack_fds_close(pack_fds);
5457 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5458 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5459 got_ref_list_free(&refs);
5460 if (outfile && fclose(outfile) == EOF && error == NULL)
5461 error = got_error_from_errno("fclose");
5462 if (f1 && fclose(f1) == EOF && error == NULL)
5463 error = got_error_from_errno("fclose");
5464 if (f2 && fclose(f2) == EOF && error == NULL)
5465 error = got_error_from_errno("fclose");
5466 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5467 error = got_error_from_errno("close");
5468 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5469 error = got_error_from_errno("close");
5477 "usage: %s blame [-c commit] [-r repository-path] path\n",
5486 char datebuf[11]; /* YYYY-MM-DD + NUL */
5489 struct blame_cb_args {
5490 struct blame_line *lines;
5494 off_t *line_offsets;
5496 struct got_repository *repo;
5499 static const struct got_error *
5500 blame_cb(void *arg, int nlines, int lineno,
5501 struct got_commit_object *commit, struct got_object_id *id)
5503 const struct got_error *err = NULL;
5504 struct blame_cb_args *a = arg;
5505 struct blame_line *bline;
5507 size_t linesize = 0;
5510 time_t committer_time;
5512 if (nlines != a->nlines ||
5513 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5514 return got_error(GOT_ERR_RANGE);
5516 if (sigint_received)
5517 return got_error(GOT_ERR_ITER_COMPLETED);
5520 return NULL; /* no change in this commit */
5522 /* Annotate this line. */
5523 bline = &a->lines[lineno - 1];
5524 if (bline->annotated)
5526 err = got_object_id_str(&bline->id_str, id);
5530 bline->committer = strdup(got_object_commit_get_committer(commit));
5531 if (bline->committer == NULL) {
5532 err = got_error_from_errno("strdup");
5536 committer_time = got_object_commit_get_committer_time(commit);
5537 if (gmtime_r(&committer_time, &tm) == NULL)
5538 return got_error_from_errno("gmtime_r");
5539 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5541 err = got_error(GOT_ERR_NO_SPACE);
5544 bline->annotated = 1;
5546 /* Print lines annotated so far. */
5547 bline = &a->lines[a->lineno_cur - 1];
5548 if (!bline->annotated)
5551 offset = a->line_offsets[a->lineno_cur - 1];
5552 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5553 err = got_error_from_errno("fseeko");
5557 while (a->lineno_cur <= a->nlines && bline->annotated) {
5558 char *smallerthan, *at, *nl, *committer;
5561 if (getline(&line, &linesize, a->f) == -1) {
5563 err = got_error_from_errno("getline");
5567 committer = bline->committer;
5568 smallerthan = strchr(committer, '<');
5569 if (smallerthan && smallerthan[1] != '\0')
5570 committer = smallerthan + 1;
5571 at = strchr(committer, '@');
5574 len = strlen(committer);
5576 committer[8] = '\0';
5578 nl = strchr(line, '\n');
5581 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5582 bline->id_str, bline->datebuf, committer, line);
5585 bline = &a->lines[a->lineno_cur - 1];
5592 static const struct got_error *
5593 cmd_blame(int argc, char *argv[])
5595 const struct got_error *error;
5596 struct got_repository *repo = NULL;
5597 struct got_worktree *worktree = NULL;
5598 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5599 char *link_target = NULL;
5600 struct got_object_id *obj_id = NULL;
5601 struct got_object_id *commit_id = NULL;
5602 struct got_commit_object *commit = NULL;
5603 struct got_blob_object *blob = NULL;
5604 char *commit_id_str = NULL;
5605 struct blame_cb_args bca;
5606 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5608 int *pack_fds = NULL;
5609 FILE *f1 = NULL, *f2 = NULL;
5611 fd1 = got_opentempfd();
5613 return got_error_from_errno("got_opentempfd");
5615 memset(&bca, 0, sizeof(bca));
5618 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5623 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5626 commit_id_str = optarg;
5629 repo_path = realpath(optarg, NULL);
5630 if (repo_path == NULL)
5631 return got_error_from_errno2("realpath",
5633 got_path_strip_trailing_slashes(repo_path);
5649 cwd = getcwd(NULL, 0);
5651 error = got_error_from_errno("getcwd");
5655 error = got_repo_pack_fds_open(&pack_fds);
5659 if (repo_path == NULL) {
5660 error = got_worktree_open(&worktree, cwd);
5661 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5667 strdup(got_worktree_get_repo_path(worktree));
5668 if (repo_path == NULL) {
5669 error = got_error_from_errno("strdup");
5674 repo_path = strdup(cwd);
5675 if (repo_path == NULL) {
5676 error = got_error_from_errno("strdup");
5682 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5687 const char *prefix = got_worktree_get_path_prefix(worktree);
5690 error = got_worktree_resolve_path(&p, worktree, path);
5693 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5694 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5696 error = got_error_from_errno("asprintf");
5701 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5703 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5706 error = got_repo_map_path(&in_repo_path, repo, path);
5711 if (commit_id_str == NULL) {
5712 struct got_reference *head_ref;
5713 error = got_ref_open(&head_ref, repo, worktree ?
5714 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5717 error = got_ref_resolve(&commit_id, repo, head_ref);
5718 got_ref_close(head_ref);
5722 struct got_reflist_head refs;
5724 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5728 error = got_repo_match_object_id(&commit_id, NULL,
5729 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5730 got_ref_list_free(&refs);
5736 /* Release work tree lock. */
5737 got_worktree_close(worktree);
5741 error = got_object_open_as_commit(&commit, repo, commit_id);
5745 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5750 error = got_object_id_by_path(&obj_id, repo, commit,
5751 link_target ? link_target : in_repo_path);
5755 error = got_object_get_type(&obj_type, repo, obj_id);
5759 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5760 error = got_error_path(link_target ? link_target : in_repo_path,
5765 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5768 bca.f = got_opentemp();
5769 if (bca.f == NULL) {
5770 error = got_error_from_errno("got_opentemp");
5773 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5774 &bca.line_offsets, bca.f, blob);
5775 if (error || bca.nlines == 0)
5778 /* Don't include \n at EOF in the blame line count. */
5779 if (bca.line_offsets[bca.nlines - 1] == filesize)
5782 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5783 if (bca.lines == NULL) {
5784 error = got_error_from_errno("calloc");
5788 bca.nlines_prec = 0;
5796 fd2 = got_opentempfd();
5798 error = got_error_from_errno("got_opentempfd");
5801 fd3 = got_opentempfd();
5803 error = got_error_from_errno("got_opentempfd");
5806 f1 = got_opentemp();
5808 error = got_error_from_errno("got_opentemp");
5811 f2 = got_opentemp();
5813 error = got_error_from_errno("got_opentemp");
5816 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5817 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5818 check_cancelled, NULL, fd2, fd3, f1, f2);
5827 got_object_commit_close(commit);
5829 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5830 error = got_error_from_errno("close");
5831 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5832 error = got_error_from_errno("close");
5833 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5834 error = got_error_from_errno("close");
5835 if (f1 && fclose(f1) == EOF && error == NULL)
5836 error = got_error_from_errno("fclose");
5837 if (f2 && fclose(f2) == EOF && error == NULL)
5838 error = got_error_from_errno("fclose");
5841 got_object_blob_close(blob);
5843 got_worktree_close(worktree);
5845 const struct got_error *close_err = got_repo_close(repo);
5850 const struct got_error *pack_err =
5851 got_repo_pack_fds_close(pack_fds);
5856 for (i = 0; i < bca.nlines; i++) {
5857 struct blame_line *bline = &bca.lines[i];
5858 free(bline->id_str);
5859 free(bline->committer);
5863 free(bca.line_offsets);
5864 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5865 error = got_error_from_errno("fclose");
5872 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5873 "[path]\n", getprogname());
5877 static const struct got_error *
5878 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5879 const char *root_path, struct got_repository *repo)
5881 const struct got_error *err = NULL;
5882 int is_root_path = (strcmp(path, root_path) == 0);
5883 const char *modestr = "";
5884 mode_t mode = got_tree_entry_get_mode(te);
5885 char *link_target = NULL;
5887 path += strlen(root_path);
5888 while (path[0] == '/')
5891 if (got_object_tree_entry_is_submodule(te))
5893 else if (S_ISLNK(mode)) {
5896 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5899 for (i = 0; i < strlen(link_target); i++) {
5900 if (!isprint((unsigned char)link_target[i]))
5901 link_target[i] = '?';
5906 else if (S_ISDIR(mode))
5908 else if (mode & S_IXUSR)
5911 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5912 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5913 link_target ? " -> ": "", link_target ? link_target : "");
5919 static const struct got_error *
5920 print_tree(const char *path, struct got_commit_object *commit,
5921 int show_ids, int recurse, const char *root_path,
5922 struct got_repository *repo)
5924 const struct got_error *err = NULL;
5925 struct got_object_id *tree_id = NULL;
5926 struct got_tree_object *tree = NULL;
5929 err = got_object_id_by_path(&tree_id, repo, commit, path);
5933 err = got_object_open_as_tree(&tree, repo, tree_id);
5936 nentries = got_object_tree_get_nentries(tree);
5937 for (i = 0; i < nentries; i++) {
5938 struct got_tree_entry *te;
5941 if (sigint_received || sigpipe_received)
5944 te = got_object_tree_get_entry(tree, i);
5947 err = got_object_id_str(&id_str,
5948 got_tree_entry_get_id(te));
5951 if (asprintf(&id, "%s ", id_str) == -1) {
5952 err = got_error_from_errno("asprintf");
5958 err = print_entry(te, id, path, root_path, repo);
5963 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5965 if (asprintf(&child_path, "%s%s%s", path,
5966 path[0] == '/' && path[1] == '\0' ? "" : "/",
5967 got_tree_entry_get_name(te)) == -1) {
5968 err = got_error_from_errno("asprintf");
5971 err = print_tree(child_path, commit, show_ids, 1,
5980 got_object_tree_close(tree);
5985 static const struct got_error *
5986 cmd_tree(int argc, char *argv[])
5988 const struct got_error *error;
5989 struct got_repository *repo = NULL;
5990 struct got_worktree *worktree = NULL;
5991 const char *path, *refname = NULL;
5992 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5993 struct got_object_id *commit_id = NULL;
5994 struct got_commit_object *commit = NULL;
5995 char *commit_id_str = NULL;
5996 int show_ids = 0, recurse = 0;
5998 int *pack_fds = NULL;
6001 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6006 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6009 commit_id_str = optarg;
6018 repo_path = realpath(optarg, NULL);
6019 if (repo_path == NULL)
6020 return got_error_from_errno2("realpath",
6022 got_path_strip_trailing_slashes(repo_path);
6040 cwd = getcwd(NULL, 0);
6042 error = got_error_from_errno("getcwd");
6046 error = got_repo_pack_fds_open(&pack_fds);
6050 if (repo_path == NULL) {
6051 error = got_worktree_open(&worktree, cwd);
6052 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6058 strdup(got_worktree_get_repo_path(worktree));
6059 if (repo_path == NULL)
6060 error = got_error_from_errno("strdup");
6064 repo_path = strdup(cwd);
6065 if (repo_path == NULL) {
6066 error = got_error_from_errno("strdup");
6072 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6077 const char *prefix = got_worktree_get_path_prefix(worktree);
6082 error = got_worktree_resolve_path(&p, worktree, path);
6085 if (asprintf(&in_repo_path, "%s%s%s", prefix,
6086 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
6088 error = got_error_from_errno("asprintf");
6093 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6097 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6102 error = got_repo_map_path(&in_repo_path, repo, path);
6107 if (commit_id_str == NULL) {
6108 struct got_reference *head_ref;
6110 refname = got_worktree_get_head_ref_name(worktree);
6112 refname = GOT_REF_HEAD;
6113 error = got_ref_open(&head_ref, repo, refname, 0);
6116 error = got_ref_resolve(&commit_id, repo, head_ref);
6117 got_ref_close(head_ref);
6121 struct got_reflist_head refs;
6123 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6127 error = got_repo_match_object_id(&commit_id, NULL,
6128 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6129 got_ref_list_free(&refs);
6135 /* Release work tree lock. */
6136 got_worktree_close(worktree);
6140 error = got_object_open_as_commit(&commit, repo, commit_id);
6144 error = print_tree(in_repo_path, commit, show_ids, recurse,
6145 in_repo_path, repo);
6152 got_object_commit_close(commit);
6154 got_worktree_close(worktree);
6156 const struct got_error *close_err = got_repo_close(repo);
6161 const struct got_error *pack_err =
6162 got_repo_pack_fds_close(pack_fds);
6172 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6173 "[-s status-codes] [path ...]\n", getprogname());
6177 struct got_status_arg {
6182 static const struct got_error *
6183 print_status(void *arg, unsigned char status, unsigned char staged_status,
6184 const char *path, struct got_object_id *blob_id,
6185 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6186 int dirfd, const char *de_name)
6188 struct got_status_arg *st = arg;
6190 if (status == staged_status && (status == GOT_STATUS_DELETE))
6191 status = GOT_STATUS_NO_CHANGE;
6192 if (st != NULL && st->status_codes) {
6193 size_t ncodes = strlen(st->status_codes);
6196 for (i = 0; i < ncodes ; i++) {
6198 if (status == st->status_codes[i] ||
6199 staged_status == st->status_codes[i]) {
6204 if (status == st->status_codes[i] ||
6205 staged_status == st->status_codes[i])
6210 if (st->suppress && j == 0)
6217 printf("%c%c %s\n", status, staged_status, path);
6221 static const struct got_error *
6222 cmd_status(int argc, char *argv[])
6224 const struct got_error *error = NULL;
6225 struct got_repository *repo = NULL;
6226 struct got_worktree *worktree = NULL;
6227 struct got_status_arg st;
6229 struct got_pathlist_head paths;
6230 int ch, i, no_ignores = 0;
6231 int *pack_fds = NULL;
6235 memset(&st, 0, sizeof(st));
6236 st.status_codes = NULL;
6239 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6245 if (st.status_codes != NULL && st.suppress == 0)
6246 option_conflict('S', 's');
6250 for (i = 0; i < strlen(optarg); i++) {
6251 switch (optarg[i]) {
6252 case GOT_STATUS_MODIFY:
6253 case GOT_STATUS_ADD:
6254 case GOT_STATUS_DELETE:
6255 case GOT_STATUS_CONFLICT:
6256 case GOT_STATUS_MISSING:
6257 case GOT_STATUS_OBSTRUCTED:
6258 case GOT_STATUS_UNVERSIONED:
6259 case GOT_STATUS_MODE_CHANGE:
6260 case GOT_STATUS_NONEXISTENT:
6263 errx(1, "invalid status code '%c'",
6267 if (ch == 's' && st.suppress)
6268 option_conflict('s', 'S');
6269 st.status_codes = optarg;
6281 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6285 cwd = getcwd(NULL, 0);
6287 error = got_error_from_errno("getcwd");
6291 error = got_repo_pack_fds_open(&pack_fds);
6295 error = got_worktree_open(&worktree, cwd);
6297 if (error->code == GOT_ERR_NOT_WORKTREE)
6298 error = wrap_not_worktree_error(error, "status", cwd);
6302 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6307 error = apply_unveil(got_repo_get_path(repo), 1,
6308 got_worktree_get_root_path(worktree));
6312 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6316 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6317 print_status, &st, check_cancelled, NULL);
6320 const struct got_error *pack_err =
6321 got_repo_pack_fds_close(pack_fds);
6326 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6334 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6335 "[-s reference] [name]\n", getprogname());
6339 static const struct got_error *
6340 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6342 static const struct got_error *err = NULL;
6343 struct got_reflist_head refs;
6344 struct got_reflist_entry *re;
6347 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6348 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6353 TAILQ_FOREACH(re, &refs, entry) {
6355 refstr = got_ref_to_str(re->ref);
6356 if (refstr == NULL) {
6357 err = got_error_from_errno("got_ref_to_str");
6360 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6364 got_ref_list_free(&refs);
6368 static const struct got_error *
6369 delete_ref_by_name(struct got_repository *repo, const char *refname)
6371 const struct got_error *err;
6372 struct got_reference *ref;
6374 err = got_ref_open(&ref, repo, refname, 0);
6378 err = delete_ref(repo, ref);
6383 static const struct got_error *
6384 add_ref(struct got_repository *repo, const char *refname, const char *target)
6386 const struct got_error *err = NULL;
6387 struct got_object_id *id = NULL;
6388 struct got_reference *ref = NULL;
6389 struct got_reflist_head refs;
6392 * Don't let the user create a reference name with a leading '-'.
6393 * While technically a valid reference name, this case is usually
6394 * an unintended typo.
6396 if (refname[0] == '-')
6397 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6400 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6403 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6405 got_ref_list_free(&refs);
6409 err = got_ref_alloc(&ref, refname, id);
6413 err = got_ref_write(ref, repo);
6421 static const struct got_error *
6422 add_symref(struct got_repository *repo, const char *refname, const char *target)
6424 const struct got_error *err = NULL;
6425 struct got_reference *ref = NULL;
6426 struct got_reference *target_ref = NULL;
6429 * Don't let the user create a reference name with a leading '-'.
6430 * While technically a valid reference name, this case is usually
6431 * an unintended typo.
6433 if (refname[0] == '-')
6434 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6436 err = got_ref_open(&target_ref, repo, target, 0);
6440 err = got_ref_alloc_symref(&ref, refname, target_ref);
6444 err = got_ref_write(ref, repo);
6447 got_ref_close(target_ref);
6453 static const struct got_error *
6454 cmd_ref(int argc, char *argv[])
6456 const struct got_error *error = NULL;
6457 struct got_repository *repo = NULL;
6458 struct got_worktree *worktree = NULL;
6459 char *cwd = NULL, *repo_path = NULL;
6460 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6461 const char *obj_arg = NULL, *symref_target= NULL;
6462 char *refname = NULL;
6463 int *pack_fds = NULL;
6465 while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6477 repo_path = realpath(optarg, NULL);
6478 if (repo_path == NULL)
6479 return got_error_from_errno2("realpath",
6481 got_path_strip_trailing_slashes(repo_path);
6484 symref_target = optarg;
6495 if (obj_arg && do_list)
6496 option_conflict('c', 'l');
6497 if (obj_arg && do_delete)
6498 option_conflict('c', 'd');
6499 if (obj_arg && symref_target)
6500 option_conflict('c', 's');
6501 if (symref_target && do_delete)
6502 option_conflict('s', 'd');
6503 if (symref_target && do_list)
6504 option_conflict('s', 'l');
6505 if (do_delete && do_list)
6506 option_conflict('d', 'l');
6507 if (sort_by_time && !do_list)
6508 errx(1, "-t option requires -l option");
6514 if (argc != 0 && argc != 1)
6517 refname = strdup(argv[0]);
6518 if (refname == NULL) {
6519 error = got_error_from_errno("strdup");
6526 refname = strdup(argv[0]);
6527 if (refname == NULL) {
6528 error = got_error_from_errno("strdup");
6534 got_path_strip_trailing_slashes(refname);
6537 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6538 "sendfd unveil", NULL) == -1)
6541 cwd = getcwd(NULL, 0);
6543 error = got_error_from_errno("getcwd");
6547 error = got_repo_pack_fds_open(&pack_fds);
6551 if (repo_path == NULL) {
6552 error = got_worktree_open(&worktree, cwd);
6553 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6559 strdup(got_worktree_get_repo_path(worktree));
6560 if (repo_path == NULL)
6561 error = got_error_from_errno("strdup");
6565 repo_path = strdup(cwd);
6566 if (repo_path == NULL) {
6567 error = got_error_from_errno("strdup");
6573 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6579 /* Remove "cpath" promise. */
6580 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6586 error = apply_unveil(got_repo_get_path(repo), do_list,
6587 worktree ? got_worktree_get_root_path(worktree) : NULL);
6592 error = list_refs(repo, refname, sort_by_time);
6594 error = delete_ref_by_name(repo, refname);
6595 else if (symref_target)
6596 error = add_symref(repo, refname, symref_target);
6598 if (obj_arg == NULL)
6600 error = add_ref(repo, refname, obj_arg);
6605 const struct got_error *close_err = got_repo_close(repo);
6610 got_worktree_close(worktree);
6612 const struct got_error *pack_err =
6613 got_repo_pack_fds_close(pack_fds);
6625 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6626 "[-r repository-path] [name]\n", getprogname());
6630 static const struct got_error *
6631 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6632 struct got_reference *ref)
6634 const struct got_error *err = NULL;
6635 const char *refname, *marker = " ";
6638 refname = got_ref_get_name(ref);
6639 if (worktree && strcmp(refname,
6640 got_worktree_get_head_ref_name(worktree)) == 0) {
6641 struct got_object_id *id = NULL;
6643 err = got_ref_resolve(&id, repo, ref);
6646 if (got_object_id_cmp(id,
6647 got_worktree_get_base_commit_id(worktree)) == 0)
6654 if (strncmp(refname, "refs/heads/", 11) == 0)
6656 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6658 if (strncmp(refname, "refs/remotes/", 13) == 0)
6661 refstr = got_ref_to_str(ref);
6663 return got_error_from_errno("got_ref_to_str");
6665 printf("%s%s: %s\n", marker, refname, refstr);
6670 static const struct got_error *
6671 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6673 const char *refname;
6675 if (worktree == NULL)
6676 return got_error(GOT_ERR_NOT_WORKTREE);
6678 refname = got_worktree_get_head_ref_name(worktree);
6680 if (strncmp(refname, "refs/heads/", 11) == 0)
6682 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6685 printf("%s\n", refname);
6690 static const struct got_error *
6691 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6694 static const struct got_error *err = NULL;
6695 struct got_reflist_head refs;
6696 struct got_reflist_entry *re;
6697 struct got_reference *temp_ref = NULL;
6698 int rebase_in_progress, histedit_in_progress;
6703 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6708 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6713 if (rebase_in_progress || histedit_in_progress) {
6714 err = got_ref_open(&temp_ref, repo,
6715 got_worktree_get_head_ref_name(worktree), 0);
6718 list_branch(repo, worktree, temp_ref);
6719 got_ref_close(temp_ref);
6723 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6724 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6729 TAILQ_FOREACH(re, &refs, entry)
6730 list_branch(repo, worktree, re->ref);
6732 got_ref_list_free(&refs);
6734 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6735 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6740 TAILQ_FOREACH(re, &refs, entry)
6741 list_branch(repo, worktree, re->ref);
6743 got_ref_list_free(&refs);
6748 static const struct got_error *
6749 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6750 const char *branch_name)
6752 const struct got_error *err = NULL;
6753 struct got_reference *ref = NULL;
6754 char *refname, *remote_refname = NULL;
6756 if (strncmp(branch_name, "refs/", 5) == 0)
6758 if (strncmp(branch_name, "heads/", 6) == 0)
6760 else if (strncmp(branch_name, "remotes/", 8) == 0)
6763 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6764 return got_error_from_errno("asprintf");
6766 if (asprintf(&remote_refname, "refs/remotes/%s",
6767 branch_name) == -1) {
6768 err = got_error_from_errno("asprintf");
6772 err = got_ref_open(&ref, repo, refname, 0);
6774 const struct got_error *err2;
6775 if (err->code != GOT_ERR_NOT_REF)
6778 * Keep 'err' intact such that if neither branch exists
6779 * we report "refs/heads" rather than "refs/remotes" in
6780 * our error message.
6782 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6789 strcmp(got_worktree_get_head_ref_name(worktree),
6790 got_ref_get_name(ref)) == 0) {
6791 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6792 "will not delete this work tree's current branch");
6796 err = delete_ref(repo, ref);
6801 free(remote_refname);
6805 static const struct got_error *
6806 add_branch(struct got_repository *repo, const char *branch_name,
6807 struct got_object_id *base_commit_id)
6809 const struct got_error *err = NULL;
6810 struct got_reference *ref = NULL;
6811 char *refname = NULL;
6814 * Don't let the user create a branch name with a leading '-'.
6815 * While technically a valid reference name, this case is usually
6816 * an unintended typo.
6818 if (branch_name[0] == '-')
6819 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6821 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6824 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6825 err = got_error_from_errno("asprintf");
6829 err = got_ref_open(&ref, repo, refname, 0);
6831 err = got_error(GOT_ERR_BRANCH_EXISTS);
6833 } else if (err->code != GOT_ERR_NOT_REF)
6836 err = got_ref_alloc(&ref, refname, base_commit_id);
6840 err = got_ref_write(ref, repo);
6848 static const struct got_error *
6849 cmd_branch(int argc, char *argv[])
6851 const struct got_error *error = NULL;
6852 struct got_repository *repo = NULL;
6853 struct got_worktree *worktree = NULL;
6854 char *cwd = NULL, *repo_path = NULL;
6855 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6856 const char *delref = NULL, *commit_id_arg = NULL;
6857 struct got_reference *ref = NULL;
6858 struct got_pathlist_head paths;
6859 struct got_object_id *commit_id = NULL;
6860 char *commit_id_str = NULL;
6861 int *pack_fds = NULL;
6865 while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
6868 commit_id_arg = optarg;
6880 repo_path = realpath(optarg, NULL);
6881 if (repo_path == NULL)
6882 return got_error_from_errno2("realpath",
6884 got_path_strip_trailing_slashes(repo_path);
6895 if (do_list && delref)
6896 option_conflict('l', 'd');
6897 if (sort_by_time && !do_list)
6898 errx(1, "-t option requires -l option");
6903 if (!do_list && !delref && argc == 0)
6906 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6907 errx(1, "-c option can only be used when creating a branch");
6909 if (do_list || delref) {
6912 } else if (!do_show && argc != 1)
6916 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6917 "sendfd unveil", NULL) == -1)
6920 cwd = getcwd(NULL, 0);
6922 error = got_error_from_errno("getcwd");
6926 error = got_repo_pack_fds_open(&pack_fds);
6930 if (repo_path == NULL) {
6931 error = got_worktree_open(&worktree, cwd);
6932 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6938 strdup(got_worktree_get_repo_path(worktree));
6939 if (repo_path == NULL)
6940 error = got_error_from_errno("strdup");
6944 repo_path = strdup(cwd);
6945 if (repo_path == NULL) {
6946 error = got_error_from_errno("strdup");
6952 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6957 if (do_list || do_show) {
6958 /* Remove "cpath" promise. */
6959 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6965 error = apply_unveil(got_repo_get_path(repo), do_list,
6966 worktree ? got_worktree_get_root_path(worktree) : NULL);
6971 error = show_current_branch(repo, worktree);
6973 error = list_branches(repo, worktree, sort_by_time);
6975 error = delete_branch(repo, worktree, delref);
6977 struct got_reflist_head refs;
6979 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6983 if (commit_id_arg == NULL)
6984 commit_id_arg = worktree ?
6985 got_worktree_get_head_ref_name(worktree) :
6987 error = got_repo_match_object_id(&commit_id, NULL,
6988 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6989 got_ref_list_free(&refs);
6992 error = add_branch(repo, argv[0], commit_id);
6995 if (worktree && do_update) {
6996 struct got_update_progress_arg upa;
6997 char *branch_refname = NULL;
6999 error = got_object_id_str(&commit_id_str, commit_id);
7002 error = get_worktree_paths_from_argv(&paths, 0, NULL,
7006 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7008 error = got_error_from_errno("asprintf");
7011 error = got_ref_open(&ref, repo, branch_refname, 0);
7012 free(branch_refname);
7015 error = switch_head_ref(ref, commit_id, worktree,
7019 error = got_worktree_set_base_commit_id(worktree, repo,
7023 memset(&upa, 0, sizeof(upa));
7024 error = got_worktree_checkout_files(worktree, &paths,
7025 repo, update_progress, &upa, check_cancelled,
7029 if (upa.did_something) {
7030 printf("Updated to %s: %s\n",
7031 got_worktree_get_head_ref_name(worktree),
7034 print_update_progress_stats(&upa);
7041 const struct got_error *close_err = got_repo_close(repo);
7046 got_worktree_close(worktree);
7048 const struct got_error *pack_err =
7049 got_repo_pack_fds_close(pack_fds);
7056 free(commit_id_str);
7057 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7065 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7066 "[-r repository-path] [-s signer-id] name\n", getprogname());
7071 static const struct got_error *
7072 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7074 const struct got_error *err = NULL;
7075 struct got_reflist_entry *re, *se, *new;
7076 struct got_object_id *re_id, *se_id;
7077 struct got_tag_object *re_tag, *se_tag;
7078 time_t re_time, se_time;
7080 STAILQ_FOREACH(re, tags, entry) {
7081 se = STAILQ_FIRST(sorted);
7083 err = got_reflist_entry_dup(&new, re);
7086 STAILQ_INSERT_HEAD(sorted, new, entry);
7089 err = got_ref_resolve(&re_id, repo, re->ref);
7092 err = got_object_open_as_tag(&re_tag, repo, re_id);
7096 re_time = got_object_tag_get_tagger_time(re_tag);
7097 got_object_tag_close(re_tag);
7101 err = got_ref_resolve(&se_id, repo, re->ref);
7104 err = got_object_open_as_tag(&se_tag, repo, se_id);
7108 se_time = got_object_tag_get_tagger_time(se_tag);
7109 got_object_tag_close(se_tag);
7111 if (se_time > re_time) {
7112 err = got_reflist_entry_dup(&new, re);
7115 STAILQ_INSERT_AFTER(sorted, se, new, entry);
7118 se = STAILQ_NEXT(se, entry);
7127 static const struct got_error *
7128 get_tag_refname(char **refname, const char *tag_name)
7130 const struct got_error *err;
7132 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7133 *refname = strdup(tag_name);
7134 if (*refname == NULL)
7135 return got_error_from_errno("strdup");
7136 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7137 err = got_error_from_errno("asprintf");
7145 static const struct got_error *
7146 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7147 const char *allowed_signers, const char *revoked_signers, int verbosity)
7149 static const struct got_error *err = NULL;
7150 struct got_reflist_head refs;
7151 struct got_reflist_entry *re;
7152 char *wanted_refname = NULL;
7157 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7162 struct got_reference *ref;
7163 err = get_tag_refname(&wanted_refname, tag_name);
7166 /* Wanted tag reference should exist. */
7167 err = got_ref_open(&ref, repo, wanted_refname, 0);
7173 TAILQ_FOREACH(re, &refs, entry) {
7174 const char *refname;
7175 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7177 const char *tagger, *ssh_sig = NULL;
7178 char *sig_msg = NULL;
7180 struct got_object_id *id;
7181 struct got_tag_object *tag;
7182 struct got_commit_object *commit = NULL;
7184 refname = got_ref_get_name(re->ref);
7185 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7186 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7189 refstr = got_ref_to_str(re->ref);
7190 if (refstr == NULL) {
7191 err = got_error_from_errno("got_ref_to_str");
7195 err = got_ref_resolve(&id, repo, re->ref);
7198 err = got_object_open_as_tag(&tag, repo, id);
7200 if (err->code != GOT_ERR_OBJ_TYPE) {
7204 /* "lightweight" tag */
7205 err = got_object_open_as_commit(&commit, repo, id);
7210 tagger = got_object_commit_get_committer(commit);
7212 got_object_commit_get_committer_time(commit);
7213 err = got_object_id_str(&id_str, id);
7219 tagger = got_object_tag_get_tagger(tag);
7220 tagger_time = got_object_tag_get_tagger_time(tag);
7221 err = got_object_id_str(&id_str,
7222 got_object_tag_get_object_id(tag));
7227 if (tag && verify_tags) {
7228 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7229 got_object_tag_get_message(tag));
7230 if (ssh_sig && allowed_signers == NULL) {
7231 err = got_error_msg(
7232 GOT_ERR_VERIFY_TAG_SIGNATURE,
7233 "SSH signature verification requires "
7234 "setting allowed_signers in "
7240 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7242 printf("from: %s\n", tagger);
7243 datestr = get_datestr(&tagger_time, datebuf);
7245 printf("date: %s UTC\n", datestr);
7247 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7249 switch (got_object_tag_get_object_type(tag)) {
7250 case GOT_OBJ_TYPE_BLOB:
7251 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7254 case GOT_OBJ_TYPE_TREE:
7255 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7258 case GOT_OBJ_TYPE_COMMIT:
7259 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7262 case GOT_OBJ_TYPE_TAG:
7263 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7273 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7274 allowed_signers, revoked_signers, verbosity);
7275 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7279 printf("signature: %s", sig_msg);
7285 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7288 got_object_commit_close(commit);
7290 tagmsg0 = strdup(got_object_tag_get_message(tag));
7291 got_object_tag_close(tag);
7292 if (tagmsg0 == NULL) {
7293 err = got_error_from_errno("strdup");
7300 line = strsep(&tagmsg, "\n");
7302 printf(" %s\n", line);
7307 got_ref_list_free(&refs);
7308 free(wanted_refname);
7310 if (err == NULL && bad_sigs)
7311 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7315 static const struct got_error *
7316 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7317 const char *tag_name, const char *repo_path)
7319 const struct got_error *err = NULL;
7320 char *template = NULL, *initial_content = NULL;
7321 char *editor = NULL;
7322 int initial_content_len;
7325 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7326 err = got_error_from_errno("asprintf");
7330 initial_content_len = asprintf(&initial_content,
7331 "\n# tagging commit %s as %s\n",
7332 commit_id_str, tag_name);
7333 if (initial_content_len == -1) {
7334 err = got_error_from_errno("asprintf");
7338 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7342 if (write(fd, initial_content, initial_content_len) == -1) {
7343 err = got_error_from_errno2("write", *tagmsg_path);
7347 err = get_editor(&editor);
7350 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7351 initial_content_len, 1);
7353 free(initial_content);
7357 if (fd != -1 && close(fd) == -1 && err == NULL)
7358 err = got_error_from_errno2("close", *tagmsg_path);
7367 static const struct got_error *
7368 add_tag(struct got_repository *repo, const char *tagger,
7369 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7370 const char *signer_id, int verbosity)
7372 const struct got_error *err = NULL;
7373 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7374 char *label = NULL, *commit_id_str = NULL;
7375 struct got_reference *ref = NULL;
7376 char *refname = NULL, *tagmsg = NULL;
7377 char *tagmsg_path = NULL, *tag_id_str = NULL;
7378 int preserve_tagmsg = 0;
7379 struct got_reflist_head refs;
7384 * Don't let the user create a tag name with a leading '-'.
7385 * While technically a valid reference name, this case is usually
7386 * an unintended typo.
7388 if (tag_name[0] == '-')
7389 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7391 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7395 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7396 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7400 err = got_object_id_str(&commit_id_str, commit_id);
7404 err = get_tag_refname(&refname, tag_name);
7407 if (strncmp("refs/tags/", tag_name, 10) == 0)
7410 err = got_ref_open(&ref, repo, refname, 0);
7412 err = got_error(GOT_ERR_TAG_EXISTS);
7414 } else if (err->code != GOT_ERR_NOT_REF)
7417 if (tagmsg_arg == NULL) {
7418 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7419 tag_name, got_repo_get_path(repo));
7421 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7422 tagmsg_path != NULL)
7423 preserve_tagmsg = 1;
7426 /* Editor is done; we can now apply unveil(2) */
7427 err = got_sigs_apply_unveil();
7430 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
7435 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7436 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7440 preserve_tagmsg = 1;
7444 err = got_ref_alloc(&ref, refname, tag_id);
7447 preserve_tagmsg = 1;
7451 err = got_ref_write(ref, repo);
7454 preserve_tagmsg = 1;
7458 err = got_object_id_str(&tag_id_str, tag_id);
7461 preserve_tagmsg = 1;
7464 printf("Created tag %s\n", tag_id_str);
7466 if (preserve_tagmsg) {
7467 fprintf(stderr, "%s: tag message preserved in %s\n",
7468 getprogname(), tagmsg_path);
7469 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7470 err = got_error_from_errno2("unlink", tagmsg_path);
7475 free(commit_id_str);
7479 got_ref_list_free(&refs);
7483 static const struct got_error *
7484 cmd_tag(int argc, char *argv[])
7486 const struct got_error *error = NULL;
7487 struct got_repository *repo = NULL;
7488 struct got_worktree *worktree = NULL;
7489 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7490 char *gitconfig_path = NULL, *tagger = NULL;
7491 char *allowed_signers = NULL, *revoked_signers = NULL;
7492 char *signer_id = NULL;
7493 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7494 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7495 int *pack_fds = NULL;
7497 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7500 commit_id_arg = optarg;
7509 repo_path = realpath(optarg, NULL);
7510 if (repo_path == NULL) {
7511 error = got_error_from_errno2("realpath",
7515 got_path_strip_trailing_slashes(repo_path);
7518 signer_id = strdup(optarg);
7519 if (signer_id == NULL) {
7520 error = got_error_from_errno("strdup");
7530 else if (verbosity < 3)
7542 if (do_list || verify_tags) {
7543 if (commit_id_arg != NULL)
7545 "-c option can only be used when creating a tag");
7548 option_conflict('l', 'm');
7550 option_conflict('V', 'm');
7554 option_conflict('l', 's');
7556 option_conflict('V', 's');
7560 } else if (argc != 1)
7567 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7568 "sendfd unveil", NULL) == -1)
7571 cwd = getcwd(NULL, 0);
7573 error = got_error_from_errno("getcwd");
7577 error = got_repo_pack_fds_open(&pack_fds);
7581 if (repo_path == NULL) {
7582 error = got_worktree_open(&worktree, cwd);
7583 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7589 strdup(got_worktree_get_repo_path(worktree));
7590 if (repo_path == NULL)
7591 error = got_error_from_errno("strdup");
7595 repo_path = strdup(cwd);
7596 if (repo_path == NULL) {
7597 error = got_error_from_errno("strdup");
7603 if (do_list || verify_tags) {
7604 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7607 error = get_allowed_signers(&allowed_signers, repo, worktree);
7610 error = get_revoked_signers(&revoked_signers, repo, worktree);
7614 /* Release work tree lock. */
7615 got_worktree_close(worktree);
7620 * Remove "cpath" promise unless needed for signature tmpfile
7624 got_sigs_apply_unveil();
7627 if (pledge("stdio rpath wpath flock proc exec sendfd "
7628 "unveil", NULL) == -1)
7632 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7635 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7636 revoked_signers, verbosity);
7638 error = get_gitconfig_path(&gitconfig_path);
7641 error = got_repo_open(&repo, repo_path, gitconfig_path,
7646 error = get_author(&tagger, repo, worktree);
7649 if (signer_id == NULL) {
7650 error = get_signer_id(&signer_id, repo, worktree);
7657 error = got_sigs_apply_unveil();
7661 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7666 if (commit_id_arg == NULL) {
7667 struct got_reference *head_ref;
7668 struct got_object_id *commit_id;
7669 error = got_ref_open(&head_ref, repo,
7670 worktree ? got_worktree_get_head_ref_name(worktree)
7674 error = got_ref_resolve(&commit_id, repo, head_ref);
7675 got_ref_close(head_ref);
7678 error = got_object_id_str(&commit_id_str, commit_id);
7685 /* Release work tree lock. */
7686 got_worktree_close(worktree);
7690 error = add_tag(repo, tagger, tag_name,
7691 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7692 signer_id, verbosity);
7696 const struct got_error *close_err = got_repo_close(repo);
7701 got_worktree_close(worktree);
7703 const struct got_error *pack_err =
7704 got_repo_pack_fds_close(pack_fds);
7710 free(gitconfig_path);
7711 free(commit_id_str);
7713 free(allowed_signers);
7714 free(revoked_signers);
7722 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
7726 static const struct got_error *
7727 add_progress(void *arg, unsigned char status, const char *path)
7729 while (path[0] == '/')
7731 printf("%c %s\n", status, path);
7735 static const struct got_error *
7736 cmd_add(int argc, char *argv[])
7738 const struct got_error *error = NULL;
7739 struct got_repository *repo = NULL;
7740 struct got_worktree *worktree = NULL;
7742 struct got_pathlist_head paths;
7743 struct got_pathlist_entry *pe;
7744 int ch, can_recurse = 0, no_ignores = 0;
7745 int *pack_fds = NULL;
7749 while ((ch = getopt(argc, argv, "IR")) != -1) {
7767 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7774 cwd = getcwd(NULL, 0);
7776 error = got_error_from_errno("getcwd");
7780 error = got_repo_pack_fds_open(&pack_fds);
7784 error = got_worktree_open(&worktree, cwd);
7786 if (error->code == GOT_ERR_NOT_WORKTREE)
7787 error = wrap_not_worktree_error(error, "add", cwd);
7791 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7796 error = apply_unveil(got_repo_get_path(repo), 1,
7797 got_worktree_get_root_path(worktree));
7801 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7808 TAILQ_FOREACH(pe, &paths, entry) {
7809 if (asprintf(&ondisk_path, "%s/%s",
7810 got_worktree_get_root_path(worktree),
7812 error = got_error_from_errno("asprintf");
7815 if (lstat(ondisk_path, &sb) == -1) {
7816 if (errno == ENOENT) {
7820 error = got_error_from_errno2("lstat",
7826 if (S_ISDIR(sb.st_mode)) {
7827 error = got_error_msg(GOT_ERR_BAD_PATH,
7828 "adding directories requires -R option");
7834 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7835 NULL, repo, no_ignores);
7838 const struct got_error *close_err = got_repo_close(repo);
7843 got_worktree_close(worktree);
7845 const struct got_error *pack_err =
7846 got_repo_pack_fds_close(pack_fds);
7850 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7858 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
7863 static const struct got_error *
7864 print_remove_status(void *arg, unsigned char status,
7865 unsigned char staged_status, const char *path)
7867 while (path[0] == '/')
7869 if (status == GOT_STATUS_NONEXISTENT)
7871 if (status == staged_status && (status == GOT_STATUS_DELETE))
7872 status = GOT_STATUS_NO_CHANGE;
7873 printf("%c%c %s\n", status, staged_status, path);
7877 static const struct got_error *
7878 cmd_remove(int argc, char *argv[])
7880 const struct got_error *error = NULL;
7881 struct got_worktree *worktree = NULL;
7882 struct got_repository *repo = NULL;
7883 const char *status_codes = NULL;
7885 struct got_pathlist_head paths;
7886 struct got_pathlist_entry *pe;
7887 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7888 int ignore_missing_paths = 0;
7889 int *pack_fds = NULL;
7893 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7896 delete_local_mods = 1;
7897 ignore_missing_paths = 1;
7906 for (i = 0; i < strlen(optarg); i++) {
7907 switch (optarg[i]) {
7908 case GOT_STATUS_MODIFY:
7909 delete_local_mods = 1;
7911 case GOT_STATUS_MISSING:
7912 ignore_missing_paths = 1;
7915 errx(1, "invalid status code '%c'",
7919 status_codes = optarg;
7931 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7938 cwd = getcwd(NULL, 0);
7940 error = got_error_from_errno("getcwd");
7944 error = got_repo_pack_fds_open(&pack_fds);
7948 error = got_worktree_open(&worktree, cwd);
7950 if (error->code == GOT_ERR_NOT_WORKTREE)
7951 error = wrap_not_worktree_error(error, "remove", cwd);
7955 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7960 error = apply_unveil(got_repo_get_path(repo), 1,
7961 got_worktree_get_root_path(worktree));
7965 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7972 TAILQ_FOREACH(pe, &paths, entry) {
7973 if (asprintf(&ondisk_path, "%s/%s",
7974 got_worktree_get_root_path(worktree),
7976 error = got_error_from_errno("asprintf");
7979 if (lstat(ondisk_path, &sb) == -1) {
7980 if (errno == ENOENT) {
7984 error = got_error_from_errno2("lstat",
7990 if (S_ISDIR(sb.st_mode)) {
7991 error = got_error_msg(GOT_ERR_BAD_PATH,
7992 "removing directories requires -R option");
7998 error = got_worktree_schedule_delete(worktree, &paths,
7999 delete_local_mods, status_codes, print_remove_status, NULL,
8000 repo, keep_on_disk, ignore_missing_paths);
8003 const struct got_error *close_err = got_repo_close(repo);
8008 got_worktree_close(worktree);
8010 const struct got_error *pack_err =
8011 got_repo_pack_fds_close(pack_fds);
8015 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8023 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8024 "[patchfile]\n", getprogname());
8028 static const struct got_error *
8029 patch_from_stdin(int *patchfd)
8031 const struct got_error *err = NULL;
8034 sig_t sighup, sigint, sigquit;
8036 *patchfd = got_opentempfd();
8038 return got_error_from_errno("got_opentempfd");
8040 sighup = signal(SIGHUP, SIG_DFL);
8041 sigint = signal(SIGINT, SIG_DFL);
8042 sigquit = signal(SIGQUIT, SIG_DFL);
8045 r = read(0, buf, sizeof(buf));
8047 err = got_error_from_errno("read");
8052 if (write(*patchfd, buf, r) == -1) {
8053 err = got_error_from_errno("write");
8058 signal(SIGHUP, sighup);
8059 signal(SIGINT, sigint);
8060 signal(SIGQUIT, sigquit);
8062 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8063 err = got_error_from_errno("lseek");
8073 static const struct got_error *
8074 patch_progress(void *arg, const char *old, const char *new,
8075 unsigned char status, const struct got_error *error, int old_from,
8076 int old_lines, int new_from, int new_lines, int offset,
8077 int ws_mangled, const struct got_error *hunk_err)
8079 const char *path = new == NULL ? old : new;
8081 while (*path == '/')
8085 printf("%c %s\n", status, path);
8088 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8090 if (offset != 0 || hunk_err != NULL || ws_mangled) {
8091 printf("@@ -%d,%d +%d,%d @@ ", old_from,
8092 old_lines, new_from, new_lines);
8093 if (hunk_err != NULL)
8094 printf("%s\n", hunk_err->msg);
8095 else if (offset != 0)
8096 printf("applied with offset %d\n", offset);
8098 printf("hunk contains mangled whitespace\n");
8104 static const struct got_error *
8105 cmd_patch(int argc, char *argv[])
8107 const struct got_error *error = NULL, *close_error = NULL;
8108 struct got_worktree *worktree = NULL;
8109 struct got_repository *repo = NULL;
8110 struct got_reflist_head refs;
8111 struct got_object_id *commit_id = NULL;
8112 const char *commit_id_str = NULL;
8116 int ch, nop = 0, strip = -1, reverse = 0;
8118 int *pack_fds = NULL;
8123 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8124 "unveil", NULL) == -1)
8128 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8131 commit_id_str = optarg;
8137 strip = strtonum(optarg, 0, INT_MAX, &errstr);
8139 errx(1, "pathname strip count is %s: %s",
8155 error = patch_from_stdin(&patchfd);
8158 } else if (argc == 1) {
8159 patchfd = open(argv[0], O_RDONLY);
8160 if (patchfd == -1) {
8161 error = got_error_from_errno2("open", argv[0]);
8164 if (fstat(patchfd, &sb) == -1) {
8165 error = got_error_from_errno2("fstat", argv[0]);
8168 if (!S_ISREG(sb.st_mode)) {
8169 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8175 if ((cwd = getcwd(NULL, 0)) == NULL) {
8176 error = got_error_from_errno("getcwd");
8180 error = got_repo_pack_fds_open(&pack_fds);
8184 error = got_worktree_open(&worktree, cwd);
8188 const char *repo_path = got_worktree_get_repo_path(worktree);
8189 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8193 error = apply_unveil(got_repo_get_path(repo), 0,
8194 got_worktree_get_root_path(worktree));
8198 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8202 if (commit_id_str != NULL) {
8203 error = got_repo_match_object_id(&commit_id, NULL,
8204 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8209 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8210 commit_id, &patch_progress, NULL, check_cancelled, NULL);
8213 got_ref_list_free(&refs);
8216 close_error = got_repo_close(repo);
8218 error = close_error;
8220 if (worktree != NULL) {
8221 close_error = got_worktree_close(worktree);
8223 error = close_error;
8226 const struct got_error *pack_err =
8227 got_repo_pack_fds_close(pack_fds);
8238 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8243 static const struct got_error *
8244 revert_progress(void *arg, unsigned char status, const char *path)
8246 if (status == GOT_STATUS_UNVERSIONED)
8249 while (path[0] == '/')
8251 printf("%c %s\n", status, path);
8255 struct choose_patch_arg {
8256 FILE *patch_script_file;
8260 static const struct got_error *
8261 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8262 int nchanges, const char *action)
8264 const struct got_error *err;
8266 size_t linesize = 0;
8270 case GOT_STATUS_ADD:
8271 printf("A %s\n%s this addition? [y/n] ", path, action);
8273 case GOT_STATUS_DELETE:
8274 printf("D %s\n%s this deletion? [y/n] ", path, action);
8276 case GOT_STATUS_MODIFY:
8277 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8278 return got_error_from_errno("fseek");
8279 printf(GOT_COMMIT_SEP_STR);
8280 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8282 if (linelen == -1 && ferror(patch_file)) {
8283 err = got_error_from_errno("getline");
8288 printf(GOT_COMMIT_SEP_STR);
8289 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8290 path, n, nchanges, action);
8293 return got_error_path(path, GOT_ERR_FILE_STATUS);
8300 static const struct got_error *
8301 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8302 FILE *patch_file, int n, int nchanges)
8304 const struct got_error *err = NULL;
8306 size_t linesize = 0;
8309 struct choose_patch_arg *a = arg;
8311 *choice = GOT_PATCH_CHOICE_NONE;
8313 if (a->patch_script_file) {
8315 err = show_change(status, path, patch_file, n, nchanges,
8319 linelen = getline(&line, &linesize, a->patch_script_file);
8320 if (linelen == -1) {
8321 if (ferror(a->patch_script_file))
8322 return got_error_from_errno("getline");
8325 nl = strchr(line, '\n');
8328 if (strcmp(line, "y") == 0) {
8329 *choice = GOT_PATCH_CHOICE_YES;
8331 } else if (strcmp(line, "n") == 0) {
8332 *choice = GOT_PATCH_CHOICE_NO;
8334 } else if (strcmp(line, "q") == 0 &&
8335 status == GOT_STATUS_MODIFY) {
8336 *choice = GOT_PATCH_CHOICE_QUIT;
8339 printf("invalid response '%s'\n", line);
8344 while (resp != 'y' && resp != 'n' && resp != 'q') {
8345 err = show_change(status, path, patch_file, n, nchanges,
8352 if (status == GOT_STATUS_MODIFY) {
8353 if (resp != 'y' && resp != 'n' && resp != 'q') {
8354 printf("invalid response '%c'\n", resp);
8357 } else if (resp != 'y' && resp != 'n') {
8358 printf("invalid response '%c'\n", resp);
8364 *choice = GOT_PATCH_CHOICE_YES;
8365 else if (resp == 'n')
8366 *choice = GOT_PATCH_CHOICE_NO;
8367 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8368 *choice = GOT_PATCH_CHOICE_QUIT;
8373 static const struct got_error *
8374 cmd_revert(int argc, char *argv[])
8376 const struct got_error *error = NULL;
8377 struct got_worktree *worktree = NULL;
8378 struct got_repository *repo = NULL;
8379 char *cwd = NULL, *path = NULL;
8380 struct got_pathlist_head paths;
8381 struct got_pathlist_entry *pe;
8382 int ch, can_recurse = 0, pflag = 0;
8383 FILE *patch_script_file = NULL;
8384 const char *patch_script_path = NULL;
8385 struct choose_patch_arg cpa;
8386 int *pack_fds = NULL;
8390 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8393 patch_script_path = optarg;
8411 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8412 "unveil", NULL) == -1)
8417 if (patch_script_path && !pflag)
8418 errx(1, "-F option can only be used together with -p option");
8420 cwd = getcwd(NULL, 0);
8422 error = got_error_from_errno("getcwd");
8426 error = got_repo_pack_fds_open(&pack_fds);
8430 error = got_worktree_open(&worktree, cwd);
8432 if (error->code == GOT_ERR_NOT_WORKTREE)
8433 error = wrap_not_worktree_error(error, "revert", cwd);
8437 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8442 if (patch_script_path) {
8443 patch_script_file = fopen(patch_script_path, "re");
8444 if (patch_script_file == NULL) {
8445 error = got_error_from_errno2("fopen",
8450 error = apply_unveil(got_repo_get_path(repo), 1,
8451 got_worktree_get_root_path(worktree));
8455 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8462 TAILQ_FOREACH(pe, &paths, entry) {
8463 if (asprintf(&ondisk_path, "%s/%s",
8464 got_worktree_get_root_path(worktree),
8466 error = got_error_from_errno("asprintf");
8469 if (lstat(ondisk_path, &sb) == -1) {
8470 if (errno == ENOENT) {
8474 error = got_error_from_errno2("lstat",
8480 if (S_ISDIR(sb.st_mode)) {
8481 error = got_error_msg(GOT_ERR_BAD_PATH,
8482 "reverting directories requires -R option");
8488 cpa.patch_script_file = patch_script_file;
8489 cpa.action = "revert";
8490 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8491 pflag ? choose_patch : NULL, &cpa, repo);
8493 if (patch_script_file && fclose(patch_script_file) == EOF &&
8495 error = got_error_from_errno2("fclose", patch_script_path);
8497 const struct got_error *close_err = got_repo_close(repo);
8502 got_worktree_close(worktree);
8504 const struct got_error *pack_err =
8505 got_repo_pack_fds_close(pack_fds);
8517 fprintf(stderr, "usage: %s commit [-NS] [-A author] [-F path] "
8518 "[-m message] [path ...]\n", getprogname());
8522 struct collect_commit_logmsg_arg {
8523 const char *cmdline_log;
8524 const char *prepared_log;
8525 int non_interactive;
8527 const char *worktree_path;
8528 const char *branch_name;
8529 const char *repo_path;
8534 static const struct got_error *
8535 read_prepared_logmsg(char **logmsg, const char *path)
8537 const struct got_error *err = NULL;
8543 memset(&sb, 0, sizeof(sb));
8545 f = fopen(path, "re");
8547 return got_error_from_errno2("fopen", path);
8549 if (fstat(fileno(f), &sb) == -1) {
8550 err = got_error_from_errno2("fstat", path);
8553 if (sb.st_size == 0) {
8554 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8558 *logmsg = malloc(sb.st_size + 1);
8559 if (*logmsg == NULL) {
8560 err = got_error_from_errno("malloc");
8564 r = fread(*logmsg, 1, sb.st_size, f);
8565 if (r != sb.st_size) {
8567 err = got_error_from_errno2("fread", path);
8569 err = got_error(GOT_ERR_IO);
8572 (*logmsg)[sb.st_size] = '\0';
8574 if (fclose(f) == EOF && err == NULL)
8575 err = got_error_from_errno2("fclose", path);
8583 static const struct got_error *
8584 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
8585 const char *diff_path, char **logmsg, void *arg)
8587 char *initial_content = NULL;
8588 struct got_pathlist_entry *pe;
8589 const struct got_error *err = NULL;
8590 char *template = NULL;
8591 struct collect_commit_logmsg_arg *a = arg;
8592 int initial_content_len;
8596 /* if a message was specified on the command line, just use it */
8597 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
8598 len = strlen(a->cmdline_log) + 1;
8599 *logmsg = malloc(len + 1);
8600 if (*logmsg == NULL)
8601 return got_error_from_errno("malloc");
8602 strlcpy(*logmsg, a->cmdline_log, len);
8604 } else if (a->prepared_log != NULL && a->non_interactive)
8605 return read_prepared_logmsg(logmsg, a->prepared_log);
8607 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
8608 return got_error_from_errno("asprintf");
8610 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
8614 if (a->prepared_log) {
8616 err = read_prepared_logmsg(&msg, a->prepared_log);
8619 if (write(fd, msg, strlen(msg)) == -1) {
8620 err = got_error_from_errno2("write", a->logmsg_path);
8627 initial_content_len = asprintf(&initial_content,
8628 "\n# changes to be committed on branch %s:\n",
8630 if (initial_content_len == -1) {
8631 err = got_error_from_errno("asprintf");
8635 if (write(fd, initial_content, initial_content_len) == -1) {
8636 err = got_error_from_errno2("write", a->logmsg_path);
8640 TAILQ_FOREACH(pe, commitable_paths, entry) {
8641 struct got_commitable *ct = pe->data;
8642 dprintf(fd, "# %c %s\n",
8643 got_commitable_get_status(ct),
8644 got_commitable_get_path(ct));
8648 dprintf(fd, "# detailed changes can be viewed in %s\n",
8652 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
8653 initial_content_len, a->prepared_log ? 0 : 1);
8655 free(initial_content);
8658 if (fd != -1 && close(fd) == -1 && err == NULL)
8659 err = got_error_from_errno2("close", a->logmsg_path);
8661 /* Editor is done; we can now apply unveil(2) */
8663 err = apply_unveil(a->repo_path, 0, a->worktree_path);
8671 static const struct got_error *
8672 cmd_commit(int argc, char *argv[])
8674 const struct got_error *error = NULL;
8675 struct got_worktree *worktree = NULL;
8676 struct got_repository *repo = NULL;
8677 char *cwd = NULL, *id_str = NULL;
8678 struct got_object_id *id = NULL;
8679 const char *logmsg = NULL;
8680 char *prepared_logmsg = NULL;
8681 struct collect_commit_logmsg_arg cl_arg;
8682 const char *author = NULL;
8683 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
8684 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8685 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8687 struct got_pathlist_head paths;
8688 int *pack_fds = NULL;
8691 cl_arg.logmsg_path = NULL;
8693 while ((ch = getopt(argc, argv, "A:F:m:NnS")) != -1) {
8697 error = valid_author(author);
8703 option_conflict('F', 'm');
8704 prepared_logmsg = realpath(optarg, NULL);
8705 if (prepared_logmsg == NULL)
8706 return got_error_from_errno2("realpath",
8710 if (prepared_logmsg)
8711 option_conflict('m', 'F');
8715 non_interactive = 1;
8721 allow_bad_symlinks = 1;
8733 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8734 "unveil", NULL) == -1)
8737 cwd = getcwd(NULL, 0);
8739 error = got_error_from_errno("getcwd");
8743 error = got_repo_pack_fds_open(&pack_fds);
8747 error = got_worktree_open(&worktree, cwd);
8749 if (error->code == GOT_ERR_NOT_WORKTREE)
8750 error = wrap_not_worktree_error(error, "commit", cwd);
8754 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8757 if (rebase_in_progress) {
8758 error = got_error(GOT_ERR_REBASING);
8762 error = got_worktree_histedit_in_progress(&histedit_in_progress,
8767 error = get_gitconfig_path(&gitconfig_path);
8770 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8771 gitconfig_path, pack_fds);
8775 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8778 if (merge_in_progress) {
8779 error = got_error(GOT_ERR_MERGE_BUSY);
8783 error = get_author(&committer, repo, worktree);
8787 if (author != NULL && !strcmp(committer, author)) {
8788 error = got_error(GOT_ERR_COMMIT_REDUNDANT_AUTHOR);
8796 * unveil(2) traverses exec(2); if an editor is used we have
8797 * to apply unveil after the log message has been written.
8799 if (logmsg == NULL || strlen(logmsg) == 0)
8800 error = get_editor(&editor);
8802 error = apply_unveil(got_repo_get_path(repo), 0,
8803 got_worktree_get_root_path(worktree));
8807 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8811 cl_arg.editor = editor;
8812 cl_arg.cmdline_log = logmsg;
8813 cl_arg.prepared_log = prepared_logmsg;
8814 cl_arg.non_interactive = non_interactive;
8815 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8816 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
8817 if (!histedit_in_progress) {
8818 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
8819 error = got_error(GOT_ERR_COMMIT_BRANCH);
8822 cl_arg.branch_name += 11;
8824 cl_arg.repo_path = got_repo_get_path(repo);
8825 error = got_worktree_commit(&id, worktree, &paths, author, committer,
8826 allow_bad_symlinks, show_diff, collect_commit_logmsg, &cl_arg,
8827 print_status, NULL, repo);
8829 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8830 cl_arg.logmsg_path != NULL)
8831 preserve_logmsg = 1;
8835 error = got_object_id_str(&id_str, id);
8838 printf("Created commit %s\n", id_str);
8840 if (preserve_logmsg) {
8841 fprintf(stderr, "%s: log message preserved in %s\n",
8842 getprogname(), cl_arg.logmsg_path);
8843 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8845 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8846 free(cl_arg.logmsg_path);
8848 const struct got_error *close_err = got_repo_close(repo);
8853 got_worktree_close(worktree);
8855 const struct got_error *pack_err =
8856 got_repo_pack_fds_close(pack_fds);
8862 free(gitconfig_path);
8865 free(prepared_logmsg);
8872 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
8873 "[-r repository-path] [-t tag] [remote-repository]\n",
8879 print_load_info(int print_colored, int print_found, int print_trees,
8880 int ncolored, int nfound, int ntrees)
8882 if (print_colored) {
8883 printf("%d commit%s colored", ncolored,
8884 ncolored == 1 ? "" : "s");
8887 printf("%s%d object%s found",
8888 ncolored > 0 ? "; " : "",
8889 nfound, nfound == 1 ? "" : "s");
8892 printf("; %d tree%s scanned", ntrees,
8893 ntrees == 1 ? "" : "s");
8897 struct got_send_progress_arg {
8898 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8905 int last_nobj_total;
8909 int printed_something;
8911 struct got_pathlist_head *delete_branches;
8914 static const struct got_error *
8915 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8916 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8917 int nobj_written, off_t bytes_sent, const char *refname,
8918 const char *errmsg, int success)
8920 struct got_send_progress_arg *a = arg;
8921 char scaled_packsize[FMT_SCALED_STRSIZE];
8922 char scaled_sent[FMT_SCALED_STRSIZE];
8923 int p_deltify = 0, p_written = 0, p_sent = 0;
8924 int print_colored = 0, print_found = 0, print_trees = 0;
8925 int print_searching = 0, print_total = 0;
8926 int print_deltify = 0, print_written = 0, print_sent = 0;
8928 if (a->verbosity < 0)
8932 const char *status = success ? "accepted" : "rejected";
8935 struct got_pathlist_entry *pe;
8936 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8937 const char *branchname = pe->path;
8938 if (got_path_cmp(branchname, refname,
8939 strlen(branchname), strlen(refname)) == 0) {
8941 a->sent_something = 1;
8947 if (a->printed_something)
8949 printf("Server has %s %s", status, refname);
8951 printf(": %s", errmsg);
8952 a->printed_something = 1;
8956 if (a->last_ncolored != ncolored) {
8958 a->last_ncolored = ncolored;
8961 if (a->last_nfound != nfound) {
8964 a->last_nfound = nfound;
8967 if (a->last_ntrees != ntrees) {
8971 a->last_ntrees = ntrees;
8974 if ((print_colored || print_found || print_trees) &&
8977 print_load_info(print_colored, print_found, print_trees,
8978 ncolored, nfound, ntrees);
8979 a->printed_something = 1;
8982 } else if (!a->loading_done) {
8984 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8986 a->loading_done = 1;
8989 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8990 return got_error_from_errno("fmt_scaled");
8991 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8992 return got_error_from_errno("fmt_scaled");
8994 if (a->last_ncommits != ncommits) {
8995 print_searching = 1;
8996 a->last_ncommits = ncommits;
8999 if (a->last_nobj_total != nobj_total) {
9000 print_searching = 1;
9002 a->last_nobj_total = nobj_total;
9005 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9006 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9007 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9008 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9009 return got_error(GOT_ERR_NO_SPACE);
9012 if (nobj_deltify > 0 || nobj_written > 0) {
9013 if (nobj_deltify > 0) {
9014 p_deltify = (nobj_deltify * 100) / nobj_total;
9015 if (p_deltify != a->last_p_deltify) {
9016 a->last_p_deltify = p_deltify;
9017 print_searching = 1;
9022 if (nobj_written > 0) {
9023 p_written = (nobj_written * 100) / nobj_total;
9024 if (p_written != a->last_p_written) {
9025 a->last_p_written = p_written;
9026 print_searching = 1;
9034 if (bytes_sent > 0) {
9035 p_sent = (bytes_sent * 100) / packfile_size;
9036 if (p_sent != a->last_p_sent) {
9037 a->last_p_sent = p_sent;
9038 print_searching = 1;
9044 a->sent_something = 1;
9047 if (print_searching || print_total || print_deltify || print_written ||
9050 if (print_searching)
9051 printf("packing %d reference%s", ncommits,
9052 ncommits == 1 ? "" : "s");
9054 printf("; %d object%s", nobj_total,
9055 nobj_total == 1 ? "" : "s");
9057 printf("; deltify: %d%%", p_deltify);
9059 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9060 scaled_packsize, p_sent);
9061 else if (print_written)
9062 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9063 scaled_packsize, p_written);
9064 if (print_searching || print_total || print_deltify ||
9065 print_written || print_sent) {
9066 a->printed_something = 1;
9072 static const struct got_error *
9073 cmd_send(int argc, char *argv[])
9075 const struct got_error *error = NULL;
9076 char *cwd = NULL, *repo_path = NULL;
9077 const char *remote_name;
9078 char *proto = NULL, *host = NULL, *port = NULL;
9079 char *repo_name = NULL, *server_path = NULL;
9080 const struct got_remote_repo *remotes, *remote = NULL;
9081 int nremotes, nbranches = 0, ndelete_branches = 0;
9082 struct got_repository *repo = NULL;
9083 struct got_worktree *worktree = NULL;
9084 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9085 struct got_pathlist_head branches;
9086 struct got_pathlist_head tags;
9087 struct got_reflist_head all_branches;
9088 struct got_reflist_head all_tags;
9089 struct got_pathlist_head delete_args;
9090 struct got_pathlist_head delete_branches;
9091 struct got_reflist_entry *re;
9092 struct got_pathlist_entry *pe;
9093 int i, ch, sendfd = -1, sendstatus;
9095 struct got_send_progress_arg spa;
9096 int verbosity = 0, overwrite_refs = 0;
9097 int send_all_branches = 0, send_all_tags = 0;
9098 struct got_reference *ref = NULL;
9099 int *pack_fds = NULL;
9101 TAILQ_INIT(&branches);
9103 TAILQ_INIT(&all_branches);
9104 TAILQ_INIT(&all_tags);
9105 TAILQ_INIT(&delete_args);
9106 TAILQ_INIT(&delete_branches);
9108 while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9111 send_all_branches = 1;
9114 error = got_pathlist_append(&branches, optarg, NULL);
9120 error = got_pathlist_append(&delete_args, optarg, NULL);
9131 repo_path = realpath(optarg, NULL);
9132 if (repo_path == NULL)
9133 return got_error_from_errno2("realpath",
9135 got_path_strip_trailing_slashes(repo_path);
9141 error = got_pathlist_append(&tags, optarg, NULL);
9148 else if (verbosity < 3)
9159 if (send_all_branches && !TAILQ_EMPTY(&branches))
9160 option_conflict('a', 'b');
9161 if (send_all_tags && !TAILQ_EMPTY(&tags))
9162 option_conflict('T', 't');
9166 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9168 remote_name = argv[0];
9172 cwd = getcwd(NULL, 0);
9174 error = got_error_from_errno("getcwd");
9178 error = got_repo_pack_fds_open(&pack_fds);
9182 if (repo_path == NULL) {
9183 error = got_worktree_open(&worktree, cwd);
9184 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9190 strdup(got_worktree_get_repo_path(worktree));
9191 if (repo_path == NULL)
9192 error = got_error_from_errno("strdup");
9196 repo_path = strdup(cwd);
9197 if (repo_path == NULL) {
9198 error = got_error_from_errno("strdup");
9204 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9209 worktree_conf = got_worktree_get_gotconfig(worktree);
9210 if (worktree_conf) {
9211 got_gotconfig_get_remotes(&nremotes, &remotes,
9213 for (i = 0; i < nremotes; i++) {
9214 if (strcmp(remotes[i].name, remote_name) == 0) {
9215 remote = &remotes[i];
9221 if (remote == NULL) {
9222 repo_conf = got_repo_get_gotconfig(repo);
9224 got_gotconfig_get_remotes(&nremotes, &remotes,
9226 for (i = 0; i < nremotes; i++) {
9227 if (strcmp(remotes[i].name, remote_name) == 0) {
9228 remote = &remotes[i];
9234 if (remote == NULL) {
9235 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9236 for (i = 0; i < nremotes; i++) {
9237 if (strcmp(remotes[i].name, remote_name) == 0) {
9238 remote = &remotes[i];
9243 if (remote == NULL) {
9244 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9248 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9249 &repo_name, remote->send_url);
9253 if (strcmp(proto, "git") == 0) {
9255 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9256 "sendfd dns inet unveil", NULL) == -1)
9259 } else if (strcmp(proto, "git+ssh") == 0 ||
9260 strcmp(proto, "ssh") == 0) {
9262 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9263 "sendfd unveil", NULL) == -1)
9266 } else if (strcmp(proto, "http") == 0 ||
9267 strcmp(proto, "git+http") == 0) {
9268 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9271 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9275 error = got_dial_apply_unveil(proto);
9279 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9283 if (send_all_branches) {
9284 error = got_ref_list(&all_branches, repo, "refs/heads",
9285 got_ref_cmp_by_name, NULL);
9288 TAILQ_FOREACH(re, &all_branches, entry) {
9289 const char *branchname = got_ref_get_name(re->ref);
9290 error = got_pathlist_append(&branches,
9296 } else if (nbranches == 0) {
9297 for (i = 0; i < remote->nsend_branches; i++) {
9298 error = got_pathlist_append(&branches,
9299 remote->send_branches[i], NULL);
9305 if (send_all_tags) {
9306 error = got_ref_list(&all_tags, repo, "refs/tags",
9307 got_ref_cmp_by_name, NULL);
9310 TAILQ_FOREACH(re, &all_tags, entry) {
9311 const char *tagname = got_ref_get_name(re->ref);
9312 error = got_pathlist_append(&tags,
9320 * To prevent accidents only branches in refs/heads/ can be deleted
9321 * with 'got send -d'.
9322 * Deleting anything else requires local repository access or Git.
9324 TAILQ_FOREACH(pe, &delete_args, entry) {
9325 const char *branchname = pe->path;
9327 struct got_pathlist_entry *new;
9328 if (strncmp(branchname, "refs/heads/", 11) == 0) {
9329 s = strdup(branchname);
9331 error = got_error_from_errno("strdup");
9335 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
9336 error = got_error_from_errno("asprintf");
9340 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
9341 if (error || new == NULL /* duplicate */)
9348 if (nbranches == 0 && ndelete_branches == 0) {
9349 struct got_reference *head_ref;
9351 error = got_ref_open(&head_ref, repo,
9352 got_worktree_get_head_ref_name(worktree), 0);
9354 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
9357 if (got_ref_is_symbolic(head_ref)) {
9358 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
9359 got_ref_close(head_ref);
9364 error = got_pathlist_append(&branches, got_ref_get_name(ref),
9371 if (verbosity >= 0) {
9372 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
9373 remote->name, proto, host,
9374 port ? ":" : "", port ? port : "",
9375 *server_path == '/' ? "" : "/", server_path);
9378 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
9379 server_path, verbosity);
9383 memset(&spa, 0, sizeof(spa));
9384 spa.last_scaled_packsize[0] = '\0';
9385 spa.last_p_deltify = -1;
9386 spa.last_p_written = -1;
9387 spa.verbosity = verbosity;
9388 spa.delete_branches = &delete_branches;
9389 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
9390 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
9391 check_cancelled, NULL);
9392 if (spa.printed_something)
9396 if (!spa.sent_something && verbosity >= 0)
9397 printf("Already up-to-date\n");
9400 if (kill(sendpid, SIGTERM) == -1)
9401 error = got_error_from_errno("kill");
9402 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
9403 error = got_error_from_errno("waitpid");
9405 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
9406 error = got_error_from_errno("close");
9408 const struct got_error *close_err = got_repo_close(repo);
9413 got_worktree_close(worktree);
9415 const struct got_error *pack_err =
9416 got_repo_pack_fds_close(pack_fds);
9422 got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
9423 got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
9424 got_ref_list_free(&all_branches);
9425 got_ref_list_free(&all_tags);
9426 got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
9427 got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
9439 usage_cherrypick(void)
9441 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
9445 static const struct got_error *
9446 cmd_cherrypick(int argc, char *argv[])
9448 const struct got_error *error = NULL;
9449 struct got_worktree *worktree = NULL;
9450 struct got_repository *repo = NULL;
9451 char *cwd = NULL, *commit_id_str = NULL;
9452 struct got_object_id *commit_id = NULL;
9453 struct got_commit_object *commit = NULL;
9454 struct got_object_qid *pid;
9456 struct got_update_progress_arg upa;
9457 int *pack_fds = NULL;
9459 while ((ch = getopt(argc, argv, "")) != -1) {
9471 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9472 "unveil", NULL) == -1)
9478 cwd = getcwd(NULL, 0);
9480 error = got_error_from_errno("getcwd");
9484 error = got_repo_pack_fds_open(&pack_fds);
9488 error = got_worktree_open(&worktree, cwd);
9490 if (error->code == GOT_ERR_NOT_WORKTREE)
9491 error = wrap_not_worktree_error(error, "cherrypick",
9496 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9501 error = apply_unveil(got_repo_get_path(repo), 0,
9502 got_worktree_get_root_path(worktree));
9506 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9507 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9510 error = got_object_id_str(&commit_id_str, commit_id);
9514 error = got_object_open_as_commit(&commit, repo, commit_id);
9517 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9518 memset(&upa, 0, sizeof(upa));
9519 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
9520 commit_id, repo, update_progress, &upa, check_cancelled,
9525 if (upa.did_something)
9526 printf("Merged commit %s\n", commit_id_str);
9527 print_merge_progress_stats(&upa);
9530 got_object_commit_close(commit);
9531 free(commit_id_str);
9533 got_worktree_close(worktree);
9535 const struct got_error *close_err = got_repo_close(repo);
9540 const struct got_error *pack_err =
9541 got_repo_pack_fds_close(pack_fds);
9552 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
9556 static const struct got_error *
9557 cmd_backout(int argc, char *argv[])
9559 const struct got_error *error = NULL;
9560 struct got_worktree *worktree = NULL;
9561 struct got_repository *repo = NULL;
9562 char *cwd = NULL, *commit_id_str = NULL;
9563 struct got_object_id *commit_id = NULL;
9564 struct got_commit_object *commit = NULL;
9565 struct got_object_qid *pid;
9567 struct got_update_progress_arg upa;
9568 int *pack_fds = NULL;
9570 while ((ch = getopt(argc, argv, "")) != -1) {
9582 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9583 "unveil", NULL) == -1)
9589 cwd = getcwd(NULL, 0);
9591 error = got_error_from_errno("getcwd");
9595 error = got_repo_pack_fds_open(&pack_fds);
9599 error = got_worktree_open(&worktree, cwd);
9601 if (error->code == GOT_ERR_NOT_WORKTREE)
9602 error = wrap_not_worktree_error(error, "backout", cwd);
9606 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9611 error = apply_unveil(got_repo_get_path(repo), 0,
9612 got_worktree_get_root_path(worktree));
9616 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9617 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9620 error = got_object_id_str(&commit_id_str, commit_id);
9624 error = got_object_open_as_commit(&commit, repo, commit_id);
9627 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9629 error = got_error(GOT_ERR_ROOT_COMMIT);
9633 memset(&upa, 0, sizeof(upa));
9634 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
9635 repo, update_progress, &upa, check_cancelled, NULL);
9639 if (upa.did_something)
9640 printf("Backed out commit %s\n", commit_id_str);
9641 print_merge_progress_stats(&upa);
9644 got_object_commit_close(commit);
9645 free(commit_id_str);
9647 got_worktree_close(worktree);
9649 const struct got_error *close_err = got_repo_close(repo);
9654 const struct got_error *pack_err =
9655 got_repo_pack_fds_close(pack_fds);
9665 fprintf(stderr, "usage: %s rebase [-aclX] [branch]\n", getprogname());
9670 trim_logmsg(char *logmsg, int limit)
9675 len = strlen(logmsg);
9679 nl = strchr(logmsg, '\n');
9684 static const struct got_error *
9685 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
9687 const struct got_error *err;
9688 char *logmsg0 = NULL;
9691 err = got_object_commit_get_logmsg(&logmsg0, commit);
9696 while (isspace((unsigned char)s[0]))
9699 *logmsg = strdup(s);
9700 if (*logmsg == NULL) {
9701 err = got_error_from_errno("strdup");
9705 trim_logmsg(*logmsg, limit);
9711 static const struct got_error *
9712 show_rebase_merge_conflict(struct got_object_id *id,
9713 struct got_repository *repo)
9715 const struct got_error *err;
9716 struct got_commit_object *commit = NULL;
9717 char *id_str = NULL, *logmsg = NULL;
9719 err = got_object_open_as_commit(&commit, repo, id);
9723 err = got_object_id_str(&id_str, id);
9729 err = get_short_logmsg(&logmsg, 42, commit);
9733 printf("%s -> merge conflict: %s\n", id_str, logmsg);
9736 got_object_commit_close(commit);
9741 static const struct got_error *
9742 show_rebase_progress(struct got_commit_object *commit,
9743 struct got_object_id *old_id, struct got_object_id *new_id)
9745 const struct got_error *err;
9746 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9748 err = got_object_id_str(&old_id_str, old_id);
9753 err = got_object_id_str(&new_id_str, new_id);
9758 old_id_str[12] = '\0';
9760 new_id_str[12] = '\0';
9762 err = get_short_logmsg(&logmsg, 42, commit);
9766 printf("%s -> %s: %s\n", old_id_str,
9767 new_id_str ? new_id_str : "no-op change", logmsg);
9775 static const struct got_error *
9776 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
9777 struct got_reference *branch, struct got_reference *new_base_branch,
9778 struct got_reference *tmp_branch, struct got_repository *repo,
9781 printf("Switching work tree to %s\n", got_ref_get_name(branch));
9782 return got_worktree_rebase_complete(worktree, fileindex,
9783 new_base_branch, tmp_branch, branch, repo, create_backup);
9786 static const struct got_error *
9787 rebase_commit(struct got_pathlist_head *merged_paths,
9788 struct got_worktree *worktree, struct got_fileindex *fileindex,
9789 struct got_reference *tmp_branch, const char *committer,
9790 struct got_object_id *commit_id, struct got_repository *repo)
9792 const struct got_error *error;
9793 struct got_commit_object *commit;
9794 struct got_object_id *new_commit_id;
9796 error = got_object_open_as_commit(&commit, repo, commit_id);
9800 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
9801 worktree, fileindex, tmp_branch, committer, commit, commit_id,
9804 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
9806 error = show_rebase_progress(commit, commit_id, NULL);
9808 error = show_rebase_progress(commit, commit_id, new_commit_id);
9809 free(new_commit_id);
9812 got_object_commit_close(commit);
9816 struct check_path_prefix_arg {
9817 const char *path_prefix;
9822 static const struct got_error *
9823 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
9824 struct got_blob_object *blob2, FILE *f1, FILE *f2,
9825 struct got_object_id *id1, struct got_object_id *id2,
9826 const char *path1, const char *path2,
9827 mode_t mode1, mode_t mode2, struct got_repository *repo)
9829 struct check_path_prefix_arg *a = arg;
9831 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
9832 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
9833 return got_error(a->errcode);
9838 static const struct got_error *
9839 check_path_prefix(struct got_object_id *parent_id,
9840 struct got_object_id *commit_id, const char *path_prefix,
9841 int errcode, struct got_repository *repo)
9843 const struct got_error *err;
9844 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
9845 struct got_commit_object *commit = NULL, *parent_commit = NULL;
9846 struct check_path_prefix_arg cpp_arg;
9848 if (got_path_is_root_dir(path_prefix))
9851 err = got_object_open_as_commit(&commit, repo, commit_id);
9855 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
9859 err = got_object_open_as_tree(&tree1, repo,
9860 got_object_commit_get_tree_id(parent_commit));
9864 err = got_object_open_as_tree(&tree2, repo,
9865 got_object_commit_get_tree_id(commit));
9869 cpp_arg.path_prefix = path_prefix;
9870 while (cpp_arg.path_prefix[0] == '/')
9871 cpp_arg.path_prefix++;
9872 cpp_arg.len = strlen(cpp_arg.path_prefix);
9873 cpp_arg.errcode = errcode;
9874 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
9875 check_path_prefix_in_diff, &cpp_arg, 0);
9878 got_object_tree_close(tree1);
9880 got_object_tree_close(tree2);
9882 got_object_commit_close(commit);
9884 got_object_commit_close(parent_commit);
9888 static const struct got_error *
9889 collect_commits(struct got_object_id_queue *commits,
9890 struct got_object_id *initial_commit_id,
9891 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
9892 const char *path_prefix, int path_prefix_errcode,
9893 struct got_repository *repo)
9895 const struct got_error *err = NULL;
9896 struct got_commit_graph *graph = NULL;
9897 struct got_object_id parent_id, commit_id;
9898 struct got_object_qid *qid;
9900 err = got_commit_graph_open(&graph, "/", 1);
9904 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
9905 check_cancelled, NULL);
9909 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
9910 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
9911 err = got_commit_graph_iter_next(&parent_id, graph, repo,
9912 check_cancelled, NULL);
9914 if (err->code == GOT_ERR_ITER_COMPLETED) {
9915 err = got_error_msg(GOT_ERR_ANCESTRY,
9916 "ran out of commits to rebase before "
9917 "youngest common ancestor commit has "
9922 err = check_path_prefix(&parent_id, &commit_id,
9923 path_prefix, path_prefix_errcode, repo);
9927 err = got_object_qid_alloc(&qid, &commit_id);
9930 STAILQ_INSERT_HEAD(commits, qid, entry);
9932 memcpy(&commit_id, &parent_id, sizeof(commit_id));
9936 got_commit_graph_close(graph);
9940 static const struct got_error *
9941 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9943 const struct got_error *err = NULL;
9944 time_t committer_time;
9946 char datebuf[11]; /* YYYY-MM-DD + NUL */
9947 char *author0 = NULL, *author, *smallerthan;
9948 char *logmsg0 = NULL, *logmsg, *newline;
9950 committer_time = got_object_commit_get_committer_time(commit);
9951 if (gmtime_r(&committer_time, &tm) == NULL)
9952 return got_error_from_errno("gmtime_r");
9953 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9954 return got_error(GOT_ERR_NO_SPACE);
9956 author0 = strdup(got_object_commit_get_author(commit));
9957 if (author0 == NULL)
9958 return got_error_from_errno("strdup");
9960 smallerthan = strchr(author, '<');
9961 if (smallerthan && smallerthan[1] != '\0')
9962 author = smallerthan + 1;
9963 author[strcspn(author, "@>")] = '\0';
9965 err = got_object_commit_get_logmsg(&logmsg0, commit);
9969 while (*logmsg == '\n')
9971 newline = strchr(logmsg, '\n');
9975 if (asprintf(brief_str, "%s %s %s",
9976 datebuf, author, logmsg) == -1)
9977 err = got_error_from_errno("asprintf");
9984 static const struct got_error *
9985 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9986 struct got_repository *repo)
9988 const struct got_error *err;
9991 err = got_object_id_str(&id_str, id);
9995 err = got_ref_delete(ref, repo);
9999 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
10005 static const struct got_error *
10006 print_backup_ref(const char *branch_name, const char *new_id_str,
10007 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
10008 struct got_reflist_object_id_map *refs_idmap,
10009 struct got_repository *repo)
10011 const struct got_error *err = NULL;
10012 struct got_reflist_head *refs;
10013 char *refs_str = NULL;
10014 struct got_object_id *new_commit_id = NULL;
10015 struct got_commit_object *new_commit = NULL;
10016 char *new_commit_brief_str = NULL;
10017 struct got_object_id *yca_id = NULL;
10018 struct got_commit_object *yca_commit = NULL;
10019 char *yca_id_str = NULL, *yca_brief_str = NULL;
10020 char *custom_refs_str;
10022 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
10023 return got_error_from_errno("asprintf");
10025 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
10026 0, 0, refs_idmap, custom_refs_str);
10030 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
10034 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
10036 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
10041 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
10045 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
10049 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10050 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
10054 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
10055 refs_str ? " (" : "", refs_str ? refs_str : "",
10056 refs_str ? ")" : "", new_commit_brief_str);
10057 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
10058 got_object_id_cmp(yca_id, old_commit_id) != 0) {
10062 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
10066 err = get_commit_brief_str(&yca_brief_str, yca_commit);
10070 err = got_object_id_str(&yca_id_str, yca_id);
10074 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
10076 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
10080 printf("history forked at %s%s%s%s\n %s\n",
10082 refs_str ? " (" : "", refs_str ? refs_str : "",
10083 refs_str ? ")" : "", yca_brief_str);
10086 free(custom_refs_str);
10087 free(new_commit_id);
10091 free(yca_brief_str);
10093 got_object_commit_close(new_commit);
10095 got_object_commit_close(yca_commit);
10100 static const struct got_error *
10101 process_backup_refs(const char *backup_ref_prefix,
10102 const char *wanted_branch_name,
10103 int delete, struct got_repository *repo)
10105 const struct got_error *err;
10106 struct got_reflist_head refs, backup_refs;
10107 struct got_reflist_entry *re;
10108 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
10109 struct got_object_id *old_commit_id = NULL;
10110 char *branch_name = NULL;
10111 struct got_commit_object *old_commit = NULL;
10112 struct got_reflist_object_id_map *refs_idmap = NULL;
10113 int wanted_branch_found = 0;
10116 TAILQ_INIT(&backup_refs);
10118 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
10122 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10126 if (wanted_branch_name) {
10127 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
10128 wanted_branch_name += 11;
10131 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
10132 got_ref_cmp_by_commit_timestamp_descending, repo);
10136 TAILQ_FOREACH(re, &backup_refs, entry) {
10137 const char *refname = got_ref_get_name(re->ref);
10140 err = check_cancelled(NULL);
10144 err = got_ref_resolve(&old_commit_id, repo, re->ref);
10148 err = got_object_open_as_commit(&old_commit, repo,
10153 if (strncmp(backup_ref_prefix, refname,
10154 backup_ref_prefix_len) == 0)
10155 refname += backup_ref_prefix_len;
10157 while (refname[0] == '/')
10160 branch_name = strdup(refname);
10161 if (branch_name == NULL) {
10162 err = got_error_from_errno("strdup");
10165 slash = strrchr(branch_name, '/');
10168 refname += strlen(branch_name) + 1;
10171 if (wanted_branch_name == NULL ||
10172 strcmp(wanted_branch_name, branch_name) == 0) {
10173 wanted_branch_found = 1;
10175 err = delete_backup_ref(re->ref,
10176 old_commit_id, repo);
10178 err = print_backup_ref(branch_name, refname,
10179 old_commit_id, old_commit, refs_idmap,
10186 free(old_commit_id);
10187 old_commit_id = NULL;
10189 branch_name = NULL;
10190 got_object_commit_close(old_commit);
10194 if (wanted_branch_name && !wanted_branch_found) {
10195 err = got_error_fmt(GOT_ERR_NOT_REF,
10196 "%s/%s/", backup_ref_prefix, wanted_branch_name);
10200 got_reflist_object_id_map_free(refs_idmap);
10201 got_ref_list_free(&refs);
10202 got_ref_list_free(&backup_refs);
10203 free(old_commit_id);
10206 got_object_commit_close(old_commit);
10210 static const struct got_error *
10211 abort_progress(void *arg, unsigned char status, const char *path)
10214 * Unversioned files should not clutter progress output when
10215 * an operation is aborted.
10217 if (status == GOT_STATUS_UNVERSIONED)
10220 return update_progress(arg, status, path);
10223 static const struct got_error *
10224 cmd_rebase(int argc, char *argv[])
10226 const struct got_error *error = NULL;
10227 struct got_worktree *worktree = NULL;
10228 struct got_repository *repo = NULL;
10229 struct got_fileindex *fileindex = NULL;
10230 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
10231 struct got_reference *branch = NULL;
10232 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
10233 struct got_object_id *commit_id = NULL, *parent_id = NULL;
10234 struct got_object_id *resume_commit_id = NULL;
10235 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
10236 struct got_object_id *head_commit_id = NULL;
10237 struct got_reference *head_ref = NULL;
10238 struct got_commit_object *commit = NULL;
10239 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
10240 int histedit_in_progress = 0, merge_in_progress = 0;
10241 int create_backup = 1, list_backups = 0, delete_backups = 0;
10242 struct got_object_id_queue commits;
10243 struct got_pathlist_head merged_paths;
10244 const struct got_object_id_queue *parent_ids;
10245 struct got_object_qid *qid, *pid;
10246 struct got_update_progress_arg upa;
10247 int *pack_fds = NULL;
10249 STAILQ_INIT(&commits);
10250 TAILQ_INIT(&merged_paths);
10251 memset(&upa, 0, sizeof(upa));
10253 while ((ch = getopt(argc, argv, "aclX")) != -1) {
10259 continue_rebase = 1;
10265 delete_backups = 1;
10277 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10278 "unveil", NULL) == -1)
10281 if (list_backups) {
10283 option_conflict('l', 'a');
10284 if (continue_rebase)
10285 option_conflict('l', 'c');
10286 if (delete_backups)
10287 option_conflict('l', 'X');
10288 if (argc != 0 && argc != 1)
10290 } else if (delete_backups) {
10292 option_conflict('X', 'a');
10293 if (continue_rebase)
10294 option_conflict('X', 'c');
10296 option_conflict('l', 'X');
10297 if (argc != 0 && argc != 1)
10300 if (abort_rebase && continue_rebase)
10302 else if (abort_rebase || continue_rebase) {
10305 } else if (argc != 1)
10309 cwd = getcwd(NULL, 0);
10311 error = got_error_from_errno("getcwd");
10315 error = got_repo_pack_fds_open(&pack_fds);
10319 error = got_worktree_open(&worktree, cwd);
10321 if (list_backups || delete_backups) {
10322 if (error->code != GOT_ERR_NOT_WORKTREE)
10325 if (error->code == GOT_ERR_NOT_WORKTREE)
10326 error = wrap_not_worktree_error(error,
10332 error = get_gitconfig_path(&gitconfig_path);
10335 error = got_repo_open(&repo,
10336 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10337 gitconfig_path, pack_fds);
10341 error = get_author(&committer, repo, worktree);
10342 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
10345 error = apply_unveil(got_repo_get_path(repo), 0,
10346 worktree ? got_worktree_get_root_path(worktree) : NULL);
10350 if (list_backups || delete_backups) {
10351 error = process_backup_refs(
10352 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
10353 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10354 goto done; /* nothing else to do */
10357 error = got_worktree_histedit_in_progress(&histedit_in_progress,
10361 if (histedit_in_progress) {
10362 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10366 error = got_worktree_merge_in_progress(&merge_in_progress,
10370 if (merge_in_progress) {
10371 error = got_error(GOT_ERR_MERGE_BUSY);
10375 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10379 if (abort_rebase) {
10380 if (!rebase_in_progress) {
10381 error = got_error(GOT_ERR_NOT_REBASING);
10384 error = got_worktree_rebase_continue(&resume_commit_id,
10385 &new_base_branch, &tmp_branch, &branch, &fileindex,
10389 printf("Switching work tree to %s\n",
10390 got_ref_get_symref_target(new_base_branch));
10391 error = got_worktree_rebase_abort(worktree, fileindex, repo,
10392 new_base_branch, abort_progress, &upa);
10395 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
10396 print_merge_progress_stats(&upa);
10397 goto done; /* nothing else to do */
10400 if (continue_rebase) {
10401 if (!rebase_in_progress) {
10402 error = got_error(GOT_ERR_NOT_REBASING);
10405 error = got_worktree_rebase_continue(&resume_commit_id,
10406 &new_base_branch, &tmp_branch, &branch, &fileindex,
10411 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
10412 committer, resume_commit_id, repo);
10416 yca_id = got_object_id_dup(resume_commit_id);
10417 if (yca_id == NULL) {
10418 error = got_error_from_errno("got_object_id_dup");
10422 error = got_ref_open(&branch, repo, argv[0], 0);
10425 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10426 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10427 "will not rebase a branch which lives outside "
10428 "the \"refs/heads/\" reference namespace");
10433 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
10437 if (!continue_rebase) {
10438 struct got_object_id *base_commit_id;
10440 error = got_ref_open(&head_ref, repo,
10441 got_worktree_get_head_ref_name(worktree), 0);
10444 error = got_ref_resolve(&head_commit_id, repo, head_ref);
10447 base_commit_id = got_worktree_get_base_commit_id(worktree);
10448 if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
10449 error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
10453 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10454 base_commit_id, branch_head_commit_id, 1, repo,
10455 check_cancelled, NULL);
10458 if (yca_id == NULL) {
10459 error = got_error_msg(GOT_ERR_ANCESTRY,
10460 "specified branch shares no common ancestry "
10461 "with work tree's branch");
10465 error = check_same_branch(base_commit_id, branch, yca_id, repo);
10467 if (error->code != GOT_ERR_ANCESTRY)
10471 struct got_pathlist_head paths;
10472 printf("%s is already based on %s\n",
10473 got_ref_get_name(branch),
10474 got_worktree_get_head_ref_name(worktree));
10475 error = switch_head_ref(branch, branch_head_commit_id,
10479 error = got_worktree_set_base_commit_id(worktree, repo,
10480 branch_head_commit_id);
10483 TAILQ_INIT(&paths);
10484 error = got_pathlist_append(&paths, "", NULL);
10487 error = got_worktree_checkout_files(worktree,
10488 &paths, repo, update_progress, &upa,
10489 check_cancelled, NULL);
10490 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
10493 if (upa.did_something) {
10495 error = got_object_id_str(&id_str,
10496 branch_head_commit_id);
10499 printf("Updated to %s: %s\n",
10500 got_worktree_get_head_ref_name(worktree),
10504 printf("Already up-to-date\n");
10505 print_update_progress_stats(&upa);
10510 commit_id = branch_head_commit_id;
10511 error = got_object_open_as_commit(&commit, repo, commit_id);
10515 parent_ids = got_object_commit_get_parent_ids(commit);
10516 pid = STAILQ_FIRST(parent_ids);
10518 error = got_error(GOT_ERR_EMPTY_REBASE);
10521 error = collect_commits(&commits, commit_id, &pid->id,
10522 yca_id, got_worktree_get_path_prefix(worktree),
10523 GOT_ERR_REBASE_PATH, repo);
10524 got_object_commit_close(commit);
10529 if (!continue_rebase) {
10530 error = got_worktree_rebase_prepare(&new_base_branch,
10531 &tmp_branch, &fileindex, worktree, branch, repo);
10536 if (STAILQ_EMPTY(&commits)) {
10537 if (continue_rebase) {
10538 error = rebase_complete(worktree, fileindex,
10539 branch, new_base_branch, tmp_branch, repo,
10543 /* Fast-forward the reference of the branch. */
10544 struct got_object_id *new_head_commit_id;
10546 error = got_ref_resolve(&new_head_commit_id, repo,
10550 error = got_object_id_str(&id_str, new_head_commit_id);
10553 printf("Forwarding %s to commit %s\n",
10554 got_ref_get_name(branch), id_str);
10556 error = got_ref_change_ref(branch,
10557 new_head_commit_id);
10560 /* No backup needed since objects did not change. */
10566 STAILQ_FOREACH(qid, &commits, entry) {
10568 commit_id = &qid->id;
10569 parent_id = pid ? &pid->id : yca_id;
10572 memset(&upa, 0, sizeof(upa));
10573 error = got_worktree_rebase_merge_files(&merged_paths,
10574 worktree, fileindex, parent_id, commit_id, repo,
10575 update_progress, &upa, check_cancelled, NULL);
10579 print_merge_progress_stats(&upa);
10580 if (upa.conflicts > 0 || upa.missing > 0 ||
10581 upa.not_deleted > 0 || upa.unversioned > 0) {
10582 if (upa.conflicts > 0) {
10583 error = show_rebase_merge_conflict(&qid->id,
10588 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
10592 error = rebase_commit(&merged_paths, worktree, fileindex,
10593 tmp_branch, committer, commit_id, repo);
10594 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
10599 if (upa.conflicts > 0 || upa.missing > 0 ||
10600 upa.not_deleted > 0 || upa.unversioned > 0) {
10601 error = got_worktree_rebase_postpone(worktree, fileindex);
10604 if (upa.conflicts > 0 && upa.missing == 0 &&
10605 upa.not_deleted == 0 && upa.unversioned == 0) {
10606 error = got_error_msg(GOT_ERR_CONFLICTS,
10607 "conflicts must be resolved before rebasing "
10609 } else if (upa.conflicts > 0) {
10610 error = got_error_msg(GOT_ERR_CONFLICTS,
10611 "conflicts must be resolved before rebasing "
10612 "can continue; changes destined for some "
10613 "files were not yet merged and should be "
10614 "merged manually if required before the "
10615 "rebase operation is continued");
10617 error = got_error_msg(GOT_ERR_CONFLICTS,
10618 "changes destined for some files were not "
10619 "yet merged and should be merged manually "
10620 "if required before the rebase operation "
10624 error = rebase_complete(worktree, fileindex, branch,
10625 new_base_branch, tmp_branch, repo, create_backup);
10629 free(gitconfig_path);
10630 got_object_id_queue_free(&commits);
10631 free(branch_head_commit_id);
10632 free(resume_commit_id);
10633 free(head_commit_id);
10636 got_object_commit_close(commit);
10638 got_ref_close(branch);
10639 if (new_base_branch)
10640 got_ref_close(new_base_branch);
10642 got_ref_close(tmp_branch);
10644 got_ref_close(head_ref);
10646 got_worktree_close(worktree);
10648 const struct got_error *close_err = got_repo_close(repo);
10653 const struct got_error *pack_err =
10654 got_repo_pack_fds_close(pack_fds);
10662 usage_histedit(void)
10664 fprintf(stderr, "usage: %s histedit [-aceflmX] [-F histedit-script] "
10665 "[branch]\n", getprogname());
10669 #define GOT_HISTEDIT_PICK 'p'
10670 #define GOT_HISTEDIT_EDIT 'e'
10671 #define GOT_HISTEDIT_FOLD 'f'
10672 #define GOT_HISTEDIT_DROP 'd'
10673 #define GOT_HISTEDIT_MESG 'm'
10675 static const struct got_histedit_cmd {
10676 unsigned char code;
10679 } got_histedit_cmds[] = {
10680 { GOT_HISTEDIT_PICK, "pick", "use commit" },
10681 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
10682 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
10684 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
10685 { GOT_HISTEDIT_MESG, "mesg",
10686 "single-line log message for commit above (open editor if empty)" },
10689 struct got_histedit_list_entry {
10690 TAILQ_ENTRY(got_histedit_list_entry) entry;
10691 struct got_object_id *commit_id;
10692 const struct got_histedit_cmd *cmd;
10695 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
10697 static const struct got_error *
10698 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
10699 FILE *f, struct got_repository *repo)
10701 const struct got_error *err = NULL;
10702 char *logmsg = NULL, *id_str = NULL;
10703 struct got_commit_object *commit = NULL;
10706 err = got_object_open_as_commit(&commit, repo, commit_id);
10710 err = get_short_logmsg(&logmsg, 34, commit);
10714 err = got_object_id_str(&id_str, commit_id);
10718 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
10720 err = got_ferror(f, GOT_ERR_IO);
10723 got_object_commit_close(commit);
10729 static const struct got_error *
10730 histedit_write_commit_list(struct got_object_id_queue *commits,
10731 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
10732 struct got_repository *repo)
10734 const struct got_error *err = NULL;
10735 struct got_object_qid *qid;
10736 const char *histedit_cmd = NULL;
10738 if (STAILQ_EMPTY(commits))
10739 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10741 STAILQ_FOREACH(qid, commits, entry) {
10742 histedit_cmd = got_histedit_cmds[0].name;
10744 histedit_cmd = "edit";
10745 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
10746 histedit_cmd = "fold";
10747 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
10750 if (edit_logmsg_only) {
10751 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
10753 err = got_ferror(f, GOT_ERR_IO);
10762 static const struct got_error *
10763 write_cmd_list(FILE *f, const char *branch_name,
10764 struct got_object_id_queue *commits)
10766 const struct got_error *err = NULL;
10770 struct got_object_qid *qid;
10772 qid = STAILQ_FIRST(commits);
10773 err = got_object_id_str(&id_str, &qid->id);
10778 "# Editing the history of branch '%s' starting at\n"
10780 "# Commits will be processed in order from top to "
10781 "bottom of this file.\n", branch_name, id_str);
10783 err = got_ferror(f, GOT_ERR_IO);
10787 n = fprintf(f, "# Available histedit commands:\n");
10789 err = got_ferror(f, GOT_ERR_IO);
10793 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10794 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
10795 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
10798 err = got_ferror(f, GOT_ERR_IO);
10807 static const struct got_error *
10808 histedit_syntax_error(int lineno)
10810 static char msg[42];
10813 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
10815 if (ret < 0 || (size_t)ret >= sizeof(msg))
10816 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
10818 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
10821 static const struct got_error *
10822 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
10823 char *logmsg, struct got_repository *repo)
10825 const struct got_error *err;
10826 struct got_commit_object *folded_commit = NULL;
10827 char *id_str, *folded_logmsg = NULL;
10829 err = got_object_id_str(&id_str, hle->commit_id);
10833 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
10837 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
10840 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
10841 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
10842 folded_logmsg) == -1) {
10843 err = got_error_from_errno("asprintf");
10847 got_object_commit_close(folded_commit);
10849 free(folded_logmsg);
10853 static struct got_histedit_list_entry *
10854 get_folded_commits(struct got_histedit_list_entry *hle)
10856 struct got_histedit_list_entry *prev, *folded = NULL;
10858 prev = TAILQ_PREV(hle, got_histedit_list, entry);
10859 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
10860 prev->cmd->code == GOT_HISTEDIT_DROP)) {
10861 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
10863 prev = TAILQ_PREV(prev, got_histedit_list, entry);
10869 static const struct got_error *
10870 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
10871 struct got_repository *repo)
10873 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
10874 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
10875 const struct got_error *err = NULL;
10876 struct got_commit_object *commit = NULL;
10879 struct got_histedit_list_entry *folded = NULL;
10881 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10885 folded = get_folded_commits(hle);
10887 while (folded != hle) {
10888 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
10889 folded = TAILQ_NEXT(folded, entry);
10892 err = append_folded_commit_msg(&new_msg, folded,
10898 folded = TAILQ_NEXT(folded, entry);
10902 err = got_object_id_str(&id_str, hle->commit_id);
10905 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
10908 logmsg_len = asprintf(&new_msg,
10909 "%s\n# original log message of commit %s: %s",
10910 logmsg ? logmsg : "", id_str, orig_logmsg);
10911 if (logmsg_len == -1) {
10912 err = got_error_from_errno("asprintf");
10918 err = got_object_id_str(&id_str, hle->commit_id);
10922 err = got_opentemp_named_fd(&logmsg_path, &fd,
10923 GOT_TMPDIR_STR "/got-logmsg", "");
10927 write(fd, logmsg, logmsg_len);
10930 err = get_editor(&editor);
10934 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
10937 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
10940 hle->logmsg = strdup(new_msg);
10941 if (hle->logmsg == NULL)
10942 err = got_error_from_errno("strdup");
10945 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
10946 err = got_error_from_errno2("unlink", logmsg_path);
10952 got_object_commit_close(commit);
10956 static const struct got_error *
10957 histedit_parse_list(struct got_histedit_list *histedit_cmds,
10958 FILE *f, struct got_repository *repo)
10960 const struct got_error *err = NULL;
10961 char *line = NULL, *p, *end;
10964 int lineno = 0, lastcmd = -1;
10965 const struct got_histedit_cmd *cmd;
10966 struct got_object_id *commit_id = NULL;
10967 struct got_histedit_list_entry *hle = NULL;
10970 len = getline(&line, &size, f);
10972 const struct got_error *getline_err;
10975 getline_err = got_error_from_errno("getline");
10976 err = got_ferror(f, getline_err->code);
10981 while (isspace((unsigned char)p[0]))
10983 if (p[0] == '#' || p[0] == '\0') {
10989 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10990 cmd = &got_histedit_cmds[i];
10991 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10992 isspace((unsigned char)p[strlen(cmd->name)])) {
10993 p += strlen(cmd->name);
10996 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
11001 if (i == nitems(got_histedit_cmds)) {
11002 err = histedit_syntax_error(lineno);
11005 while (isspace((unsigned char)p[0]))
11007 if (cmd->code == GOT_HISTEDIT_MESG) {
11008 if (lastcmd != GOT_HISTEDIT_PICK &&
11009 lastcmd != GOT_HISTEDIT_EDIT) {
11010 err = got_error(GOT_ERR_HISTEDIT_CMD);
11013 if (p[0] == '\0') {
11014 err = histedit_edit_logmsg(hle, repo);
11018 hle->logmsg = strdup(p);
11019 if (hle->logmsg == NULL) {
11020 err = got_error_from_errno("strdup");
11026 lastcmd = cmd->code;
11030 while (end[0] && !isspace((unsigned char)end[0]))
11034 err = got_object_resolve_id_str(&commit_id, repo, p);
11036 /* override error code */
11037 err = histedit_syntax_error(lineno);
11041 hle = malloc(sizeof(*hle));
11043 err = got_error_from_errno("malloc");
11047 hle->commit_id = commit_id;
11048 hle->logmsg = NULL;
11052 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
11053 lastcmd = cmd->code;
11061 static const struct got_error *
11062 histedit_check_script(struct got_histedit_list *histedit_cmds,
11063 struct got_object_id_queue *commits, struct got_repository *repo)
11065 const struct got_error *err = NULL;
11066 struct got_object_qid *qid;
11067 struct got_histedit_list_entry *hle;
11068 static char msg[92];
11071 if (TAILQ_EMPTY(histedit_cmds))
11072 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
11073 "histedit script contains no commands");
11074 if (STAILQ_EMPTY(commits))
11075 return got_error(GOT_ERR_EMPTY_HISTEDIT);
11077 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11078 struct got_histedit_list_entry *hle2;
11079 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
11082 if (got_object_id_cmp(hle->commit_id,
11083 hle2->commit_id) != 0)
11085 err = got_object_id_str(&id_str, hle->commit_id);
11088 snprintf(msg, sizeof(msg), "commit %s is listed "
11089 "more than once in histedit script", id_str);
11091 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
11095 STAILQ_FOREACH(qid, commits, entry) {
11096 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11097 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
11101 err = got_object_id_str(&id_str, &qid->id);
11104 snprintf(msg, sizeof(msg),
11105 "commit %s missing from histedit script", id_str);
11107 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
11111 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
11112 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
11113 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
11114 "last commit in histedit script cannot be folded");
11119 static const struct got_error *
11120 histedit_run_editor(struct got_histedit_list *histedit_cmds,
11121 const char *path, struct got_object_id_queue *commits,
11122 struct got_repository *repo)
11124 const struct got_error *err = NULL;
11128 err = get_editor(&editor);
11132 if (spawn_editor(editor, path) == -1) {
11133 err = got_error_from_errno("failed spawning editor");
11137 f = fopen(path, "re");
11139 err = got_error_from_errno("fopen");
11142 err = histedit_parse_list(histedit_cmds, f, repo);
11146 err = histedit_check_script(histedit_cmds, commits, repo);
11148 if (f && fclose(f) == EOF && err == NULL)
11149 err = got_error_from_errno("fclose");
11154 static const struct got_error *
11155 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
11156 struct got_object_id_queue *, const char *, const char *,
11157 struct got_repository *);
11159 static const struct got_error *
11160 histedit_edit_script(struct got_histedit_list *histedit_cmds,
11161 struct got_object_id_queue *commits, const char *branch_name,
11162 int edit_logmsg_only, int fold_only, int edit_only,
11163 struct got_repository *repo)
11165 const struct got_error *err;
11169 err = got_opentemp_named(&path, &f, "got-histedit", "");
11173 err = write_cmd_list(f, branch_name, commits);
11177 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
11178 fold_only, edit_only, repo);
11182 if (edit_logmsg_only || fold_only || edit_only) {
11184 err = histedit_parse_list(histedit_cmds, f, repo);
11186 if (fclose(f) == EOF) {
11187 err = got_error_from_errno("fclose");
11191 err = histedit_run_editor(histedit_cmds, path, commits, repo);
11193 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11194 err->code != GOT_ERR_HISTEDIT_CMD)
11196 err = histedit_edit_list_retry(histedit_cmds, err,
11197 commits, path, branch_name, repo);
11201 if (f && fclose(f) == EOF && err == NULL)
11202 err = got_error_from_errno("fclose");
11203 if (path && unlink(path) != 0 && err == NULL)
11204 err = got_error_from_errno2("unlink", path);
11209 static const struct got_error *
11210 histedit_save_list(struct got_histedit_list *histedit_cmds,
11211 struct got_worktree *worktree, struct got_repository *repo)
11213 const struct got_error *err = NULL;
11216 struct got_histedit_list_entry *hle;
11217 struct got_commit_object *commit = NULL;
11219 err = got_worktree_get_histedit_script_path(&path, worktree);
11223 f = fopen(path, "we");
11225 err = got_error_from_errno2("fopen", path);
11228 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11229 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
11235 int n = fprintf(f, "%c %s\n",
11236 GOT_HISTEDIT_MESG, hle->logmsg);
11238 err = got_ferror(f, GOT_ERR_IO);
11244 if (f && fclose(f) == EOF && err == NULL)
11245 err = got_error_from_errno("fclose");
11248 got_object_commit_close(commit);
11253 histedit_free_list(struct got_histedit_list *histedit_cmds)
11255 struct got_histedit_list_entry *hle;
11257 while ((hle = TAILQ_FIRST(histedit_cmds))) {
11258 TAILQ_REMOVE(histedit_cmds, hle, entry);
11263 static const struct got_error *
11264 histedit_load_list(struct got_histedit_list *histedit_cmds,
11265 const char *path, struct got_repository *repo)
11267 const struct got_error *err = NULL;
11270 f = fopen(path, "re");
11272 err = got_error_from_errno2("fopen", path);
11276 err = histedit_parse_list(histedit_cmds, f, repo);
11278 if (f && fclose(f) == EOF && err == NULL)
11279 err = got_error_from_errno("fclose");
11283 static const struct got_error *
11284 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
11285 const struct got_error *edit_err, struct got_object_id_queue *commits,
11286 const char *path, const char *branch_name, struct got_repository *repo)
11288 const struct got_error *err = NULL, *prev_err = edit_err;
11291 while (resp != 'c' && resp != 'r' && resp != 'a') {
11292 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
11293 "or (a)bort: ", getprogname(), prev_err->msg);
11298 histedit_free_list(histedit_cmds);
11299 err = histedit_run_editor(histedit_cmds, path, commits,
11302 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11303 err->code != GOT_ERR_HISTEDIT_CMD)
11310 } else if (resp == 'r') {
11311 histedit_free_list(histedit_cmds);
11312 err = histedit_edit_script(histedit_cmds,
11313 commits, branch_name, 0, 0, 0, repo);
11315 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11316 err->code != GOT_ERR_HISTEDIT_CMD)
11323 } else if (resp == 'a') {
11324 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
11327 printf("invalid response '%c'\n", resp);
11333 static const struct got_error *
11334 histedit_complete(struct got_worktree *worktree,
11335 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
11336 struct got_reference *branch, struct got_repository *repo)
11338 printf("Switching work tree to %s\n",
11339 got_ref_get_symref_target(branch));
11340 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
11344 static const struct got_error *
11345 show_histedit_progress(struct got_commit_object *commit,
11346 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
11348 const struct got_error *err;
11349 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
11351 err = got_object_id_str(&old_id_str, hle->commit_id);
11356 err = got_object_id_str(&new_id_str, new_id);
11361 old_id_str[12] = '\0';
11363 new_id_str[12] = '\0';
11366 logmsg = strdup(hle->logmsg);
11367 if (logmsg == NULL) {
11368 err = got_error_from_errno("strdup");
11371 trim_logmsg(logmsg, 42);
11373 err = get_short_logmsg(&logmsg, 42, commit);
11378 switch (hle->cmd->code) {
11379 case GOT_HISTEDIT_PICK:
11380 case GOT_HISTEDIT_EDIT:
11381 printf("%s -> %s: %s\n", old_id_str,
11382 new_id_str ? new_id_str : "no-op change", logmsg);
11384 case GOT_HISTEDIT_DROP:
11385 case GOT_HISTEDIT_FOLD:
11386 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
11398 static const struct got_error *
11399 histedit_commit(struct got_pathlist_head *merged_paths,
11400 struct got_worktree *worktree, struct got_fileindex *fileindex,
11401 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
11402 const char *committer, struct got_repository *repo)
11404 const struct got_error *err;
11405 struct got_commit_object *commit;
11406 struct got_object_id *new_commit_id;
11408 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
11409 && hle->logmsg == NULL) {
11410 err = histedit_edit_logmsg(hle, repo);
11415 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
11419 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
11420 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
11421 hle->logmsg, repo);
11423 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
11425 err = show_histedit_progress(commit, hle, NULL);
11427 err = show_histedit_progress(commit, hle, new_commit_id);
11428 free(new_commit_id);
11431 got_object_commit_close(commit);
11435 static const struct got_error *
11436 histedit_skip_commit(struct got_histedit_list_entry *hle,
11437 struct got_worktree *worktree, struct got_repository *repo)
11439 const struct got_error *error;
11440 struct got_commit_object *commit;
11442 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
11447 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
11451 error = show_histedit_progress(commit, hle, NULL);
11452 got_object_commit_close(commit);
11456 static const struct got_error *
11457 check_local_changes(void *arg, unsigned char status,
11458 unsigned char staged_status, const char *path,
11459 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11460 struct got_object_id *commit_id, int dirfd, const char *de_name)
11462 int *have_local_changes = arg;
11465 case GOT_STATUS_ADD:
11466 case GOT_STATUS_DELETE:
11467 case GOT_STATUS_MODIFY:
11468 case GOT_STATUS_CONFLICT:
11469 *have_local_changes = 1;
11470 return got_error(GOT_ERR_CANCELLED);
11475 switch (staged_status) {
11476 case GOT_STATUS_ADD:
11477 case GOT_STATUS_DELETE:
11478 case GOT_STATUS_MODIFY:
11479 *have_local_changes = 1;
11480 return got_error(GOT_ERR_CANCELLED);
11488 static const struct got_error *
11489 cmd_histedit(int argc, char *argv[])
11491 const struct got_error *error = NULL;
11492 struct got_worktree *worktree = NULL;
11493 struct got_fileindex *fileindex = NULL;
11494 struct got_repository *repo = NULL;
11495 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11496 struct got_reference *branch = NULL;
11497 struct got_reference *tmp_branch = NULL;
11498 struct got_object_id *resume_commit_id = NULL;
11499 struct got_object_id *base_commit_id = NULL;
11500 struct got_object_id *head_commit_id = NULL;
11501 struct got_commit_object *commit = NULL;
11502 int ch, rebase_in_progress = 0, merge_in_progress = 0;
11503 struct got_update_progress_arg upa;
11504 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
11505 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
11506 int list_backups = 0, delete_backups = 0;
11507 const char *edit_script_path = NULL;
11508 struct got_object_id_queue commits;
11509 struct got_pathlist_head merged_paths;
11510 const struct got_object_id_queue *parent_ids;
11511 struct got_object_qid *pid;
11512 struct got_histedit_list histedit_cmds;
11513 struct got_histedit_list_entry *hle;
11514 int *pack_fds = NULL;
11516 STAILQ_INIT(&commits);
11517 TAILQ_INIT(&histedit_cmds);
11518 TAILQ_INIT(&merged_paths);
11519 memset(&upa, 0, sizeof(upa));
11521 while ((ch = getopt(argc, argv, "aceF:flmX")) != -1) {
11533 edit_script_path = optarg;
11542 edit_logmsg_only = 1;
11545 delete_backups = 1;
11557 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11558 "unveil", NULL) == -1)
11561 if (abort_edit && continue_edit)
11562 option_conflict('a', 'c');
11563 if (edit_script_path && edit_logmsg_only)
11564 option_conflict('F', 'm');
11565 if (abort_edit && edit_logmsg_only)
11566 option_conflict('a', 'm');
11567 if (continue_edit && edit_logmsg_only)
11568 option_conflict('c', 'm');
11569 if (abort_edit && fold_only)
11570 option_conflict('a', 'f');
11571 if (continue_edit && fold_only)
11572 option_conflict('c', 'f');
11573 if (fold_only && edit_logmsg_only)
11574 option_conflict('f', 'm');
11575 if (edit_script_path && fold_only)
11576 option_conflict('F', 'f');
11577 if (abort_edit && edit_only)
11578 option_conflict('a', 'e');
11579 if (continue_edit && edit_only)
11580 option_conflict('c', 'e');
11581 if (edit_only && edit_logmsg_only)
11582 option_conflict('e', 'm');
11583 if (edit_script_path && edit_only)
11584 option_conflict('F', 'e');
11585 if (list_backups) {
11587 option_conflict('l', 'a');
11589 option_conflict('l', 'c');
11590 if (edit_script_path)
11591 option_conflict('l', 'F');
11592 if (edit_logmsg_only)
11593 option_conflict('l', 'm');
11595 option_conflict('l', 'f');
11597 option_conflict('l', 'e');
11598 if (delete_backups)
11599 option_conflict('l', 'X');
11600 if (argc != 0 && argc != 1)
11602 } else if (delete_backups) {
11604 option_conflict('X', 'a');
11606 option_conflict('X', 'c');
11607 if (edit_script_path)
11608 option_conflict('X', 'F');
11609 if (edit_logmsg_only)
11610 option_conflict('X', 'm');
11612 option_conflict('X', 'f');
11614 option_conflict('X', 'e');
11616 option_conflict('X', 'l');
11617 if (argc != 0 && argc != 1)
11619 } else if (argc != 0)
11623 * This command cannot apply unveil(2) in all cases because the
11624 * user may choose to run an editor to edit the histedit script
11625 * and to edit individual commit log messages.
11626 * unveil(2) traverses exec(2); if an editor is used we have to
11627 * apply unveil after edit script and log messages have been written.
11628 * XXX TODO: Make use of unveil(2) where possible.
11631 cwd = getcwd(NULL, 0);
11633 error = got_error_from_errno("getcwd");
11637 error = got_repo_pack_fds_open(&pack_fds);
11641 error = got_worktree_open(&worktree, cwd);
11643 if (list_backups || delete_backups) {
11644 if (error->code != GOT_ERR_NOT_WORKTREE)
11647 if (error->code == GOT_ERR_NOT_WORKTREE)
11648 error = wrap_not_worktree_error(error,
11654 if (list_backups || delete_backups) {
11655 error = got_repo_open(&repo,
11656 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11660 error = apply_unveil(got_repo_get_path(repo), 0,
11661 worktree ? got_worktree_get_root_path(worktree) : NULL);
11664 error = process_backup_refs(
11665 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
11666 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11667 goto done; /* nothing else to do */
11670 error = get_gitconfig_path(&gitconfig_path);
11673 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11674 gitconfig_path, pack_fds);
11678 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11681 if (rebase_in_progress) {
11682 error = got_error(GOT_ERR_REBASING);
11686 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11690 if (merge_in_progress) {
11691 error = got_error(GOT_ERR_MERGE_BUSY);
11695 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
11699 if (edit_in_progress && edit_logmsg_only) {
11700 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11701 "histedit operation is in progress in this "
11702 "work tree and must be continued or aborted "
11703 "before the -m option can be used");
11706 if (edit_in_progress && fold_only) {
11707 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11708 "histedit operation is in progress in this "
11709 "work tree and must be continued or aborted "
11710 "before the -f option can be used");
11713 if (edit_in_progress && edit_only) {
11714 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11715 "histedit operation is in progress in this "
11716 "work tree and must be continued or aborted "
11717 "before the -e option can be used");
11721 if (edit_in_progress && abort_edit) {
11722 error = got_worktree_histedit_continue(&resume_commit_id,
11723 &tmp_branch, &branch, &base_commit_id, &fileindex,
11727 printf("Switching work tree to %s\n",
11728 got_ref_get_symref_target(branch));
11729 error = got_worktree_histedit_abort(worktree, fileindex, repo,
11730 branch, base_commit_id, abort_progress, &upa);
11733 printf("Histedit of %s aborted\n",
11734 got_ref_get_symref_target(branch));
11735 print_merge_progress_stats(&upa);
11736 goto done; /* nothing else to do */
11737 } else if (abort_edit) {
11738 error = got_error(GOT_ERR_NOT_HISTEDIT);
11742 error = get_author(&committer, repo, worktree);
11746 if (continue_edit) {
11749 if (!edit_in_progress) {
11750 error = got_error(GOT_ERR_NOT_HISTEDIT);
11754 error = got_worktree_get_histedit_script_path(&path, worktree);
11758 error = histedit_load_list(&histedit_cmds, path, repo);
11763 error = got_worktree_histedit_continue(&resume_commit_id,
11764 &tmp_branch, &branch, &base_commit_id, &fileindex,
11769 error = got_ref_resolve(&head_commit_id, repo, branch);
11773 error = got_object_open_as_commit(&commit, repo,
11777 parent_ids = got_object_commit_get_parent_ids(commit);
11778 pid = STAILQ_FIRST(parent_ids);
11780 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11783 error = collect_commits(&commits, head_commit_id, &pid->id,
11784 base_commit_id, got_worktree_get_path_prefix(worktree),
11785 GOT_ERR_HISTEDIT_PATH, repo);
11786 got_object_commit_close(commit);
11791 if (edit_in_progress) {
11792 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11796 error = got_ref_open(&branch, repo,
11797 got_worktree_get_head_ref_name(worktree), 0);
11801 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11802 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11803 "will not edit commit history of a branch outside "
11804 "the \"refs/heads/\" reference namespace");
11808 error = got_ref_resolve(&head_commit_id, repo, branch);
11809 got_ref_close(branch);
11814 error = got_object_open_as_commit(&commit, repo,
11818 parent_ids = got_object_commit_get_parent_ids(commit);
11819 pid = STAILQ_FIRST(parent_ids);
11821 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11824 error = collect_commits(&commits, head_commit_id, &pid->id,
11825 got_worktree_get_base_commit_id(worktree),
11826 got_worktree_get_path_prefix(worktree),
11827 GOT_ERR_HISTEDIT_PATH, repo);
11828 got_object_commit_close(commit);
11833 if (STAILQ_EMPTY(&commits)) {
11834 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11838 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
11839 &base_commit_id, &fileindex, worktree, repo);
11843 if (edit_script_path) {
11844 error = histedit_load_list(&histedit_cmds,
11845 edit_script_path, repo);
11847 got_worktree_histedit_abort(worktree, fileindex,
11848 repo, branch, base_commit_id,
11849 abort_progress, &upa);
11850 print_merge_progress_stats(&upa);
11854 const char *branch_name;
11855 branch_name = got_ref_get_symref_target(branch);
11856 if (strncmp(branch_name, "refs/heads/", 11) == 0)
11858 error = histedit_edit_script(&histedit_cmds, &commits,
11859 branch_name, edit_logmsg_only, fold_only,
11862 got_worktree_histedit_abort(worktree, fileindex,
11863 repo, branch, base_commit_id,
11864 abort_progress, &upa);
11865 print_merge_progress_stats(&upa);
11871 error = histedit_save_list(&histedit_cmds, worktree,
11874 got_worktree_histedit_abort(worktree, fileindex,
11875 repo, branch, base_commit_id,
11876 abort_progress, &upa);
11877 print_merge_progress_stats(&upa);
11883 error = histedit_check_script(&histedit_cmds, &commits, repo);
11887 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
11888 if (resume_commit_id) {
11889 if (got_object_id_cmp(hle->commit_id,
11890 resume_commit_id) != 0)
11893 resume_commit_id = NULL;
11894 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
11895 hle->cmd->code == GOT_HISTEDIT_FOLD) {
11896 error = histedit_skip_commit(hle, worktree,
11901 struct got_pathlist_head paths;
11902 int have_changes = 0;
11904 TAILQ_INIT(&paths);
11905 error = got_pathlist_append(&paths, "", NULL);
11908 error = got_worktree_status(worktree, &paths,
11909 repo, 0, check_local_changes, &have_changes,
11910 check_cancelled, NULL);
11911 got_pathlist_free(&paths,
11912 GOT_PATHLIST_FREE_NONE);
11914 if (error->code != GOT_ERR_CANCELLED)
11916 if (sigint_received || sigpipe_received)
11919 if (have_changes) {
11920 error = histedit_commit(NULL, worktree,
11921 fileindex, tmp_branch, hle,
11926 error = got_object_open_as_commit(
11927 &commit, repo, hle->commit_id);
11930 error = show_histedit_progress(commit,
11932 got_object_commit_close(commit);
11941 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
11942 error = histedit_skip_commit(hle, worktree, repo);
11948 error = got_object_open_as_commit(&commit, repo,
11952 parent_ids = got_object_commit_get_parent_ids(commit);
11953 pid = STAILQ_FIRST(parent_ids);
11955 error = got_worktree_histedit_merge_files(&merged_paths,
11956 worktree, fileindex, &pid->id, hle->commit_id, repo,
11957 update_progress, &upa, check_cancelled, NULL);
11960 got_object_commit_close(commit);
11963 print_merge_progress_stats(&upa);
11964 if (upa.conflicts > 0 || upa.missing > 0 ||
11965 upa.not_deleted > 0 || upa.unversioned > 0) {
11966 if (upa.conflicts > 0) {
11967 error = show_rebase_merge_conflict(
11968 hle->commit_id, repo);
11972 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11976 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
11978 error = got_object_id_str(&id_str, hle->commit_id);
11981 printf("Stopping histedit for amending commit %s\n",
11984 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11985 error = got_worktree_histedit_postpone(worktree,
11990 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11991 error = histedit_skip_commit(hle, worktree, repo);
11997 error = histedit_commit(&merged_paths, worktree, fileindex,
11998 tmp_branch, hle, committer, repo);
11999 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
12004 if (upa.conflicts > 0 || upa.missing > 0 ||
12005 upa.not_deleted > 0 || upa.unversioned > 0) {
12006 error = got_worktree_histedit_postpone(worktree, fileindex);
12009 if (upa.conflicts > 0 && upa.missing == 0 &&
12010 upa.not_deleted == 0 && upa.unversioned == 0) {
12011 error = got_error_msg(GOT_ERR_CONFLICTS,
12012 "conflicts must be resolved before histedit "
12014 } else if (upa.conflicts > 0) {
12015 error = got_error_msg(GOT_ERR_CONFLICTS,
12016 "conflicts must be resolved before histedit "
12017 "can continue; changes destined for some "
12018 "files were not yet merged and should be "
12019 "merged manually if required before the "
12020 "histedit operation is continued");
12022 error = got_error_msg(GOT_ERR_CONFLICTS,
12023 "changes destined for some files were not "
12024 "yet merged and should be merged manually "
12025 "if required before the histedit operation "
12029 error = histedit_complete(worktree, fileindex, tmp_branch,
12034 free(gitconfig_path);
12035 got_object_id_queue_free(&commits);
12036 histedit_free_list(&histedit_cmds);
12037 free(head_commit_id);
12038 free(base_commit_id);
12039 free(resume_commit_id);
12041 got_object_commit_close(commit);
12043 got_ref_close(branch);
12045 got_ref_close(tmp_branch);
12047 got_worktree_close(worktree);
12049 const struct got_error *close_err = got_repo_close(repo);
12054 const struct got_error *pack_err =
12055 got_repo_pack_fds_close(pack_fds);
12063 usage_integrate(void)
12065 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
12069 static const struct got_error *
12070 cmd_integrate(int argc, char *argv[])
12072 const struct got_error *error = NULL;
12073 struct got_repository *repo = NULL;
12074 struct got_worktree *worktree = NULL;
12075 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
12076 const char *branch_arg = NULL;
12077 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
12078 struct got_fileindex *fileindex = NULL;
12079 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
12081 struct got_update_progress_arg upa;
12082 int *pack_fds = NULL;
12084 while ((ch = getopt(argc, argv, "")) != -1) {
12097 branch_arg = argv[0];
12099 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12100 "unveil", NULL) == -1)
12103 cwd = getcwd(NULL, 0);
12105 error = got_error_from_errno("getcwd");
12109 error = got_repo_pack_fds_open(&pack_fds);
12113 error = got_worktree_open(&worktree, cwd);
12115 if (error->code == GOT_ERR_NOT_WORKTREE)
12116 error = wrap_not_worktree_error(error, "integrate",
12121 error = check_rebase_or_histedit_in_progress(worktree);
12125 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12130 error = apply_unveil(got_repo_get_path(repo), 0,
12131 got_worktree_get_root_path(worktree));
12135 error = check_merge_in_progress(worktree, repo);
12139 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
12140 error = got_error_from_errno("asprintf");
12144 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
12145 &base_branch_ref, worktree, refname, repo);
12149 refname = strdup(got_ref_get_name(branch_ref));
12150 if (refname == NULL) {
12151 error = got_error_from_errno("strdup");
12152 got_worktree_integrate_abort(worktree, fileindex, repo,
12153 branch_ref, base_branch_ref);
12156 base_refname = strdup(got_ref_get_name(base_branch_ref));
12157 if (base_refname == NULL) {
12158 error = got_error_from_errno("strdup");
12159 got_worktree_integrate_abort(worktree, fileindex, repo,
12160 branch_ref, base_branch_ref);
12163 if (strncmp(base_refname, "refs/heads/", 11) != 0) {
12164 error = got_error(GOT_ERR_INTEGRATE_BRANCH);
12165 got_worktree_integrate_abort(worktree, fileindex, repo,
12166 branch_ref, base_branch_ref);
12170 error = got_ref_resolve(&commit_id, repo, branch_ref);
12174 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
12178 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
12179 error = got_error_msg(GOT_ERR_SAME_BRANCH,
12180 "specified branch has already been integrated");
12181 got_worktree_integrate_abort(worktree, fileindex, repo,
12182 branch_ref, base_branch_ref);
12186 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
12188 if (error->code == GOT_ERR_ANCESTRY)
12189 error = got_error(GOT_ERR_REBASE_REQUIRED);
12190 got_worktree_integrate_abort(worktree, fileindex, repo,
12191 branch_ref, base_branch_ref);
12195 memset(&upa, 0, sizeof(upa));
12196 error = got_worktree_integrate_continue(worktree, fileindex, repo,
12197 branch_ref, base_branch_ref, update_progress, &upa,
12198 check_cancelled, NULL);
12202 printf("Integrated %s into %s\n", refname, base_refname);
12203 print_update_progress_stats(&upa);
12206 const struct got_error *close_err = got_repo_close(repo);
12211 got_worktree_close(worktree);
12213 const struct got_error *pack_err =
12214 got_repo_pack_fds_close(pack_fds);
12219 free(base_commit_id);
12222 free(base_refname);
12229 fprintf(stderr, "usage: %s merge [-acn] [branch]\n", getprogname());
12233 static const struct got_error *
12234 cmd_merge(int argc, char *argv[])
12236 const struct got_error *error = NULL;
12237 struct got_worktree *worktree = NULL;
12238 struct got_repository *repo = NULL;
12239 struct got_fileindex *fileindex = NULL;
12240 char *cwd = NULL, *id_str = NULL, *author = NULL;
12241 struct got_reference *branch = NULL, *wt_branch = NULL;
12242 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
12243 struct got_object_id *wt_branch_tip = NULL;
12244 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
12245 int interrupt_merge = 0;
12246 struct got_update_progress_arg upa;
12247 struct got_object_id *merge_commit_id = NULL;
12248 char *branch_name = NULL;
12249 int *pack_fds = NULL;
12251 memset(&upa, 0, sizeof(upa));
12253 while ((ch = getopt(argc, argv, "acn")) != -1) {
12259 continue_merge = 1;
12262 interrupt_merge = 1;
12274 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12275 "unveil", NULL) == -1)
12279 if (abort_merge && continue_merge)
12280 option_conflict('a', 'c');
12281 if (abort_merge || continue_merge) {
12284 } else if (argc != 1)
12287 cwd = getcwd(NULL, 0);
12289 error = got_error_from_errno("getcwd");
12293 error = got_repo_pack_fds_open(&pack_fds);
12297 error = got_worktree_open(&worktree, cwd);
12299 if (error->code == GOT_ERR_NOT_WORKTREE)
12300 error = wrap_not_worktree_error(error,
12305 error = got_repo_open(&repo,
12306 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
12311 error = apply_unveil(got_repo_get_path(repo), 0,
12312 worktree ? got_worktree_get_root_path(worktree) : NULL);
12316 error = check_rebase_or_histedit_in_progress(worktree);
12320 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12326 if (!merge_in_progress) {
12327 error = got_error(GOT_ERR_NOT_MERGING);
12330 error = got_worktree_merge_continue(&branch_name,
12331 &branch_tip, &fileindex, worktree, repo);
12334 error = got_worktree_merge_abort(worktree, fileindex, repo,
12335 abort_progress, &upa);
12338 printf("Merge of %s aborted\n", branch_name);
12339 goto done; /* nothing else to do */
12342 error = get_author(&author, repo, worktree);
12346 if (continue_merge) {
12347 if (!merge_in_progress) {
12348 error = got_error(GOT_ERR_NOT_MERGING);
12351 error = got_worktree_merge_continue(&branch_name,
12352 &branch_tip, &fileindex, worktree, repo);
12356 error = got_ref_open(&branch, repo, argv[0], 0);
12359 branch_name = strdup(got_ref_get_name(branch));
12360 if (branch_name == NULL) {
12361 error = got_error_from_errno("strdup");
12364 error = got_ref_resolve(&branch_tip, repo, branch);
12369 error = got_ref_open(&wt_branch, repo,
12370 got_worktree_get_head_ref_name(worktree), 0);
12373 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
12376 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
12377 wt_branch_tip, branch_tip, 0, repo,
12378 check_cancelled, NULL);
12379 if (error && error->code != GOT_ERR_ANCESTRY)
12382 if (!continue_merge) {
12383 error = check_path_prefix(wt_branch_tip, branch_tip,
12384 got_worktree_get_path_prefix(worktree),
12385 GOT_ERR_MERGE_PATH, repo);
12389 error = check_same_branch(wt_branch_tip, branch,
12392 if (error->code != GOT_ERR_ANCESTRY)
12396 static char msg[512];
12397 snprintf(msg, sizeof(msg),
12398 "cannot create a merge commit because "
12399 "%s is based on %s; %s can be integrated "
12400 "with 'got integrate' instead", branch_name,
12401 got_worktree_get_head_ref_name(worktree),
12403 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
12407 error = got_worktree_merge_prepare(&fileindex, worktree,
12412 error = got_worktree_merge_branch(worktree, fileindex,
12413 yca_id, branch_tip, repo, update_progress, &upa,
12414 check_cancelled, NULL);
12417 print_merge_progress_stats(&upa);
12418 if (!upa.did_something) {
12419 error = got_worktree_merge_abort(worktree, fileindex,
12420 repo, abort_progress, &upa);
12423 printf("Already up-to-date\n");
12428 if (interrupt_merge) {
12429 error = got_worktree_merge_postpone(worktree, fileindex);
12432 printf("Merge of %s interrupted on request\n", branch_name);
12433 } else if (upa.conflicts > 0 || upa.missing > 0 ||
12434 upa.not_deleted > 0 || upa.unversioned > 0) {
12435 error = got_worktree_merge_postpone(worktree, fileindex);
12438 if (upa.conflicts > 0 && upa.missing == 0 &&
12439 upa.not_deleted == 0 && upa.unversioned == 0) {
12440 error = got_error_msg(GOT_ERR_CONFLICTS,
12441 "conflicts must be resolved before merging "
12443 } else if (upa.conflicts > 0) {
12444 error = got_error_msg(GOT_ERR_CONFLICTS,
12445 "conflicts must be resolved before merging "
12446 "can continue; changes destined for some "
12447 "files were not yet merged and "
12448 "should be merged manually if required before the "
12449 "merge operation is continued");
12451 error = got_error_msg(GOT_ERR_CONFLICTS,
12452 "changes destined for some "
12453 "files were not yet merged and should be "
12454 "merged manually if required before the "
12455 "merge operation is continued");
12459 error = got_worktree_merge_commit(&merge_commit_id, worktree,
12460 fileindex, author, NULL, 1, branch_tip, branch_name,
12461 repo, continue_merge ? print_status : NULL, NULL);
12464 error = got_worktree_merge_complete(worktree, fileindex, repo);
12467 error = got_object_id_str(&id_str, merge_commit_id);
12470 printf("Merged %s into %s: %s\n", branch_name,
12471 got_worktree_get_head_ref_name(worktree),
12477 free(merge_commit_id);
12483 got_ref_close(branch);
12485 got_ref_close(wt_branch);
12487 got_worktree_close(worktree);
12489 const struct got_error *close_err = got_repo_close(repo);
12494 const struct got_error *pack_err =
12495 got_repo_pack_fds_close(pack_fds);
12505 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
12506 "[path ...]\n", getprogname());
12510 static const struct got_error *
12511 print_stage(void *arg, unsigned char status, unsigned char staged_status,
12512 const char *path, struct got_object_id *blob_id,
12513 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
12514 int dirfd, const char *de_name)
12516 const struct got_error *err = NULL;
12517 char *id_str = NULL;
12519 if (staged_status != GOT_STATUS_ADD &&
12520 staged_status != GOT_STATUS_MODIFY &&
12521 staged_status != GOT_STATUS_DELETE)
12524 if (staged_status == GOT_STATUS_ADD ||
12525 staged_status == GOT_STATUS_MODIFY)
12526 err = got_object_id_str(&id_str, staged_blob_id);
12528 err = got_object_id_str(&id_str, blob_id);
12532 printf("%s %c %s\n", id_str, staged_status, path);
12537 static const struct got_error *
12538 cmd_stage(int argc, char *argv[])
12540 const struct got_error *error = NULL;
12541 struct got_repository *repo = NULL;
12542 struct got_worktree *worktree = NULL;
12544 struct got_pathlist_head paths;
12545 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
12546 FILE *patch_script_file = NULL;
12547 const char *patch_script_path = NULL;
12548 struct choose_patch_arg cpa;
12549 int *pack_fds = NULL;
12551 TAILQ_INIT(&paths);
12553 while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
12556 patch_script_path = optarg;
12565 allow_bad_symlinks = 1;
12577 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12578 "unveil", NULL) == -1)
12581 if (list_stage && (pflag || patch_script_path))
12582 errx(1, "-l option cannot be used with other options");
12583 if (patch_script_path && !pflag)
12584 errx(1, "-F option can only be used together with -p option");
12586 cwd = getcwd(NULL, 0);
12588 error = got_error_from_errno("getcwd");
12592 error = got_repo_pack_fds_open(&pack_fds);
12596 error = got_worktree_open(&worktree, cwd);
12598 if (error->code == GOT_ERR_NOT_WORKTREE)
12599 error = wrap_not_worktree_error(error, "stage", cwd);
12603 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12608 if (patch_script_path) {
12609 patch_script_file = fopen(patch_script_path, "re");
12610 if (patch_script_file == NULL) {
12611 error = got_error_from_errno2("fopen",
12612 patch_script_path);
12616 error = apply_unveil(got_repo_get_path(repo), 0,
12617 got_worktree_get_root_path(worktree));
12621 error = check_merge_in_progress(worktree, repo);
12625 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12630 error = got_worktree_status(worktree, &paths, repo, 0,
12631 print_stage, NULL, check_cancelled, NULL);
12633 cpa.patch_script_file = patch_script_file;
12634 cpa.action = "stage";
12635 error = got_worktree_stage(worktree, &paths,
12636 pflag ? NULL : print_status, NULL,
12637 pflag ? choose_patch : NULL, &cpa,
12638 allow_bad_symlinks, repo);
12641 if (patch_script_file && fclose(patch_script_file) == EOF &&
12643 error = got_error_from_errno2("fclose", patch_script_path);
12645 const struct got_error *close_err = got_repo_close(repo);
12650 got_worktree_close(worktree);
12652 const struct got_error *pack_err =
12653 got_repo_pack_fds_close(pack_fds);
12657 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
12663 usage_unstage(void)
12665 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
12666 "[path ...]\n", getprogname());
12671 static const struct got_error *
12672 cmd_unstage(int argc, char *argv[])
12674 const struct got_error *error = NULL;
12675 struct got_repository *repo = NULL;
12676 struct got_worktree *worktree = NULL;
12678 struct got_pathlist_head paths;
12680 struct got_update_progress_arg upa;
12681 FILE *patch_script_file = NULL;
12682 const char *patch_script_path = NULL;
12683 struct choose_patch_arg cpa;
12684 int *pack_fds = NULL;
12686 TAILQ_INIT(&paths);
12688 while ((ch = getopt(argc, argv, "F:p")) != -1) {
12691 patch_script_path = optarg;
12706 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12707 "unveil", NULL) == -1)
12710 if (patch_script_path && !pflag)
12711 errx(1, "-F option can only be used together with -p option");
12713 cwd = getcwd(NULL, 0);
12715 error = got_error_from_errno("getcwd");
12719 error = got_repo_pack_fds_open(&pack_fds);
12723 error = got_worktree_open(&worktree, cwd);
12725 if (error->code == GOT_ERR_NOT_WORKTREE)
12726 error = wrap_not_worktree_error(error, "unstage", cwd);
12730 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12735 if (patch_script_path) {
12736 patch_script_file = fopen(patch_script_path, "re");
12737 if (patch_script_file == NULL) {
12738 error = got_error_from_errno2("fopen",
12739 patch_script_path);
12744 error = apply_unveil(got_repo_get_path(repo), 0,
12745 got_worktree_get_root_path(worktree));
12749 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12753 cpa.patch_script_file = patch_script_file;
12754 cpa.action = "unstage";
12755 memset(&upa, 0, sizeof(upa));
12756 error = got_worktree_unstage(worktree, &paths, update_progress,
12757 &upa, pflag ? choose_patch : NULL, &cpa, repo);
12759 print_merge_progress_stats(&upa);
12761 if (patch_script_file && fclose(patch_script_file) == EOF &&
12763 error = got_error_from_errno2("fclose", patch_script_path);
12765 const struct got_error *close_err = got_repo_close(repo);
12770 got_worktree_close(worktree);
12772 const struct got_error *pack_err =
12773 got_repo_pack_fds_close(pack_fds);
12777 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
12785 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
12786 "arg ...\n", getprogname());
12790 static const struct got_error *
12791 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12793 const struct got_error *err;
12794 struct got_blob_object *blob;
12797 fd = got_opentempfd();
12799 return got_error_from_errno("got_opentempfd");
12801 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
12805 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
12807 if (fd != -1 && close(fd) == -1 && err == NULL)
12808 err = got_error_from_errno("close");
12810 got_object_blob_close(blob);
12814 static const struct got_error *
12815 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12817 const struct got_error *err;
12818 struct got_tree_object *tree;
12821 err = got_object_open_as_tree(&tree, repo, id);
12825 nentries = got_object_tree_get_nentries(tree);
12826 for (i = 0; i < nentries; i++) {
12827 struct got_tree_entry *te;
12829 if (sigint_received || sigpipe_received)
12831 te = got_object_tree_get_entry(tree, i);
12832 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
12835 fprintf(outfile, "%s %.7o %s\n", id_str,
12836 got_tree_entry_get_mode(te),
12837 got_tree_entry_get_name(te));
12841 got_object_tree_close(tree);
12845 static const struct got_error *
12846 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12848 const struct got_error *err;
12849 struct got_commit_object *commit;
12850 const struct got_object_id_queue *parent_ids;
12851 struct got_object_qid *pid;
12852 char *id_str = NULL;
12853 const char *logmsg = NULL;
12856 err = got_object_open_as_commit(&commit, repo, id);
12860 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
12864 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
12865 parent_ids = got_object_commit_get_parent_ids(commit);
12866 fprintf(outfile, "numparents %d\n",
12867 got_object_commit_get_nparents(commit));
12868 STAILQ_FOREACH(pid, parent_ids, entry) {
12870 err = got_object_id_str(&pid_str, &pid->id);
12873 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
12876 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12877 got_object_commit_get_author_gmtoff(commit));
12878 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
12879 got_object_commit_get_author(commit),
12880 (long long)got_object_commit_get_author_time(commit),
12883 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12884 got_object_commit_get_committer_gmtoff(commit));
12885 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
12886 got_object_commit_get_committer(commit),
12887 (long long)got_object_commit_get_committer_time(commit),
12890 logmsg = got_object_commit_get_logmsg_raw(commit);
12891 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
12892 fprintf(outfile, "%s", logmsg);
12895 got_object_commit_close(commit);
12899 static const struct got_error *
12900 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12902 const struct got_error *err;
12903 struct got_tag_object *tag;
12904 char *id_str = NULL;
12905 const char *tagmsg = NULL;
12908 err = got_object_open_as_tag(&tag, repo, id);
12912 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
12916 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
12918 switch (got_object_tag_get_object_type(tag)) {
12919 case GOT_OBJ_TYPE_BLOB:
12920 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12921 GOT_OBJ_LABEL_BLOB);
12923 case GOT_OBJ_TYPE_TREE:
12924 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12925 GOT_OBJ_LABEL_TREE);
12927 case GOT_OBJ_TYPE_COMMIT:
12928 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12929 GOT_OBJ_LABEL_COMMIT);
12931 case GOT_OBJ_TYPE_TAG:
12932 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12933 GOT_OBJ_LABEL_TAG);
12939 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
12940 got_object_tag_get_name(tag));
12942 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12943 got_object_tag_get_tagger_gmtoff(tag));
12944 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
12945 got_object_tag_get_tagger(tag),
12946 (long long)got_object_tag_get_tagger_time(tag),
12949 tagmsg = got_object_tag_get_message(tag);
12950 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
12951 fprintf(outfile, "%s", tagmsg);
12954 got_object_tag_close(tag);
12958 static const struct got_error *
12959 cmd_cat(int argc, char *argv[])
12961 const struct got_error *error;
12962 struct got_repository *repo = NULL;
12963 struct got_worktree *worktree = NULL;
12964 char *cwd = NULL, *repo_path = NULL, *label = NULL;
12965 const char *commit_id_str = NULL;
12966 struct got_object_id *id = NULL, *commit_id = NULL;
12967 struct got_commit_object *commit = NULL;
12968 int ch, obj_type, i, force_path = 0;
12969 struct got_reflist_head refs;
12970 int *pack_fds = NULL;
12975 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12980 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
12983 commit_id_str = optarg;
12989 repo_path = realpath(optarg, NULL);
12990 if (repo_path == NULL)
12991 return got_error_from_errno2("realpath",
12993 got_path_strip_trailing_slashes(repo_path);
13004 cwd = getcwd(NULL, 0);
13006 error = got_error_from_errno("getcwd");
13010 error = got_repo_pack_fds_open(&pack_fds);
13014 if (repo_path == NULL) {
13015 error = got_worktree_open(&worktree, cwd);
13016 if (error && error->code != GOT_ERR_NOT_WORKTREE)
13019 repo_path = strdup(
13020 got_worktree_get_repo_path(worktree));
13021 if (repo_path == NULL) {
13022 error = got_error_from_errno("strdup");
13026 /* Release work tree lock. */
13027 got_worktree_close(worktree);
13032 if (repo_path == NULL) {
13033 repo_path = strdup(cwd);
13034 if (repo_path == NULL)
13035 return got_error_from_errno("strdup");
13038 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
13043 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
13047 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
13051 if (commit_id_str == NULL)
13052 commit_id_str = GOT_REF_HEAD;
13053 error = got_repo_match_object_id(&commit_id, NULL,
13054 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
13058 error = got_object_open_as_commit(&commit, repo, commit_id);
13062 for (i = 0; i < argc; i++) {
13064 error = got_object_id_by_path(&id, repo, commit,
13069 error = got_repo_match_object_id(&id, &label, argv[i],
13070 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
13073 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
13074 error->code != GOT_ERR_NOT_REF)
13076 error = got_object_id_by_path(&id, repo,
13083 error = got_object_get_type(&obj_type, repo, id);
13087 switch (obj_type) {
13088 case GOT_OBJ_TYPE_BLOB:
13089 error = cat_blob(id, repo, stdout);
13091 case GOT_OBJ_TYPE_TREE:
13092 error = cat_tree(id, repo, stdout);
13094 case GOT_OBJ_TYPE_COMMIT:
13095 error = cat_commit(id, repo, stdout);
13097 case GOT_OBJ_TYPE_TAG:
13098 error = cat_tag(id, repo, stdout);
13101 error = got_error(GOT_ERR_OBJ_TYPE);
13116 got_object_commit_close(commit);
13118 got_worktree_close(worktree);
13120 const struct got_error *close_err = got_repo_close(repo);
13125 const struct got_error *pack_err =
13126 got_repo_pack_fds_close(pack_fds);
13131 got_ref_list_free(&refs);
13138 fprintf(stderr, "usage: %s info [path ...]\n",
13143 static const struct got_error *
13144 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
13145 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
13146 struct got_object_id *commit_id)
13148 const struct got_error *err = NULL;
13149 char *id_str = NULL;
13151 struct tm mytm, *tm;
13152 struct got_pathlist_head *paths = arg;
13153 struct got_pathlist_entry *pe;
13156 * Clear error indication from any of the path arguments which
13157 * would cause this file index entry to be displayed.
13159 TAILQ_FOREACH(pe, paths, entry) {
13160 if (got_path_cmp(path, pe->path, strlen(path),
13161 pe->path_len) == 0 ||
13162 got_path_is_child(path, pe->path, pe->path_len))
13163 pe->data = NULL; /* no error */
13166 printf(GOT_COMMIT_SEP_STR);
13168 printf("symlink: %s\n", path);
13169 else if (S_ISREG(mode)) {
13170 printf("file: %s\n", path);
13171 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
13172 } else if (S_ISDIR(mode))
13173 printf("directory: %s\n", path);
13175 printf("something: %s\n", path);
13177 tm = localtime_r(&mtime, &mytm);
13180 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
13181 return got_error(GOT_ERR_NO_SPACE);
13182 printf("timestamp: %s\n", datebuf);
13185 err = got_object_id_str(&id_str, blob_id);
13188 printf("based on blob: %s\n", id_str);
13192 if (staged_blob_id) {
13193 err = got_object_id_str(&id_str, staged_blob_id);
13196 printf("based on staged blob: %s\n", id_str);
13201 err = got_object_id_str(&id_str, commit_id);
13204 printf("based on commit: %s\n", id_str);
13211 static const struct got_error *
13212 cmd_info(int argc, char *argv[])
13214 const struct got_error *error = NULL;
13215 struct got_worktree *worktree = NULL;
13216 char *cwd = NULL, *id_str = NULL;
13217 struct got_pathlist_head paths;
13218 char *uuidstr = NULL;
13219 int ch, show_files = 0;
13221 TAILQ_INIT(&paths);
13223 while ((ch = getopt(argc, argv, "")) != -1) {
13235 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
13239 cwd = getcwd(NULL, 0);
13241 error = got_error_from_errno("getcwd");
13245 error = got_worktree_open(&worktree, cwd);
13247 if (error->code == GOT_ERR_NOT_WORKTREE)
13248 error = wrap_not_worktree_error(error, "info", cwd);
13253 /* Remove "wpath cpath proc exec sendfd" promises. */
13254 if (pledge("stdio rpath flock unveil", NULL) == -1)
13257 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
13262 error = get_worktree_paths_from_argv(&paths, argc, argv,
13269 error = got_object_id_str(&id_str,
13270 got_worktree_get_base_commit_id(worktree));
13274 error = got_worktree_get_uuid(&uuidstr, worktree);
13278 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
13279 printf("work tree base commit: %s\n", id_str);
13280 printf("work tree path prefix: %s\n",
13281 got_worktree_get_path_prefix(worktree));
13282 printf("work tree branch reference: %s\n",
13283 got_worktree_get_head_ref_name(worktree));
13284 printf("work tree UUID: %s\n", uuidstr);
13285 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
13288 struct got_pathlist_entry *pe;
13289 TAILQ_FOREACH(pe, &paths, entry) {
13290 if (pe->path_len == 0)
13293 * Assume this path will fail. This will be corrected
13294 * in print_path_info() in case the path does suceeed.
13296 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
13298 error = got_worktree_path_info(worktree, &paths,
13299 print_path_info, &paths, check_cancelled, NULL);
13302 TAILQ_FOREACH(pe, &paths, entry) {
13303 if (pe->data != NULL) {
13304 const struct got_error *perr;
13307 error = got_error_fmt(perr->code, "%s",
13315 got_worktree_close(worktree);
13316 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);