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>
42 #include "got_compat.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 insertion%s(+), %d deletion%s(-)\n\n",
4172 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
4173 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
4175 if (fflush(stdout) != 0)
4176 return got_error_from_errno("fflush");
4181 static const struct got_error *
4182 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4183 struct got_repository *repo, const char *path,
4184 struct got_pathlist_head *changed_paths, struct got_diffstat_cb_arg *dsa,
4185 int show_patch, int diff_context,
4186 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str)
4188 const struct got_error *err = NULL;
4189 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4191 time_t committer_time;
4192 const char *author, *committer;
4193 char *refs_str = NULL;
4195 err = got_object_id_str(&id_str, id);
4199 if (custom_refs_str == NULL) {
4200 struct got_reflist_head *refs;
4201 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4203 err = build_refs_str(&refs_str, refs, id, repo, 0);
4209 printf(GOT_COMMIT_SEP_STR);
4210 if (custom_refs_str)
4211 printf("commit %s (%s)\n", id_str, custom_refs_str);
4213 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4214 refs_str ? refs_str : "", refs_str ? ")" : "");
4219 printf("from: %s\n", got_object_commit_get_author(commit));
4220 author = got_object_commit_get_author(commit);
4221 committer = got_object_commit_get_committer(commit);
4222 if (strcmp(author, committer) != 0)
4223 printf("via: %s\n", committer);
4224 committer_time = got_object_commit_get_committer_time(commit);
4225 datestr = get_datestr(&committer_time, datebuf);
4227 printf("date: %s UTC\n", datestr);
4228 if (got_object_commit_get_nparents(commit) > 1) {
4229 const struct got_object_id_queue *parent_ids;
4230 struct got_object_qid *qid;
4232 parent_ids = got_object_commit_get_parent_ids(commit);
4233 STAILQ_FOREACH(qid, parent_ids, entry) {
4234 err = got_object_id_str(&id_str, &qid->id);
4237 printf("parent %d: %s\n", n++, id_str);
4243 err = got_object_commit_get_logmsg(&logmsg0, commit);
4249 line = strsep(&logmsg, "\n");
4251 printf(" %s\n", line);
4255 if (dsa && changed_paths) {
4256 err = print_diffstat(dsa, changed_paths, NULL);
4259 } else if (changed_paths) {
4260 struct got_pathlist_entry *pe;
4262 TAILQ_FOREACH(pe, changed_paths, entry) {
4263 struct got_diff_changed_path *cp = pe->data;
4265 printf(" %c %s\n", cp->status, pe->path);
4270 err = print_patch(commit, id, path, diff_context, repo, stdout);
4275 if (fflush(stdout) != 0 && err == NULL)
4276 err = got_error_from_errno("fflush");
4283 static const struct got_error *
4284 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4285 struct got_repository *repo, const char *path, int show_changed_paths,
4286 int show_diffstat, int show_patch, const char *search_pattern,
4287 int diff_context, int limit, int log_branches, int reverse_display_order,
4288 struct got_reflist_object_id_map *refs_idmap, int one_line,
4291 const struct got_error *err;
4292 struct got_commit_graph *graph;
4295 struct got_object_id_queue reversed_commits;
4296 struct got_object_qid *qid;
4297 struct got_commit_object *commit;
4298 struct got_pathlist_head changed_paths;
4300 STAILQ_INIT(&reversed_commits);
4301 TAILQ_INIT(&changed_paths);
4303 if (search_pattern && regcomp(®ex, search_pattern,
4304 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4305 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4307 err = got_commit_graph_open(&graph, path, !log_branches);
4310 err = got_commit_graph_iter_start(graph, root_id, repo,
4311 check_cancelled, NULL);
4315 struct got_object_id id;
4316 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4317 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4319 if (sigint_received || sigpipe_received)
4322 err = got_commit_graph_iter_next(&id, graph, repo,
4323 check_cancelled, NULL);
4325 if (err->code == GOT_ERR_ITER_COMPLETED)
4330 err = got_object_open_as_commit(&commit, repo, &id);
4334 if ((show_changed_paths || show_diffstat) &&
4335 !reverse_display_order) {
4336 err = get_changed_paths(&changed_paths, commit, repo,
4337 show_diffstat ? &dsa : NULL);
4342 if (search_pattern) {
4343 err = match_commit(&have_match, &id, commit, ®ex);
4345 got_object_commit_close(commit);
4348 if (have_match == 0 && show_changed_paths)
4349 match_changed_paths(&have_match,
4350 &changed_paths, ®ex);
4351 if (have_match == 0 && show_patch) {
4352 err = match_patch(&have_match, commit, &id,
4353 path, diff_context, repo, ®ex,
4358 if (have_match == 0) {
4359 got_object_commit_close(commit);
4360 got_pathlist_free(&changed_paths,
4361 GOT_PATHLIST_FREE_ALL);
4366 if (reverse_display_order) {
4367 err = got_object_qid_alloc(&qid, &id);
4370 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4371 got_object_commit_close(commit);
4374 err = print_commit_oneline(commit, &id,
4377 err = print_commit(commit, &id, repo, path,
4378 (show_changed_paths || show_diffstat) ?
4379 &changed_paths : NULL,
4380 show_diffstat ? &dsa : NULL, show_patch,
4381 diff_context, refs_idmap, NULL);
4382 got_object_commit_close(commit);
4386 if ((limit && --limit == 0) ||
4387 (end_id && got_object_id_cmp(&id, end_id) == 0))
4390 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4392 if (reverse_display_order) {
4393 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4394 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4395 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4397 err = got_object_open_as_commit(&commit, repo,
4401 if (show_changed_paths || show_diffstat) {
4402 err = get_changed_paths(&changed_paths,
4403 commit, repo, show_diffstat ? &dsa : NULL);
4408 err = print_commit_oneline(commit, &qid->id,
4411 err = print_commit(commit, &qid->id, repo, path,
4412 (show_changed_paths || show_diffstat) ?
4413 &changed_paths : NULL,
4414 show_diffstat ? &dsa : NULL, show_patch,
4415 diff_context, refs_idmap, NULL);
4416 got_object_commit_close(commit);
4419 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4423 while (!STAILQ_EMPTY(&reversed_commits)) {
4424 qid = STAILQ_FIRST(&reversed_commits);
4425 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4426 got_object_qid_free(qid);
4428 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4431 got_commit_graph_close(graph);
4438 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
4439 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4440 "[path]\n", getprogname());
4445 get_default_log_limit(void)
4447 const char *got_default_log_limit;
4451 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4452 if (got_default_log_limit == NULL)
4454 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4460 static const struct got_error *
4461 cmd_log(int argc, char *argv[])
4463 const struct got_error *error;
4464 struct got_repository *repo = NULL;
4465 struct got_worktree *worktree = NULL;
4466 struct got_object_id *start_id = NULL, *end_id = NULL;
4467 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4468 const char *start_commit = NULL, *end_commit = NULL;
4469 const char *search_pattern = NULL;
4470 int diff_context = -1, ch;
4471 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4472 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4474 struct got_reflist_head refs;
4475 struct got_reflist_object_id_map *refs_idmap = NULL;
4476 FILE *tmpfile = NULL;
4477 int *pack_fds = NULL;
4482 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4488 limit = get_default_log_limit();
4490 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
4496 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4499 errx(1, "number of context lines is %s: %s",
4503 start_commit = optarg;
4509 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4511 errx(1, "number of commits is %s: %s",
4515 show_changed_paths = 1;
4521 reverse_display_order = 1;
4524 repo_path = realpath(optarg, NULL);
4525 if (repo_path == NULL)
4526 return got_error_from_errno2("realpath",
4528 got_path_strip_trailing_slashes(repo_path);
4531 search_pattern = optarg;
4537 end_commit = optarg;
4548 if (diff_context == -1)
4550 else if (!show_patch)
4551 errx(1, "-C requires -p");
4553 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4554 errx(1, "cannot use -s with -d, -p or -P");
4556 cwd = getcwd(NULL, 0);
4558 error = got_error_from_errno("getcwd");
4562 error = got_repo_pack_fds_open(&pack_fds);
4566 if (repo_path == NULL) {
4567 error = got_worktree_open(&worktree, cwd);
4568 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4575 error = got_worktree_resolve_path(&path, worktree,
4580 path = strdup(argv[0]);
4582 error = got_error_from_errno("strdup");
4586 } else if (argc != 0)
4589 if (repo_path == NULL) {
4590 repo_path = worktree ?
4591 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4593 if (repo_path == NULL) {
4594 error = got_error_from_errno("strdup");
4598 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4602 error = apply_unveil(got_repo_get_path(repo), 1,
4603 worktree ? got_worktree_get_root_path(worktree) : NULL);
4607 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4611 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4615 if (start_commit == NULL) {
4616 struct got_reference *head_ref;
4617 struct got_commit_object *commit = NULL;
4618 error = got_ref_open(&head_ref, repo,
4619 worktree ? got_worktree_get_head_ref_name(worktree)
4623 error = got_ref_resolve(&start_id, repo, head_ref);
4624 got_ref_close(head_ref);
4627 error = got_object_open_as_commit(&commit, repo,
4631 got_object_commit_close(commit);
4633 error = got_repo_match_object_id(&start_id, NULL,
4634 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4638 if (end_commit != NULL) {
4639 error = got_repo_match_object_id(&end_id, NULL,
4640 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4647 * If a path was specified on the command line it was resolved
4648 * to a path in the work tree above. Prepend the work tree's
4649 * path prefix to obtain the corresponding in-repository path.
4653 prefix = got_worktree_get_path_prefix(worktree);
4654 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4655 (path[0] != '\0') ? "/" : "", path) == -1) {
4656 error = got_error_from_errno("asprintf");
4661 error = got_repo_map_path(&in_repo_path, repo,
4667 path = in_repo_path;
4671 /* Release work tree lock. */
4672 got_worktree_close(worktree);
4676 if (search_pattern && show_patch) {
4677 tmpfile = got_opentemp();
4678 if (tmpfile == NULL) {
4679 error = got_error_from_errno("got_opentemp");
4684 error = print_commits(start_id, end_id, repo, path ? path : "",
4685 show_changed_paths, show_diffstat, show_patch, search_pattern,
4686 diff_context, limit, log_branches, reverse_display_order,
4687 refs_idmap, one_line, tmpfile);
4693 got_worktree_close(worktree);
4695 const struct got_error *close_err = got_repo_close(repo);
4700 const struct got_error *pack_err =
4701 got_repo_pack_fds_close(pack_fds);
4706 got_reflist_object_id_map_free(refs_idmap);
4707 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4708 error = got_error_from_errno("fclose");
4709 got_ref_list_free(&refs);
4716 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4717 "[-r repository-path] [object1 object2 | path ...]\n",
4722 struct print_diff_arg {
4723 struct got_repository *repo;
4724 struct got_worktree *worktree;
4725 struct got_diffstat_cb_arg *diffstat;
4730 enum got_diff_algorithm diff_algo;
4731 int ignore_whitespace;
4732 int force_text_diff;
4740 * Create a file which contains the target path of a symlink so we can feed
4741 * it as content to the diff engine.
4743 static const struct got_error *
4744 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4745 const char *abspath)
4747 const struct got_error *err = NULL;
4748 char target_path[PATH_MAX];
4749 ssize_t target_len, outlen;
4754 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4755 if (target_len == -1)
4756 return got_error_from_errno2("readlinkat", abspath);
4758 target_len = readlink(abspath, target_path, PATH_MAX);
4759 if (target_len == -1)
4760 return got_error_from_errno2("readlink", abspath);
4763 *fd = got_opentempfd();
4765 return got_error_from_errno("got_opentempfd");
4767 outlen = write(*fd, target_path, target_len);
4769 err = got_error_from_errno("got_opentempfd");
4773 if (lseek(*fd, 0, SEEK_SET) == -1) {
4774 err = got_error_from_errno2("lseek", abspath);
4785 static const struct got_error *
4786 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4787 const char *path, struct got_object_id *blob_id,
4788 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4789 int dirfd, const char *de_name)
4791 struct print_diff_arg *a = arg;
4792 const struct got_error *err = NULL;
4793 struct got_blob_object *blob1 = NULL;
4794 int fd = -1, fd1 = -1, fd2 = -1;
4796 char *abspath = NULL, *label1 = NULL;
4801 memset(&sb, 0, sizeof(sb));
4803 if (a->diff_staged) {
4804 if (staged_status != GOT_STATUS_MODIFY &&
4805 staged_status != GOT_STATUS_ADD &&
4806 staged_status != GOT_STATUS_DELETE)
4809 if (staged_status == GOT_STATUS_DELETE)
4811 if (status == GOT_STATUS_NONEXISTENT)
4812 return got_error_set_errno(ENOENT, path);
4813 if (status != GOT_STATUS_MODIFY &&
4814 status != GOT_STATUS_ADD &&
4815 status != GOT_STATUS_DELETE &&
4816 status != GOT_STATUS_CONFLICT)
4820 err = got_opentemp_truncate(a->f1);
4822 return got_error_from_errno("got_opentemp_truncate");
4823 err = got_opentemp_truncate(a->f2);
4825 return got_error_from_errno("got_opentemp_truncate");
4827 if (!a->header_shown) {
4828 if (fprintf(a->outfile, "diff %s%s\n",
4829 a->diff_staged ? "-s " : "",
4830 got_worktree_get_root_path(a->worktree)) < 0) {
4831 err = got_error_from_errno("fprintf");
4834 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4835 err = got_error_from_errno("fprintf");
4838 if (fprintf(a->outfile, "path + %s%s\n",
4839 got_worktree_get_root_path(a->worktree),
4840 a->diff_staged ? " (staged changes)" : "") < 0) {
4841 err = got_error_from_errno("fprintf");
4844 a->header_shown = 1;
4847 if (a->diff_staged) {
4848 const char *label1 = NULL, *label2 = NULL;
4849 switch (staged_status) {
4850 case GOT_STATUS_MODIFY:
4854 case GOT_STATUS_ADD:
4857 case GOT_STATUS_DELETE:
4861 return got_error(GOT_ERR_FILE_STATUS);
4863 fd1 = got_opentempfd();
4865 err = got_error_from_errno("got_opentempfd");
4868 fd2 = got_opentempfd();
4870 err = got_error_from_errno("got_opentempfd");
4873 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4874 fd1, fd2, blob_id, staged_blob_id, label1, label2,
4875 a->diff_algo, a->diff_context, a->ignore_whitespace,
4876 a->force_text_diff, a->show_diffstat, a->diffstat, a->repo,
4881 fd1 = got_opentempfd();
4883 err = got_error_from_errno("got_opentempfd");
4887 if (staged_status == GOT_STATUS_ADD ||
4888 staged_status == GOT_STATUS_MODIFY) {
4890 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4894 err = got_object_id_str(&id_str, staged_blob_id);
4897 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4898 err = got_error_from_errno("asprintf");
4903 } else if (status != GOT_STATUS_ADD) {
4904 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4910 if (status != GOT_STATUS_DELETE) {
4911 if (asprintf(&abspath, "%s/%s",
4912 got_worktree_get_root_path(a->worktree), path) == -1) {
4913 err = got_error_from_errno("asprintf");
4918 fd = openat(dirfd, de_name,
4919 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4921 if (!got_err_open_nofollow_on_symlink()) {
4922 err = got_error_from_errno2("openat",
4926 err = get_symlink_target_file(&fd, dirfd,
4932 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4934 if (!got_err_open_nofollow_on_symlink()) {
4935 err = got_error_from_errno2("open",
4939 err = get_symlink_target_file(&fd, dirfd,
4945 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4946 err = got_error_from_errno2("fstatat", abspath);
4949 f2 = fdopen(fd, "r");
4951 err = got_error_from_errno2("fdopen", abspath);
4959 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4965 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4966 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4967 a->ignore_whitespace, a->force_text_diff, a->show_diffstat,
4968 a->diffstat, a->outfile);
4970 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4971 err = got_error_from_errno("close");
4972 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4973 err = got_error_from_errno("close");
4975 got_object_blob_close(blob1);
4976 if (fd != -1 && close(fd) == -1 && err == NULL)
4977 err = got_error_from_errno("close");
4978 if (f2 && fclose(f2) == EOF && err == NULL)
4979 err = got_error_from_errno("fclose");
4984 static const struct got_error *
4990 if (fseeko(f, 0L, SEEK_SET) == -1)
4991 return got_error_from_errno("fseek");
4994 r = fread(buf, 1, sizeof(buf), f);
4997 return got_error_from_errno("fread");
5001 if (fwrite(buf, 1, r, stdout) != r)
5002 return got_ferror(stdout, GOT_ERR_IO);
5008 static const struct got_error *
5009 cmd_diff(int argc, char *argv[])
5011 const struct got_error *error;
5012 struct got_repository *repo = NULL;
5013 struct got_worktree *worktree = NULL;
5014 char *cwd = NULL, *repo_path = NULL;
5015 const char *commit_args[2] = { NULL, NULL };
5016 int ncommit_args = 0;
5017 struct got_object_id *ids[2] = { NULL, NULL };
5018 char *labels[2] = { NULL, NULL };
5019 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5020 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5021 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5023 struct got_reflist_head refs;
5024 struct got_pathlist_head diffstat_paths, paths;
5025 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5026 int fd1 = -1, fd2 = -1;
5027 int *pack_fds = NULL;
5028 struct got_diffstat_cb_arg dsa;
5030 memset(&dsa, 0, sizeof(dsa));
5034 TAILQ_INIT(&diffstat_paths);
5037 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5042 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5045 force_text_diff = 1;
5048 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5051 errx(1, "number of context lines is %s: %s",
5055 if (ncommit_args >= 2)
5056 errx(1, "too many -c options used");
5057 commit_args[ncommit_args++] = optarg;
5066 repo_path = realpath(optarg, NULL);
5067 if (repo_path == NULL)
5068 return got_error_from_errno2("realpath",
5070 got_path_strip_trailing_slashes(repo_path);
5077 ignore_whitespace = 1;
5088 cwd = getcwd(NULL, 0);
5090 error = got_error_from_errno("getcwd");
5094 error = got_repo_pack_fds_open(&pack_fds);
5098 if (repo_path == NULL) {
5099 error = got_worktree_open(&worktree, cwd);
5100 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5106 strdup(got_worktree_get_repo_path(worktree));
5107 if (repo_path == NULL) {
5108 error = got_error_from_errno("strdup");
5112 repo_path = strdup(cwd);
5113 if (repo_path == NULL) {
5114 error = got_error_from_errno("strdup");
5120 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5125 if (show_diffstat) {
5126 dsa.paths = &diffstat_paths;
5127 dsa.force_text = force_text_diff;
5128 dsa.ignore_ws = ignore_whitespace;
5129 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5132 if (rflag || worktree == NULL || ncommit_args > 0) {
5134 error = got_error_msg(GOT_ERR_NOT_IMPL,
5135 "-P option can only be used when diffing "
5140 error = got_error_msg(GOT_ERR_NOT_IMPL,
5141 "-s option can only be used when diffing "
5147 error = apply_unveil(got_repo_get_path(repo), 1,
5148 worktree ? got_worktree_get_root_path(worktree) : NULL);
5152 if ((!force_path && argc == 2) || ncommit_args > 0) {
5153 int obj_type = (ncommit_args > 0 ?
5154 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5155 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5159 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5161 if (ncommit_args > 0)
5162 arg = commit_args[i];
5165 error = got_repo_match_object_id(&ids[i], &labels[i],
5166 arg, obj_type, &refs, repo);
5168 if (error->code != GOT_ERR_NOT_REF &&
5169 error->code != GOT_ERR_NO_OBJ)
5171 if (ncommit_args > 0)
5179 f1 = got_opentemp();
5181 error = got_error_from_errno("got_opentemp");
5185 f2 = got_opentemp();
5187 error = got_error_from_errno("got_opentemp");
5191 outfile = got_opentemp();
5192 if (outfile == NULL) {
5193 error = got_error_from_errno("got_opentemp");
5197 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5198 struct print_diff_arg arg;
5201 if (worktree == NULL) {
5202 if (argc == 2 && ids[0] == NULL) {
5203 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5205 } else if (argc == 2 && ids[1] == NULL) {
5206 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5208 } else if (argc > 0) {
5209 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5210 "%s", "specified paths cannot be resolved");
5213 error = got_error(GOT_ERR_NOT_WORKTREE);
5218 error = get_worktree_paths_from_argv(&paths, argc, argv,
5223 error = got_object_id_str(&id_str,
5224 got_worktree_get_base_commit_id(worktree));
5228 arg.worktree = worktree;
5229 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5230 arg.diff_context = diff_context;
5231 arg.id_str = id_str;
5232 arg.header_shown = 0;
5233 arg.diff_staged = diff_staged;
5234 arg.ignore_whitespace = ignore_whitespace;
5235 arg.force_text_diff = force_text_diff;
5236 arg.show_diffstat = show_diffstat;
5237 arg.diffstat = &dsa;
5240 arg.outfile = outfile;
5242 error = got_worktree_status(worktree, &paths, repo, 0,
5243 print_diff, &arg, check_cancelled, NULL);
5248 if (show_diffstat && dsa.nfiles > 0) {
5251 if (asprintf(&header, "diffstat %s%s",
5252 diff_staged ? "-s " : "",
5253 got_worktree_get_root_path(worktree)) == -1) {
5254 error = got_error_from_errno("asprintf");
5258 error = print_diffstat(&dsa, &diffstat_paths, header);
5264 error = printfile(outfile);
5268 if (ncommit_args == 1) {
5269 struct got_commit_object *commit;
5270 error = got_object_open_as_commit(&commit, repo, ids[0]);
5274 labels[1] = labels[0];
5276 if (got_object_commit_get_nparents(commit) > 0) {
5277 const struct got_object_id_queue *pids;
5278 struct got_object_qid *pid;
5279 pids = got_object_commit_get_parent_ids(commit);
5280 pid = STAILQ_FIRST(pids);
5281 ids[0] = got_object_id_dup(&pid->id);
5282 if (ids[0] == NULL) {
5283 error = got_error_from_errno(
5284 "got_object_id_dup");
5285 got_object_commit_close(commit);
5288 error = got_object_id_str(&labels[0], ids[0]);
5290 got_object_commit_close(commit);
5295 labels[0] = strdup("/dev/null");
5296 if (labels[0] == NULL) {
5297 error = got_error_from_errno("strdup");
5298 got_object_commit_close(commit);
5303 got_object_commit_close(commit);
5306 if (ncommit_args == 0 && argc > 2) {
5307 error = got_error_msg(GOT_ERR_BAD_PATH,
5308 "path arguments cannot be used when diffing two objects");
5313 error = got_object_get_type(&type1, repo, ids[0]);
5318 error = got_object_get_type(&type2, repo, ids[1]);
5321 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5322 error = got_error(GOT_ERR_OBJ_TYPE);
5325 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5326 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5327 "path arguments cannot be used when diffing blobs");
5331 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5333 struct got_pathlist_entry *new;
5337 error = got_worktree_resolve_path(&p, worktree,
5341 prefix = got_worktree_get_path_prefix(worktree);
5342 while (prefix[0] == '/')
5344 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5345 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5347 error = got_error_from_errno("asprintf");
5353 char *mapped_path, *s;
5354 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5360 in_repo_path = strdup(s);
5361 if (in_repo_path == NULL) {
5362 error = got_error_from_errno("asprintf");
5369 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5370 if (error || new == NULL /* duplicate */)
5377 /* Release work tree lock. */
5378 got_worktree_close(worktree);
5382 fd1 = got_opentempfd();
5384 error = got_error_from_errno("got_opentempfd");
5388 fd2 = got_opentempfd();
5390 error = got_error_from_errno("got_opentempfd");
5394 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5395 case GOT_OBJ_TYPE_BLOB:
5396 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5397 fd1, fd2, ids[0], ids[1], NULL, NULL,
5398 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5399 ignore_whitespace, force_text_diff, show_diffstat,
5400 show_diffstat ? &dsa : NULL, repo, outfile);
5402 case GOT_OBJ_TYPE_TREE:
5403 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5404 ids[0], ids[1], &paths, "", "",
5405 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5406 ignore_whitespace, force_text_diff, show_diffstat,
5407 show_diffstat ? &dsa : NULL, repo, outfile);
5409 case GOT_OBJ_TYPE_COMMIT:
5410 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5411 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5412 fd1, fd2, ids[0], ids[1], &paths,
5413 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5414 ignore_whitespace, force_text_diff, show_diffstat,
5415 show_diffstat ? &dsa : NULL, repo, outfile);
5418 error = got_error(GOT_ERR_OBJ_TYPE);
5423 if (show_diffstat && dsa.nfiles > 0) {
5424 char *header = NULL;
5426 if (asprintf(&header, "diffstat %s %s",
5427 labels[0], labels[1]) == -1) {
5428 error = got_error_from_errno("asprintf");
5432 error = print_diffstat(&dsa, &diffstat_paths, header);
5438 error = printfile(outfile);
5446 got_worktree_close(worktree);
5448 const struct got_error *close_err = got_repo_close(repo);
5453 const struct got_error *pack_err =
5454 got_repo_pack_fds_close(pack_fds);
5458 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5459 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5460 got_ref_list_free(&refs);
5461 if (outfile && fclose(outfile) == EOF && error == NULL)
5462 error = got_error_from_errno("fclose");
5463 if (f1 && fclose(f1) == EOF && error == NULL)
5464 error = got_error_from_errno("fclose");
5465 if (f2 && fclose(f2) == EOF && error == NULL)
5466 error = got_error_from_errno("fclose");
5467 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5468 error = got_error_from_errno("close");
5469 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5470 error = got_error_from_errno("close");
5478 "usage: %s blame [-c commit] [-r repository-path] path\n",
5487 char datebuf[11]; /* YYYY-MM-DD + NUL */
5490 struct blame_cb_args {
5491 struct blame_line *lines;
5495 off_t *line_offsets;
5497 struct got_repository *repo;
5500 static const struct got_error *
5501 blame_cb(void *arg, int nlines, int lineno,
5502 struct got_commit_object *commit, struct got_object_id *id)
5504 const struct got_error *err = NULL;
5505 struct blame_cb_args *a = arg;
5506 struct blame_line *bline;
5508 size_t linesize = 0;
5511 time_t committer_time;
5513 if (nlines != a->nlines ||
5514 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5515 return got_error(GOT_ERR_RANGE);
5517 if (sigint_received)
5518 return got_error(GOT_ERR_ITER_COMPLETED);
5521 return NULL; /* no change in this commit */
5523 /* Annotate this line. */
5524 bline = &a->lines[lineno - 1];
5525 if (bline->annotated)
5527 err = got_object_id_str(&bline->id_str, id);
5531 bline->committer = strdup(got_object_commit_get_committer(commit));
5532 if (bline->committer == NULL) {
5533 err = got_error_from_errno("strdup");
5537 committer_time = got_object_commit_get_committer_time(commit);
5538 if (gmtime_r(&committer_time, &tm) == NULL)
5539 return got_error_from_errno("gmtime_r");
5540 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5542 err = got_error(GOT_ERR_NO_SPACE);
5545 bline->annotated = 1;
5547 /* Print lines annotated so far. */
5548 bline = &a->lines[a->lineno_cur - 1];
5549 if (!bline->annotated)
5552 offset = a->line_offsets[a->lineno_cur - 1];
5553 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5554 err = got_error_from_errno("fseeko");
5558 while (a->lineno_cur <= a->nlines && bline->annotated) {
5559 char *smallerthan, *at, *nl, *committer;
5562 if (getline(&line, &linesize, a->f) == -1) {
5564 err = got_error_from_errno("getline");
5568 committer = bline->committer;
5569 smallerthan = strchr(committer, '<');
5570 if (smallerthan && smallerthan[1] != '\0')
5571 committer = smallerthan + 1;
5572 at = strchr(committer, '@');
5575 len = strlen(committer);
5577 committer[8] = '\0';
5579 nl = strchr(line, '\n');
5582 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5583 bline->id_str, bline->datebuf, committer, line);
5586 bline = &a->lines[a->lineno_cur - 1];
5593 static const struct got_error *
5594 cmd_blame(int argc, char *argv[])
5596 const struct got_error *error;
5597 struct got_repository *repo = NULL;
5598 struct got_worktree *worktree = NULL;
5599 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5600 char *link_target = NULL;
5601 struct got_object_id *obj_id = NULL;
5602 struct got_object_id *commit_id = NULL;
5603 struct got_commit_object *commit = NULL;
5604 struct got_blob_object *blob = NULL;
5605 char *commit_id_str = NULL;
5606 struct blame_cb_args bca;
5607 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5609 int *pack_fds = NULL;
5610 FILE *f1 = NULL, *f2 = NULL;
5612 fd1 = got_opentempfd();
5614 return got_error_from_errno("got_opentempfd");
5616 memset(&bca, 0, sizeof(bca));
5619 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5624 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5627 commit_id_str = optarg;
5630 repo_path = realpath(optarg, NULL);
5631 if (repo_path == NULL)
5632 return got_error_from_errno2("realpath",
5634 got_path_strip_trailing_slashes(repo_path);
5650 cwd = getcwd(NULL, 0);
5652 error = got_error_from_errno("getcwd");
5656 error = got_repo_pack_fds_open(&pack_fds);
5660 if (repo_path == NULL) {
5661 error = got_worktree_open(&worktree, cwd);
5662 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5668 strdup(got_worktree_get_repo_path(worktree));
5669 if (repo_path == NULL) {
5670 error = got_error_from_errno("strdup");
5675 repo_path = strdup(cwd);
5676 if (repo_path == NULL) {
5677 error = got_error_from_errno("strdup");
5683 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5688 const char *prefix = got_worktree_get_path_prefix(worktree);
5691 error = got_worktree_resolve_path(&p, worktree, path);
5694 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5695 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5697 error = got_error_from_errno("asprintf");
5702 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5704 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5707 error = got_repo_map_path(&in_repo_path, repo, path);
5712 if (commit_id_str == NULL) {
5713 struct got_reference *head_ref;
5714 error = got_ref_open(&head_ref, repo, worktree ?
5715 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5718 error = got_ref_resolve(&commit_id, repo, head_ref);
5719 got_ref_close(head_ref);
5723 struct got_reflist_head refs;
5725 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5729 error = got_repo_match_object_id(&commit_id, NULL,
5730 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5731 got_ref_list_free(&refs);
5737 /* Release work tree lock. */
5738 got_worktree_close(worktree);
5742 error = got_object_open_as_commit(&commit, repo, commit_id);
5746 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5751 error = got_object_id_by_path(&obj_id, repo, commit,
5752 link_target ? link_target : in_repo_path);
5756 error = got_object_get_type(&obj_type, repo, obj_id);
5760 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5761 error = got_error_path(link_target ? link_target : in_repo_path,
5766 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5769 bca.f = got_opentemp();
5770 if (bca.f == NULL) {
5771 error = got_error_from_errno("got_opentemp");
5774 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5775 &bca.line_offsets, bca.f, blob);
5776 if (error || bca.nlines == 0)
5779 /* Don't include \n at EOF in the blame line count. */
5780 if (bca.line_offsets[bca.nlines - 1] == filesize)
5783 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5784 if (bca.lines == NULL) {
5785 error = got_error_from_errno("calloc");
5789 bca.nlines_prec = 0;
5797 fd2 = got_opentempfd();
5799 error = got_error_from_errno("got_opentempfd");
5802 fd3 = got_opentempfd();
5804 error = got_error_from_errno("got_opentempfd");
5807 f1 = got_opentemp();
5809 error = got_error_from_errno("got_opentemp");
5812 f2 = got_opentemp();
5814 error = got_error_from_errno("got_opentemp");
5817 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5818 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5819 check_cancelled, NULL, fd2, fd3, f1, f2);
5828 got_object_commit_close(commit);
5830 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5831 error = got_error_from_errno("close");
5832 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5833 error = got_error_from_errno("close");
5834 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5835 error = got_error_from_errno("close");
5836 if (f1 && fclose(f1) == EOF && error == NULL)
5837 error = got_error_from_errno("fclose");
5838 if (f2 && fclose(f2) == EOF && error == NULL)
5839 error = got_error_from_errno("fclose");
5842 got_object_blob_close(blob);
5844 got_worktree_close(worktree);
5846 const struct got_error *close_err = got_repo_close(repo);
5851 const struct got_error *pack_err =
5852 got_repo_pack_fds_close(pack_fds);
5857 for (i = 0; i < bca.nlines; i++) {
5858 struct blame_line *bline = &bca.lines[i];
5859 free(bline->id_str);
5860 free(bline->committer);
5864 free(bca.line_offsets);
5865 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5866 error = got_error_from_errno("fclose");
5873 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5874 "[path]\n", getprogname());
5878 static const struct got_error *
5879 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5880 const char *root_path, struct got_repository *repo)
5882 const struct got_error *err = NULL;
5883 int is_root_path = (strcmp(path, root_path) == 0);
5884 const char *modestr = "";
5885 mode_t mode = got_tree_entry_get_mode(te);
5886 char *link_target = NULL;
5888 path += strlen(root_path);
5889 while (path[0] == '/')
5892 if (got_object_tree_entry_is_submodule(te))
5894 else if (S_ISLNK(mode)) {
5897 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5900 for (i = 0; i < strlen(link_target); i++) {
5901 if (!isprint((unsigned char)link_target[i]))
5902 link_target[i] = '?';
5907 else if (S_ISDIR(mode))
5909 else if (mode & S_IXUSR)
5912 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5913 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5914 link_target ? " -> ": "", link_target ? link_target : "");
5920 static const struct got_error *
5921 print_tree(const char *path, struct got_commit_object *commit,
5922 int show_ids, int recurse, const char *root_path,
5923 struct got_repository *repo)
5925 const struct got_error *err = NULL;
5926 struct got_object_id *tree_id = NULL;
5927 struct got_tree_object *tree = NULL;
5930 err = got_object_id_by_path(&tree_id, repo, commit, path);
5934 err = got_object_open_as_tree(&tree, repo, tree_id);
5937 nentries = got_object_tree_get_nentries(tree);
5938 for (i = 0; i < nentries; i++) {
5939 struct got_tree_entry *te;
5942 if (sigint_received || sigpipe_received)
5945 te = got_object_tree_get_entry(tree, i);
5948 err = got_object_id_str(&id_str,
5949 got_tree_entry_get_id(te));
5952 if (asprintf(&id, "%s ", id_str) == -1) {
5953 err = got_error_from_errno("asprintf");
5959 err = print_entry(te, id, path, root_path, repo);
5964 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5966 if (asprintf(&child_path, "%s%s%s", path,
5967 path[0] == '/' && path[1] == '\0' ? "" : "/",
5968 got_tree_entry_get_name(te)) == -1) {
5969 err = got_error_from_errno("asprintf");
5972 err = print_tree(child_path, commit, show_ids, 1,
5981 got_object_tree_close(tree);
5986 static const struct got_error *
5987 cmd_tree(int argc, char *argv[])
5989 const struct got_error *error;
5990 struct got_repository *repo = NULL;
5991 struct got_worktree *worktree = NULL;
5992 const char *path, *refname = NULL;
5993 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5994 struct got_object_id *commit_id = NULL;
5995 struct got_commit_object *commit = NULL;
5996 char *commit_id_str = NULL;
5997 int show_ids = 0, recurse = 0;
5999 int *pack_fds = NULL;
6002 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6007 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6010 commit_id_str = optarg;
6019 repo_path = realpath(optarg, NULL);
6020 if (repo_path == NULL)
6021 return got_error_from_errno2("realpath",
6023 got_path_strip_trailing_slashes(repo_path);
6041 cwd = getcwd(NULL, 0);
6043 error = got_error_from_errno("getcwd");
6047 error = got_repo_pack_fds_open(&pack_fds);
6051 if (repo_path == NULL) {
6052 error = got_worktree_open(&worktree, cwd);
6053 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6059 strdup(got_worktree_get_repo_path(worktree));
6060 if (repo_path == NULL)
6061 error = got_error_from_errno("strdup");
6065 repo_path = strdup(cwd);
6066 if (repo_path == NULL) {
6067 error = got_error_from_errno("strdup");
6073 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6078 const char *prefix = got_worktree_get_path_prefix(worktree);
6083 error = got_worktree_resolve_path(&p, worktree, path);
6086 if (asprintf(&in_repo_path, "%s%s%s", prefix,
6087 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
6089 error = got_error_from_errno("asprintf");
6094 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6098 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6103 error = got_repo_map_path(&in_repo_path, repo, path);
6108 if (commit_id_str == NULL) {
6109 struct got_reference *head_ref;
6111 refname = got_worktree_get_head_ref_name(worktree);
6113 refname = GOT_REF_HEAD;
6114 error = got_ref_open(&head_ref, repo, refname, 0);
6117 error = got_ref_resolve(&commit_id, repo, head_ref);
6118 got_ref_close(head_ref);
6122 struct got_reflist_head refs;
6124 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6128 error = got_repo_match_object_id(&commit_id, NULL,
6129 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6130 got_ref_list_free(&refs);
6136 /* Release work tree lock. */
6137 got_worktree_close(worktree);
6141 error = got_object_open_as_commit(&commit, repo, commit_id);
6145 error = print_tree(in_repo_path, commit, show_ids, recurse,
6146 in_repo_path, repo);
6153 got_object_commit_close(commit);
6155 got_worktree_close(worktree);
6157 const struct got_error *close_err = got_repo_close(repo);
6162 const struct got_error *pack_err =
6163 got_repo_pack_fds_close(pack_fds);
6173 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6174 "[-s status-codes] [path ...]\n", getprogname());
6178 struct got_status_arg {
6183 static const struct got_error *
6184 print_status(void *arg, unsigned char status, unsigned char staged_status,
6185 const char *path, struct got_object_id *blob_id,
6186 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6187 int dirfd, const char *de_name)
6189 struct got_status_arg *st = arg;
6191 if (status == staged_status && (status == GOT_STATUS_DELETE))
6192 status = GOT_STATUS_NO_CHANGE;
6193 if (st != NULL && st->status_codes) {
6194 size_t ncodes = strlen(st->status_codes);
6197 for (i = 0; i < ncodes ; i++) {
6199 if (status == st->status_codes[i] ||
6200 staged_status == st->status_codes[i]) {
6205 if (status == st->status_codes[i] ||
6206 staged_status == st->status_codes[i])
6211 if (st->suppress && j == 0)
6218 printf("%c%c %s\n", status, staged_status, path);
6222 static const struct got_error *
6223 cmd_status(int argc, char *argv[])
6225 const struct got_error *error = NULL;
6226 struct got_repository *repo = NULL;
6227 struct got_worktree *worktree = NULL;
6228 struct got_status_arg st;
6230 struct got_pathlist_head paths;
6231 int ch, i, no_ignores = 0;
6232 int *pack_fds = NULL;
6236 memset(&st, 0, sizeof(st));
6237 st.status_codes = NULL;
6240 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6246 if (st.status_codes != NULL && st.suppress == 0)
6247 option_conflict('S', 's');
6251 for (i = 0; i < strlen(optarg); i++) {
6252 switch (optarg[i]) {
6253 case GOT_STATUS_MODIFY:
6254 case GOT_STATUS_ADD:
6255 case GOT_STATUS_DELETE:
6256 case GOT_STATUS_CONFLICT:
6257 case GOT_STATUS_MISSING:
6258 case GOT_STATUS_OBSTRUCTED:
6259 case GOT_STATUS_UNVERSIONED:
6260 case GOT_STATUS_MODE_CHANGE:
6261 case GOT_STATUS_NONEXISTENT:
6264 errx(1, "invalid status code '%c'",
6268 if (ch == 's' && st.suppress)
6269 option_conflict('s', 'S');
6270 st.status_codes = optarg;
6282 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6286 cwd = getcwd(NULL, 0);
6288 error = got_error_from_errno("getcwd");
6292 error = got_repo_pack_fds_open(&pack_fds);
6296 error = got_worktree_open(&worktree, cwd);
6298 if (error->code == GOT_ERR_NOT_WORKTREE)
6299 error = wrap_not_worktree_error(error, "status", cwd);
6303 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6308 error = apply_unveil(got_repo_get_path(repo), 1,
6309 got_worktree_get_root_path(worktree));
6313 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6317 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6318 print_status, &st, check_cancelled, NULL);
6321 const struct got_error *pack_err =
6322 got_repo_pack_fds_close(pack_fds);
6327 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6335 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6336 "[-s reference] [name]\n", getprogname());
6340 static const struct got_error *
6341 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6343 static const struct got_error *err = NULL;
6344 struct got_reflist_head refs;
6345 struct got_reflist_entry *re;
6348 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6349 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6354 TAILQ_FOREACH(re, &refs, entry) {
6356 refstr = got_ref_to_str(re->ref);
6357 if (refstr == NULL) {
6358 err = got_error_from_errno("got_ref_to_str");
6361 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6365 got_ref_list_free(&refs);
6369 static const struct got_error *
6370 delete_ref_by_name(struct got_repository *repo, const char *refname)
6372 const struct got_error *err;
6373 struct got_reference *ref;
6375 err = got_ref_open(&ref, repo, refname, 0);
6379 err = delete_ref(repo, ref);
6384 static const struct got_error *
6385 add_ref(struct got_repository *repo, const char *refname, const char *target)
6387 const struct got_error *err = NULL;
6388 struct got_object_id *id = NULL;
6389 struct got_reference *ref = NULL;
6390 struct got_reflist_head refs;
6393 * Don't let the user create a reference name with a leading '-'.
6394 * While technically a valid reference name, this case is usually
6395 * an unintended typo.
6397 if (refname[0] == '-')
6398 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6401 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6404 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6406 got_ref_list_free(&refs);
6410 err = got_ref_alloc(&ref, refname, id);
6414 err = got_ref_write(ref, repo);
6422 static const struct got_error *
6423 add_symref(struct got_repository *repo, const char *refname, const char *target)
6425 const struct got_error *err = NULL;
6426 struct got_reference *ref = NULL;
6427 struct got_reference *target_ref = NULL;
6430 * Don't let the user create a reference name with a leading '-'.
6431 * While technically a valid reference name, this case is usually
6432 * an unintended typo.
6434 if (refname[0] == '-')
6435 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6437 err = got_ref_open(&target_ref, repo, target, 0);
6441 err = got_ref_alloc_symref(&ref, refname, target_ref);
6445 err = got_ref_write(ref, repo);
6448 got_ref_close(target_ref);
6454 static const struct got_error *
6455 cmd_ref(int argc, char *argv[])
6457 const struct got_error *error = NULL;
6458 struct got_repository *repo = NULL;
6459 struct got_worktree *worktree = NULL;
6460 char *cwd = NULL, *repo_path = NULL;
6461 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6462 const char *obj_arg = NULL, *symref_target= NULL;
6463 char *refname = NULL;
6464 int *pack_fds = NULL;
6466 while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6478 repo_path = realpath(optarg, NULL);
6479 if (repo_path == NULL)
6480 return got_error_from_errno2("realpath",
6482 got_path_strip_trailing_slashes(repo_path);
6485 symref_target = optarg;
6496 if (obj_arg && do_list)
6497 option_conflict('c', 'l');
6498 if (obj_arg && do_delete)
6499 option_conflict('c', 'd');
6500 if (obj_arg && symref_target)
6501 option_conflict('c', 's');
6502 if (symref_target && do_delete)
6503 option_conflict('s', 'd');
6504 if (symref_target && do_list)
6505 option_conflict('s', 'l');
6506 if (do_delete && do_list)
6507 option_conflict('d', 'l');
6508 if (sort_by_time && !do_list)
6509 errx(1, "-t option requires -l option");
6515 if (argc != 0 && argc != 1)
6518 refname = strdup(argv[0]);
6519 if (refname == NULL) {
6520 error = got_error_from_errno("strdup");
6527 refname = strdup(argv[0]);
6528 if (refname == NULL) {
6529 error = got_error_from_errno("strdup");
6535 got_path_strip_trailing_slashes(refname);
6538 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6539 "sendfd unveil", NULL) == -1)
6542 cwd = getcwd(NULL, 0);
6544 error = got_error_from_errno("getcwd");
6548 error = got_repo_pack_fds_open(&pack_fds);
6552 if (repo_path == NULL) {
6553 error = got_worktree_open(&worktree, cwd);
6554 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6560 strdup(got_worktree_get_repo_path(worktree));
6561 if (repo_path == NULL)
6562 error = got_error_from_errno("strdup");
6566 repo_path = strdup(cwd);
6567 if (repo_path == NULL) {
6568 error = got_error_from_errno("strdup");
6574 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6580 /* Remove "cpath" promise. */
6581 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6587 error = apply_unveil(got_repo_get_path(repo), do_list,
6588 worktree ? got_worktree_get_root_path(worktree) : NULL);
6593 error = list_refs(repo, refname, sort_by_time);
6595 error = delete_ref_by_name(repo, refname);
6596 else if (symref_target)
6597 error = add_symref(repo, refname, symref_target);
6599 if (obj_arg == NULL)
6601 error = add_ref(repo, refname, obj_arg);
6606 const struct got_error *close_err = got_repo_close(repo);
6611 got_worktree_close(worktree);
6613 const struct got_error *pack_err =
6614 got_repo_pack_fds_close(pack_fds);
6626 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6627 "[-r repository-path] [name]\n", getprogname());
6631 static const struct got_error *
6632 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6633 struct got_reference *ref)
6635 const struct got_error *err = NULL;
6636 const char *refname, *marker = " ";
6639 refname = got_ref_get_name(ref);
6640 if (worktree && strcmp(refname,
6641 got_worktree_get_head_ref_name(worktree)) == 0) {
6642 struct got_object_id *id = NULL;
6644 err = got_ref_resolve(&id, repo, ref);
6647 if (got_object_id_cmp(id,
6648 got_worktree_get_base_commit_id(worktree)) == 0)
6655 if (strncmp(refname, "refs/heads/", 11) == 0)
6657 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6659 if (strncmp(refname, "refs/remotes/", 13) == 0)
6662 refstr = got_ref_to_str(ref);
6664 return got_error_from_errno("got_ref_to_str");
6666 printf("%s%s: %s\n", marker, refname, refstr);
6671 static const struct got_error *
6672 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6674 const char *refname;
6676 if (worktree == NULL)
6677 return got_error(GOT_ERR_NOT_WORKTREE);
6679 refname = got_worktree_get_head_ref_name(worktree);
6681 if (strncmp(refname, "refs/heads/", 11) == 0)
6683 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6686 printf("%s\n", refname);
6691 static const struct got_error *
6692 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6695 static const struct got_error *err = NULL;
6696 struct got_reflist_head refs;
6697 struct got_reflist_entry *re;
6698 struct got_reference *temp_ref = NULL;
6699 int rebase_in_progress, histedit_in_progress;
6704 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6709 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6714 if (rebase_in_progress || histedit_in_progress) {
6715 err = got_ref_open(&temp_ref, repo,
6716 got_worktree_get_head_ref_name(worktree), 0);
6719 list_branch(repo, worktree, temp_ref);
6720 got_ref_close(temp_ref);
6724 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6725 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6730 TAILQ_FOREACH(re, &refs, entry)
6731 list_branch(repo, worktree, re->ref);
6733 got_ref_list_free(&refs);
6735 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6736 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6741 TAILQ_FOREACH(re, &refs, entry)
6742 list_branch(repo, worktree, re->ref);
6744 got_ref_list_free(&refs);
6749 static const struct got_error *
6750 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6751 const char *branch_name)
6753 const struct got_error *err = NULL;
6754 struct got_reference *ref = NULL;
6755 char *refname, *remote_refname = NULL;
6757 if (strncmp(branch_name, "refs/", 5) == 0)
6759 if (strncmp(branch_name, "heads/", 6) == 0)
6761 else if (strncmp(branch_name, "remotes/", 8) == 0)
6764 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6765 return got_error_from_errno("asprintf");
6767 if (asprintf(&remote_refname, "refs/remotes/%s",
6768 branch_name) == -1) {
6769 err = got_error_from_errno("asprintf");
6773 err = got_ref_open(&ref, repo, refname, 0);
6775 const struct got_error *err2;
6776 if (err->code != GOT_ERR_NOT_REF)
6779 * Keep 'err' intact such that if neither branch exists
6780 * we report "refs/heads" rather than "refs/remotes" in
6781 * our error message.
6783 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6790 strcmp(got_worktree_get_head_ref_name(worktree),
6791 got_ref_get_name(ref)) == 0) {
6792 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6793 "will not delete this work tree's current branch");
6797 err = delete_ref(repo, ref);
6802 free(remote_refname);
6806 static const struct got_error *
6807 add_branch(struct got_repository *repo, const char *branch_name,
6808 struct got_object_id *base_commit_id)
6810 const struct got_error *err = NULL;
6811 struct got_reference *ref = NULL;
6812 char *refname = NULL;
6815 * Don't let the user create a branch name with a leading '-'.
6816 * While technically a valid reference name, this case is usually
6817 * an unintended typo.
6819 if (branch_name[0] == '-')
6820 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6822 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6825 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6826 err = got_error_from_errno("asprintf");
6830 err = got_ref_open(&ref, repo, refname, 0);
6832 err = got_error(GOT_ERR_BRANCH_EXISTS);
6834 } else if (err->code != GOT_ERR_NOT_REF)
6837 err = got_ref_alloc(&ref, refname, base_commit_id);
6841 err = got_ref_write(ref, repo);
6849 static const struct got_error *
6850 cmd_branch(int argc, char *argv[])
6852 const struct got_error *error = NULL;
6853 struct got_repository *repo = NULL;
6854 struct got_worktree *worktree = NULL;
6855 char *cwd = NULL, *repo_path = NULL;
6856 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6857 const char *delref = NULL, *commit_id_arg = NULL;
6858 struct got_reference *ref = NULL;
6859 struct got_pathlist_head paths;
6860 struct got_object_id *commit_id = NULL;
6861 char *commit_id_str = NULL;
6862 int *pack_fds = NULL;
6866 while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
6869 commit_id_arg = optarg;
6881 repo_path = realpath(optarg, NULL);
6882 if (repo_path == NULL)
6883 return got_error_from_errno2("realpath",
6885 got_path_strip_trailing_slashes(repo_path);
6896 if (do_list && delref)
6897 option_conflict('l', 'd');
6898 if (sort_by_time && !do_list)
6899 errx(1, "-t option requires -l option");
6904 if (!do_list && !delref && argc == 0)
6907 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6908 errx(1, "-c option can only be used when creating a branch");
6910 if (do_list || delref) {
6913 } else if (!do_show && argc != 1)
6917 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6918 "sendfd unveil", NULL) == -1)
6921 cwd = getcwd(NULL, 0);
6923 error = got_error_from_errno("getcwd");
6927 error = got_repo_pack_fds_open(&pack_fds);
6931 if (repo_path == NULL) {
6932 error = got_worktree_open(&worktree, cwd);
6933 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6939 strdup(got_worktree_get_repo_path(worktree));
6940 if (repo_path == NULL)
6941 error = got_error_from_errno("strdup");
6945 repo_path = strdup(cwd);
6946 if (repo_path == NULL) {
6947 error = got_error_from_errno("strdup");
6953 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6958 if (do_list || do_show) {
6959 /* Remove "cpath" promise. */
6960 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6966 error = apply_unveil(got_repo_get_path(repo), do_list,
6967 worktree ? got_worktree_get_root_path(worktree) : NULL);
6972 error = show_current_branch(repo, worktree);
6974 error = list_branches(repo, worktree, sort_by_time);
6976 error = delete_branch(repo, worktree, delref);
6978 struct got_reflist_head refs;
6980 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6984 if (commit_id_arg == NULL)
6985 commit_id_arg = worktree ?
6986 got_worktree_get_head_ref_name(worktree) :
6988 error = got_repo_match_object_id(&commit_id, NULL,
6989 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6990 got_ref_list_free(&refs);
6993 error = add_branch(repo, argv[0], commit_id);
6996 if (worktree && do_update) {
6997 struct got_update_progress_arg upa;
6998 char *branch_refname = NULL;
7000 error = got_object_id_str(&commit_id_str, commit_id);
7003 error = get_worktree_paths_from_argv(&paths, 0, NULL,
7007 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7009 error = got_error_from_errno("asprintf");
7012 error = got_ref_open(&ref, repo, branch_refname, 0);
7013 free(branch_refname);
7016 error = switch_head_ref(ref, commit_id, worktree,
7020 error = got_worktree_set_base_commit_id(worktree, repo,
7024 memset(&upa, 0, sizeof(upa));
7025 error = got_worktree_checkout_files(worktree, &paths,
7026 repo, update_progress, &upa, check_cancelled,
7030 if (upa.did_something) {
7031 printf("Updated to %s: %s\n",
7032 got_worktree_get_head_ref_name(worktree),
7035 print_update_progress_stats(&upa);
7042 const struct got_error *close_err = got_repo_close(repo);
7047 got_worktree_close(worktree);
7049 const struct got_error *pack_err =
7050 got_repo_pack_fds_close(pack_fds);
7057 free(commit_id_str);
7058 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7066 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7067 "[-r repository-path] [-s signer-id] name\n", getprogname());
7072 static const struct got_error *
7073 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7075 const struct got_error *err = NULL;
7076 struct got_reflist_entry *re, *se, *new;
7077 struct got_object_id *re_id, *se_id;
7078 struct got_tag_object *re_tag, *se_tag;
7079 time_t re_time, se_time;
7081 STAILQ_FOREACH(re, tags, entry) {
7082 se = STAILQ_FIRST(sorted);
7084 err = got_reflist_entry_dup(&new, re);
7087 STAILQ_INSERT_HEAD(sorted, new, entry);
7090 err = got_ref_resolve(&re_id, repo, re->ref);
7093 err = got_object_open_as_tag(&re_tag, repo, re_id);
7097 re_time = got_object_tag_get_tagger_time(re_tag);
7098 got_object_tag_close(re_tag);
7102 err = got_ref_resolve(&se_id, repo, re->ref);
7105 err = got_object_open_as_tag(&se_tag, repo, se_id);
7109 se_time = got_object_tag_get_tagger_time(se_tag);
7110 got_object_tag_close(se_tag);
7112 if (se_time > re_time) {
7113 err = got_reflist_entry_dup(&new, re);
7116 STAILQ_INSERT_AFTER(sorted, se, new, entry);
7119 se = STAILQ_NEXT(se, entry);
7128 static const struct got_error *
7129 get_tag_refname(char **refname, const char *tag_name)
7131 const struct got_error *err;
7133 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7134 *refname = strdup(tag_name);
7135 if (*refname == NULL)
7136 return got_error_from_errno("strdup");
7137 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7138 err = got_error_from_errno("asprintf");
7146 static const struct got_error *
7147 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7148 const char *allowed_signers, const char *revoked_signers, int verbosity)
7150 static const struct got_error *err = NULL;
7151 struct got_reflist_head refs;
7152 struct got_reflist_entry *re;
7153 char *wanted_refname = NULL;
7158 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7163 struct got_reference *ref;
7164 err = get_tag_refname(&wanted_refname, tag_name);
7167 /* Wanted tag reference should exist. */
7168 err = got_ref_open(&ref, repo, wanted_refname, 0);
7174 TAILQ_FOREACH(re, &refs, entry) {
7175 const char *refname;
7176 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7178 const char *tagger, *ssh_sig = NULL;
7179 char *sig_msg = NULL;
7181 struct got_object_id *id;
7182 struct got_tag_object *tag;
7183 struct got_commit_object *commit = NULL;
7185 refname = got_ref_get_name(re->ref);
7186 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7187 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7190 refstr = got_ref_to_str(re->ref);
7191 if (refstr == NULL) {
7192 err = got_error_from_errno("got_ref_to_str");
7196 err = got_ref_resolve(&id, repo, re->ref);
7199 err = got_object_open_as_tag(&tag, repo, id);
7201 if (err->code != GOT_ERR_OBJ_TYPE) {
7205 /* "lightweight" tag */
7206 err = got_object_open_as_commit(&commit, repo, id);
7211 tagger = got_object_commit_get_committer(commit);
7213 got_object_commit_get_committer_time(commit);
7214 err = got_object_id_str(&id_str, id);
7220 tagger = got_object_tag_get_tagger(tag);
7221 tagger_time = got_object_tag_get_tagger_time(tag);
7222 err = got_object_id_str(&id_str,
7223 got_object_tag_get_object_id(tag));
7228 if (tag && verify_tags) {
7229 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7230 got_object_tag_get_message(tag));
7231 if (ssh_sig && allowed_signers == NULL) {
7232 err = got_error_msg(
7233 GOT_ERR_VERIFY_TAG_SIGNATURE,
7234 "SSH signature verification requires "
7235 "setting allowed_signers in "
7241 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7243 printf("from: %s\n", tagger);
7244 datestr = get_datestr(&tagger_time, datebuf);
7246 printf("date: %s UTC\n", datestr);
7248 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7250 switch (got_object_tag_get_object_type(tag)) {
7251 case GOT_OBJ_TYPE_BLOB:
7252 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7255 case GOT_OBJ_TYPE_TREE:
7256 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7259 case GOT_OBJ_TYPE_COMMIT:
7260 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7263 case GOT_OBJ_TYPE_TAG:
7264 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7274 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7275 allowed_signers, revoked_signers, verbosity);
7276 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7280 printf("signature: %s", sig_msg);
7286 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7289 got_object_commit_close(commit);
7291 tagmsg0 = strdup(got_object_tag_get_message(tag));
7292 got_object_tag_close(tag);
7293 if (tagmsg0 == NULL) {
7294 err = got_error_from_errno("strdup");
7301 line = strsep(&tagmsg, "\n");
7303 printf(" %s\n", line);
7308 got_ref_list_free(&refs);
7309 free(wanted_refname);
7311 if (err == NULL && bad_sigs)
7312 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7316 static const struct got_error *
7317 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7318 const char *tag_name, const char *repo_path)
7320 const struct got_error *err = NULL;
7321 char *template = NULL, *initial_content = NULL;
7322 char *editor = NULL;
7323 int initial_content_len;
7326 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7327 err = got_error_from_errno("asprintf");
7331 initial_content_len = asprintf(&initial_content,
7332 "\n# tagging commit %s as %s\n",
7333 commit_id_str, tag_name);
7334 if (initial_content_len == -1) {
7335 err = got_error_from_errno("asprintf");
7339 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7343 if (write(fd, initial_content, initial_content_len) == -1) {
7344 err = got_error_from_errno2("write", *tagmsg_path);
7348 err = get_editor(&editor);
7351 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7352 initial_content_len, 1);
7354 free(initial_content);
7358 if (fd != -1 && close(fd) == -1 && err == NULL)
7359 err = got_error_from_errno2("close", *tagmsg_path);
7368 static const struct got_error *
7369 add_tag(struct got_repository *repo, const char *tagger,
7370 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7371 const char *signer_id, int verbosity)
7373 const struct got_error *err = NULL;
7374 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7375 char *label = NULL, *commit_id_str = NULL;
7376 struct got_reference *ref = NULL;
7377 char *refname = NULL, *tagmsg = NULL;
7378 char *tagmsg_path = NULL, *tag_id_str = NULL;
7379 int preserve_tagmsg = 0;
7380 struct got_reflist_head refs;
7385 * Don't let the user create a tag name with a leading '-'.
7386 * While technically a valid reference name, this case is usually
7387 * an unintended typo.
7389 if (tag_name[0] == '-')
7390 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7392 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7396 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7397 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7401 err = got_object_id_str(&commit_id_str, commit_id);
7405 err = get_tag_refname(&refname, tag_name);
7408 if (strncmp("refs/tags/", tag_name, 10) == 0)
7411 err = got_ref_open(&ref, repo, refname, 0);
7413 err = got_error(GOT_ERR_TAG_EXISTS);
7415 } else if (err->code != GOT_ERR_NOT_REF)
7418 if (tagmsg_arg == NULL) {
7419 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7420 tag_name, got_repo_get_path(repo));
7422 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7423 tagmsg_path != NULL)
7424 preserve_tagmsg = 1;
7427 /* Editor is done; we can now apply unveil(2) */
7428 err = got_sigs_apply_unveil();
7431 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
7436 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7437 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7441 preserve_tagmsg = 1;
7445 err = got_ref_alloc(&ref, refname, tag_id);
7448 preserve_tagmsg = 1;
7452 err = got_ref_write(ref, repo);
7455 preserve_tagmsg = 1;
7459 err = got_object_id_str(&tag_id_str, tag_id);
7462 preserve_tagmsg = 1;
7465 printf("Created tag %s\n", tag_id_str);
7467 if (preserve_tagmsg) {
7468 fprintf(stderr, "%s: tag message preserved in %s\n",
7469 getprogname(), tagmsg_path);
7470 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7471 err = got_error_from_errno2("unlink", tagmsg_path);
7476 free(commit_id_str);
7480 got_ref_list_free(&refs);
7484 static const struct got_error *
7485 cmd_tag(int argc, char *argv[])
7487 const struct got_error *error = NULL;
7488 struct got_repository *repo = NULL;
7489 struct got_worktree *worktree = NULL;
7490 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7491 char *gitconfig_path = NULL, *tagger = NULL;
7492 char *allowed_signers = NULL, *revoked_signers = NULL;
7493 char *signer_id = NULL;
7494 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7495 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7496 int *pack_fds = NULL;
7498 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7501 commit_id_arg = optarg;
7510 repo_path = realpath(optarg, NULL);
7511 if (repo_path == NULL) {
7512 error = got_error_from_errno2("realpath",
7516 got_path_strip_trailing_slashes(repo_path);
7519 signer_id = strdup(optarg);
7520 if (signer_id == NULL) {
7521 error = got_error_from_errno("strdup");
7531 else if (verbosity < 3)
7543 if (do_list || verify_tags) {
7544 if (commit_id_arg != NULL)
7546 "-c option can only be used when creating a tag");
7549 option_conflict('l', 'm');
7551 option_conflict('V', 'm');
7555 option_conflict('l', 's');
7557 option_conflict('V', 's');
7561 } else if (argc != 1)
7568 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7569 "sendfd unveil", NULL) == -1)
7572 cwd = getcwd(NULL, 0);
7574 error = got_error_from_errno("getcwd");
7578 error = got_repo_pack_fds_open(&pack_fds);
7582 if (repo_path == NULL) {
7583 error = got_worktree_open(&worktree, cwd);
7584 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7590 strdup(got_worktree_get_repo_path(worktree));
7591 if (repo_path == NULL)
7592 error = got_error_from_errno("strdup");
7596 repo_path = strdup(cwd);
7597 if (repo_path == NULL) {
7598 error = got_error_from_errno("strdup");
7604 if (do_list || verify_tags) {
7605 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7608 error = get_allowed_signers(&allowed_signers, repo, worktree);
7611 error = get_revoked_signers(&revoked_signers, repo, worktree);
7615 /* Release work tree lock. */
7616 got_worktree_close(worktree);
7621 * Remove "cpath" promise unless needed for signature tmpfile
7625 got_sigs_apply_unveil();
7628 if (pledge("stdio rpath wpath flock proc exec sendfd "
7629 "unveil", NULL) == -1)
7633 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7636 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7637 revoked_signers, verbosity);
7639 error = get_gitconfig_path(&gitconfig_path);
7642 error = got_repo_open(&repo, repo_path, gitconfig_path,
7647 error = get_author(&tagger, repo, worktree);
7650 if (signer_id == NULL) {
7651 error = get_signer_id(&signer_id, repo, worktree);
7658 error = got_sigs_apply_unveil();
7662 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7667 if (commit_id_arg == NULL) {
7668 struct got_reference *head_ref;
7669 struct got_object_id *commit_id;
7670 error = got_ref_open(&head_ref, repo,
7671 worktree ? got_worktree_get_head_ref_name(worktree)
7675 error = got_ref_resolve(&commit_id, repo, head_ref);
7676 got_ref_close(head_ref);
7679 error = got_object_id_str(&commit_id_str, commit_id);
7686 /* Release work tree lock. */
7687 got_worktree_close(worktree);
7691 error = add_tag(repo, tagger, tag_name,
7692 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7693 signer_id, verbosity);
7697 const struct got_error *close_err = got_repo_close(repo);
7702 got_worktree_close(worktree);
7704 const struct got_error *pack_err =
7705 got_repo_pack_fds_close(pack_fds);
7711 free(gitconfig_path);
7712 free(commit_id_str);
7714 free(allowed_signers);
7715 free(revoked_signers);
7723 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
7727 static const struct got_error *
7728 add_progress(void *arg, unsigned char status, const char *path)
7730 while (path[0] == '/')
7732 printf("%c %s\n", status, path);
7736 static const struct got_error *
7737 cmd_add(int argc, char *argv[])
7739 const struct got_error *error = NULL;
7740 struct got_repository *repo = NULL;
7741 struct got_worktree *worktree = NULL;
7743 struct got_pathlist_head paths;
7744 struct got_pathlist_entry *pe;
7745 int ch, can_recurse = 0, no_ignores = 0;
7746 int *pack_fds = NULL;
7750 while ((ch = getopt(argc, argv, "IR")) != -1) {
7768 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7775 cwd = getcwd(NULL, 0);
7777 error = got_error_from_errno("getcwd");
7781 error = got_repo_pack_fds_open(&pack_fds);
7785 error = got_worktree_open(&worktree, cwd);
7787 if (error->code == GOT_ERR_NOT_WORKTREE)
7788 error = wrap_not_worktree_error(error, "add", cwd);
7792 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7797 error = apply_unveil(got_repo_get_path(repo), 1,
7798 got_worktree_get_root_path(worktree));
7802 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7809 TAILQ_FOREACH(pe, &paths, entry) {
7810 if (asprintf(&ondisk_path, "%s/%s",
7811 got_worktree_get_root_path(worktree),
7813 error = got_error_from_errno("asprintf");
7816 if (lstat(ondisk_path, &sb) == -1) {
7817 if (errno == ENOENT) {
7821 error = got_error_from_errno2("lstat",
7827 if (S_ISDIR(sb.st_mode)) {
7828 error = got_error_msg(GOT_ERR_BAD_PATH,
7829 "adding directories requires -R option");
7835 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7836 NULL, repo, no_ignores);
7839 const struct got_error *close_err = got_repo_close(repo);
7844 got_worktree_close(worktree);
7846 const struct got_error *pack_err =
7847 got_repo_pack_fds_close(pack_fds);
7851 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7859 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
7864 static const struct got_error *
7865 print_remove_status(void *arg, unsigned char status,
7866 unsigned char staged_status, const char *path)
7868 while (path[0] == '/')
7870 if (status == GOT_STATUS_NONEXISTENT)
7872 if (status == staged_status && (status == GOT_STATUS_DELETE))
7873 status = GOT_STATUS_NO_CHANGE;
7874 printf("%c%c %s\n", status, staged_status, path);
7878 static const struct got_error *
7879 cmd_remove(int argc, char *argv[])
7881 const struct got_error *error = NULL;
7882 struct got_worktree *worktree = NULL;
7883 struct got_repository *repo = NULL;
7884 const char *status_codes = NULL;
7886 struct got_pathlist_head paths;
7887 struct got_pathlist_entry *pe;
7888 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7889 int ignore_missing_paths = 0;
7890 int *pack_fds = NULL;
7894 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7897 delete_local_mods = 1;
7898 ignore_missing_paths = 1;
7907 for (i = 0; i < strlen(optarg); i++) {
7908 switch (optarg[i]) {
7909 case GOT_STATUS_MODIFY:
7910 delete_local_mods = 1;
7912 case GOT_STATUS_MISSING:
7913 ignore_missing_paths = 1;
7916 errx(1, "invalid status code '%c'",
7920 status_codes = optarg;
7932 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7939 cwd = getcwd(NULL, 0);
7941 error = got_error_from_errno("getcwd");
7945 error = got_repo_pack_fds_open(&pack_fds);
7949 error = got_worktree_open(&worktree, cwd);
7951 if (error->code == GOT_ERR_NOT_WORKTREE)
7952 error = wrap_not_worktree_error(error, "remove", cwd);
7956 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7961 error = apply_unveil(got_repo_get_path(repo), 1,
7962 got_worktree_get_root_path(worktree));
7966 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7973 TAILQ_FOREACH(pe, &paths, entry) {
7974 if (asprintf(&ondisk_path, "%s/%s",
7975 got_worktree_get_root_path(worktree),
7977 error = got_error_from_errno("asprintf");
7980 if (lstat(ondisk_path, &sb) == -1) {
7981 if (errno == ENOENT) {
7985 error = got_error_from_errno2("lstat",
7991 if (S_ISDIR(sb.st_mode)) {
7992 error = got_error_msg(GOT_ERR_BAD_PATH,
7993 "removing directories requires -R option");
7999 error = got_worktree_schedule_delete(worktree, &paths,
8000 delete_local_mods, status_codes, print_remove_status, NULL,
8001 repo, keep_on_disk, ignore_missing_paths);
8004 const struct got_error *close_err = got_repo_close(repo);
8009 got_worktree_close(worktree);
8011 const struct got_error *pack_err =
8012 got_repo_pack_fds_close(pack_fds);
8016 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8024 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8025 "[patchfile]\n", getprogname());
8029 static const struct got_error *
8030 patch_from_stdin(int *patchfd)
8032 const struct got_error *err = NULL;
8035 sig_t sighup, sigint, sigquit;
8037 *patchfd = got_opentempfd();
8039 return got_error_from_errno("got_opentempfd");
8041 sighup = signal(SIGHUP, SIG_DFL);
8042 sigint = signal(SIGINT, SIG_DFL);
8043 sigquit = signal(SIGQUIT, SIG_DFL);
8046 r = read(0, buf, sizeof(buf));
8048 err = got_error_from_errno("read");
8053 if (write(*patchfd, buf, r) == -1) {
8054 err = got_error_from_errno("write");
8059 signal(SIGHUP, sighup);
8060 signal(SIGINT, sigint);
8061 signal(SIGQUIT, sigquit);
8063 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8064 err = got_error_from_errno("lseek");
8074 static const struct got_error *
8075 patch_progress(void *arg, const char *old, const char *new,
8076 unsigned char status, const struct got_error *error, int old_from,
8077 int old_lines, int new_from, int new_lines, int offset,
8078 int ws_mangled, const struct got_error *hunk_err)
8080 const char *path = new == NULL ? old : new;
8082 while (*path == '/')
8086 printf("%c %s\n", status, path);
8089 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8091 if (offset != 0 || hunk_err != NULL || ws_mangled) {
8092 printf("@@ -%d,%d +%d,%d @@ ", old_from,
8093 old_lines, new_from, new_lines);
8094 if (hunk_err != NULL)
8095 printf("%s\n", hunk_err->msg);
8096 else if (offset != 0)
8097 printf("applied with offset %d\n", offset);
8099 printf("hunk contains mangled whitespace\n");
8105 static const struct got_error *
8106 cmd_patch(int argc, char *argv[])
8108 const struct got_error *error = NULL, *close_error = NULL;
8109 struct got_worktree *worktree = NULL;
8110 struct got_repository *repo = NULL;
8111 struct got_reflist_head refs;
8112 struct got_object_id *commit_id = NULL;
8113 const char *commit_id_str = NULL;
8117 int ch, nop = 0, strip = -1, reverse = 0;
8119 int *pack_fds = NULL;
8124 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8125 "unveil", NULL) == -1)
8129 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8132 commit_id_str = optarg;
8138 strip = strtonum(optarg, 0, INT_MAX, &errstr);
8140 errx(1, "pathname strip count is %s: %s",
8156 error = patch_from_stdin(&patchfd);
8159 } else if (argc == 1) {
8160 patchfd = open(argv[0], O_RDONLY);
8161 if (patchfd == -1) {
8162 error = got_error_from_errno2("open", argv[0]);
8165 if (fstat(patchfd, &sb) == -1) {
8166 error = got_error_from_errno2("fstat", argv[0]);
8169 if (!S_ISREG(sb.st_mode)) {
8170 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8176 if ((cwd = getcwd(NULL, 0)) == NULL) {
8177 error = got_error_from_errno("getcwd");
8181 error = got_repo_pack_fds_open(&pack_fds);
8185 error = got_worktree_open(&worktree, cwd);
8189 const char *repo_path = got_worktree_get_repo_path(worktree);
8190 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8194 error = apply_unveil(got_repo_get_path(repo), 0,
8195 got_worktree_get_root_path(worktree));
8199 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8203 if (commit_id_str != NULL) {
8204 error = got_repo_match_object_id(&commit_id, NULL,
8205 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8210 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8211 commit_id, &patch_progress, NULL, check_cancelled, NULL);
8214 got_ref_list_free(&refs);
8217 close_error = got_repo_close(repo);
8219 error = close_error;
8221 if (worktree != NULL) {
8222 close_error = got_worktree_close(worktree);
8224 error = close_error;
8227 const struct got_error *pack_err =
8228 got_repo_pack_fds_close(pack_fds);
8239 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8244 static const struct got_error *
8245 revert_progress(void *arg, unsigned char status, const char *path)
8247 if (status == GOT_STATUS_UNVERSIONED)
8250 while (path[0] == '/')
8252 printf("%c %s\n", status, path);
8256 struct choose_patch_arg {
8257 FILE *patch_script_file;
8261 static const struct got_error *
8262 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8263 int nchanges, const char *action)
8265 const struct got_error *err;
8267 size_t linesize = 0;
8271 case GOT_STATUS_ADD:
8272 printf("A %s\n%s this addition? [y/n] ", path, action);
8274 case GOT_STATUS_DELETE:
8275 printf("D %s\n%s this deletion? [y/n] ", path, action);
8277 case GOT_STATUS_MODIFY:
8278 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8279 return got_error_from_errno("fseek");
8280 printf(GOT_COMMIT_SEP_STR);
8281 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8283 if (linelen == -1 && ferror(patch_file)) {
8284 err = got_error_from_errno("getline");
8289 printf(GOT_COMMIT_SEP_STR);
8290 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8291 path, n, nchanges, action);
8294 return got_error_path(path, GOT_ERR_FILE_STATUS);
8301 static const struct got_error *
8302 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8303 FILE *patch_file, int n, int nchanges)
8305 const struct got_error *err = NULL;
8307 size_t linesize = 0;
8310 struct choose_patch_arg *a = arg;
8312 *choice = GOT_PATCH_CHOICE_NONE;
8314 if (a->patch_script_file) {
8316 err = show_change(status, path, patch_file, n, nchanges,
8320 linelen = getline(&line, &linesize, a->patch_script_file);
8321 if (linelen == -1) {
8322 if (ferror(a->patch_script_file))
8323 return got_error_from_errno("getline");
8326 nl = strchr(line, '\n');
8329 if (strcmp(line, "y") == 0) {
8330 *choice = GOT_PATCH_CHOICE_YES;
8332 } else if (strcmp(line, "n") == 0) {
8333 *choice = GOT_PATCH_CHOICE_NO;
8335 } else if (strcmp(line, "q") == 0 &&
8336 status == GOT_STATUS_MODIFY) {
8337 *choice = GOT_PATCH_CHOICE_QUIT;
8340 printf("invalid response '%s'\n", line);
8345 while (resp != 'y' && resp != 'n' && resp != 'q') {
8346 err = show_change(status, path, patch_file, n, nchanges,
8353 if (status == GOT_STATUS_MODIFY) {
8354 if (resp != 'y' && resp != 'n' && resp != 'q') {
8355 printf("invalid response '%c'\n", resp);
8358 } else if (resp != 'y' && resp != 'n') {
8359 printf("invalid response '%c'\n", resp);
8365 *choice = GOT_PATCH_CHOICE_YES;
8366 else if (resp == 'n')
8367 *choice = GOT_PATCH_CHOICE_NO;
8368 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8369 *choice = GOT_PATCH_CHOICE_QUIT;
8374 static const struct got_error *
8375 cmd_revert(int argc, char *argv[])
8377 const struct got_error *error = NULL;
8378 struct got_worktree *worktree = NULL;
8379 struct got_repository *repo = NULL;
8380 char *cwd = NULL, *path = NULL;
8381 struct got_pathlist_head paths;
8382 struct got_pathlist_entry *pe;
8383 int ch, can_recurse = 0, pflag = 0;
8384 FILE *patch_script_file = NULL;
8385 const char *patch_script_path = NULL;
8386 struct choose_patch_arg cpa;
8387 int *pack_fds = NULL;
8391 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8394 patch_script_path = optarg;
8412 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8413 "unveil", NULL) == -1)
8418 if (patch_script_path && !pflag)
8419 errx(1, "-F option can only be used together with -p option");
8421 cwd = getcwd(NULL, 0);
8423 error = got_error_from_errno("getcwd");
8427 error = got_repo_pack_fds_open(&pack_fds);
8431 error = got_worktree_open(&worktree, cwd);
8433 if (error->code == GOT_ERR_NOT_WORKTREE)
8434 error = wrap_not_worktree_error(error, "revert", cwd);
8438 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8443 if (patch_script_path) {
8444 patch_script_file = fopen(patch_script_path, "re");
8445 if (patch_script_file == NULL) {
8446 error = got_error_from_errno2("fopen",
8451 error = apply_unveil(got_repo_get_path(repo), 1,
8452 got_worktree_get_root_path(worktree));
8456 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8463 TAILQ_FOREACH(pe, &paths, entry) {
8464 if (asprintf(&ondisk_path, "%s/%s",
8465 got_worktree_get_root_path(worktree),
8467 error = got_error_from_errno("asprintf");
8470 if (lstat(ondisk_path, &sb) == -1) {
8471 if (errno == ENOENT) {
8475 error = got_error_from_errno2("lstat",
8481 if (S_ISDIR(sb.st_mode)) {
8482 error = got_error_msg(GOT_ERR_BAD_PATH,
8483 "reverting directories requires -R option");
8489 cpa.patch_script_file = patch_script_file;
8490 cpa.action = "revert";
8491 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8492 pflag ? choose_patch : NULL, &cpa, repo);
8494 if (patch_script_file && fclose(patch_script_file) == EOF &&
8496 error = got_error_from_errno2("fclose", patch_script_path);
8498 const struct got_error *close_err = got_repo_close(repo);
8503 got_worktree_close(worktree);
8505 const struct got_error *pack_err =
8506 got_repo_pack_fds_close(pack_fds);
8518 fprintf(stderr, "usage: %s commit [-NS] [-A author] [-F path] "
8519 "[-m message] [path ...]\n", getprogname());
8523 struct collect_commit_logmsg_arg {
8524 const char *cmdline_log;
8525 const char *prepared_log;
8526 int non_interactive;
8528 const char *worktree_path;
8529 const char *branch_name;
8530 const char *repo_path;
8535 static const struct got_error *
8536 read_prepared_logmsg(char **logmsg, const char *path)
8538 const struct got_error *err = NULL;
8544 memset(&sb, 0, sizeof(sb));
8546 f = fopen(path, "re");
8548 return got_error_from_errno2("fopen", path);
8550 if (fstat(fileno(f), &sb) == -1) {
8551 err = got_error_from_errno2("fstat", path);
8554 if (sb.st_size == 0) {
8555 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8559 *logmsg = malloc(sb.st_size + 1);
8560 if (*logmsg == NULL) {
8561 err = got_error_from_errno("malloc");
8565 r = fread(*logmsg, 1, sb.st_size, f);
8566 if (r != sb.st_size) {
8568 err = got_error_from_errno2("fread", path);
8570 err = got_error(GOT_ERR_IO);
8573 (*logmsg)[sb.st_size] = '\0';
8575 if (fclose(f) == EOF && err == NULL)
8576 err = got_error_from_errno2("fclose", path);
8584 static const struct got_error *
8585 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
8586 const char *diff_path, char **logmsg, void *arg)
8588 char *initial_content = NULL;
8589 struct got_pathlist_entry *pe;
8590 const struct got_error *err = NULL;
8591 char *template = NULL;
8592 struct collect_commit_logmsg_arg *a = arg;
8593 int initial_content_len;
8597 /* if a message was specified on the command line, just use it */
8598 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
8599 len = strlen(a->cmdline_log) + 1;
8600 *logmsg = malloc(len + 1);
8601 if (*logmsg == NULL)
8602 return got_error_from_errno("malloc");
8603 strlcpy(*logmsg, a->cmdline_log, len);
8605 } else if (a->prepared_log != NULL && a->non_interactive)
8606 return read_prepared_logmsg(logmsg, a->prepared_log);
8608 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
8609 return got_error_from_errno("asprintf");
8611 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
8615 if (a->prepared_log) {
8617 err = read_prepared_logmsg(&msg, a->prepared_log);
8620 if (write(fd, msg, strlen(msg)) == -1) {
8621 err = got_error_from_errno2("write", a->logmsg_path);
8628 initial_content_len = asprintf(&initial_content,
8629 "\n# changes to be committed on branch %s:\n",
8631 if (initial_content_len == -1) {
8632 err = got_error_from_errno("asprintf");
8636 if (write(fd, initial_content, initial_content_len) == -1) {
8637 err = got_error_from_errno2("write", a->logmsg_path);
8641 TAILQ_FOREACH(pe, commitable_paths, entry) {
8642 struct got_commitable *ct = pe->data;
8643 dprintf(fd, "# %c %s\n",
8644 got_commitable_get_status(ct),
8645 got_commitable_get_path(ct));
8649 dprintf(fd, "# detailed changes can be viewed in %s\n",
8653 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
8654 initial_content_len, a->prepared_log ? 0 : 1);
8656 free(initial_content);
8659 if (fd != -1 && close(fd) == -1 && err == NULL)
8660 err = got_error_from_errno2("close", a->logmsg_path);
8662 /* Editor is done; we can now apply unveil(2) */
8664 err = apply_unveil(a->repo_path, 0, a->worktree_path);
8672 static const struct got_error *
8673 cmd_commit(int argc, char *argv[])
8675 const struct got_error *error = NULL;
8676 struct got_worktree *worktree = NULL;
8677 struct got_repository *repo = NULL;
8678 char *cwd = NULL, *id_str = NULL;
8679 struct got_object_id *id = NULL;
8680 const char *logmsg = NULL;
8681 char *prepared_logmsg = NULL;
8682 struct collect_commit_logmsg_arg cl_arg;
8683 const char *author = NULL;
8684 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
8685 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8686 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8688 struct got_pathlist_head paths;
8689 int *pack_fds = NULL;
8692 cl_arg.logmsg_path = NULL;
8694 while ((ch = getopt(argc, argv, "A:F:m:NnS")) != -1) {
8698 error = valid_author(author);
8704 option_conflict('F', 'm');
8705 prepared_logmsg = realpath(optarg, NULL);
8706 if (prepared_logmsg == NULL)
8707 return got_error_from_errno2("realpath",
8711 if (prepared_logmsg)
8712 option_conflict('m', 'F');
8716 non_interactive = 1;
8722 allow_bad_symlinks = 1;
8734 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8735 "unveil", NULL) == -1)
8738 cwd = getcwd(NULL, 0);
8740 error = got_error_from_errno("getcwd");
8744 error = got_repo_pack_fds_open(&pack_fds);
8748 error = got_worktree_open(&worktree, cwd);
8750 if (error->code == GOT_ERR_NOT_WORKTREE)
8751 error = wrap_not_worktree_error(error, "commit", cwd);
8755 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8758 if (rebase_in_progress) {
8759 error = got_error(GOT_ERR_REBASING);
8763 error = got_worktree_histedit_in_progress(&histedit_in_progress,
8768 error = get_gitconfig_path(&gitconfig_path);
8771 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8772 gitconfig_path, pack_fds);
8776 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8779 if (merge_in_progress) {
8780 error = got_error(GOT_ERR_MERGE_BUSY);
8784 error = get_author(&committer, repo, worktree);
8788 if (author != NULL && !strcmp(committer, author)) {
8789 error = got_error(GOT_ERR_COMMIT_REDUNDANT_AUTHOR);
8797 * unveil(2) traverses exec(2); if an editor is used we have
8798 * to apply unveil after the log message has been written.
8800 if (logmsg == NULL || strlen(logmsg) == 0)
8801 error = get_editor(&editor);
8803 error = apply_unveil(got_repo_get_path(repo), 0,
8804 got_worktree_get_root_path(worktree));
8808 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8812 cl_arg.editor = editor;
8813 cl_arg.cmdline_log = logmsg;
8814 cl_arg.prepared_log = prepared_logmsg;
8815 cl_arg.non_interactive = non_interactive;
8816 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8817 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
8818 if (!histedit_in_progress) {
8819 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
8820 error = got_error(GOT_ERR_COMMIT_BRANCH);
8823 cl_arg.branch_name += 11;
8825 cl_arg.repo_path = got_repo_get_path(repo);
8826 error = got_worktree_commit(&id, worktree, &paths, author, committer,
8827 allow_bad_symlinks, show_diff, collect_commit_logmsg, &cl_arg,
8828 print_status, NULL, repo);
8830 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8831 cl_arg.logmsg_path != NULL)
8832 preserve_logmsg = 1;
8836 error = got_object_id_str(&id_str, id);
8839 printf("Created commit %s\n", id_str);
8841 if (preserve_logmsg) {
8842 fprintf(stderr, "%s: log message preserved in %s\n",
8843 getprogname(), cl_arg.logmsg_path);
8844 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8846 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8847 free(cl_arg.logmsg_path);
8849 const struct got_error *close_err = got_repo_close(repo);
8854 got_worktree_close(worktree);
8856 const struct got_error *pack_err =
8857 got_repo_pack_fds_close(pack_fds);
8863 free(gitconfig_path);
8866 free(prepared_logmsg);
8873 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
8874 "[-r repository-path] [-t tag] [remote-repository]\n",
8880 print_load_info(int print_colored, int print_found, int print_trees,
8881 int ncolored, int nfound, int ntrees)
8883 if (print_colored) {
8884 printf("%d commit%s colored", ncolored,
8885 ncolored == 1 ? "" : "s");
8888 printf("%s%d object%s found",
8889 ncolored > 0 ? "; " : "",
8890 nfound, nfound == 1 ? "" : "s");
8893 printf("; %d tree%s scanned", ntrees,
8894 ntrees == 1 ? "" : "s");
8898 struct got_send_progress_arg {
8899 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8906 int last_nobj_total;
8910 int printed_something;
8912 struct got_pathlist_head *delete_branches;
8915 static const struct got_error *
8916 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8917 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8918 int nobj_written, off_t bytes_sent, const char *refname,
8919 const char *errmsg, int success)
8921 struct got_send_progress_arg *a = arg;
8922 char scaled_packsize[FMT_SCALED_STRSIZE];
8923 char scaled_sent[FMT_SCALED_STRSIZE];
8924 int p_deltify = 0, p_written = 0, p_sent = 0;
8925 int print_colored = 0, print_found = 0, print_trees = 0;
8926 int print_searching = 0, print_total = 0;
8927 int print_deltify = 0, print_written = 0, print_sent = 0;
8929 if (a->verbosity < 0)
8933 const char *status = success ? "accepted" : "rejected";
8936 struct got_pathlist_entry *pe;
8937 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8938 const char *branchname = pe->path;
8939 if (got_path_cmp(branchname, refname,
8940 strlen(branchname), strlen(refname)) == 0) {
8942 a->sent_something = 1;
8948 if (a->printed_something)
8950 printf("Server has %s %s", status, refname);
8952 printf(": %s", errmsg);
8953 a->printed_something = 1;
8957 if (a->last_ncolored != ncolored) {
8959 a->last_ncolored = ncolored;
8962 if (a->last_nfound != nfound) {
8965 a->last_nfound = nfound;
8968 if (a->last_ntrees != ntrees) {
8972 a->last_ntrees = ntrees;
8975 if ((print_colored || print_found || print_trees) &&
8978 print_load_info(print_colored, print_found, print_trees,
8979 ncolored, nfound, ntrees);
8980 a->printed_something = 1;
8983 } else if (!a->loading_done) {
8985 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8987 a->loading_done = 1;
8990 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8991 return got_error_from_errno("fmt_scaled");
8992 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8993 return got_error_from_errno("fmt_scaled");
8995 if (a->last_ncommits != ncommits) {
8996 print_searching = 1;
8997 a->last_ncommits = ncommits;
9000 if (a->last_nobj_total != nobj_total) {
9001 print_searching = 1;
9003 a->last_nobj_total = nobj_total;
9006 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9007 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9008 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9009 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9010 return got_error(GOT_ERR_NO_SPACE);
9013 if (nobj_deltify > 0 || nobj_written > 0) {
9014 if (nobj_deltify > 0) {
9015 p_deltify = (nobj_deltify * 100) / nobj_total;
9016 if (p_deltify != a->last_p_deltify) {
9017 a->last_p_deltify = p_deltify;
9018 print_searching = 1;
9023 if (nobj_written > 0) {
9024 p_written = (nobj_written * 100) / nobj_total;
9025 if (p_written != a->last_p_written) {
9026 a->last_p_written = p_written;
9027 print_searching = 1;
9035 if (bytes_sent > 0) {
9036 p_sent = (bytes_sent * 100) / packfile_size;
9037 if (p_sent != a->last_p_sent) {
9038 a->last_p_sent = p_sent;
9039 print_searching = 1;
9045 a->sent_something = 1;
9048 if (print_searching || print_total || print_deltify || print_written ||
9051 if (print_searching)
9052 printf("packing %d reference%s", ncommits,
9053 ncommits == 1 ? "" : "s");
9055 printf("; %d object%s", nobj_total,
9056 nobj_total == 1 ? "" : "s");
9058 printf("; deltify: %d%%", p_deltify);
9060 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9061 scaled_packsize, p_sent);
9062 else if (print_written)
9063 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9064 scaled_packsize, p_written);
9065 if (print_searching || print_total || print_deltify ||
9066 print_written || print_sent) {
9067 a->printed_something = 1;
9073 static const struct got_error *
9074 cmd_send(int argc, char *argv[])
9076 const struct got_error *error = NULL;
9077 char *cwd = NULL, *repo_path = NULL;
9078 const char *remote_name;
9079 char *proto = NULL, *host = NULL, *port = NULL;
9080 char *repo_name = NULL, *server_path = NULL;
9081 const struct got_remote_repo *remotes, *remote = NULL;
9082 int nremotes, nbranches = 0, ndelete_branches = 0;
9083 struct got_repository *repo = NULL;
9084 struct got_worktree *worktree = NULL;
9085 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9086 struct got_pathlist_head branches;
9087 struct got_pathlist_head tags;
9088 struct got_reflist_head all_branches;
9089 struct got_reflist_head all_tags;
9090 struct got_pathlist_head delete_args;
9091 struct got_pathlist_head delete_branches;
9092 struct got_reflist_entry *re;
9093 struct got_pathlist_entry *pe;
9094 int i, ch, sendfd = -1, sendstatus;
9096 struct got_send_progress_arg spa;
9097 int verbosity = 0, overwrite_refs = 0;
9098 int send_all_branches = 0, send_all_tags = 0;
9099 struct got_reference *ref = NULL;
9100 int *pack_fds = NULL;
9102 TAILQ_INIT(&branches);
9104 TAILQ_INIT(&all_branches);
9105 TAILQ_INIT(&all_tags);
9106 TAILQ_INIT(&delete_args);
9107 TAILQ_INIT(&delete_branches);
9109 while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9112 send_all_branches = 1;
9115 error = got_pathlist_append(&branches, optarg, NULL);
9121 error = got_pathlist_append(&delete_args, optarg, NULL);
9132 repo_path = realpath(optarg, NULL);
9133 if (repo_path == NULL)
9134 return got_error_from_errno2("realpath",
9136 got_path_strip_trailing_slashes(repo_path);
9142 error = got_pathlist_append(&tags, optarg, NULL);
9149 else if (verbosity < 3)
9160 if (send_all_branches && !TAILQ_EMPTY(&branches))
9161 option_conflict('a', 'b');
9162 if (send_all_tags && !TAILQ_EMPTY(&tags))
9163 option_conflict('T', 't');
9167 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9169 remote_name = argv[0];
9173 cwd = getcwd(NULL, 0);
9175 error = got_error_from_errno("getcwd");
9179 error = got_repo_pack_fds_open(&pack_fds);
9183 if (repo_path == NULL) {
9184 error = got_worktree_open(&worktree, cwd);
9185 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9191 strdup(got_worktree_get_repo_path(worktree));
9192 if (repo_path == NULL)
9193 error = got_error_from_errno("strdup");
9197 repo_path = strdup(cwd);
9198 if (repo_path == NULL) {
9199 error = got_error_from_errno("strdup");
9205 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9210 worktree_conf = got_worktree_get_gotconfig(worktree);
9211 if (worktree_conf) {
9212 got_gotconfig_get_remotes(&nremotes, &remotes,
9214 for (i = 0; i < nremotes; i++) {
9215 if (strcmp(remotes[i].name, remote_name) == 0) {
9216 remote = &remotes[i];
9222 if (remote == NULL) {
9223 repo_conf = got_repo_get_gotconfig(repo);
9225 got_gotconfig_get_remotes(&nremotes, &remotes,
9227 for (i = 0; i < nremotes; i++) {
9228 if (strcmp(remotes[i].name, remote_name) == 0) {
9229 remote = &remotes[i];
9235 if (remote == NULL) {
9236 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9237 for (i = 0; i < nremotes; i++) {
9238 if (strcmp(remotes[i].name, remote_name) == 0) {
9239 remote = &remotes[i];
9244 if (remote == NULL) {
9245 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9249 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9250 &repo_name, remote->send_url);
9254 if (strcmp(proto, "git") == 0) {
9256 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9257 "sendfd dns inet unveil", NULL) == -1)
9260 } else if (strcmp(proto, "git+ssh") == 0 ||
9261 strcmp(proto, "ssh") == 0) {
9263 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9264 "sendfd unveil", NULL) == -1)
9267 } else if (strcmp(proto, "http") == 0 ||
9268 strcmp(proto, "git+http") == 0) {
9269 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9272 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9276 error = got_dial_apply_unveil(proto);
9280 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9284 if (send_all_branches) {
9285 error = got_ref_list(&all_branches, repo, "refs/heads",
9286 got_ref_cmp_by_name, NULL);
9289 TAILQ_FOREACH(re, &all_branches, entry) {
9290 const char *branchname = got_ref_get_name(re->ref);
9291 error = got_pathlist_append(&branches,
9297 } else if (nbranches == 0) {
9298 for (i = 0; i < remote->nsend_branches; i++) {
9299 error = got_pathlist_append(&branches,
9300 remote->send_branches[i], NULL);
9306 if (send_all_tags) {
9307 error = got_ref_list(&all_tags, repo, "refs/tags",
9308 got_ref_cmp_by_name, NULL);
9311 TAILQ_FOREACH(re, &all_tags, entry) {
9312 const char *tagname = got_ref_get_name(re->ref);
9313 error = got_pathlist_append(&tags,
9321 * To prevent accidents only branches in refs/heads/ can be deleted
9322 * with 'got send -d'.
9323 * Deleting anything else requires local repository access or Git.
9325 TAILQ_FOREACH(pe, &delete_args, entry) {
9326 const char *branchname = pe->path;
9328 struct got_pathlist_entry *new;
9329 if (strncmp(branchname, "refs/heads/", 11) == 0) {
9330 s = strdup(branchname);
9332 error = got_error_from_errno("strdup");
9336 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
9337 error = got_error_from_errno("asprintf");
9341 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
9342 if (error || new == NULL /* duplicate */)
9349 if (nbranches == 0 && ndelete_branches == 0) {
9350 struct got_reference *head_ref;
9352 error = got_ref_open(&head_ref, repo,
9353 got_worktree_get_head_ref_name(worktree), 0);
9355 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
9358 if (got_ref_is_symbolic(head_ref)) {
9359 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
9360 got_ref_close(head_ref);
9365 error = got_pathlist_append(&branches, got_ref_get_name(ref),
9372 if (verbosity >= 0) {
9373 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
9374 remote->name, proto, host,
9375 port ? ":" : "", port ? port : "",
9376 *server_path == '/' ? "" : "/", server_path);
9379 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
9380 server_path, verbosity);
9384 memset(&spa, 0, sizeof(spa));
9385 spa.last_scaled_packsize[0] = '\0';
9386 spa.last_p_deltify = -1;
9387 spa.last_p_written = -1;
9388 spa.verbosity = verbosity;
9389 spa.delete_branches = &delete_branches;
9390 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
9391 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
9392 check_cancelled, NULL);
9393 if (spa.printed_something)
9397 if (!spa.sent_something && verbosity >= 0)
9398 printf("Already up-to-date\n");
9401 if (kill(sendpid, SIGTERM) == -1)
9402 error = got_error_from_errno("kill");
9403 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
9404 error = got_error_from_errno("waitpid");
9406 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
9407 error = got_error_from_errno("close");
9409 const struct got_error *close_err = got_repo_close(repo);
9414 got_worktree_close(worktree);
9416 const struct got_error *pack_err =
9417 got_repo_pack_fds_close(pack_fds);
9423 got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
9424 got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
9425 got_ref_list_free(&all_branches);
9426 got_ref_list_free(&all_tags);
9427 got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
9428 got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
9440 usage_cherrypick(void)
9442 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
9446 static const struct got_error *
9447 cmd_cherrypick(int argc, char *argv[])
9449 const struct got_error *error = NULL;
9450 struct got_worktree *worktree = NULL;
9451 struct got_repository *repo = NULL;
9452 char *cwd = NULL, *commit_id_str = NULL;
9453 struct got_object_id *commit_id = NULL;
9454 struct got_commit_object *commit = NULL;
9455 struct got_object_qid *pid;
9457 struct got_update_progress_arg upa;
9458 int *pack_fds = NULL;
9460 while ((ch = getopt(argc, argv, "")) != -1) {
9472 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9473 "unveil", NULL) == -1)
9479 cwd = getcwd(NULL, 0);
9481 error = got_error_from_errno("getcwd");
9485 error = got_repo_pack_fds_open(&pack_fds);
9489 error = got_worktree_open(&worktree, cwd);
9491 if (error->code == GOT_ERR_NOT_WORKTREE)
9492 error = wrap_not_worktree_error(error, "cherrypick",
9497 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9502 error = apply_unveil(got_repo_get_path(repo), 0,
9503 got_worktree_get_root_path(worktree));
9507 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9508 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9511 error = got_object_id_str(&commit_id_str, commit_id);
9515 error = got_object_open_as_commit(&commit, repo, commit_id);
9518 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9519 memset(&upa, 0, sizeof(upa));
9520 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
9521 commit_id, repo, update_progress, &upa, check_cancelled,
9526 if (upa.did_something)
9527 printf("Merged commit %s\n", commit_id_str);
9528 print_merge_progress_stats(&upa);
9531 got_object_commit_close(commit);
9532 free(commit_id_str);
9534 got_worktree_close(worktree);
9536 const struct got_error *close_err = got_repo_close(repo);
9541 const struct got_error *pack_err =
9542 got_repo_pack_fds_close(pack_fds);
9553 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
9557 static const struct got_error *
9558 cmd_backout(int argc, char *argv[])
9560 const struct got_error *error = NULL;
9561 struct got_worktree *worktree = NULL;
9562 struct got_repository *repo = NULL;
9563 char *cwd = NULL, *commit_id_str = NULL;
9564 struct got_object_id *commit_id = NULL;
9565 struct got_commit_object *commit = NULL;
9566 struct got_object_qid *pid;
9568 struct got_update_progress_arg upa;
9569 int *pack_fds = NULL;
9571 while ((ch = getopt(argc, argv, "")) != -1) {
9583 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9584 "unveil", NULL) == -1)
9590 cwd = getcwd(NULL, 0);
9592 error = got_error_from_errno("getcwd");
9596 error = got_repo_pack_fds_open(&pack_fds);
9600 error = got_worktree_open(&worktree, cwd);
9602 if (error->code == GOT_ERR_NOT_WORKTREE)
9603 error = wrap_not_worktree_error(error, "backout", cwd);
9607 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9612 error = apply_unveil(got_repo_get_path(repo), 0,
9613 got_worktree_get_root_path(worktree));
9617 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9618 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9621 error = got_object_id_str(&commit_id_str, commit_id);
9625 error = got_object_open_as_commit(&commit, repo, commit_id);
9628 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9630 error = got_error(GOT_ERR_ROOT_COMMIT);
9634 memset(&upa, 0, sizeof(upa));
9635 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
9636 repo, update_progress, &upa, check_cancelled, NULL);
9640 if (upa.did_something)
9641 printf("Backed out commit %s\n", commit_id_str);
9642 print_merge_progress_stats(&upa);
9645 got_object_commit_close(commit);
9646 free(commit_id_str);
9648 got_worktree_close(worktree);
9650 const struct got_error *close_err = got_repo_close(repo);
9655 const struct got_error *pack_err =
9656 got_repo_pack_fds_close(pack_fds);
9666 fprintf(stderr, "usage: %s rebase [-aclX] [branch]\n", getprogname());
9671 trim_logmsg(char *logmsg, int limit)
9676 len = strlen(logmsg);
9680 nl = strchr(logmsg, '\n');
9685 static const struct got_error *
9686 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
9688 const struct got_error *err;
9689 char *logmsg0 = NULL;
9692 err = got_object_commit_get_logmsg(&logmsg0, commit);
9697 while (isspace((unsigned char)s[0]))
9700 *logmsg = strdup(s);
9701 if (*logmsg == NULL) {
9702 err = got_error_from_errno("strdup");
9706 trim_logmsg(*logmsg, limit);
9712 static const struct got_error *
9713 show_rebase_merge_conflict(struct got_object_id *id,
9714 struct got_repository *repo)
9716 const struct got_error *err;
9717 struct got_commit_object *commit = NULL;
9718 char *id_str = NULL, *logmsg = NULL;
9720 err = got_object_open_as_commit(&commit, repo, id);
9724 err = got_object_id_str(&id_str, id);
9730 err = get_short_logmsg(&logmsg, 42, commit);
9734 printf("%s -> merge conflict: %s\n", id_str, logmsg);
9737 got_object_commit_close(commit);
9742 static const struct got_error *
9743 show_rebase_progress(struct got_commit_object *commit,
9744 struct got_object_id *old_id, struct got_object_id *new_id)
9746 const struct got_error *err;
9747 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9749 err = got_object_id_str(&old_id_str, old_id);
9754 err = got_object_id_str(&new_id_str, new_id);
9759 old_id_str[12] = '\0';
9761 new_id_str[12] = '\0';
9763 err = get_short_logmsg(&logmsg, 42, commit);
9767 printf("%s -> %s: %s\n", old_id_str,
9768 new_id_str ? new_id_str : "no-op change", logmsg);
9776 static const struct got_error *
9777 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
9778 struct got_reference *branch, struct got_reference *new_base_branch,
9779 struct got_reference *tmp_branch, struct got_repository *repo,
9782 printf("Switching work tree to %s\n", got_ref_get_name(branch));
9783 return got_worktree_rebase_complete(worktree, fileindex,
9784 new_base_branch, tmp_branch, branch, repo, create_backup);
9787 static const struct got_error *
9788 rebase_commit(struct got_pathlist_head *merged_paths,
9789 struct got_worktree *worktree, struct got_fileindex *fileindex,
9790 struct got_reference *tmp_branch, const char *committer,
9791 struct got_object_id *commit_id, struct got_repository *repo)
9793 const struct got_error *error;
9794 struct got_commit_object *commit;
9795 struct got_object_id *new_commit_id;
9797 error = got_object_open_as_commit(&commit, repo, commit_id);
9801 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
9802 worktree, fileindex, tmp_branch, committer, commit, commit_id,
9805 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
9807 error = show_rebase_progress(commit, commit_id, NULL);
9809 error = show_rebase_progress(commit, commit_id, new_commit_id);
9810 free(new_commit_id);
9813 got_object_commit_close(commit);
9817 struct check_path_prefix_arg {
9818 const char *path_prefix;
9823 static const struct got_error *
9824 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
9825 struct got_blob_object *blob2, FILE *f1, FILE *f2,
9826 struct got_object_id *id1, struct got_object_id *id2,
9827 const char *path1, const char *path2,
9828 mode_t mode1, mode_t mode2, struct got_repository *repo)
9830 struct check_path_prefix_arg *a = arg;
9832 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
9833 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
9834 return got_error(a->errcode);
9839 static const struct got_error *
9840 check_path_prefix(struct got_object_id *parent_id,
9841 struct got_object_id *commit_id, const char *path_prefix,
9842 int errcode, struct got_repository *repo)
9844 const struct got_error *err;
9845 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
9846 struct got_commit_object *commit = NULL, *parent_commit = NULL;
9847 struct check_path_prefix_arg cpp_arg;
9849 if (got_path_is_root_dir(path_prefix))
9852 err = got_object_open_as_commit(&commit, repo, commit_id);
9856 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
9860 err = got_object_open_as_tree(&tree1, repo,
9861 got_object_commit_get_tree_id(parent_commit));
9865 err = got_object_open_as_tree(&tree2, repo,
9866 got_object_commit_get_tree_id(commit));
9870 cpp_arg.path_prefix = path_prefix;
9871 while (cpp_arg.path_prefix[0] == '/')
9872 cpp_arg.path_prefix++;
9873 cpp_arg.len = strlen(cpp_arg.path_prefix);
9874 cpp_arg.errcode = errcode;
9875 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
9876 check_path_prefix_in_diff, &cpp_arg, 0);
9879 got_object_tree_close(tree1);
9881 got_object_tree_close(tree2);
9883 got_object_commit_close(commit);
9885 got_object_commit_close(parent_commit);
9889 static const struct got_error *
9890 collect_commits(struct got_object_id_queue *commits,
9891 struct got_object_id *initial_commit_id,
9892 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
9893 const char *path_prefix, int path_prefix_errcode,
9894 struct got_repository *repo)
9896 const struct got_error *err = NULL;
9897 struct got_commit_graph *graph = NULL;
9898 struct got_object_id parent_id, commit_id;
9899 struct got_object_qid *qid;
9901 err = got_commit_graph_open(&graph, "/", 1);
9905 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
9906 check_cancelled, NULL);
9910 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
9911 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
9912 err = got_commit_graph_iter_next(&parent_id, graph, repo,
9913 check_cancelled, NULL);
9915 if (err->code == GOT_ERR_ITER_COMPLETED) {
9916 err = got_error_msg(GOT_ERR_ANCESTRY,
9917 "ran out of commits to rebase before "
9918 "youngest common ancestor commit has "
9923 err = check_path_prefix(&parent_id, &commit_id,
9924 path_prefix, path_prefix_errcode, repo);
9928 err = got_object_qid_alloc(&qid, &commit_id);
9931 STAILQ_INSERT_HEAD(commits, qid, entry);
9933 memcpy(&commit_id, &parent_id, sizeof(commit_id));
9937 got_commit_graph_close(graph);
9941 static const struct got_error *
9942 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9944 const struct got_error *err = NULL;
9945 time_t committer_time;
9947 char datebuf[11]; /* YYYY-MM-DD + NUL */
9948 char *author0 = NULL, *author, *smallerthan;
9949 char *logmsg0 = NULL, *logmsg, *newline;
9951 committer_time = got_object_commit_get_committer_time(commit);
9952 if (gmtime_r(&committer_time, &tm) == NULL)
9953 return got_error_from_errno("gmtime_r");
9954 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9955 return got_error(GOT_ERR_NO_SPACE);
9957 author0 = strdup(got_object_commit_get_author(commit));
9958 if (author0 == NULL)
9959 return got_error_from_errno("strdup");
9961 smallerthan = strchr(author, '<');
9962 if (smallerthan && smallerthan[1] != '\0')
9963 author = smallerthan + 1;
9964 author[strcspn(author, "@>")] = '\0';
9966 err = got_object_commit_get_logmsg(&logmsg0, commit);
9970 while (*logmsg == '\n')
9972 newline = strchr(logmsg, '\n');
9976 if (asprintf(brief_str, "%s %s %s",
9977 datebuf, author, logmsg) == -1)
9978 err = got_error_from_errno("asprintf");
9985 static const struct got_error *
9986 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9987 struct got_repository *repo)
9989 const struct got_error *err;
9992 err = got_object_id_str(&id_str, id);
9996 err = got_ref_delete(ref, repo);
10000 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
10006 static const struct got_error *
10007 print_backup_ref(const char *branch_name, const char *new_id_str,
10008 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
10009 struct got_reflist_object_id_map *refs_idmap,
10010 struct got_repository *repo)
10012 const struct got_error *err = NULL;
10013 struct got_reflist_head *refs;
10014 char *refs_str = NULL;
10015 struct got_object_id *new_commit_id = NULL;
10016 struct got_commit_object *new_commit = NULL;
10017 char *new_commit_brief_str = NULL;
10018 struct got_object_id *yca_id = NULL;
10019 struct got_commit_object *yca_commit = NULL;
10020 char *yca_id_str = NULL, *yca_brief_str = NULL;
10021 char *custom_refs_str;
10023 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
10024 return got_error_from_errno("asprintf");
10026 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
10027 0, 0, refs_idmap, custom_refs_str);
10031 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
10035 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
10037 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
10042 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
10046 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
10050 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10051 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
10055 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
10056 refs_str ? " (" : "", refs_str ? refs_str : "",
10057 refs_str ? ")" : "", new_commit_brief_str);
10058 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
10059 got_object_id_cmp(yca_id, old_commit_id) != 0) {
10063 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
10067 err = get_commit_brief_str(&yca_brief_str, yca_commit);
10071 err = got_object_id_str(&yca_id_str, yca_id);
10075 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
10077 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
10081 printf("history forked at %s%s%s%s\n %s\n",
10083 refs_str ? " (" : "", refs_str ? refs_str : "",
10084 refs_str ? ")" : "", yca_brief_str);
10087 free(custom_refs_str);
10088 free(new_commit_id);
10092 free(yca_brief_str);
10094 got_object_commit_close(new_commit);
10096 got_object_commit_close(yca_commit);
10101 static const struct got_error *
10102 process_backup_refs(const char *backup_ref_prefix,
10103 const char *wanted_branch_name,
10104 int delete, struct got_repository *repo)
10106 const struct got_error *err;
10107 struct got_reflist_head refs, backup_refs;
10108 struct got_reflist_entry *re;
10109 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
10110 struct got_object_id *old_commit_id = NULL;
10111 char *branch_name = NULL;
10112 struct got_commit_object *old_commit = NULL;
10113 struct got_reflist_object_id_map *refs_idmap = NULL;
10114 int wanted_branch_found = 0;
10117 TAILQ_INIT(&backup_refs);
10119 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
10123 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10127 if (wanted_branch_name) {
10128 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
10129 wanted_branch_name += 11;
10132 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
10133 got_ref_cmp_by_commit_timestamp_descending, repo);
10137 TAILQ_FOREACH(re, &backup_refs, entry) {
10138 const char *refname = got_ref_get_name(re->ref);
10141 err = check_cancelled(NULL);
10145 err = got_ref_resolve(&old_commit_id, repo, re->ref);
10149 err = got_object_open_as_commit(&old_commit, repo,
10154 if (strncmp(backup_ref_prefix, refname,
10155 backup_ref_prefix_len) == 0)
10156 refname += backup_ref_prefix_len;
10158 while (refname[0] == '/')
10161 branch_name = strdup(refname);
10162 if (branch_name == NULL) {
10163 err = got_error_from_errno("strdup");
10166 slash = strrchr(branch_name, '/');
10169 refname += strlen(branch_name) + 1;
10172 if (wanted_branch_name == NULL ||
10173 strcmp(wanted_branch_name, branch_name) == 0) {
10174 wanted_branch_found = 1;
10176 err = delete_backup_ref(re->ref,
10177 old_commit_id, repo);
10179 err = print_backup_ref(branch_name, refname,
10180 old_commit_id, old_commit, refs_idmap,
10187 free(old_commit_id);
10188 old_commit_id = NULL;
10190 branch_name = NULL;
10191 got_object_commit_close(old_commit);
10195 if (wanted_branch_name && !wanted_branch_found) {
10196 err = got_error_fmt(GOT_ERR_NOT_REF,
10197 "%s/%s/", backup_ref_prefix, wanted_branch_name);
10201 got_reflist_object_id_map_free(refs_idmap);
10202 got_ref_list_free(&refs);
10203 got_ref_list_free(&backup_refs);
10204 free(old_commit_id);
10207 got_object_commit_close(old_commit);
10211 static const struct got_error *
10212 abort_progress(void *arg, unsigned char status, const char *path)
10215 * Unversioned files should not clutter progress output when
10216 * an operation is aborted.
10218 if (status == GOT_STATUS_UNVERSIONED)
10221 return update_progress(arg, status, path);
10224 static const struct got_error *
10225 cmd_rebase(int argc, char *argv[])
10227 const struct got_error *error = NULL;
10228 struct got_worktree *worktree = NULL;
10229 struct got_repository *repo = NULL;
10230 struct got_fileindex *fileindex = NULL;
10231 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
10232 struct got_reference *branch = NULL;
10233 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
10234 struct got_object_id *commit_id = NULL, *parent_id = NULL;
10235 struct got_object_id *resume_commit_id = NULL;
10236 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
10237 struct got_object_id *head_commit_id = NULL;
10238 struct got_reference *head_ref = NULL;
10239 struct got_commit_object *commit = NULL;
10240 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
10241 int histedit_in_progress = 0, merge_in_progress = 0;
10242 int create_backup = 1, list_backups = 0, delete_backups = 0;
10243 struct got_object_id_queue commits;
10244 struct got_pathlist_head merged_paths;
10245 const struct got_object_id_queue *parent_ids;
10246 struct got_object_qid *qid, *pid;
10247 struct got_update_progress_arg upa;
10248 int *pack_fds = NULL;
10250 STAILQ_INIT(&commits);
10251 TAILQ_INIT(&merged_paths);
10252 memset(&upa, 0, sizeof(upa));
10254 while ((ch = getopt(argc, argv, "aclX")) != -1) {
10260 continue_rebase = 1;
10266 delete_backups = 1;
10278 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10279 "unveil", NULL) == -1)
10282 if (list_backups) {
10284 option_conflict('l', 'a');
10285 if (continue_rebase)
10286 option_conflict('l', 'c');
10287 if (delete_backups)
10288 option_conflict('l', 'X');
10289 if (argc != 0 && argc != 1)
10291 } else if (delete_backups) {
10293 option_conflict('X', 'a');
10294 if (continue_rebase)
10295 option_conflict('X', 'c');
10297 option_conflict('l', 'X');
10298 if (argc != 0 && argc != 1)
10301 if (abort_rebase && continue_rebase)
10303 else if (abort_rebase || continue_rebase) {
10306 } else if (argc != 1)
10310 cwd = getcwd(NULL, 0);
10312 error = got_error_from_errno("getcwd");
10316 error = got_repo_pack_fds_open(&pack_fds);
10320 error = got_worktree_open(&worktree, cwd);
10322 if (list_backups || delete_backups) {
10323 if (error->code != GOT_ERR_NOT_WORKTREE)
10326 if (error->code == GOT_ERR_NOT_WORKTREE)
10327 error = wrap_not_worktree_error(error,
10333 error = get_gitconfig_path(&gitconfig_path);
10336 error = got_repo_open(&repo,
10337 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10338 gitconfig_path, pack_fds);
10342 error = get_author(&committer, repo, worktree);
10343 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
10346 error = apply_unveil(got_repo_get_path(repo), 0,
10347 worktree ? got_worktree_get_root_path(worktree) : NULL);
10351 if (list_backups || delete_backups) {
10352 error = process_backup_refs(
10353 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
10354 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10355 goto done; /* nothing else to do */
10358 error = got_worktree_histedit_in_progress(&histedit_in_progress,
10362 if (histedit_in_progress) {
10363 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10367 error = got_worktree_merge_in_progress(&merge_in_progress,
10371 if (merge_in_progress) {
10372 error = got_error(GOT_ERR_MERGE_BUSY);
10376 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10380 if (abort_rebase) {
10381 if (!rebase_in_progress) {
10382 error = got_error(GOT_ERR_NOT_REBASING);
10385 error = got_worktree_rebase_continue(&resume_commit_id,
10386 &new_base_branch, &tmp_branch, &branch, &fileindex,
10390 printf("Switching work tree to %s\n",
10391 got_ref_get_symref_target(new_base_branch));
10392 error = got_worktree_rebase_abort(worktree, fileindex, repo,
10393 new_base_branch, abort_progress, &upa);
10396 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
10397 print_merge_progress_stats(&upa);
10398 goto done; /* nothing else to do */
10401 if (continue_rebase) {
10402 if (!rebase_in_progress) {
10403 error = got_error(GOT_ERR_NOT_REBASING);
10406 error = got_worktree_rebase_continue(&resume_commit_id,
10407 &new_base_branch, &tmp_branch, &branch, &fileindex,
10412 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
10413 committer, resume_commit_id, repo);
10417 yca_id = got_object_id_dup(resume_commit_id);
10418 if (yca_id == NULL) {
10419 error = got_error_from_errno("got_object_id_dup");
10423 error = got_ref_open(&branch, repo, argv[0], 0);
10426 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10427 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10428 "will not rebase a branch which lives outside "
10429 "the \"refs/heads/\" reference namespace");
10434 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
10438 if (!continue_rebase) {
10439 struct got_object_id *base_commit_id;
10441 error = got_ref_open(&head_ref, repo,
10442 got_worktree_get_head_ref_name(worktree), 0);
10445 error = got_ref_resolve(&head_commit_id, repo, head_ref);
10448 base_commit_id = got_worktree_get_base_commit_id(worktree);
10449 if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
10450 error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
10454 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10455 base_commit_id, branch_head_commit_id, 1, repo,
10456 check_cancelled, NULL);
10459 if (yca_id == NULL) {
10460 error = got_error_msg(GOT_ERR_ANCESTRY,
10461 "specified branch shares no common ancestry "
10462 "with work tree's branch");
10466 error = check_same_branch(base_commit_id, branch, yca_id, repo);
10468 if (error->code != GOT_ERR_ANCESTRY)
10472 struct got_pathlist_head paths;
10473 printf("%s is already based on %s\n",
10474 got_ref_get_name(branch),
10475 got_worktree_get_head_ref_name(worktree));
10476 error = switch_head_ref(branch, branch_head_commit_id,
10480 error = got_worktree_set_base_commit_id(worktree, repo,
10481 branch_head_commit_id);
10484 TAILQ_INIT(&paths);
10485 error = got_pathlist_append(&paths, "", NULL);
10488 error = got_worktree_checkout_files(worktree,
10489 &paths, repo, update_progress, &upa,
10490 check_cancelled, NULL);
10491 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
10494 if (upa.did_something) {
10496 error = got_object_id_str(&id_str,
10497 branch_head_commit_id);
10500 printf("Updated to %s: %s\n",
10501 got_worktree_get_head_ref_name(worktree),
10505 printf("Already up-to-date\n");
10506 print_update_progress_stats(&upa);
10511 commit_id = branch_head_commit_id;
10512 error = got_object_open_as_commit(&commit, repo, commit_id);
10516 parent_ids = got_object_commit_get_parent_ids(commit);
10517 pid = STAILQ_FIRST(parent_ids);
10519 error = got_error(GOT_ERR_EMPTY_REBASE);
10522 error = collect_commits(&commits, commit_id, &pid->id,
10523 yca_id, got_worktree_get_path_prefix(worktree),
10524 GOT_ERR_REBASE_PATH, repo);
10525 got_object_commit_close(commit);
10530 if (!continue_rebase) {
10531 error = got_worktree_rebase_prepare(&new_base_branch,
10532 &tmp_branch, &fileindex, worktree, branch, repo);
10537 if (STAILQ_EMPTY(&commits)) {
10538 if (continue_rebase) {
10539 error = rebase_complete(worktree, fileindex,
10540 branch, new_base_branch, tmp_branch, repo,
10544 /* Fast-forward the reference of the branch. */
10545 struct got_object_id *new_head_commit_id;
10547 error = got_ref_resolve(&new_head_commit_id, repo,
10551 error = got_object_id_str(&id_str, new_head_commit_id);
10554 printf("Forwarding %s to commit %s\n",
10555 got_ref_get_name(branch), id_str);
10557 error = got_ref_change_ref(branch,
10558 new_head_commit_id);
10561 /* No backup needed since objects did not change. */
10567 STAILQ_FOREACH(qid, &commits, entry) {
10569 commit_id = &qid->id;
10570 parent_id = pid ? &pid->id : yca_id;
10573 memset(&upa, 0, sizeof(upa));
10574 error = got_worktree_rebase_merge_files(&merged_paths,
10575 worktree, fileindex, parent_id, commit_id, repo,
10576 update_progress, &upa, check_cancelled, NULL);
10580 print_merge_progress_stats(&upa);
10581 if (upa.conflicts > 0 || upa.missing > 0 ||
10582 upa.not_deleted > 0 || upa.unversioned > 0) {
10583 if (upa.conflicts > 0) {
10584 error = show_rebase_merge_conflict(&qid->id,
10589 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
10593 error = rebase_commit(&merged_paths, worktree, fileindex,
10594 tmp_branch, committer, commit_id, repo);
10595 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
10600 if (upa.conflicts > 0 || upa.missing > 0 ||
10601 upa.not_deleted > 0 || upa.unversioned > 0) {
10602 error = got_worktree_rebase_postpone(worktree, fileindex);
10605 if (upa.conflicts > 0 && upa.missing == 0 &&
10606 upa.not_deleted == 0 && upa.unversioned == 0) {
10607 error = got_error_msg(GOT_ERR_CONFLICTS,
10608 "conflicts must be resolved before rebasing "
10610 } else if (upa.conflicts > 0) {
10611 error = got_error_msg(GOT_ERR_CONFLICTS,
10612 "conflicts must be resolved before rebasing "
10613 "can continue; changes destined for some "
10614 "files were not yet merged and should be "
10615 "merged manually if required before the "
10616 "rebase operation is continued");
10618 error = got_error_msg(GOT_ERR_CONFLICTS,
10619 "changes destined for some files were not "
10620 "yet merged and should be merged manually "
10621 "if required before the rebase operation "
10625 error = rebase_complete(worktree, fileindex, branch,
10626 new_base_branch, tmp_branch, repo, create_backup);
10630 free(gitconfig_path);
10631 got_object_id_queue_free(&commits);
10632 free(branch_head_commit_id);
10633 free(resume_commit_id);
10634 free(head_commit_id);
10637 got_object_commit_close(commit);
10639 got_ref_close(branch);
10640 if (new_base_branch)
10641 got_ref_close(new_base_branch);
10643 got_ref_close(tmp_branch);
10645 got_ref_close(head_ref);
10647 got_worktree_close(worktree);
10649 const struct got_error *close_err = got_repo_close(repo);
10654 const struct got_error *pack_err =
10655 got_repo_pack_fds_close(pack_fds);
10663 usage_histedit(void)
10665 fprintf(stderr, "usage: %s histedit [-aceflmX] [-F histedit-script] "
10666 "[branch]\n", getprogname());
10670 #define GOT_HISTEDIT_PICK 'p'
10671 #define GOT_HISTEDIT_EDIT 'e'
10672 #define GOT_HISTEDIT_FOLD 'f'
10673 #define GOT_HISTEDIT_DROP 'd'
10674 #define GOT_HISTEDIT_MESG 'm'
10676 static const struct got_histedit_cmd {
10677 unsigned char code;
10680 } got_histedit_cmds[] = {
10681 { GOT_HISTEDIT_PICK, "pick", "use commit" },
10682 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
10683 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
10685 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
10686 { GOT_HISTEDIT_MESG, "mesg",
10687 "single-line log message for commit above (open editor if empty)" },
10690 struct got_histedit_list_entry {
10691 TAILQ_ENTRY(got_histedit_list_entry) entry;
10692 struct got_object_id *commit_id;
10693 const struct got_histedit_cmd *cmd;
10696 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
10698 static const struct got_error *
10699 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
10700 FILE *f, struct got_repository *repo)
10702 const struct got_error *err = NULL;
10703 char *logmsg = NULL, *id_str = NULL;
10704 struct got_commit_object *commit = NULL;
10707 err = got_object_open_as_commit(&commit, repo, commit_id);
10711 err = get_short_logmsg(&logmsg, 34, commit);
10715 err = got_object_id_str(&id_str, commit_id);
10719 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
10721 err = got_ferror(f, GOT_ERR_IO);
10724 got_object_commit_close(commit);
10730 static const struct got_error *
10731 histedit_write_commit_list(struct got_object_id_queue *commits,
10732 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
10733 struct got_repository *repo)
10735 const struct got_error *err = NULL;
10736 struct got_object_qid *qid;
10737 const char *histedit_cmd = NULL;
10739 if (STAILQ_EMPTY(commits))
10740 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10742 STAILQ_FOREACH(qid, commits, entry) {
10743 histedit_cmd = got_histedit_cmds[0].name;
10745 histedit_cmd = "edit";
10746 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
10747 histedit_cmd = "fold";
10748 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
10751 if (edit_logmsg_only) {
10752 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
10754 err = got_ferror(f, GOT_ERR_IO);
10763 static const struct got_error *
10764 write_cmd_list(FILE *f, const char *branch_name,
10765 struct got_object_id_queue *commits)
10767 const struct got_error *err = NULL;
10771 struct got_object_qid *qid;
10773 qid = STAILQ_FIRST(commits);
10774 err = got_object_id_str(&id_str, &qid->id);
10779 "# Editing the history of branch '%s' starting at\n"
10781 "# Commits will be processed in order from top to "
10782 "bottom of this file.\n", branch_name, id_str);
10784 err = got_ferror(f, GOT_ERR_IO);
10788 n = fprintf(f, "# Available histedit commands:\n");
10790 err = got_ferror(f, GOT_ERR_IO);
10794 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10795 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
10796 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
10799 err = got_ferror(f, GOT_ERR_IO);
10808 static const struct got_error *
10809 histedit_syntax_error(int lineno)
10811 static char msg[42];
10814 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
10816 if (ret < 0 || (size_t)ret >= sizeof(msg))
10817 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
10819 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
10822 static const struct got_error *
10823 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
10824 char *logmsg, struct got_repository *repo)
10826 const struct got_error *err;
10827 struct got_commit_object *folded_commit = NULL;
10828 char *id_str, *folded_logmsg = NULL;
10830 err = got_object_id_str(&id_str, hle->commit_id);
10834 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
10838 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
10841 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
10842 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
10843 folded_logmsg) == -1) {
10844 err = got_error_from_errno("asprintf");
10848 got_object_commit_close(folded_commit);
10850 free(folded_logmsg);
10854 static struct got_histedit_list_entry *
10855 get_folded_commits(struct got_histedit_list_entry *hle)
10857 struct got_histedit_list_entry *prev, *folded = NULL;
10859 prev = TAILQ_PREV(hle, got_histedit_list, entry);
10860 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
10861 prev->cmd->code == GOT_HISTEDIT_DROP)) {
10862 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
10864 prev = TAILQ_PREV(prev, got_histedit_list, entry);
10870 static const struct got_error *
10871 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
10872 struct got_repository *repo)
10874 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
10875 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
10876 const struct got_error *err = NULL;
10877 struct got_commit_object *commit = NULL;
10880 struct got_histedit_list_entry *folded = NULL;
10882 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10886 folded = get_folded_commits(hle);
10888 while (folded != hle) {
10889 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
10890 folded = TAILQ_NEXT(folded, entry);
10893 err = append_folded_commit_msg(&new_msg, folded,
10899 folded = TAILQ_NEXT(folded, entry);
10903 err = got_object_id_str(&id_str, hle->commit_id);
10906 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
10909 logmsg_len = asprintf(&new_msg,
10910 "%s\n# original log message of commit %s: %s",
10911 logmsg ? logmsg : "", id_str, orig_logmsg);
10912 if (logmsg_len == -1) {
10913 err = got_error_from_errno("asprintf");
10919 err = got_object_id_str(&id_str, hle->commit_id);
10923 err = got_opentemp_named_fd(&logmsg_path, &fd,
10924 GOT_TMPDIR_STR "/got-logmsg", "");
10928 write(fd, logmsg, logmsg_len);
10931 err = get_editor(&editor);
10935 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
10938 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
10941 hle->logmsg = strdup(new_msg);
10942 if (hle->logmsg == NULL)
10943 err = got_error_from_errno("strdup");
10946 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
10947 err = got_error_from_errno2("unlink", logmsg_path);
10953 got_object_commit_close(commit);
10957 static const struct got_error *
10958 histedit_parse_list(struct got_histedit_list *histedit_cmds,
10959 FILE *f, struct got_repository *repo)
10961 const struct got_error *err = NULL;
10962 char *line = NULL, *p, *end;
10965 int lineno = 0, lastcmd = -1;
10966 const struct got_histedit_cmd *cmd;
10967 struct got_object_id *commit_id = NULL;
10968 struct got_histedit_list_entry *hle = NULL;
10971 len = getline(&line, &size, f);
10973 const struct got_error *getline_err;
10976 getline_err = got_error_from_errno("getline");
10977 err = got_ferror(f, getline_err->code);
10982 while (isspace((unsigned char)p[0]))
10984 if (p[0] == '#' || p[0] == '\0') {
10990 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10991 cmd = &got_histedit_cmds[i];
10992 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10993 isspace((unsigned char)p[strlen(cmd->name)])) {
10994 p += strlen(cmd->name);
10997 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
11002 if (i == nitems(got_histedit_cmds)) {
11003 err = histedit_syntax_error(lineno);
11006 while (isspace((unsigned char)p[0]))
11008 if (cmd->code == GOT_HISTEDIT_MESG) {
11009 if (lastcmd != GOT_HISTEDIT_PICK &&
11010 lastcmd != GOT_HISTEDIT_EDIT) {
11011 err = got_error(GOT_ERR_HISTEDIT_CMD);
11014 if (p[0] == '\0') {
11015 err = histedit_edit_logmsg(hle, repo);
11019 hle->logmsg = strdup(p);
11020 if (hle->logmsg == NULL) {
11021 err = got_error_from_errno("strdup");
11027 lastcmd = cmd->code;
11031 while (end[0] && !isspace((unsigned char)end[0]))
11035 err = got_object_resolve_id_str(&commit_id, repo, p);
11037 /* override error code */
11038 err = histedit_syntax_error(lineno);
11042 hle = malloc(sizeof(*hle));
11044 err = got_error_from_errno("malloc");
11048 hle->commit_id = commit_id;
11049 hle->logmsg = NULL;
11053 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
11054 lastcmd = cmd->code;
11062 static const struct got_error *
11063 histedit_check_script(struct got_histedit_list *histedit_cmds,
11064 struct got_object_id_queue *commits, struct got_repository *repo)
11066 const struct got_error *err = NULL;
11067 struct got_object_qid *qid;
11068 struct got_histedit_list_entry *hle;
11069 static char msg[92];
11072 if (TAILQ_EMPTY(histedit_cmds))
11073 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
11074 "histedit script contains no commands");
11075 if (STAILQ_EMPTY(commits))
11076 return got_error(GOT_ERR_EMPTY_HISTEDIT);
11078 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11079 struct got_histedit_list_entry *hle2;
11080 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
11083 if (got_object_id_cmp(hle->commit_id,
11084 hle2->commit_id) != 0)
11086 err = got_object_id_str(&id_str, hle->commit_id);
11089 snprintf(msg, sizeof(msg), "commit %s is listed "
11090 "more than once in histedit script", id_str);
11092 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
11096 STAILQ_FOREACH(qid, commits, entry) {
11097 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11098 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
11102 err = got_object_id_str(&id_str, &qid->id);
11105 snprintf(msg, sizeof(msg),
11106 "commit %s missing from histedit script", id_str);
11108 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
11112 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
11113 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
11114 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
11115 "last commit in histedit script cannot be folded");
11120 static const struct got_error *
11121 histedit_run_editor(struct got_histedit_list *histedit_cmds,
11122 const char *path, struct got_object_id_queue *commits,
11123 struct got_repository *repo)
11125 const struct got_error *err = NULL;
11129 err = get_editor(&editor);
11133 if (spawn_editor(editor, path) == -1) {
11134 err = got_error_from_errno("failed spawning editor");
11138 f = fopen(path, "re");
11140 err = got_error_from_errno("fopen");
11143 err = histedit_parse_list(histedit_cmds, f, repo);
11147 err = histedit_check_script(histedit_cmds, commits, repo);
11149 if (f && fclose(f) == EOF && err == NULL)
11150 err = got_error_from_errno("fclose");
11155 static const struct got_error *
11156 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
11157 struct got_object_id_queue *, const char *, const char *,
11158 struct got_repository *);
11160 static const struct got_error *
11161 histedit_edit_script(struct got_histedit_list *histedit_cmds,
11162 struct got_object_id_queue *commits, const char *branch_name,
11163 int edit_logmsg_only, int fold_only, int edit_only,
11164 struct got_repository *repo)
11166 const struct got_error *err;
11170 err = got_opentemp_named(&path, &f, "got-histedit", "");
11174 err = write_cmd_list(f, branch_name, commits);
11178 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
11179 fold_only, edit_only, repo);
11183 if (edit_logmsg_only || fold_only || edit_only) {
11185 err = histedit_parse_list(histedit_cmds, f, repo);
11187 if (fclose(f) == EOF) {
11188 err = got_error_from_errno("fclose");
11192 err = histedit_run_editor(histedit_cmds, path, commits, repo);
11194 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11195 err->code != GOT_ERR_HISTEDIT_CMD)
11197 err = histedit_edit_list_retry(histedit_cmds, err,
11198 commits, path, branch_name, repo);
11202 if (f && fclose(f) == EOF && err == NULL)
11203 err = got_error_from_errno("fclose");
11204 if (path && unlink(path) != 0 && err == NULL)
11205 err = got_error_from_errno2("unlink", path);
11210 static const struct got_error *
11211 histedit_save_list(struct got_histedit_list *histedit_cmds,
11212 struct got_worktree *worktree, struct got_repository *repo)
11214 const struct got_error *err = NULL;
11217 struct got_histedit_list_entry *hle;
11218 struct got_commit_object *commit = NULL;
11220 err = got_worktree_get_histedit_script_path(&path, worktree);
11224 f = fopen(path, "we");
11226 err = got_error_from_errno2("fopen", path);
11229 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11230 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
11236 int n = fprintf(f, "%c %s\n",
11237 GOT_HISTEDIT_MESG, hle->logmsg);
11239 err = got_ferror(f, GOT_ERR_IO);
11245 if (f && fclose(f) == EOF && err == NULL)
11246 err = got_error_from_errno("fclose");
11249 got_object_commit_close(commit);
11254 histedit_free_list(struct got_histedit_list *histedit_cmds)
11256 struct got_histedit_list_entry *hle;
11258 while ((hle = TAILQ_FIRST(histedit_cmds))) {
11259 TAILQ_REMOVE(histedit_cmds, hle, entry);
11264 static const struct got_error *
11265 histedit_load_list(struct got_histedit_list *histedit_cmds,
11266 const char *path, struct got_repository *repo)
11268 const struct got_error *err = NULL;
11271 f = fopen(path, "re");
11273 err = got_error_from_errno2("fopen", path);
11277 err = histedit_parse_list(histedit_cmds, f, repo);
11279 if (f && fclose(f) == EOF && err == NULL)
11280 err = got_error_from_errno("fclose");
11284 static const struct got_error *
11285 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
11286 const struct got_error *edit_err, struct got_object_id_queue *commits,
11287 const char *path, const char *branch_name, struct got_repository *repo)
11289 const struct got_error *err = NULL, *prev_err = edit_err;
11292 while (resp != 'c' && resp != 'r' && resp != 'a') {
11293 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
11294 "or (a)bort: ", getprogname(), prev_err->msg);
11299 histedit_free_list(histedit_cmds);
11300 err = histedit_run_editor(histedit_cmds, path, commits,
11303 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11304 err->code != GOT_ERR_HISTEDIT_CMD)
11311 } else if (resp == 'r') {
11312 histedit_free_list(histedit_cmds);
11313 err = histedit_edit_script(histedit_cmds,
11314 commits, branch_name, 0, 0, 0, repo);
11316 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11317 err->code != GOT_ERR_HISTEDIT_CMD)
11324 } else if (resp == 'a') {
11325 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
11328 printf("invalid response '%c'\n", resp);
11334 static const struct got_error *
11335 histedit_complete(struct got_worktree *worktree,
11336 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
11337 struct got_reference *branch, struct got_repository *repo)
11339 printf("Switching work tree to %s\n",
11340 got_ref_get_symref_target(branch));
11341 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
11345 static const struct got_error *
11346 show_histedit_progress(struct got_commit_object *commit,
11347 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
11349 const struct got_error *err;
11350 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
11352 err = got_object_id_str(&old_id_str, hle->commit_id);
11357 err = got_object_id_str(&new_id_str, new_id);
11362 old_id_str[12] = '\0';
11364 new_id_str[12] = '\0';
11367 logmsg = strdup(hle->logmsg);
11368 if (logmsg == NULL) {
11369 err = got_error_from_errno("strdup");
11372 trim_logmsg(logmsg, 42);
11374 err = get_short_logmsg(&logmsg, 42, commit);
11379 switch (hle->cmd->code) {
11380 case GOT_HISTEDIT_PICK:
11381 case GOT_HISTEDIT_EDIT:
11382 printf("%s -> %s: %s\n", old_id_str,
11383 new_id_str ? new_id_str : "no-op change", logmsg);
11385 case GOT_HISTEDIT_DROP:
11386 case GOT_HISTEDIT_FOLD:
11387 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
11399 static const struct got_error *
11400 histedit_commit(struct got_pathlist_head *merged_paths,
11401 struct got_worktree *worktree, struct got_fileindex *fileindex,
11402 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
11403 const char *committer, struct got_repository *repo)
11405 const struct got_error *err;
11406 struct got_commit_object *commit;
11407 struct got_object_id *new_commit_id;
11409 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
11410 && hle->logmsg == NULL) {
11411 err = histedit_edit_logmsg(hle, repo);
11416 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
11420 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
11421 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
11422 hle->logmsg, repo);
11424 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
11426 err = show_histedit_progress(commit, hle, NULL);
11428 err = show_histedit_progress(commit, hle, new_commit_id);
11429 free(new_commit_id);
11432 got_object_commit_close(commit);
11436 static const struct got_error *
11437 histedit_skip_commit(struct got_histedit_list_entry *hle,
11438 struct got_worktree *worktree, struct got_repository *repo)
11440 const struct got_error *error;
11441 struct got_commit_object *commit;
11443 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
11448 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
11452 error = show_histedit_progress(commit, hle, NULL);
11453 got_object_commit_close(commit);
11457 static const struct got_error *
11458 check_local_changes(void *arg, unsigned char status,
11459 unsigned char staged_status, const char *path,
11460 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11461 struct got_object_id *commit_id, int dirfd, const char *de_name)
11463 int *have_local_changes = arg;
11466 case GOT_STATUS_ADD:
11467 case GOT_STATUS_DELETE:
11468 case GOT_STATUS_MODIFY:
11469 case GOT_STATUS_CONFLICT:
11470 *have_local_changes = 1;
11471 return got_error(GOT_ERR_CANCELLED);
11476 switch (staged_status) {
11477 case GOT_STATUS_ADD:
11478 case GOT_STATUS_DELETE:
11479 case GOT_STATUS_MODIFY:
11480 *have_local_changes = 1;
11481 return got_error(GOT_ERR_CANCELLED);
11489 static const struct got_error *
11490 cmd_histedit(int argc, char *argv[])
11492 const struct got_error *error = NULL;
11493 struct got_worktree *worktree = NULL;
11494 struct got_fileindex *fileindex = NULL;
11495 struct got_repository *repo = NULL;
11496 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11497 struct got_reference *branch = NULL;
11498 struct got_reference *tmp_branch = NULL;
11499 struct got_object_id *resume_commit_id = NULL;
11500 struct got_object_id *base_commit_id = NULL;
11501 struct got_object_id *head_commit_id = NULL;
11502 struct got_commit_object *commit = NULL;
11503 int ch, rebase_in_progress = 0, merge_in_progress = 0;
11504 struct got_update_progress_arg upa;
11505 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
11506 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
11507 int list_backups = 0, delete_backups = 0;
11508 const char *edit_script_path = NULL;
11509 struct got_object_id_queue commits;
11510 struct got_pathlist_head merged_paths;
11511 const struct got_object_id_queue *parent_ids;
11512 struct got_object_qid *pid;
11513 struct got_histedit_list histedit_cmds;
11514 struct got_histedit_list_entry *hle;
11515 int *pack_fds = NULL;
11517 STAILQ_INIT(&commits);
11518 TAILQ_INIT(&histedit_cmds);
11519 TAILQ_INIT(&merged_paths);
11520 memset(&upa, 0, sizeof(upa));
11522 while ((ch = getopt(argc, argv, "aceF:flmX")) != -1) {
11534 edit_script_path = optarg;
11543 edit_logmsg_only = 1;
11546 delete_backups = 1;
11558 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11559 "unveil", NULL) == -1)
11562 if (abort_edit && continue_edit)
11563 option_conflict('a', 'c');
11564 if (edit_script_path && edit_logmsg_only)
11565 option_conflict('F', 'm');
11566 if (abort_edit && edit_logmsg_only)
11567 option_conflict('a', 'm');
11568 if (continue_edit && edit_logmsg_only)
11569 option_conflict('c', 'm');
11570 if (abort_edit && fold_only)
11571 option_conflict('a', 'f');
11572 if (continue_edit && fold_only)
11573 option_conflict('c', 'f');
11574 if (fold_only && edit_logmsg_only)
11575 option_conflict('f', 'm');
11576 if (edit_script_path && fold_only)
11577 option_conflict('F', 'f');
11578 if (abort_edit && edit_only)
11579 option_conflict('a', 'e');
11580 if (continue_edit && edit_only)
11581 option_conflict('c', 'e');
11582 if (edit_only && edit_logmsg_only)
11583 option_conflict('e', 'm');
11584 if (edit_script_path && edit_only)
11585 option_conflict('F', 'e');
11586 if (list_backups) {
11588 option_conflict('l', 'a');
11590 option_conflict('l', 'c');
11591 if (edit_script_path)
11592 option_conflict('l', 'F');
11593 if (edit_logmsg_only)
11594 option_conflict('l', 'm');
11596 option_conflict('l', 'f');
11598 option_conflict('l', 'e');
11599 if (delete_backups)
11600 option_conflict('l', 'X');
11601 if (argc != 0 && argc != 1)
11603 } else if (delete_backups) {
11605 option_conflict('X', 'a');
11607 option_conflict('X', 'c');
11608 if (edit_script_path)
11609 option_conflict('X', 'F');
11610 if (edit_logmsg_only)
11611 option_conflict('X', 'm');
11613 option_conflict('X', 'f');
11615 option_conflict('X', 'e');
11617 option_conflict('X', 'l');
11618 if (argc != 0 && argc != 1)
11620 } else if (argc != 0)
11624 * This command cannot apply unveil(2) in all cases because the
11625 * user may choose to run an editor to edit the histedit script
11626 * and to edit individual commit log messages.
11627 * unveil(2) traverses exec(2); if an editor is used we have to
11628 * apply unveil after edit script and log messages have been written.
11629 * XXX TODO: Make use of unveil(2) where possible.
11632 cwd = getcwd(NULL, 0);
11634 error = got_error_from_errno("getcwd");
11638 error = got_repo_pack_fds_open(&pack_fds);
11642 error = got_worktree_open(&worktree, cwd);
11644 if (list_backups || delete_backups) {
11645 if (error->code != GOT_ERR_NOT_WORKTREE)
11648 if (error->code == GOT_ERR_NOT_WORKTREE)
11649 error = wrap_not_worktree_error(error,
11655 if (list_backups || delete_backups) {
11656 error = got_repo_open(&repo,
11657 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11661 error = apply_unveil(got_repo_get_path(repo), 0,
11662 worktree ? got_worktree_get_root_path(worktree) : NULL);
11665 error = process_backup_refs(
11666 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
11667 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11668 goto done; /* nothing else to do */
11671 error = get_gitconfig_path(&gitconfig_path);
11674 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11675 gitconfig_path, pack_fds);
11679 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11682 if (rebase_in_progress) {
11683 error = got_error(GOT_ERR_REBASING);
11687 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11691 if (merge_in_progress) {
11692 error = got_error(GOT_ERR_MERGE_BUSY);
11696 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
11700 if (edit_in_progress && edit_logmsg_only) {
11701 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11702 "histedit operation is in progress in this "
11703 "work tree and must be continued or aborted "
11704 "before the -m option can be used");
11707 if (edit_in_progress && fold_only) {
11708 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11709 "histedit operation is in progress in this "
11710 "work tree and must be continued or aborted "
11711 "before the -f option can be used");
11714 if (edit_in_progress && edit_only) {
11715 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11716 "histedit operation is in progress in this "
11717 "work tree and must be continued or aborted "
11718 "before the -e option can be used");
11722 if (edit_in_progress && abort_edit) {
11723 error = got_worktree_histedit_continue(&resume_commit_id,
11724 &tmp_branch, &branch, &base_commit_id, &fileindex,
11728 printf("Switching work tree to %s\n",
11729 got_ref_get_symref_target(branch));
11730 error = got_worktree_histedit_abort(worktree, fileindex, repo,
11731 branch, base_commit_id, abort_progress, &upa);
11734 printf("Histedit of %s aborted\n",
11735 got_ref_get_symref_target(branch));
11736 print_merge_progress_stats(&upa);
11737 goto done; /* nothing else to do */
11738 } else if (abort_edit) {
11739 error = got_error(GOT_ERR_NOT_HISTEDIT);
11743 error = get_author(&committer, repo, worktree);
11747 if (continue_edit) {
11750 if (!edit_in_progress) {
11751 error = got_error(GOT_ERR_NOT_HISTEDIT);
11755 error = got_worktree_get_histedit_script_path(&path, worktree);
11759 error = histedit_load_list(&histedit_cmds, path, repo);
11764 error = got_worktree_histedit_continue(&resume_commit_id,
11765 &tmp_branch, &branch, &base_commit_id, &fileindex,
11770 error = got_ref_resolve(&head_commit_id, repo, branch);
11774 error = got_object_open_as_commit(&commit, repo,
11778 parent_ids = got_object_commit_get_parent_ids(commit);
11779 pid = STAILQ_FIRST(parent_ids);
11781 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11784 error = collect_commits(&commits, head_commit_id, &pid->id,
11785 base_commit_id, got_worktree_get_path_prefix(worktree),
11786 GOT_ERR_HISTEDIT_PATH, repo);
11787 got_object_commit_close(commit);
11792 if (edit_in_progress) {
11793 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11797 error = got_ref_open(&branch, repo,
11798 got_worktree_get_head_ref_name(worktree), 0);
11802 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11803 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11804 "will not edit commit history of a branch outside "
11805 "the \"refs/heads/\" reference namespace");
11809 error = got_ref_resolve(&head_commit_id, repo, branch);
11810 got_ref_close(branch);
11815 error = got_object_open_as_commit(&commit, repo,
11819 parent_ids = got_object_commit_get_parent_ids(commit);
11820 pid = STAILQ_FIRST(parent_ids);
11822 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11825 error = collect_commits(&commits, head_commit_id, &pid->id,
11826 got_worktree_get_base_commit_id(worktree),
11827 got_worktree_get_path_prefix(worktree),
11828 GOT_ERR_HISTEDIT_PATH, repo);
11829 got_object_commit_close(commit);
11834 if (STAILQ_EMPTY(&commits)) {
11835 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11839 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
11840 &base_commit_id, &fileindex, worktree, repo);
11844 if (edit_script_path) {
11845 error = histedit_load_list(&histedit_cmds,
11846 edit_script_path, repo);
11848 got_worktree_histedit_abort(worktree, fileindex,
11849 repo, branch, base_commit_id,
11850 abort_progress, &upa);
11851 print_merge_progress_stats(&upa);
11855 const char *branch_name;
11856 branch_name = got_ref_get_symref_target(branch);
11857 if (strncmp(branch_name, "refs/heads/", 11) == 0)
11859 error = histedit_edit_script(&histedit_cmds, &commits,
11860 branch_name, edit_logmsg_only, fold_only,
11863 got_worktree_histedit_abort(worktree, fileindex,
11864 repo, branch, base_commit_id,
11865 abort_progress, &upa);
11866 print_merge_progress_stats(&upa);
11872 error = histedit_save_list(&histedit_cmds, worktree,
11875 got_worktree_histedit_abort(worktree, fileindex,
11876 repo, branch, base_commit_id,
11877 abort_progress, &upa);
11878 print_merge_progress_stats(&upa);
11884 error = histedit_check_script(&histedit_cmds, &commits, repo);
11888 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
11889 if (resume_commit_id) {
11890 if (got_object_id_cmp(hle->commit_id,
11891 resume_commit_id) != 0)
11894 resume_commit_id = NULL;
11895 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
11896 hle->cmd->code == GOT_HISTEDIT_FOLD) {
11897 error = histedit_skip_commit(hle, worktree,
11902 struct got_pathlist_head paths;
11903 int have_changes = 0;
11905 TAILQ_INIT(&paths);
11906 error = got_pathlist_append(&paths, "", NULL);
11909 error = got_worktree_status(worktree, &paths,
11910 repo, 0, check_local_changes, &have_changes,
11911 check_cancelled, NULL);
11912 got_pathlist_free(&paths,
11913 GOT_PATHLIST_FREE_NONE);
11915 if (error->code != GOT_ERR_CANCELLED)
11917 if (sigint_received || sigpipe_received)
11920 if (have_changes) {
11921 error = histedit_commit(NULL, worktree,
11922 fileindex, tmp_branch, hle,
11927 error = got_object_open_as_commit(
11928 &commit, repo, hle->commit_id);
11931 error = show_histedit_progress(commit,
11933 got_object_commit_close(commit);
11942 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
11943 error = histedit_skip_commit(hle, worktree, repo);
11949 error = got_object_open_as_commit(&commit, repo,
11953 parent_ids = got_object_commit_get_parent_ids(commit);
11954 pid = STAILQ_FIRST(parent_ids);
11956 error = got_worktree_histedit_merge_files(&merged_paths,
11957 worktree, fileindex, &pid->id, hle->commit_id, repo,
11958 update_progress, &upa, check_cancelled, NULL);
11961 got_object_commit_close(commit);
11964 print_merge_progress_stats(&upa);
11965 if (upa.conflicts > 0 || upa.missing > 0 ||
11966 upa.not_deleted > 0 || upa.unversioned > 0) {
11967 if (upa.conflicts > 0) {
11968 error = show_rebase_merge_conflict(
11969 hle->commit_id, repo);
11973 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11977 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
11979 error = got_object_id_str(&id_str, hle->commit_id);
11982 printf("Stopping histedit for amending commit %s\n",
11985 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11986 error = got_worktree_histedit_postpone(worktree,
11991 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11992 error = histedit_skip_commit(hle, worktree, repo);
11998 error = histedit_commit(&merged_paths, worktree, fileindex,
11999 tmp_branch, hle, committer, repo);
12000 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
12005 if (upa.conflicts > 0 || upa.missing > 0 ||
12006 upa.not_deleted > 0 || upa.unversioned > 0) {
12007 error = got_worktree_histedit_postpone(worktree, fileindex);
12010 if (upa.conflicts > 0 && upa.missing == 0 &&
12011 upa.not_deleted == 0 && upa.unversioned == 0) {
12012 error = got_error_msg(GOT_ERR_CONFLICTS,
12013 "conflicts must be resolved before histedit "
12015 } else if (upa.conflicts > 0) {
12016 error = got_error_msg(GOT_ERR_CONFLICTS,
12017 "conflicts must be resolved before histedit "
12018 "can continue; changes destined for some "
12019 "files were not yet merged and should be "
12020 "merged manually if required before the "
12021 "histedit operation is continued");
12023 error = got_error_msg(GOT_ERR_CONFLICTS,
12024 "changes destined for some files were not "
12025 "yet merged and should be merged manually "
12026 "if required before the histedit operation "
12030 error = histedit_complete(worktree, fileindex, tmp_branch,
12035 free(gitconfig_path);
12036 got_object_id_queue_free(&commits);
12037 histedit_free_list(&histedit_cmds);
12038 free(head_commit_id);
12039 free(base_commit_id);
12040 free(resume_commit_id);
12042 got_object_commit_close(commit);
12044 got_ref_close(branch);
12046 got_ref_close(tmp_branch);
12048 got_worktree_close(worktree);
12050 const struct got_error *close_err = got_repo_close(repo);
12055 const struct got_error *pack_err =
12056 got_repo_pack_fds_close(pack_fds);
12064 usage_integrate(void)
12066 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
12070 static const struct got_error *
12071 cmd_integrate(int argc, char *argv[])
12073 const struct got_error *error = NULL;
12074 struct got_repository *repo = NULL;
12075 struct got_worktree *worktree = NULL;
12076 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
12077 const char *branch_arg = NULL;
12078 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
12079 struct got_fileindex *fileindex = NULL;
12080 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
12082 struct got_update_progress_arg upa;
12083 int *pack_fds = NULL;
12085 while ((ch = getopt(argc, argv, "")) != -1) {
12098 branch_arg = argv[0];
12100 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12101 "unveil", NULL) == -1)
12104 cwd = getcwd(NULL, 0);
12106 error = got_error_from_errno("getcwd");
12110 error = got_repo_pack_fds_open(&pack_fds);
12114 error = got_worktree_open(&worktree, cwd);
12116 if (error->code == GOT_ERR_NOT_WORKTREE)
12117 error = wrap_not_worktree_error(error, "integrate",
12122 error = check_rebase_or_histedit_in_progress(worktree);
12126 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12131 error = apply_unveil(got_repo_get_path(repo), 0,
12132 got_worktree_get_root_path(worktree));
12136 error = check_merge_in_progress(worktree, repo);
12140 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
12141 error = got_error_from_errno("asprintf");
12145 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
12146 &base_branch_ref, worktree, refname, repo);
12150 refname = strdup(got_ref_get_name(branch_ref));
12151 if (refname == NULL) {
12152 error = got_error_from_errno("strdup");
12153 got_worktree_integrate_abort(worktree, fileindex, repo,
12154 branch_ref, base_branch_ref);
12157 base_refname = strdup(got_ref_get_name(base_branch_ref));
12158 if (base_refname == NULL) {
12159 error = got_error_from_errno("strdup");
12160 got_worktree_integrate_abort(worktree, fileindex, repo,
12161 branch_ref, base_branch_ref);
12164 if (strncmp(base_refname, "refs/heads/", 11) != 0) {
12165 error = got_error(GOT_ERR_INTEGRATE_BRANCH);
12166 got_worktree_integrate_abort(worktree, fileindex, repo,
12167 branch_ref, base_branch_ref);
12171 error = got_ref_resolve(&commit_id, repo, branch_ref);
12175 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
12179 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
12180 error = got_error_msg(GOT_ERR_SAME_BRANCH,
12181 "specified branch has already been integrated");
12182 got_worktree_integrate_abort(worktree, fileindex, repo,
12183 branch_ref, base_branch_ref);
12187 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
12189 if (error->code == GOT_ERR_ANCESTRY)
12190 error = got_error(GOT_ERR_REBASE_REQUIRED);
12191 got_worktree_integrate_abort(worktree, fileindex, repo,
12192 branch_ref, base_branch_ref);
12196 memset(&upa, 0, sizeof(upa));
12197 error = got_worktree_integrate_continue(worktree, fileindex, repo,
12198 branch_ref, base_branch_ref, update_progress, &upa,
12199 check_cancelled, NULL);
12203 printf("Integrated %s into %s\n", refname, base_refname);
12204 print_update_progress_stats(&upa);
12207 const struct got_error *close_err = got_repo_close(repo);
12212 got_worktree_close(worktree);
12214 const struct got_error *pack_err =
12215 got_repo_pack_fds_close(pack_fds);
12220 free(base_commit_id);
12223 free(base_refname);
12230 fprintf(stderr, "usage: %s merge [-acn] [branch]\n", getprogname());
12234 static const struct got_error *
12235 cmd_merge(int argc, char *argv[])
12237 const struct got_error *error = NULL;
12238 struct got_worktree *worktree = NULL;
12239 struct got_repository *repo = NULL;
12240 struct got_fileindex *fileindex = NULL;
12241 char *cwd = NULL, *id_str = NULL, *author = NULL;
12242 struct got_reference *branch = NULL, *wt_branch = NULL;
12243 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
12244 struct got_object_id *wt_branch_tip = NULL;
12245 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
12246 int interrupt_merge = 0;
12247 struct got_update_progress_arg upa;
12248 struct got_object_id *merge_commit_id = NULL;
12249 char *branch_name = NULL;
12250 int *pack_fds = NULL;
12252 memset(&upa, 0, sizeof(upa));
12254 while ((ch = getopt(argc, argv, "acn")) != -1) {
12260 continue_merge = 1;
12263 interrupt_merge = 1;
12275 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12276 "unveil", NULL) == -1)
12280 if (abort_merge && continue_merge)
12281 option_conflict('a', 'c');
12282 if (abort_merge || continue_merge) {
12285 } else if (argc != 1)
12288 cwd = getcwd(NULL, 0);
12290 error = got_error_from_errno("getcwd");
12294 error = got_repo_pack_fds_open(&pack_fds);
12298 error = got_worktree_open(&worktree, cwd);
12300 if (error->code == GOT_ERR_NOT_WORKTREE)
12301 error = wrap_not_worktree_error(error,
12306 error = got_repo_open(&repo,
12307 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
12312 error = apply_unveil(got_repo_get_path(repo), 0,
12313 worktree ? got_worktree_get_root_path(worktree) : NULL);
12317 error = check_rebase_or_histedit_in_progress(worktree);
12321 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12327 if (!merge_in_progress) {
12328 error = got_error(GOT_ERR_NOT_MERGING);
12331 error = got_worktree_merge_continue(&branch_name,
12332 &branch_tip, &fileindex, worktree, repo);
12335 error = got_worktree_merge_abort(worktree, fileindex, repo,
12336 abort_progress, &upa);
12339 printf("Merge of %s aborted\n", branch_name);
12340 goto done; /* nothing else to do */
12343 error = get_author(&author, repo, worktree);
12347 if (continue_merge) {
12348 if (!merge_in_progress) {
12349 error = got_error(GOT_ERR_NOT_MERGING);
12352 error = got_worktree_merge_continue(&branch_name,
12353 &branch_tip, &fileindex, worktree, repo);
12357 error = got_ref_open(&branch, repo, argv[0], 0);
12360 branch_name = strdup(got_ref_get_name(branch));
12361 if (branch_name == NULL) {
12362 error = got_error_from_errno("strdup");
12365 error = got_ref_resolve(&branch_tip, repo, branch);
12370 error = got_ref_open(&wt_branch, repo,
12371 got_worktree_get_head_ref_name(worktree), 0);
12374 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
12377 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
12378 wt_branch_tip, branch_tip, 0, repo,
12379 check_cancelled, NULL);
12380 if (error && error->code != GOT_ERR_ANCESTRY)
12383 if (!continue_merge) {
12384 error = check_path_prefix(wt_branch_tip, branch_tip,
12385 got_worktree_get_path_prefix(worktree),
12386 GOT_ERR_MERGE_PATH, repo);
12390 error = check_same_branch(wt_branch_tip, branch,
12393 if (error->code != GOT_ERR_ANCESTRY)
12397 static char msg[512];
12398 snprintf(msg, sizeof(msg),
12399 "cannot create a merge commit because "
12400 "%s is based on %s; %s can be integrated "
12401 "with 'got integrate' instead", branch_name,
12402 got_worktree_get_head_ref_name(worktree),
12404 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
12408 error = got_worktree_merge_prepare(&fileindex, worktree,
12413 error = got_worktree_merge_branch(worktree, fileindex,
12414 yca_id, branch_tip, repo, update_progress, &upa,
12415 check_cancelled, NULL);
12418 print_merge_progress_stats(&upa);
12419 if (!upa.did_something) {
12420 error = got_worktree_merge_abort(worktree, fileindex,
12421 repo, abort_progress, &upa);
12424 printf("Already up-to-date\n");
12429 if (interrupt_merge) {
12430 error = got_worktree_merge_postpone(worktree, fileindex);
12433 printf("Merge of %s interrupted on request\n", branch_name);
12434 } else if (upa.conflicts > 0 || upa.missing > 0 ||
12435 upa.not_deleted > 0 || upa.unversioned > 0) {
12436 error = got_worktree_merge_postpone(worktree, fileindex);
12439 if (upa.conflicts > 0 && upa.missing == 0 &&
12440 upa.not_deleted == 0 && upa.unversioned == 0) {
12441 error = got_error_msg(GOT_ERR_CONFLICTS,
12442 "conflicts must be resolved before merging "
12444 } else if (upa.conflicts > 0) {
12445 error = got_error_msg(GOT_ERR_CONFLICTS,
12446 "conflicts must be resolved before merging "
12447 "can continue; changes destined for some "
12448 "files were not yet merged and "
12449 "should be merged manually if required before the "
12450 "merge operation is continued");
12452 error = got_error_msg(GOT_ERR_CONFLICTS,
12453 "changes destined for some "
12454 "files were not yet merged and should be "
12455 "merged manually if required before the "
12456 "merge operation is continued");
12460 error = got_worktree_merge_commit(&merge_commit_id, worktree,
12461 fileindex, author, NULL, 1, branch_tip, branch_name,
12462 repo, continue_merge ? print_status : NULL, NULL);
12465 error = got_worktree_merge_complete(worktree, fileindex, repo);
12468 error = got_object_id_str(&id_str, merge_commit_id);
12471 printf("Merged %s into %s: %s\n", branch_name,
12472 got_worktree_get_head_ref_name(worktree),
12478 free(merge_commit_id);
12484 got_ref_close(branch);
12486 got_ref_close(wt_branch);
12488 got_worktree_close(worktree);
12490 const struct got_error *close_err = got_repo_close(repo);
12495 const struct got_error *pack_err =
12496 got_repo_pack_fds_close(pack_fds);
12506 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
12507 "[path ...]\n", getprogname());
12511 static const struct got_error *
12512 print_stage(void *arg, unsigned char status, unsigned char staged_status,
12513 const char *path, struct got_object_id *blob_id,
12514 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
12515 int dirfd, const char *de_name)
12517 const struct got_error *err = NULL;
12518 char *id_str = NULL;
12520 if (staged_status != GOT_STATUS_ADD &&
12521 staged_status != GOT_STATUS_MODIFY &&
12522 staged_status != GOT_STATUS_DELETE)
12525 if (staged_status == GOT_STATUS_ADD ||
12526 staged_status == GOT_STATUS_MODIFY)
12527 err = got_object_id_str(&id_str, staged_blob_id);
12529 err = got_object_id_str(&id_str, blob_id);
12533 printf("%s %c %s\n", id_str, staged_status, path);
12538 static const struct got_error *
12539 cmd_stage(int argc, char *argv[])
12541 const struct got_error *error = NULL;
12542 struct got_repository *repo = NULL;
12543 struct got_worktree *worktree = NULL;
12545 struct got_pathlist_head paths;
12546 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
12547 FILE *patch_script_file = NULL;
12548 const char *patch_script_path = NULL;
12549 struct choose_patch_arg cpa;
12550 int *pack_fds = NULL;
12552 TAILQ_INIT(&paths);
12554 while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
12557 patch_script_path = optarg;
12566 allow_bad_symlinks = 1;
12578 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12579 "unveil", NULL) == -1)
12582 if (list_stage && (pflag || patch_script_path))
12583 errx(1, "-l option cannot be used with other options");
12584 if (patch_script_path && !pflag)
12585 errx(1, "-F option can only be used together with -p option");
12587 cwd = getcwd(NULL, 0);
12589 error = got_error_from_errno("getcwd");
12593 error = got_repo_pack_fds_open(&pack_fds);
12597 error = got_worktree_open(&worktree, cwd);
12599 if (error->code == GOT_ERR_NOT_WORKTREE)
12600 error = wrap_not_worktree_error(error, "stage", cwd);
12604 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12609 if (patch_script_path) {
12610 patch_script_file = fopen(patch_script_path, "re");
12611 if (patch_script_file == NULL) {
12612 error = got_error_from_errno2("fopen",
12613 patch_script_path);
12617 error = apply_unveil(got_repo_get_path(repo), 0,
12618 got_worktree_get_root_path(worktree));
12622 error = check_merge_in_progress(worktree, repo);
12626 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12631 error = got_worktree_status(worktree, &paths, repo, 0,
12632 print_stage, NULL, check_cancelled, NULL);
12634 cpa.patch_script_file = patch_script_file;
12635 cpa.action = "stage";
12636 error = got_worktree_stage(worktree, &paths,
12637 pflag ? NULL : print_status, NULL,
12638 pflag ? choose_patch : NULL, &cpa,
12639 allow_bad_symlinks, repo);
12642 if (patch_script_file && fclose(patch_script_file) == EOF &&
12644 error = got_error_from_errno2("fclose", patch_script_path);
12646 const struct got_error *close_err = got_repo_close(repo);
12651 got_worktree_close(worktree);
12653 const struct got_error *pack_err =
12654 got_repo_pack_fds_close(pack_fds);
12658 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
12664 usage_unstage(void)
12666 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
12667 "[path ...]\n", getprogname());
12672 static const struct got_error *
12673 cmd_unstage(int argc, char *argv[])
12675 const struct got_error *error = NULL;
12676 struct got_repository *repo = NULL;
12677 struct got_worktree *worktree = NULL;
12679 struct got_pathlist_head paths;
12681 struct got_update_progress_arg upa;
12682 FILE *patch_script_file = NULL;
12683 const char *patch_script_path = NULL;
12684 struct choose_patch_arg cpa;
12685 int *pack_fds = NULL;
12687 TAILQ_INIT(&paths);
12689 while ((ch = getopt(argc, argv, "F:p")) != -1) {
12692 patch_script_path = optarg;
12707 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12708 "unveil", NULL) == -1)
12711 if (patch_script_path && !pflag)
12712 errx(1, "-F option can only be used together with -p option");
12714 cwd = getcwd(NULL, 0);
12716 error = got_error_from_errno("getcwd");
12720 error = got_repo_pack_fds_open(&pack_fds);
12724 error = got_worktree_open(&worktree, cwd);
12726 if (error->code == GOT_ERR_NOT_WORKTREE)
12727 error = wrap_not_worktree_error(error, "unstage", cwd);
12731 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12736 if (patch_script_path) {
12737 patch_script_file = fopen(patch_script_path, "re");
12738 if (patch_script_file == NULL) {
12739 error = got_error_from_errno2("fopen",
12740 patch_script_path);
12745 error = apply_unveil(got_repo_get_path(repo), 0,
12746 got_worktree_get_root_path(worktree));
12750 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12754 cpa.patch_script_file = patch_script_file;
12755 cpa.action = "unstage";
12756 memset(&upa, 0, sizeof(upa));
12757 error = got_worktree_unstage(worktree, &paths, update_progress,
12758 &upa, pflag ? choose_patch : NULL, &cpa, repo);
12760 print_merge_progress_stats(&upa);
12762 if (patch_script_file && fclose(patch_script_file) == EOF &&
12764 error = got_error_from_errno2("fclose", patch_script_path);
12766 const struct got_error *close_err = got_repo_close(repo);
12771 got_worktree_close(worktree);
12773 const struct got_error *pack_err =
12774 got_repo_pack_fds_close(pack_fds);
12778 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
12786 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
12787 "arg ...\n", getprogname());
12791 static const struct got_error *
12792 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12794 const struct got_error *err;
12795 struct got_blob_object *blob;
12798 fd = got_opentempfd();
12800 return got_error_from_errno("got_opentempfd");
12802 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
12806 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
12808 if (fd != -1 && close(fd) == -1 && err == NULL)
12809 err = got_error_from_errno("close");
12811 got_object_blob_close(blob);
12815 static const struct got_error *
12816 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12818 const struct got_error *err;
12819 struct got_tree_object *tree;
12822 err = got_object_open_as_tree(&tree, repo, id);
12826 nentries = got_object_tree_get_nentries(tree);
12827 for (i = 0; i < nentries; i++) {
12828 struct got_tree_entry *te;
12830 if (sigint_received || sigpipe_received)
12832 te = got_object_tree_get_entry(tree, i);
12833 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
12836 fprintf(outfile, "%s %.7o %s\n", id_str,
12837 got_tree_entry_get_mode(te),
12838 got_tree_entry_get_name(te));
12842 got_object_tree_close(tree);
12846 static const struct got_error *
12847 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12849 const struct got_error *err;
12850 struct got_commit_object *commit;
12851 const struct got_object_id_queue *parent_ids;
12852 struct got_object_qid *pid;
12853 char *id_str = NULL;
12854 const char *logmsg = NULL;
12857 err = got_object_open_as_commit(&commit, repo, id);
12861 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
12865 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
12866 parent_ids = got_object_commit_get_parent_ids(commit);
12867 fprintf(outfile, "numparents %d\n",
12868 got_object_commit_get_nparents(commit));
12869 STAILQ_FOREACH(pid, parent_ids, entry) {
12871 err = got_object_id_str(&pid_str, &pid->id);
12874 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
12877 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12878 got_object_commit_get_author_gmtoff(commit));
12879 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
12880 got_object_commit_get_author(commit),
12881 (long long)got_object_commit_get_author_time(commit),
12884 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12885 got_object_commit_get_committer_gmtoff(commit));
12886 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
12887 got_object_commit_get_committer(commit),
12888 (long long)got_object_commit_get_committer_time(commit),
12891 logmsg = got_object_commit_get_logmsg_raw(commit);
12892 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
12893 fprintf(outfile, "%s", logmsg);
12896 got_object_commit_close(commit);
12900 static const struct got_error *
12901 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12903 const struct got_error *err;
12904 struct got_tag_object *tag;
12905 char *id_str = NULL;
12906 const char *tagmsg = NULL;
12909 err = got_object_open_as_tag(&tag, repo, id);
12913 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
12917 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
12919 switch (got_object_tag_get_object_type(tag)) {
12920 case GOT_OBJ_TYPE_BLOB:
12921 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12922 GOT_OBJ_LABEL_BLOB);
12924 case GOT_OBJ_TYPE_TREE:
12925 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12926 GOT_OBJ_LABEL_TREE);
12928 case GOT_OBJ_TYPE_COMMIT:
12929 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12930 GOT_OBJ_LABEL_COMMIT);
12932 case GOT_OBJ_TYPE_TAG:
12933 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12934 GOT_OBJ_LABEL_TAG);
12940 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
12941 got_object_tag_get_name(tag));
12943 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12944 got_object_tag_get_tagger_gmtoff(tag));
12945 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
12946 got_object_tag_get_tagger(tag),
12947 (long long)got_object_tag_get_tagger_time(tag),
12950 tagmsg = got_object_tag_get_message(tag);
12951 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
12952 fprintf(outfile, "%s", tagmsg);
12955 got_object_tag_close(tag);
12959 static const struct got_error *
12960 cmd_cat(int argc, char *argv[])
12962 const struct got_error *error;
12963 struct got_repository *repo = NULL;
12964 struct got_worktree *worktree = NULL;
12965 char *cwd = NULL, *repo_path = NULL, *label = NULL;
12966 const char *commit_id_str = NULL;
12967 struct got_object_id *id = NULL, *commit_id = NULL;
12968 struct got_commit_object *commit = NULL;
12969 int ch, obj_type, i, force_path = 0;
12970 struct got_reflist_head refs;
12971 int *pack_fds = NULL;
12976 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12981 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
12984 commit_id_str = optarg;
12990 repo_path = realpath(optarg, NULL);
12991 if (repo_path == NULL)
12992 return got_error_from_errno2("realpath",
12994 got_path_strip_trailing_slashes(repo_path);
13005 cwd = getcwd(NULL, 0);
13007 error = got_error_from_errno("getcwd");
13011 error = got_repo_pack_fds_open(&pack_fds);
13015 if (repo_path == NULL) {
13016 error = got_worktree_open(&worktree, cwd);
13017 if (error && error->code != GOT_ERR_NOT_WORKTREE)
13020 repo_path = strdup(
13021 got_worktree_get_repo_path(worktree));
13022 if (repo_path == NULL) {
13023 error = got_error_from_errno("strdup");
13027 /* Release work tree lock. */
13028 got_worktree_close(worktree);
13033 if (repo_path == NULL) {
13034 repo_path = strdup(cwd);
13035 if (repo_path == NULL)
13036 return got_error_from_errno("strdup");
13039 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
13044 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
13048 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
13052 if (commit_id_str == NULL)
13053 commit_id_str = GOT_REF_HEAD;
13054 error = got_repo_match_object_id(&commit_id, NULL,
13055 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
13059 error = got_object_open_as_commit(&commit, repo, commit_id);
13063 for (i = 0; i < argc; i++) {
13065 error = got_object_id_by_path(&id, repo, commit,
13070 error = got_repo_match_object_id(&id, &label, argv[i],
13071 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
13074 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
13075 error->code != GOT_ERR_NOT_REF)
13077 error = got_object_id_by_path(&id, repo,
13084 error = got_object_get_type(&obj_type, repo, id);
13088 switch (obj_type) {
13089 case GOT_OBJ_TYPE_BLOB:
13090 error = cat_blob(id, repo, stdout);
13092 case GOT_OBJ_TYPE_TREE:
13093 error = cat_tree(id, repo, stdout);
13095 case GOT_OBJ_TYPE_COMMIT:
13096 error = cat_commit(id, repo, stdout);
13098 case GOT_OBJ_TYPE_TAG:
13099 error = cat_tag(id, repo, stdout);
13102 error = got_error(GOT_ERR_OBJ_TYPE);
13117 got_object_commit_close(commit);
13119 got_worktree_close(worktree);
13121 const struct got_error *close_err = got_repo_close(repo);
13126 const struct got_error *pack_err =
13127 got_repo_pack_fds_close(pack_fds);
13132 got_ref_list_free(&refs);
13139 fprintf(stderr, "usage: %s info [path ...]\n",
13144 static const struct got_error *
13145 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
13146 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
13147 struct got_object_id *commit_id)
13149 const struct got_error *err = NULL;
13150 char *id_str = NULL;
13152 struct tm mytm, *tm;
13153 struct got_pathlist_head *paths = arg;
13154 struct got_pathlist_entry *pe;
13157 * Clear error indication from any of the path arguments which
13158 * would cause this file index entry to be displayed.
13160 TAILQ_FOREACH(pe, paths, entry) {
13161 if (got_path_cmp(path, pe->path, strlen(path),
13162 pe->path_len) == 0 ||
13163 got_path_is_child(path, pe->path, pe->path_len))
13164 pe->data = NULL; /* no error */
13167 printf(GOT_COMMIT_SEP_STR);
13169 printf("symlink: %s\n", path);
13170 else if (S_ISREG(mode)) {
13171 printf("file: %s\n", path);
13172 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
13173 } else if (S_ISDIR(mode))
13174 printf("directory: %s\n", path);
13176 printf("something: %s\n", path);
13178 tm = localtime_r(&mtime, &mytm);
13181 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
13182 return got_error(GOT_ERR_NO_SPACE);
13183 printf("timestamp: %s\n", datebuf);
13186 err = got_object_id_str(&id_str, blob_id);
13189 printf("based on blob: %s\n", id_str);
13193 if (staged_blob_id) {
13194 err = got_object_id_str(&id_str, staged_blob_id);
13197 printf("based on staged blob: %s\n", id_str);
13202 err = got_object_id_str(&id_str, commit_id);
13205 printf("based on commit: %s\n", id_str);
13212 static const struct got_error *
13213 cmd_info(int argc, char *argv[])
13215 const struct got_error *error = NULL;
13216 struct got_worktree *worktree = NULL;
13217 char *cwd = NULL, *id_str = NULL;
13218 struct got_pathlist_head paths;
13219 char *uuidstr = NULL;
13220 int ch, show_files = 0;
13222 TAILQ_INIT(&paths);
13224 while ((ch = getopt(argc, argv, "")) != -1) {
13236 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
13240 cwd = getcwd(NULL, 0);
13242 error = got_error_from_errno("getcwd");
13246 error = got_worktree_open(&worktree, cwd);
13248 if (error->code == GOT_ERR_NOT_WORKTREE)
13249 error = wrap_not_worktree_error(error, "info", cwd);
13254 /* Remove "wpath cpath proc exec sendfd" promises. */
13255 if (pledge("stdio rpath flock unveil", NULL) == -1)
13258 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
13263 error = get_worktree_paths_from_argv(&paths, argc, argv,
13270 error = got_object_id_str(&id_str,
13271 got_worktree_get_base_commit_id(worktree));
13275 error = got_worktree_get_uuid(&uuidstr, worktree);
13279 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
13280 printf("work tree base commit: %s\n", id_str);
13281 printf("work tree path prefix: %s\n",
13282 got_worktree_get_path_prefix(worktree));
13283 printf("work tree branch reference: %s\n",
13284 got_worktree_get_head_ref_name(worktree));
13285 printf("work tree UUID: %s\n", uuidstr);
13286 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
13289 struct got_pathlist_entry *pe;
13290 TAILQ_FOREACH(pe, &paths, entry) {
13291 if (pe->path_len == 0)
13294 * Assume this path will fail. This will be corrected
13295 * in print_path_info() in case the path does suceeed.
13297 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
13299 error = got_worktree_path_info(worktree, &paths,
13300 print_path_info, &paths, check_cancelled, NULL);
13303 TAILQ_FOREACH(pe, &paths, entry) {
13304 if (pe->data != NULL) {
13305 const struct got_error *perr;
13308 error = got_error_fmt(perr->code, "%s",
13316 got_worktree_close(worktree);
13317 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);