2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/queue.h>
21 #include <sys/types.h>
44 #include "got_version.h"
45 #include "got_error.h"
46 #include "got_object.h"
47 #include "got_reference.h"
48 #include "got_repository.h"
50 #include "got_cancel.h"
51 #include "got_worktree.h"
53 #include "got_commit_graph.h"
54 #include "got_fetch.h"
56 #include "got_blame.h"
57 #include "got_privsep.h"
58 #include "got_opentemp.h"
59 #include "got_gotconfig.h"
61 #include "got_patch.h"
66 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
69 static volatile sig_atomic_t sigint_received;
70 static volatile sig_atomic_t sigpipe_received;
73 catch_sigint(int signo)
79 catch_sigpipe(int signo)
87 const struct got_error *(*cmd_main)(int, char *[]);
88 void (*cmd_usage)(void);
89 const char *cmd_alias;
92 __dead static void usage(int, int);
93 __dead static void usage_import(void);
94 __dead static void usage_clone(void);
95 __dead static void usage_fetch(void);
96 __dead static void usage_checkout(void);
97 __dead static void usage_update(void);
98 __dead static void usage_log(void);
99 __dead static void usage_diff(void);
100 __dead static void usage_blame(void);
101 __dead static void usage_tree(void);
102 __dead static void usage_status(void);
103 __dead static void usage_ref(void);
104 __dead static void usage_branch(void);
105 __dead static void usage_tag(void);
106 __dead static void usage_add(void);
107 __dead static void usage_remove(void);
108 __dead static void usage_patch(void);
109 __dead static void usage_revert(void);
110 __dead static void usage_commit(void);
111 __dead static void usage_send(void);
112 __dead static void usage_cherrypick(void);
113 __dead static void usage_backout(void);
114 __dead static void usage_rebase(void);
115 __dead static void usage_histedit(void);
116 __dead static void usage_integrate(void);
117 __dead static void usage_merge(void);
118 __dead static void usage_stage(void);
119 __dead static void usage_unstage(void);
120 __dead static void usage_cat(void);
121 __dead static void usage_info(void);
123 static const struct got_error* cmd_import(int, char *[]);
124 static const struct got_error* cmd_clone(int, char *[]);
125 static const struct got_error* cmd_fetch(int, char *[]);
126 static const struct got_error* cmd_checkout(int, char *[]);
127 static const struct got_error* cmd_update(int, char *[]);
128 static const struct got_error* cmd_log(int, char *[]);
129 static const struct got_error* cmd_diff(int, char *[]);
130 static const struct got_error* cmd_blame(int, char *[]);
131 static const struct got_error* cmd_tree(int, char *[]);
132 static const struct got_error* cmd_status(int, char *[]);
133 static const struct got_error* cmd_ref(int, char *[]);
134 static const struct got_error* cmd_branch(int, char *[]);
135 static const struct got_error* cmd_tag(int, char *[]);
136 static const struct got_error* cmd_add(int, char *[]);
137 static const struct got_error* cmd_remove(int, char *[]);
138 static const struct got_error* cmd_patch(int, char *[]);
139 static const struct got_error* cmd_revert(int, char *[]);
140 static const struct got_error* cmd_commit(int, char *[]);
141 static const struct got_error* cmd_send(int, char *[]);
142 static const struct got_error* cmd_cherrypick(int, char *[]);
143 static const struct got_error* cmd_backout(int, char *[]);
144 static const struct got_error* cmd_rebase(int, char *[]);
145 static const struct got_error* cmd_histedit(int, char *[]);
146 static const struct got_error* cmd_integrate(int, char *[]);
147 static const struct got_error* cmd_merge(int, char *[]);
148 static const struct got_error* cmd_stage(int, char *[]);
149 static const struct got_error* cmd_unstage(int, char *[]);
150 static const struct got_error* cmd_cat(int, char *[]);
151 static const struct got_error* cmd_info(int, char *[]);
153 static const struct got_cmd got_commands[] = {
154 { "import", cmd_import, usage_import, "im" },
155 { "clone", cmd_clone, usage_clone, "cl" },
156 { "fetch", cmd_fetch, usage_fetch, "fe" },
157 { "checkout", cmd_checkout, usage_checkout, "co" },
158 { "update", cmd_update, usage_update, "up" },
159 { "log", cmd_log, usage_log, "" },
160 { "diff", cmd_diff, usage_diff, "di" },
161 { "blame", cmd_blame, usage_blame, "bl" },
162 { "tree", cmd_tree, usage_tree, "tr" },
163 { "status", cmd_status, usage_status, "st" },
164 { "ref", cmd_ref, usage_ref, "" },
165 { "branch", cmd_branch, usage_branch, "br" },
166 { "tag", cmd_tag, usage_tag, "" },
167 { "add", cmd_add, usage_add, "" },
168 { "remove", cmd_remove, usage_remove, "rm" },
169 { "patch", cmd_patch, usage_patch, "pa" },
170 { "revert", cmd_revert, usage_revert, "rv" },
171 { "commit", cmd_commit, usage_commit, "ci" },
172 { "send", cmd_send, usage_send, "se" },
173 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
174 { "backout", cmd_backout, usage_backout, "bo" },
175 { "rebase", cmd_rebase, usage_rebase, "rb" },
176 { "histedit", cmd_histedit, usage_histedit, "he" },
177 { "integrate", cmd_integrate, usage_integrate,"ig" },
178 { "merge", cmd_merge, usage_merge, "mg" },
179 { "stage", cmd_stage, usage_stage, "sg" },
180 { "unstage", cmd_unstage, usage_unstage, "ug" },
181 { "cat", cmd_cat, usage_cat, "" },
182 { "info", cmd_info, usage_info, "" },
186 list_commands(FILE *fp)
190 fprintf(fp, "commands:");
191 for (i = 0; i < nitems(got_commands); i++) {
192 const struct got_cmd *cmd = &got_commands[i];
193 fprintf(fp, " %s", cmd->cmd_name);
199 option_conflict(char a, char b)
201 errx(1, "-%c and -%c options are mutually exclusive", a, b);
205 main(int argc, char *argv[])
207 const struct got_cmd *cmd;
210 int hflag = 0, Vflag = 0;
211 static const struct option longopts[] = {
212 { "version", no_argument, NULL, 'V' },
216 setlocale(LC_CTYPE, "");
218 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
238 got_version_print_str();
243 usage(hflag, hflag ? 0 : 1);
245 signal(SIGINT, catch_sigint);
246 signal(SIGPIPE, catch_sigpipe);
248 for (i = 0; i < nitems(got_commands); i++) {
249 const struct got_error *error;
251 cmd = &got_commands[i];
253 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
254 strcmp(cmd->cmd_alias, argv[0]) != 0)
260 error = cmd->cmd_main(argc, argv);
261 if (error && error->code != GOT_ERR_CANCELLED &&
262 error->code != GOT_ERR_PRIVSEP_EXIT &&
263 !(sigpipe_received &&
264 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
266 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
267 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
274 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
275 list_commands(stderr);
280 usage(int hflag, int status)
282 FILE *fp = (status == 0) ? stdout : stderr;
284 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
291 static const struct got_error *
292 get_editor(char **abspath)
294 const struct got_error *err = NULL;
299 editor = getenv("VISUAL");
301 editor = getenv("EDITOR");
304 err = got_path_find_prog(abspath, editor);
309 if (*abspath == NULL) {
310 *abspath = strdup("/bin/ed");
311 if (*abspath == NULL)
312 return got_error_from_errno("strdup");
318 static const struct got_error *
319 apply_unveil(const char *repo_path, int repo_read_only,
320 const char *worktree_path)
322 const struct got_error *err;
325 if (unveil("gmon.out", "rwc") != 0)
326 return got_error_from_errno2("unveil", "gmon.out");
328 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
329 return got_error_from_errno2("unveil", repo_path);
331 if (worktree_path && unveil(worktree_path, "rwc") != 0)
332 return got_error_from_errno2("unveil", worktree_path);
334 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
335 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
337 err = got_privsep_unveil_exec_helpers();
341 if (unveil(NULL, NULL) != 0)
342 return got_error_from_errno("unveil");
350 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
351 "[-r repository-path] directory\n", getprogname());
356 spawn_editor(const char *editor, const char *file)
359 sig_t sighup, sigint, sigquit;
362 sighup = signal(SIGHUP, SIG_IGN);
363 sigint = signal(SIGINT, SIG_IGN);
364 sigquit = signal(SIGQUIT, SIG_IGN);
366 switch (pid = fork()) {
370 execl(editor, editor, file, (char *)NULL);
374 while (waitpid(pid, &st, 0) == -1)
379 (void)signal(SIGHUP, sighup);
380 (void)signal(SIGINT, sigint);
381 (void)signal(SIGQUIT, sigquit);
383 if (!WIFEXITED(st)) {
388 return WEXITSTATUS(st);
391 static const struct got_error *
392 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
393 const char *initial_content, size_t initial_content_len,
394 int require_modification)
396 const struct got_error *err = NULL;
401 size_t len, logmsg_len;
402 char *initial_content_stripped = NULL, *buf = NULL, *s;
406 if (stat(logmsg_path, &st) == -1)
407 return got_error_from_errno2("stat", logmsg_path);
409 if (spawn_editor(editor, logmsg_path) == -1)
410 return got_error_from_errno("failed spawning editor");
412 if (stat(logmsg_path, &st2) == -1)
413 return got_error_from_errno("stat");
415 if (require_modification &&
416 st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
417 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
418 "no changes made to commit message, aborting");
421 * Set up a stripped version of the initial content without comments
422 * and blank lines. We need this in order to check if the message
423 * has in fact been edited.
425 initial_content_stripped = malloc(initial_content_len + 1);
426 if (initial_content_stripped == NULL)
427 return got_error_from_errno("malloc");
428 initial_content_stripped[0] = '\0';
430 buf = strdup(initial_content);
432 err = got_error_from_errno("strdup");
437 while ((line = strsep(&s, "\n")) != NULL) {
438 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
439 continue; /* remove comments and leading empty lines */
440 len = strlcat(initial_content_stripped, line,
441 initial_content_len + 1);
442 if (len >= initial_content_len + 1) {
443 err = got_error(GOT_ERR_NO_SPACE);
447 while (len > 0 && initial_content_stripped[len - 1] == '\n') {
448 initial_content_stripped[len - 1] = '\0';
452 logmsg_len = st2.st_size;
453 *logmsg = malloc(logmsg_len + 1);
455 return got_error_from_errno("malloc");
458 fp = fopen(logmsg_path, "re");
460 err = got_error_from_errno("fopen");
465 while (getline(&line, &linesize, fp) != -1) {
466 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
467 continue; /* remove comments and leading empty lines */
468 len = strlcat(*logmsg, line, logmsg_len + 1);
469 if (len >= logmsg_len + 1) {
470 err = got_error(GOT_ERR_NO_SPACE);
476 err = got_ferror(fp, GOT_ERR_IO);
479 while (len > 0 && (*logmsg)[len - 1] == '\n') {
480 (*logmsg)[len - 1] = '\0';
485 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
486 "commit message cannot be empty, aborting");
489 if (require_modification &&
490 strcmp(*logmsg, initial_content_stripped) == 0)
491 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
492 "no changes made to commit message, aborting");
494 free(initial_content_stripped);
496 if (fp && fclose(fp) == EOF && err == NULL)
497 err = got_error_from_errno("fclose");
505 static const struct got_error *
506 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
507 const char *path_dir, const char *branch_name)
509 char *initial_content = NULL;
510 const struct got_error *err = NULL;
511 int initial_content_len;
514 initial_content_len = asprintf(&initial_content,
515 "\n# %s to be imported to branch %s\n", path_dir,
517 if (initial_content_len == -1)
518 return got_error_from_errno("asprintf");
520 err = got_opentemp_named_fd(logmsg_path, &fd,
521 GOT_TMPDIR_STR "/got-importmsg");
525 if (write(fd, initial_content, initial_content_len) == -1) {
526 err = got_error_from_errno2("write", *logmsg_path);
530 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
531 initial_content_len, 1);
533 if (fd != -1 && close(fd) == -1 && err == NULL)
534 err = got_error_from_errno2("close", *logmsg_path);
535 free(initial_content);
543 static const struct got_error *
544 import_progress(void *arg, const char *path)
546 printf("A %s\n", path);
550 static const struct got_error *
551 valid_author(const char *author)
553 const char *email = author;
556 * Git' expects the author (or committer) to be in the form
557 * "name <email>", which are mostly free form (see the
558 * "committer" description in git-fast-import(1)). We're only
559 * doing this to avoid git's object parser breaking on commits
563 while (*author && *author != '\n' && *author != '<' && *author != '>')
565 if (*author++ != '<')
566 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
567 while (*author && *author != '\n' && *author != '<' && *author != '>')
569 if (strcmp(author, ">") != 0)
570 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
574 static const struct got_error *
575 get_author(char **author, struct got_repository *repo,
576 struct got_worktree *worktree)
578 const struct got_error *err = NULL;
579 const char *got_author = NULL, *name, *email;
580 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
585 worktree_conf = got_worktree_get_gotconfig(worktree);
586 repo_conf = got_repo_get_gotconfig(repo);
589 * Priority of potential author information sources, from most
590 * significant to least significant:
591 * 1) work tree's .got/got.conf file
592 * 2) repository's got.conf file
593 * 3) repository's git config file
594 * 4) environment variables
595 * 5) global git config files (in user's home directory or /etc)
599 got_author = got_gotconfig_get_author(worktree_conf);
600 if (got_author == NULL)
601 got_author = got_gotconfig_get_author(repo_conf);
602 if (got_author == NULL) {
603 name = got_repo_get_gitconfig_author_name(repo);
604 email = got_repo_get_gitconfig_author_email(repo);
606 if (asprintf(author, "%s <%s>", name, email) == -1)
607 return got_error_from_errno("asprintf");
611 got_author = getenv("GOT_AUTHOR");
612 if (got_author == NULL) {
613 name = got_repo_get_global_gitconfig_author_name(repo);
614 email = got_repo_get_global_gitconfig_author_email(
617 if (asprintf(author, "%s <%s>", name, email)
619 return got_error_from_errno("asprintf");
622 /* TODO: Look up user in password database? */
623 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
627 *author = strdup(got_author);
629 return got_error_from_errno("strdup");
631 err = valid_author(*author);
639 static const struct got_error *
640 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
641 struct got_worktree *worktree)
643 const char *got_allowed_signers = NULL;
644 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
646 *allowed_signers = NULL;
649 worktree_conf = got_worktree_get_gotconfig(worktree);
650 repo_conf = got_repo_get_gotconfig(repo);
653 * Priority of potential author information sources, from most
654 * significant to least significant:
655 * 1) work tree's .got/got.conf file
656 * 2) repository's got.conf file
660 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
662 if (got_allowed_signers == NULL)
663 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
666 if (got_allowed_signers) {
667 *allowed_signers = strdup(got_allowed_signers);
668 if (*allowed_signers == NULL)
669 return got_error_from_errno("strdup");
674 static const struct got_error *
675 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
676 struct got_worktree *worktree)
678 const char *got_revoked_signers = NULL;
679 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
681 *revoked_signers = NULL;
684 worktree_conf = got_worktree_get_gotconfig(worktree);
685 repo_conf = got_repo_get_gotconfig(repo);
688 * Priority of potential author information sources, from most
689 * significant to least significant:
690 * 1) work tree's .got/got.conf file
691 * 2) repository's got.conf file
695 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
697 if (got_revoked_signers == NULL)
698 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
701 if (got_revoked_signers) {
702 *revoked_signers = strdup(got_revoked_signers);
703 if (*revoked_signers == NULL)
704 return got_error_from_errno("strdup");
709 static const struct got_error *
710 get_signer_id(char **signer_id, struct got_repository *repo,
711 struct got_worktree *worktree)
713 const char *got_signer_id = NULL;
714 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
719 worktree_conf = got_worktree_get_gotconfig(worktree);
720 repo_conf = got_repo_get_gotconfig(repo);
723 * Priority of potential author information sources, from most
724 * significant to least significant:
725 * 1) work tree's .got/got.conf file
726 * 2) repository's got.conf file
730 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
731 if (got_signer_id == NULL)
732 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
735 *signer_id = strdup(got_signer_id);
736 if (*signer_id == NULL)
737 return got_error_from_errno("strdup");
742 static const struct got_error *
743 get_gitconfig_path(char **gitconfig_path)
745 const char *homedir = getenv("HOME");
747 *gitconfig_path = NULL;
749 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
750 return got_error_from_errno("asprintf");
756 static const struct got_error *
757 cmd_import(int argc, char *argv[])
759 const struct got_error *error = NULL;
760 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
761 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
762 const char *branch_name = NULL;
763 char *id_str = NULL, *logmsg_path = NULL;
764 char refname[PATH_MAX] = "refs/heads/";
765 struct got_repository *repo = NULL;
766 struct got_reference *branch_ref = NULL, *head_ref = NULL;
767 struct got_object_id *new_commit_id = NULL;
769 struct got_pathlist_head ignores;
770 struct got_pathlist_entry *pe;
771 int preserve_logmsg = 0;
772 int *pack_fds = NULL;
774 TAILQ_INIT(&ignores);
776 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
779 branch_name = optarg;
782 if (optarg[0] == '\0')
784 error = got_pathlist_insert(&pe, &ignores, optarg,
790 logmsg = strdup(optarg);
791 if (logmsg == NULL) {
792 error = got_error_from_errno("strdup");
797 repo_path = realpath(optarg, NULL);
798 if (repo_path == NULL) {
799 error = got_error_from_errno2("realpath",
814 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
822 if (repo_path == NULL) {
823 repo_path = getcwd(NULL, 0);
824 if (repo_path == NULL)
825 return got_error_from_errno("getcwd");
827 got_path_strip_trailing_slashes(repo_path);
828 error = get_gitconfig_path(&gitconfig_path);
831 error = got_repo_pack_fds_open(&pack_fds);
834 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
838 error = get_author(&author, repo, NULL);
843 * Don't let the user create a branch name with a leading '-'.
844 * While technically a valid reference name, this case is usually
845 * an unintended typo.
847 if (branch_name && branch_name[0] == '-')
848 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
850 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
851 if (error && error->code != GOT_ERR_NOT_REF)
855 n = strlcat(refname, branch_name, sizeof(refname));
856 else if (head_ref && got_ref_is_symbolic(head_ref))
857 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
860 n = strlcat(refname, "main", sizeof(refname));
861 if (n >= sizeof(refname)) {
862 error = got_error(GOT_ERR_NO_SPACE);
866 error = got_ref_open(&branch_ref, repo, refname, 0);
868 if (error->code != GOT_ERR_NOT_REF)
871 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
872 "import target branch already exists");
876 path_dir = realpath(argv[0], NULL);
877 if (path_dir == NULL) {
878 error = got_error_from_errno2("realpath", argv[0]);
881 got_path_strip_trailing_slashes(path_dir);
884 * unveil(2) traverses exec(2); if an editor is used we have
885 * to apply unveil after the log message has been written.
887 if (logmsg == NULL || strlen(logmsg) == 0) {
888 error = get_editor(&editor);
892 error = collect_import_msg(&logmsg, &logmsg_path, editor,
895 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
902 if (unveil(path_dir, "r") != 0) {
903 error = got_error_from_errno2("unveil", path_dir);
909 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
916 error = got_repo_import(&new_commit_id, path_dir, logmsg,
917 author, &ignores, repo, import_progress, NULL);
924 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
931 error = got_ref_write(branch_ref, repo);
938 error = got_object_id_str(&id_str, new_commit_id);
945 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
947 if (error->code != GOT_ERR_NOT_REF) {
953 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
961 error = got_ref_write(head_ref, repo);
969 printf("Created branch %s with commit %s\n",
970 got_ref_get_name(branch_ref), id_str);
973 const struct got_error *pack_err =
974 got_repo_pack_fds_close(pack_fds);
978 if (preserve_logmsg) {
979 fprintf(stderr, "%s: log message preserved in %s\n",
980 getprogname(), logmsg_path);
981 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
982 error = got_error_from_errno2("unlink", logmsg_path);
990 free(gitconfig_path);
992 got_ref_close(branch_ref);
994 got_ref_close(head_ref);
1001 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
1002 "repository-URL [directory]\n", getprogname());
1006 struct got_fetch_progress_arg {
1007 char last_scaled_size[FMT_SCALED_STRSIZE];
1009 int last_p_resolved;
1012 struct got_repository *repo;
1015 int configs_created;
1017 struct got_pathlist_head *symrefs;
1018 struct got_pathlist_head *wanted_branches;
1019 struct got_pathlist_head *wanted_refs;
1023 const char *remote_repo_path;
1024 const char *git_url;
1025 int fetch_all_branches;
1026 int mirror_references;
1030 /* XXX forward declaration */
1031 static const struct got_error *
1032 create_config_files(const char *proto, const char *host, const char *port,
1033 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1034 int mirror_references, struct got_pathlist_head *symrefs,
1035 struct got_pathlist_head *wanted_branches,
1036 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1038 static const struct got_error *
1039 fetch_progress(void *arg, const char *message, off_t packfile_size,
1040 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1042 const struct got_error *err = NULL;
1043 struct got_fetch_progress_arg *a = arg;
1044 char scaled_size[FMT_SCALED_STRSIZE];
1045 int p_indexed, p_resolved;
1046 int print_size = 0, print_indexed = 0, print_resolved = 0;
1049 * In order to allow a failed clone to be resumed with 'got fetch'
1050 * we try to create configuration files as soon as possible.
1051 * Once the server has sent information about its default branch
1052 * we have all required information.
1054 if (a->create_configs && !a->configs_created &&
1055 !TAILQ_EMPTY(a->config_info.symrefs)) {
1056 err = create_config_files(a->config_info.proto,
1057 a->config_info.host, a->config_info.port,
1058 a->config_info.remote_repo_path,
1059 a->config_info.git_url,
1060 a->config_info.fetch_all_branches,
1061 a->config_info.mirror_references,
1062 a->config_info.symrefs,
1063 a->config_info.wanted_branches,
1064 a->config_info.wanted_refs, a->repo);
1067 a->configs_created = 1;
1070 if (a->verbosity < 0)
1073 if (message && message[0] != '\0') {
1074 printf("\rserver: %s", message);
1079 if (packfile_size > 0 || nobj_indexed > 0) {
1080 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1081 (a->last_scaled_size[0] == '\0' ||
1082 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1084 if (strlcpy(a->last_scaled_size, scaled_size,
1085 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1086 return got_error(GOT_ERR_NO_SPACE);
1088 if (nobj_indexed > 0) {
1089 p_indexed = (nobj_indexed * 100) / nobj_total;
1090 if (p_indexed != a->last_p_indexed) {
1091 a->last_p_indexed = p_indexed;
1096 if (nobj_resolved > 0) {
1097 p_resolved = (nobj_resolved * 100) /
1098 (nobj_total - nobj_loose);
1099 if (p_resolved != a->last_p_resolved) {
1100 a->last_p_resolved = p_resolved;
1108 if (print_size || print_indexed || print_resolved)
1111 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1113 printf("; indexing %d%%", p_indexed);
1115 printf("; resolving deltas %d%%", p_resolved);
1116 if (print_size || print_indexed || print_resolved)
1122 static const struct got_error *
1123 create_symref(const char *refname, struct got_reference *target_ref,
1124 int verbosity, struct got_repository *repo)
1126 const struct got_error *err;
1127 struct got_reference *head_symref;
1129 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1133 err = got_ref_write(head_symref, repo);
1134 if (err == NULL && verbosity > 0) {
1135 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1136 got_ref_get_name(target_ref));
1138 got_ref_close(head_symref);
1142 static const struct got_error *
1143 list_remote_refs(struct got_pathlist_head *symrefs,
1144 struct got_pathlist_head *refs)
1146 const struct got_error *err;
1147 struct got_pathlist_entry *pe;
1149 TAILQ_FOREACH(pe, symrefs, entry) {
1150 const char *refname = pe->path;
1151 const char *targetref = pe->data;
1153 printf("%s: %s\n", refname, targetref);
1156 TAILQ_FOREACH(pe, refs, entry) {
1157 const char *refname = pe->path;
1158 struct got_object_id *id = pe->data;
1161 err = got_object_id_str(&id_str, id);
1164 printf("%s: %s\n", refname, id_str);
1171 static const struct got_error *
1172 create_ref(const char *refname, struct got_object_id *id,
1173 int verbosity, struct got_repository *repo)
1175 const struct got_error *err = NULL;
1176 struct got_reference *ref;
1179 err = got_object_id_str(&id_str, id);
1183 err = got_ref_alloc(&ref, refname, id);
1187 err = got_ref_write(ref, repo);
1190 if (err == NULL && verbosity >= 0)
1191 printf("Created reference %s: %s\n", refname, id_str);
1198 match_wanted_ref(const char *refname, const char *wanted_ref)
1200 if (strncmp(refname, "refs/", 5) != 0)
1205 * Prevent fetching of references that won't make any
1206 * sense outside of the remote repository's context.
1208 if (strncmp(refname, "got/", 4) == 0)
1210 if (strncmp(refname, "remotes/", 8) == 0)
1213 if (strncmp(wanted_ref, "refs/", 5) == 0)
1216 /* Allow prefix match. */
1217 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1220 /* Allow exact match. */
1221 return (strcmp(refname, wanted_ref) == 0);
1225 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1227 struct got_pathlist_entry *pe;
1229 TAILQ_FOREACH(pe, wanted_refs, entry) {
1230 if (match_wanted_ref(refname, pe->path))
1237 static const struct got_error *
1238 create_wanted_ref(const char *refname, struct got_object_id *id,
1239 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1241 const struct got_error *err;
1242 char *remote_refname;
1244 if (strncmp("refs/", refname, 5) == 0)
1247 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1248 remote_repo_name, refname) == -1)
1249 return got_error_from_errno("asprintf");
1251 err = create_ref(remote_refname, id, verbosity, repo);
1252 free(remote_refname);
1256 static const struct got_error *
1257 create_gotconfig(const char *proto, const char *host, const char *port,
1258 const char *remote_repo_path, const char *default_branch,
1259 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1260 struct got_pathlist_head *wanted_refs, int mirror_references,
1261 struct got_repository *repo)
1263 const struct got_error *err = NULL;
1264 char *gotconfig_path = NULL;
1265 char *gotconfig = NULL;
1266 FILE *gotconfig_file = NULL;
1267 const char *branchname = NULL;
1268 char *branches = NULL, *refs = NULL;
1271 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1272 struct got_pathlist_entry *pe;
1273 TAILQ_FOREACH(pe, wanted_branches, entry) {
1275 branchname = pe->path;
1276 if (strncmp(branchname, "refs/heads/", 11) == 0)
1278 if (asprintf(&s, "%s\"%s\" ",
1279 branches ? branches : "", branchname) == -1) {
1280 err = got_error_from_errno("asprintf");
1286 } else if (!fetch_all_branches && default_branch) {
1287 branchname = default_branch;
1288 if (strncmp(branchname, "refs/heads/", 11) == 0)
1290 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1291 err = got_error_from_errno("asprintf");
1295 if (!TAILQ_EMPTY(wanted_refs)) {
1296 struct got_pathlist_entry *pe;
1297 TAILQ_FOREACH(pe, wanted_refs, entry) {
1299 const char *refname = pe->path;
1300 if (strncmp(refname, "refs/", 5) == 0)
1302 if (asprintf(&s, "%s\"%s\" ",
1303 refs ? refs : "", refname) == -1) {
1304 err = got_error_from_errno("asprintf");
1312 /* Create got.conf(5). */
1313 gotconfig_path = got_repo_get_path_gotconfig(repo);
1314 if (gotconfig_path == NULL) {
1315 err = got_error_from_errno("got_repo_get_path_gotconfig");
1318 gotconfig_file = fopen(gotconfig_path, "ae");
1319 if (gotconfig_file == NULL) {
1320 err = got_error_from_errno2("fopen", gotconfig_path);
1323 if (asprintf(&gotconfig,
1328 "\trepository \"%s\"\n"
1334 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1335 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1336 remote_repo_path, branches ? "\tbranch { " : "",
1337 branches ? branches : "", branches ? "}\n" : "",
1338 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1339 mirror_references ? "\tmirror_references yes\n" : "",
1340 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1341 err = got_error_from_errno("asprintf");
1344 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1345 if (n != strlen(gotconfig)) {
1346 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1351 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1352 err = got_error_from_errno2("fclose", gotconfig_path);
1353 free(gotconfig_path);
1358 static const struct got_error *
1359 create_gitconfig(const char *git_url, const char *default_branch,
1360 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1361 struct got_pathlist_head *wanted_refs, int mirror_references,
1362 struct got_repository *repo)
1364 const struct got_error *err = NULL;
1365 char *gitconfig_path = NULL;
1366 char *gitconfig = NULL;
1367 FILE *gitconfig_file = NULL;
1368 char *branches = NULL, *refs = NULL;
1369 const char *branchname;
1372 /* Create a config file Git can understand. */
1373 gitconfig_path = got_repo_get_path_gitconfig(repo);
1374 if (gitconfig_path == NULL) {
1375 err = got_error_from_errno("got_repo_get_path_gitconfig");
1378 gitconfig_file = fopen(gitconfig_path, "ae");
1379 if (gitconfig_file == NULL) {
1380 err = got_error_from_errno2("fopen", gitconfig_path);
1383 if (fetch_all_branches) {
1384 if (mirror_references) {
1385 if (asprintf(&branches,
1386 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1387 err = got_error_from_errno("asprintf");
1390 } else if (asprintf(&branches,
1391 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1392 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1393 err = got_error_from_errno("asprintf");
1396 } else if (!TAILQ_EMPTY(wanted_branches)) {
1397 struct got_pathlist_entry *pe;
1398 TAILQ_FOREACH(pe, wanted_branches, entry) {
1400 branchname = pe->path;
1401 if (strncmp(branchname, "refs/heads/", 11) == 0)
1403 if (mirror_references) {
1405 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1406 branches ? branches : "",
1407 branchname, branchname) == -1) {
1408 err = got_error_from_errno("asprintf");
1411 } else if (asprintf(&s,
1412 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1413 branches ? branches : "",
1414 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1415 branchname) == -1) {
1416 err = got_error_from_errno("asprintf");
1424 * If the server specified a default branch, use just that one.
1425 * Otherwise fall back to fetching all branches on next fetch.
1427 if (default_branch) {
1428 branchname = default_branch;
1429 if (strncmp(branchname, "refs/heads/", 11) == 0)
1432 branchname = "*"; /* fall back to all branches */
1433 if (mirror_references) {
1434 if (asprintf(&branches,
1435 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1436 branchname, branchname) == -1) {
1437 err = got_error_from_errno("asprintf");
1440 } else if (asprintf(&branches,
1441 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1442 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1443 branchname) == -1) {
1444 err = got_error_from_errno("asprintf");
1448 if (!TAILQ_EMPTY(wanted_refs)) {
1449 struct got_pathlist_entry *pe;
1450 TAILQ_FOREACH(pe, wanted_refs, entry) {
1452 const char *refname = pe->path;
1453 if (strncmp(refname, "refs/", 5) == 0)
1455 if (mirror_references) {
1457 "%s\tfetch = refs/%s:refs/%s\n",
1458 refs ? refs : "", refname, refname) == -1) {
1459 err = got_error_from_errno("asprintf");
1462 } else if (asprintf(&s,
1463 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1465 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1467 err = got_error_from_errno("asprintf");
1475 if (asprintf(&gitconfig,
1480 "\tfetch = refs/tags/*:refs/tags/*\n",
1481 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1482 refs ? refs : "") == -1) {
1483 err = got_error_from_errno("asprintf");
1486 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1487 if (n != strlen(gitconfig)) {
1488 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1492 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1493 err = got_error_from_errno2("fclose", gitconfig_path);
1494 free(gitconfig_path);
1499 static const struct got_error *
1500 create_config_files(const char *proto, const char *host, const char *port,
1501 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1502 int mirror_references, struct got_pathlist_head *symrefs,
1503 struct got_pathlist_head *wanted_branches,
1504 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1506 const struct got_error *err = NULL;
1507 const char *default_branch = NULL;
1508 struct got_pathlist_entry *pe;
1511 * If we asked for a set of wanted branches then use the first
1514 if (!TAILQ_EMPTY(wanted_branches)) {
1515 pe = TAILQ_FIRST(wanted_branches);
1516 default_branch = pe->path;
1518 /* First HEAD ref listed by server is the default branch. */
1519 TAILQ_FOREACH(pe, symrefs, entry) {
1520 const char *refname = pe->path;
1521 const char *target = pe->data;
1523 if (strcmp(refname, GOT_REF_HEAD) != 0)
1526 default_branch = target;
1531 /* Create got.conf(5). */
1532 err = create_gotconfig(proto, host, port, remote_repo_path,
1533 default_branch, fetch_all_branches, wanted_branches,
1534 wanted_refs, mirror_references, repo);
1538 /* Create a config file Git can understand. */
1539 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1540 wanted_branches, wanted_refs, mirror_references, repo);
1543 static const struct got_error *
1544 cmd_clone(int argc, char *argv[])
1546 const struct got_error *error = NULL;
1547 const char *uri, *dirname;
1548 char *proto, *host, *port, *repo_name, *server_path;
1549 char *default_destdir = NULL, *id_str = NULL;
1550 const char *repo_path;
1551 struct got_repository *repo = NULL;
1552 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1553 struct got_pathlist_entry *pe;
1554 struct got_object_id *pack_hash = NULL;
1555 int ch, fetchfd = -1, fetchstatus;
1556 pid_t fetchpid = -1;
1557 struct got_fetch_progress_arg fpa;
1558 char *git_url = NULL;
1559 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1560 int list_refs_only = 0;
1561 int *pack_fds = NULL;
1564 TAILQ_INIT(&symrefs);
1565 TAILQ_INIT(&wanted_branches);
1566 TAILQ_INIT(&wanted_refs);
1568 while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1571 fetch_all_branches = 1;
1574 error = got_pathlist_append(&wanted_branches,
1583 mirror_references = 1;
1589 error = got_pathlist_append(&wanted_refs,
1597 else if (verbosity < 3)
1608 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1609 option_conflict('a', 'b');
1610 if (list_refs_only) {
1611 if (!TAILQ_EMPTY(&wanted_branches))
1612 option_conflict('l', 'b');
1613 if (fetch_all_branches)
1614 option_conflict('l', 'a');
1615 if (mirror_references)
1616 option_conflict('l', 'm');
1617 if (!TAILQ_EMPTY(&wanted_refs))
1618 option_conflict('l', 'R');
1630 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1635 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1636 host, port ? ":" : "", port ? port : "",
1637 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1638 error = got_error_from_errno("asprintf");
1642 if (strcmp(proto, "git") == 0) {
1644 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1645 "sendfd dns inet unveil", NULL) == -1)
1648 } else if (strcmp(proto, "git+ssh") == 0 ||
1649 strcmp(proto, "ssh") == 0) {
1651 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1652 "sendfd unveil", NULL) == -1)
1655 } else if (strcmp(proto, "http") == 0 ||
1656 strcmp(proto, "git+http") == 0) {
1657 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1660 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1663 if (dirname == NULL) {
1664 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1665 error = got_error_from_errno("asprintf");
1668 repo_path = default_destdir;
1670 repo_path = dirname;
1672 if (!list_refs_only) {
1673 error = got_path_mkdir(repo_path);
1675 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1676 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1678 if (!got_path_dir_is_empty(repo_path)) {
1679 error = got_error_path(repo_path,
1680 GOT_ERR_DIR_NOT_EMPTY);
1685 error = got_dial_apply_unveil(proto);
1689 error = apply_unveil(repo_path, 0, NULL);
1694 printf("Connecting to %s%s%s\n", host,
1695 port ? ":" : "", port ? port : "");
1697 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1698 server_path, verbosity);
1702 if (!list_refs_only) {
1703 error = got_repo_init(repo_path, NULL);
1706 error = got_repo_pack_fds_open(&pack_fds);
1709 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1714 fpa.last_scaled_size[0] = '\0';
1715 fpa.last_p_indexed = -1;
1716 fpa.last_p_resolved = -1;
1717 fpa.verbosity = verbosity;
1718 fpa.create_configs = 1;
1719 fpa.configs_created = 0;
1721 fpa.config_info.symrefs = &symrefs;
1722 fpa.config_info.wanted_branches = &wanted_branches;
1723 fpa.config_info.wanted_refs = &wanted_refs;
1724 fpa.config_info.proto = proto;
1725 fpa.config_info.host = host;
1726 fpa.config_info.port = port;
1727 fpa.config_info.remote_repo_path = server_path;
1728 fpa.config_info.git_url = git_url;
1729 fpa.config_info.fetch_all_branches = fetch_all_branches;
1730 fpa.config_info.mirror_references = mirror_references;
1731 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1732 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1733 fetch_all_branches, &wanted_branches, &wanted_refs,
1734 list_refs_only, verbosity, fetchfd, repo,
1735 fetch_progress, &fpa);
1739 if (list_refs_only) {
1740 error = list_remote_refs(&symrefs, &refs);
1744 if (pack_hash == NULL) {
1745 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1746 "server sent an empty pack file");
1749 error = got_object_id_str(&id_str, pack_hash);
1753 printf("\nFetched %s.pack\n", id_str);
1756 /* Set up references provided with the pack file. */
1757 TAILQ_FOREACH(pe, &refs, entry) {
1758 const char *refname = pe->path;
1759 struct got_object_id *id = pe->data;
1760 char *remote_refname;
1762 if (is_wanted_ref(&wanted_refs, refname) &&
1763 !mirror_references) {
1764 error = create_wanted_ref(refname, id,
1765 GOT_FETCH_DEFAULT_REMOTE_NAME,
1766 verbosity - 1, repo);
1772 error = create_ref(refname, id, verbosity - 1, repo);
1776 if (mirror_references)
1779 if (strncmp("refs/heads/", refname, 11) != 0)
1782 if (asprintf(&remote_refname,
1783 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1784 refname + 11) == -1) {
1785 error = got_error_from_errno("asprintf");
1788 error = create_ref(remote_refname, id, verbosity - 1, repo);
1789 free(remote_refname);
1794 /* Set the HEAD reference if the server provided one. */
1795 TAILQ_FOREACH(pe, &symrefs, entry) {
1796 struct got_reference *target_ref;
1797 const char *refname = pe->path;
1798 const char *target = pe->data;
1799 char *remote_refname = NULL, *remote_target = NULL;
1801 if (strcmp(refname, GOT_REF_HEAD) != 0)
1804 error = got_ref_open(&target_ref, repo, target, 0);
1806 if (error->code == GOT_ERR_NOT_REF) {
1813 error = create_symref(refname, target_ref, verbosity, repo);
1814 got_ref_close(target_ref);
1818 if (mirror_references)
1821 if (strncmp("refs/heads/", target, 11) != 0)
1824 if (asprintf(&remote_refname,
1825 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1827 error = got_error_from_errno("asprintf");
1830 if (asprintf(&remote_target,
1831 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1832 target + 11) == -1) {
1833 error = got_error_from_errno("asprintf");
1834 free(remote_refname);
1837 error = got_ref_open(&target_ref, repo, remote_target, 0);
1839 free(remote_refname);
1840 free(remote_target);
1841 if (error->code == GOT_ERR_NOT_REF) {
1847 error = create_symref(remote_refname, target_ref,
1848 verbosity - 1, repo);
1849 free(remote_refname);
1850 free(remote_target);
1851 got_ref_close(target_ref);
1857 * We failed to set the HEAD reference. If we asked for
1858 * a set of wanted branches use the first of one of those
1859 * which could be fetched instead.
1861 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1862 const char *target = pe->path;
1863 struct got_reference *target_ref;
1865 error = got_ref_open(&target_ref, repo, target, 0);
1867 if (error->code == GOT_ERR_NOT_REF) {
1874 error = create_symref(GOT_REF_HEAD, target_ref,
1876 got_ref_close(target_ref);
1884 printf("Created %s repository '%s'\n",
1885 mirror_references ? "mirrored" : "cloned", repo_path);
1888 const struct got_error *pack_err =
1889 got_repo_pack_fds_close(pack_fds);
1894 if (kill(fetchpid, SIGTERM) == -1)
1895 error = got_error_from_errno("kill");
1896 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1897 error = got_error_from_errno("waitpid");
1899 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1900 error = got_error_from_errno("close");
1902 const struct got_error *close_err = got_repo_close(repo);
1906 TAILQ_FOREACH(pe, &refs, entry) {
1907 free((void *)pe->path);
1910 got_pathlist_free(&refs);
1911 TAILQ_FOREACH(pe, &symrefs, entry) {
1912 free((void *)pe->path);
1915 got_pathlist_free(&symrefs);
1916 got_pathlist_free(&wanted_branches);
1917 got_pathlist_free(&wanted_refs);
1924 free(default_destdir);
1929 static const struct got_error *
1930 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1931 int replace_tags, int verbosity, struct got_repository *repo)
1933 const struct got_error *err = NULL;
1934 char *new_id_str = NULL;
1935 struct got_object_id *old_id = NULL;
1937 err = got_object_id_str(&new_id_str, new_id);
1941 if (!replace_tags &&
1942 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1943 err = got_ref_resolve(&old_id, repo, ref);
1946 if (got_object_id_cmp(old_id, new_id) == 0)
1948 if (verbosity >= 0) {
1949 printf("Rejecting update of existing tag %s: %s\n",
1950 got_ref_get_name(ref), new_id_str);
1955 if (got_ref_is_symbolic(ref)) {
1956 if (verbosity >= 0) {
1957 printf("Replacing reference %s: %s\n",
1958 got_ref_get_name(ref),
1959 got_ref_get_symref_target(ref));
1961 err = got_ref_change_symref_to_ref(ref, new_id);
1964 err = got_ref_write(ref, repo);
1968 err = got_ref_resolve(&old_id, repo, ref);
1971 if (got_object_id_cmp(old_id, new_id) == 0)
1974 err = got_ref_change_ref(ref, new_id);
1977 err = got_ref_write(ref, repo);
1983 printf("Updated %s: %s\n", got_ref_get_name(ref),
1991 static const struct got_error *
1992 update_symref(const char *refname, struct got_reference *target_ref,
1993 int verbosity, struct got_repository *repo)
1995 const struct got_error *err = NULL, *unlock_err;
1996 struct got_reference *symref;
1997 int symref_is_locked = 0;
1999 err = got_ref_open(&symref, repo, refname, 1);
2001 if (err->code != GOT_ERR_NOT_REF)
2003 err = got_ref_alloc_symref(&symref, refname, target_ref);
2007 err = got_ref_write(symref, repo);
2012 printf("Created reference %s: %s\n",
2013 got_ref_get_name(symref),
2014 got_ref_get_symref_target(symref));
2016 symref_is_locked = 1;
2018 if (strcmp(got_ref_get_symref_target(symref),
2019 got_ref_get_name(target_ref)) == 0)
2022 err = got_ref_change_symref(symref,
2023 got_ref_get_name(target_ref));
2027 err = got_ref_write(symref, repo);
2032 printf("Updated %s: %s\n", got_ref_get_name(symref),
2033 got_ref_get_symref_target(symref));
2037 if (symref_is_locked) {
2038 unlock_err = got_ref_unlock(symref);
2039 if (unlock_err && err == NULL)
2042 got_ref_close(symref);
2049 fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2050 "[-R reference] [-r repository-path] [remote-repository]\n",
2055 static const struct got_error *
2056 delete_missing_ref(struct got_reference *ref,
2057 int verbosity, struct got_repository *repo)
2059 const struct got_error *err = NULL;
2060 struct got_object_id *id = NULL;
2061 char *id_str = NULL;
2063 if (got_ref_is_symbolic(ref)) {
2064 err = got_ref_delete(ref, repo);
2067 if (verbosity >= 0) {
2068 printf("Deleted %s: %s\n",
2069 got_ref_get_name(ref),
2070 got_ref_get_symref_target(ref));
2073 err = got_ref_resolve(&id, repo, ref);
2076 err = got_object_id_str(&id_str, id);
2080 err = got_ref_delete(ref, repo);
2083 if (verbosity >= 0) {
2084 printf("Deleted %s: %s\n",
2085 got_ref_get_name(ref), id_str);
2094 static const struct got_error *
2095 delete_missing_refs(struct got_pathlist_head *their_refs,
2096 struct got_pathlist_head *their_symrefs,
2097 const struct got_remote_repo *remote,
2098 int verbosity, struct got_repository *repo)
2100 const struct got_error *err = NULL, *unlock_err;
2101 struct got_reflist_head my_refs;
2102 struct got_reflist_entry *re;
2103 struct got_pathlist_entry *pe;
2104 char *remote_namespace = NULL;
2105 char *local_refname = NULL;
2107 TAILQ_INIT(&my_refs);
2109 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2111 return got_error_from_errno("asprintf");
2113 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2117 TAILQ_FOREACH(re, &my_refs, entry) {
2118 const char *refname = got_ref_get_name(re->ref);
2119 const char *their_refname;
2121 if (remote->mirror_references) {
2122 their_refname = refname;
2124 if (strncmp(refname, remote_namespace,
2125 strlen(remote_namespace)) == 0) {
2126 if (strcmp(refname + strlen(remote_namespace),
2129 if (asprintf(&local_refname, "refs/heads/%s",
2130 refname + strlen(remote_namespace)) == -1) {
2131 err = got_error_from_errno("asprintf");
2134 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2137 their_refname = local_refname;
2140 TAILQ_FOREACH(pe, their_refs, entry) {
2141 if (strcmp(their_refname, pe->path) == 0)
2147 TAILQ_FOREACH(pe, their_symrefs, entry) {
2148 if (strcmp(their_refname, pe->path) == 0)
2154 err = delete_missing_ref(re->ref, verbosity, repo);
2158 if (local_refname) {
2159 struct got_reference *ref;
2160 err = got_ref_open(&ref, repo, local_refname, 1);
2162 if (err->code != GOT_ERR_NOT_REF)
2164 free(local_refname);
2165 local_refname = NULL;
2168 err = delete_missing_ref(ref, verbosity, repo);
2171 unlock_err = got_ref_unlock(ref);
2173 if (unlock_err && err == NULL) {
2178 free(local_refname);
2179 local_refname = NULL;
2183 got_ref_list_free(&my_refs);
2184 free(remote_namespace);
2185 free(local_refname);
2189 static const struct got_error *
2190 update_wanted_ref(const char *refname, struct got_object_id *id,
2191 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2193 const struct got_error *err, *unlock_err;
2194 char *remote_refname;
2195 struct got_reference *ref;
2197 if (strncmp("refs/", refname, 5) == 0)
2200 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2201 remote_repo_name, refname) == -1)
2202 return got_error_from_errno("asprintf");
2204 err = got_ref_open(&ref, repo, remote_refname, 1);
2206 if (err->code != GOT_ERR_NOT_REF)
2208 err = create_ref(remote_refname, id, verbosity, repo);
2210 err = update_ref(ref, id, 0, verbosity, repo);
2211 unlock_err = got_ref_unlock(ref);
2212 if (unlock_err && err == NULL)
2217 free(remote_refname);
2221 static const struct got_error *
2222 delete_ref(struct got_repository *repo, struct got_reference *ref)
2224 const struct got_error *err = NULL;
2225 struct got_object_id *id = NULL;
2226 char *id_str = NULL;
2229 if (got_ref_is_symbolic(ref)) {
2230 target = got_ref_get_symref_target(ref);
2232 err = got_ref_resolve(&id, repo, ref);
2235 err = got_object_id_str(&id_str, id);
2241 err = got_ref_delete(ref, repo);
2245 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2252 static const struct got_error *
2253 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2255 const struct got_error *err = NULL;
2256 struct got_reflist_head refs;
2257 struct got_reflist_entry *re;
2262 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2263 err = got_error_from_errno("asprintf");
2266 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2270 TAILQ_FOREACH(re, &refs, entry)
2271 delete_ref(repo, re->ref);
2273 got_ref_list_free(&refs);
2277 static const struct got_error *
2278 cmd_fetch(int argc, char *argv[])
2280 const struct got_error *error = NULL, *unlock_err;
2281 char *cwd = NULL, *repo_path = NULL;
2282 const char *remote_name;
2283 char *proto = NULL, *host = NULL, *port = NULL;
2284 char *repo_name = NULL, *server_path = NULL;
2285 const struct got_remote_repo *remotes, *remote = NULL;
2287 char *id_str = NULL;
2288 struct got_repository *repo = NULL;
2289 struct got_worktree *worktree = NULL;
2290 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2291 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2292 struct got_pathlist_entry *pe;
2293 struct got_object_id *pack_hash = NULL;
2294 int i, ch, fetchfd = -1, fetchstatus;
2295 pid_t fetchpid = -1;
2296 struct got_fetch_progress_arg fpa;
2297 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2298 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2299 int *pack_fds = NULL;
2302 TAILQ_INIT(&symrefs);
2303 TAILQ_INIT(&wanted_branches);
2304 TAILQ_INIT(&wanted_refs);
2306 while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2309 fetch_all_branches = 1;
2312 error = got_pathlist_append(&wanted_branches,
2327 error = got_pathlist_append(&wanted_refs,
2333 repo_path = realpath(optarg, NULL);
2334 if (repo_path == NULL)
2335 return got_error_from_errno2("realpath",
2337 got_path_strip_trailing_slashes(repo_path);
2345 else if (verbosity < 3)
2359 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2360 option_conflict('a', 'b');
2361 if (list_refs_only) {
2362 if (!TAILQ_EMPTY(&wanted_branches))
2363 option_conflict('l', 'b');
2364 if (fetch_all_branches)
2365 option_conflict('l', 'a');
2367 option_conflict('l', 'd');
2369 option_conflict('l', 'X');
2371 if (delete_remote) {
2372 if (fetch_all_branches)
2373 option_conflict('X', 'a');
2374 if (!TAILQ_EMPTY(&wanted_branches))
2375 option_conflict('X', 'b');
2377 option_conflict('X', 'd');
2379 option_conflict('X', 't');
2380 if (!TAILQ_EMPTY(&wanted_refs))
2381 option_conflict('X', 'R');
2386 errx(1, "-X option requires a remote name");
2387 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2388 } else if (argc == 1)
2389 remote_name = argv[0];
2393 cwd = getcwd(NULL, 0);
2395 error = got_error_from_errno("getcwd");
2399 error = got_repo_pack_fds_open(&pack_fds);
2403 if (repo_path == NULL) {
2404 error = got_worktree_open(&worktree, cwd);
2405 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2411 strdup(got_worktree_get_repo_path(worktree));
2412 if (repo_path == NULL)
2413 error = got_error_from_errno("strdup");
2417 repo_path = strdup(cwd);
2418 if (repo_path == NULL) {
2419 error = got_error_from_errno("strdup");
2425 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2429 if (delete_remote) {
2430 error = delete_refs_for_remote(repo, remote_name);
2431 goto done; /* nothing else to do */
2435 worktree_conf = got_worktree_get_gotconfig(worktree);
2436 if (worktree_conf) {
2437 got_gotconfig_get_remotes(&nremotes, &remotes,
2439 for (i = 0; i < nremotes; i++) {
2440 if (strcmp(remotes[i].name, remote_name) == 0) {
2441 remote = &remotes[i];
2447 if (remote == NULL) {
2448 repo_conf = got_repo_get_gotconfig(repo);
2450 got_gotconfig_get_remotes(&nremotes, &remotes,
2452 for (i = 0; i < nremotes; i++) {
2453 if (strcmp(remotes[i].name, remote_name) == 0) {
2454 remote = &remotes[i];
2460 if (remote == NULL) {
2461 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2462 for (i = 0; i < nremotes; i++) {
2463 if (strcmp(remotes[i].name, remote_name) == 0) {
2464 remote = &remotes[i];
2469 if (remote == NULL) {
2470 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2474 if (TAILQ_EMPTY(&wanted_branches)) {
2475 if (!fetch_all_branches)
2476 fetch_all_branches = remote->fetch_all_branches;
2477 for (i = 0; i < remote->nfetch_branches; i++) {
2478 got_pathlist_append(&wanted_branches,
2479 remote->fetch_branches[i], NULL);
2482 if (TAILQ_EMPTY(&wanted_refs)) {
2483 for (i = 0; i < remote->nfetch_refs; i++) {
2484 got_pathlist_append(&wanted_refs,
2485 remote->fetch_refs[i], NULL);
2489 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2490 &repo_name, remote->fetch_url);
2494 if (strcmp(proto, "git") == 0) {
2496 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2497 "sendfd dns inet unveil", NULL) == -1)
2500 } else if (strcmp(proto, "git+ssh") == 0 ||
2501 strcmp(proto, "ssh") == 0) {
2503 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2504 "sendfd unveil", NULL) == -1)
2507 } else if (strcmp(proto, "http") == 0 ||
2508 strcmp(proto, "git+http") == 0) {
2509 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2512 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2516 error = got_dial_apply_unveil(proto);
2520 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2525 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2526 port ? ":" : "", port ? port : "");
2528 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2529 server_path, verbosity);
2533 fpa.last_scaled_size[0] = '\0';
2534 fpa.last_p_indexed = -1;
2535 fpa.last_p_resolved = -1;
2536 fpa.verbosity = verbosity;
2538 fpa.create_configs = 0;
2539 fpa.configs_created = 0;
2540 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2541 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2542 remote->mirror_references, fetch_all_branches, &wanted_branches,
2543 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2544 fetch_progress, &fpa);
2548 if (list_refs_only) {
2549 error = list_remote_refs(&symrefs, &refs);
2553 if (pack_hash == NULL) {
2555 printf("Already up-to-date\n");
2556 } else if (verbosity >= 0) {
2557 error = got_object_id_str(&id_str, pack_hash);
2560 printf("\nFetched %s.pack\n", id_str);
2565 /* Update references provided with the pack file. */
2566 TAILQ_FOREACH(pe, &refs, entry) {
2567 const char *refname = pe->path;
2568 struct got_object_id *id = pe->data;
2569 struct got_reference *ref;
2570 char *remote_refname;
2572 if (is_wanted_ref(&wanted_refs, refname) &&
2573 !remote->mirror_references) {
2574 error = update_wanted_ref(refname, id,
2575 remote->name, verbosity, repo);
2581 if (remote->mirror_references ||
2582 strncmp("refs/tags/", refname, 10) == 0) {
2583 error = got_ref_open(&ref, repo, refname, 1);
2585 if (error->code != GOT_ERR_NOT_REF)
2587 error = create_ref(refname, id, verbosity,
2592 error = update_ref(ref, id, replace_tags,
2594 unlock_err = got_ref_unlock(ref);
2595 if (unlock_err && error == NULL)
2601 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2602 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2603 remote_name, refname + 11) == -1) {
2604 error = got_error_from_errno("asprintf");
2608 error = got_ref_open(&ref, repo, remote_refname, 1);
2610 if (error->code != GOT_ERR_NOT_REF)
2612 error = create_ref(remote_refname, id,
2617 error = update_ref(ref, id, replace_tags,
2619 unlock_err = got_ref_unlock(ref);
2620 if (unlock_err && error == NULL)
2627 /* Also create a local branch if none exists yet. */
2628 error = got_ref_open(&ref, repo, refname, 1);
2630 if (error->code != GOT_ERR_NOT_REF)
2632 error = create_ref(refname, id, verbosity,
2637 unlock_err = got_ref_unlock(ref);
2638 if (unlock_err && error == NULL)
2645 error = delete_missing_refs(&refs, &symrefs, remote,
2651 if (!remote->mirror_references) {
2652 /* Update remote HEAD reference if the server provided one. */
2653 TAILQ_FOREACH(pe, &symrefs, entry) {
2654 struct got_reference *target_ref;
2655 const char *refname = pe->path;
2656 const char *target = pe->data;
2657 char *remote_refname = NULL, *remote_target = NULL;
2659 if (strcmp(refname, GOT_REF_HEAD) != 0)
2662 if (strncmp("refs/heads/", target, 11) != 0)
2665 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2666 remote->name, refname) == -1) {
2667 error = got_error_from_errno("asprintf");
2670 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2671 remote->name, target + 11) == -1) {
2672 error = got_error_from_errno("asprintf");
2673 free(remote_refname);
2677 error = got_ref_open(&target_ref, repo, remote_target,
2680 free(remote_refname);
2681 free(remote_target);
2682 if (error->code == GOT_ERR_NOT_REF) {
2688 error = update_symref(remote_refname, target_ref,
2690 free(remote_refname);
2691 free(remote_target);
2692 got_ref_close(target_ref);
2699 if (kill(fetchpid, SIGTERM) == -1)
2700 error = got_error_from_errno("kill");
2701 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2702 error = got_error_from_errno("waitpid");
2704 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2705 error = got_error_from_errno("close");
2707 const struct got_error *close_err = got_repo_close(repo);
2712 got_worktree_close(worktree);
2714 const struct got_error *pack_err =
2715 got_repo_pack_fds_close(pack_fds);
2719 TAILQ_FOREACH(pe, &refs, entry) {
2720 free((void *)pe->path);
2723 got_pathlist_free(&refs);
2724 TAILQ_FOREACH(pe, &symrefs, entry) {
2725 free((void *)pe->path);
2728 got_pathlist_free(&symrefs);
2729 got_pathlist_free(&wanted_branches);
2730 got_pathlist_free(&wanted_refs);
2745 usage_checkout(void)
2747 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2748 "[-p path-prefix] repository-path [work-tree-path]\n",
2754 show_worktree_base_ref_warning(void)
2756 fprintf(stderr, "%s: warning: could not create a reference "
2757 "to the work tree's base commit; the commit could be "
2758 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2759 "repository writable and running 'got update' will prevent this\n",
2763 struct got_checkout_progress_arg {
2764 const char *worktree_path;
2765 int had_base_commit_ref_error;
2769 static const struct got_error *
2770 checkout_progress(void *arg, unsigned char status, const char *path)
2772 struct got_checkout_progress_arg *a = arg;
2774 /* Base commit bump happens silently. */
2775 if (status == GOT_STATUS_BUMP_BASE)
2778 if (status == GOT_STATUS_BASE_REF_ERR) {
2779 a->had_base_commit_ref_error = 1;
2783 while (path[0] == '/')
2786 if (a->verbosity >= 0)
2787 printf("%c %s/%s\n", status, a->worktree_path, path);
2792 static const struct got_error *
2793 check_cancelled(void *arg)
2795 if (sigint_received || sigpipe_received)
2796 return got_error(GOT_ERR_CANCELLED);
2800 static const struct got_error *
2801 check_linear_ancestry(struct got_object_id *commit_id,
2802 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2803 struct got_repository *repo)
2805 const struct got_error *err = NULL;
2806 struct got_object_id *yca_id;
2808 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2809 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2814 return got_error(GOT_ERR_ANCESTRY);
2817 * Require a straight line of history between the target commit
2818 * and the work tree's base commit.
2820 * Non-linear situations such as this require a rebase:
2822 * (commit) D F (base_commit)
2830 * 'got update' only handles linear cases:
2831 * Update forwards in time: A (base/yca) - B - C - D (commit)
2832 * Update backwards in time: D (base) - C - B - A (commit/yca)
2834 if (allow_forwards_in_time_only) {
2835 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2836 return got_error(GOT_ERR_ANCESTRY);
2837 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2838 got_object_id_cmp(base_commit_id, yca_id) != 0)
2839 return got_error(GOT_ERR_ANCESTRY);
2845 static const struct got_error *
2846 check_same_branch(struct got_object_id *commit_id,
2847 struct got_reference *head_ref, struct got_object_id *yca_id,
2848 struct got_repository *repo)
2850 const struct got_error *err = NULL;
2851 struct got_commit_graph *graph = NULL;
2852 struct got_object_id *head_commit_id = NULL;
2853 int is_same_branch = 0;
2855 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2859 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2863 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2868 err = got_commit_graph_open(&graph, "/", 1);
2872 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2873 check_cancelled, NULL);
2878 struct got_object_id id;
2880 err = got_commit_graph_iter_next(&id, graph, repo,
2881 check_cancelled, NULL);
2883 if (err->code == GOT_ERR_ITER_COMPLETED)
2888 if (yca_id && got_object_id_cmp(&id, yca_id) == 0)
2890 if (got_object_id_cmp(&id, commit_id) == 0) {
2897 got_commit_graph_close(graph);
2898 free(head_commit_id);
2899 if (!err && !is_same_branch)
2900 err = got_error(GOT_ERR_ANCESTRY);
2904 static const struct got_error *
2905 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2907 static char msg[512];
2908 const char *branch_name;
2910 if (got_ref_is_symbolic(ref))
2911 branch_name = got_ref_get_symref_target(ref);
2913 branch_name = got_ref_get_name(ref);
2915 if (strncmp("refs/heads/", branch_name, 11) == 0)
2918 snprintf(msg, sizeof(msg),
2919 "target commit is not contained in branch '%s'; "
2920 "the branch to use must be specified with -b; "
2921 "if necessary a new branch can be created for "
2922 "this commit with 'got branch -c %s BRANCH_NAME'",
2923 branch_name, commit_id_str);
2925 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2928 static const struct got_error *
2929 cmd_checkout(int argc, char *argv[])
2931 const struct got_error *error = NULL;
2932 struct got_repository *repo = NULL;
2933 struct got_reference *head_ref = NULL, *ref = NULL;
2934 struct got_worktree *worktree = NULL;
2935 char *repo_path = NULL;
2936 char *worktree_path = NULL;
2937 const char *path_prefix = "";
2938 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2939 char *commit_id_str = NULL;
2940 struct got_object_id *commit_id = NULL;
2942 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2943 struct got_pathlist_head paths;
2944 struct got_checkout_progress_arg cpa;
2945 int *pack_fds = NULL;
2949 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2952 branch_name = optarg;
2955 commit_id_str = strdup(optarg);
2956 if (commit_id_str == NULL)
2957 return got_error_from_errno("strdup");
2963 path_prefix = optarg;
2978 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2979 "unveil", NULL) == -1)
2983 char *base, *dotgit;
2985 repo_path = realpath(argv[0], NULL);
2986 if (repo_path == NULL)
2987 return got_error_from_errno2("realpath", argv[0]);
2988 cwd = getcwd(NULL, 0);
2990 error = got_error_from_errno("getcwd");
2997 error = got_path_basename(&base, path);
3000 dotgit = strstr(base, ".git");
3003 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3004 error = got_error_from_errno("asprintf");
3009 } else if (argc == 2) {
3010 repo_path = realpath(argv[0], NULL);
3011 if (repo_path == NULL) {
3012 error = got_error_from_errno2("realpath", argv[0]);
3015 worktree_path = realpath(argv[1], NULL);
3016 if (worktree_path == NULL) {
3017 if (errno != ENOENT) {
3018 error = got_error_from_errno2("realpath",
3022 worktree_path = strdup(argv[1]);
3023 if (worktree_path == NULL) {
3024 error = got_error_from_errno("strdup");
3031 got_path_strip_trailing_slashes(repo_path);
3032 got_path_strip_trailing_slashes(worktree_path);
3034 error = got_repo_pack_fds_open(&pack_fds);
3038 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3042 /* Pre-create work tree path for unveil(2) */
3043 error = got_path_mkdir(worktree_path);
3045 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3046 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3048 if (!allow_nonempty &&
3049 !got_path_dir_is_empty(worktree_path)) {
3050 error = got_error_path(worktree_path,
3051 GOT_ERR_DIR_NOT_EMPTY);
3056 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3060 error = got_ref_open(&head_ref, repo, branch_name, 0);
3064 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
3065 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3068 error = got_worktree_open(&worktree, worktree_path);
3072 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3076 if (!same_path_prefix) {
3077 error = got_error(GOT_ERR_PATH_PREFIX);
3081 if (commit_id_str) {
3082 struct got_reflist_head refs;
3084 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3088 error = got_repo_match_object_id(&commit_id, NULL,
3089 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3090 got_ref_list_free(&refs);
3093 error = check_linear_ancestry(commit_id,
3094 got_worktree_get_base_commit_id(worktree), 0, repo);
3095 if (error != NULL) {
3096 if (error->code == GOT_ERR_ANCESTRY) {
3097 error = checkout_ancestry_error(
3098 head_ref, commit_id_str);
3102 error = check_same_branch(commit_id, head_ref, NULL, repo);
3104 if (error->code == GOT_ERR_ANCESTRY) {
3105 error = checkout_ancestry_error(
3106 head_ref, commit_id_str);
3110 error = got_worktree_set_base_commit_id(worktree, repo,
3114 /* Expand potentially abbreviated commit ID string. */
3115 free(commit_id_str);
3116 error = got_object_id_str(&commit_id_str, commit_id);
3120 commit_id = got_object_id_dup(
3121 got_worktree_get_base_commit_id(worktree));
3122 if (commit_id == NULL) {
3123 error = got_error_from_errno("got_object_id_dup");
3126 error = got_object_id_str(&commit_id_str, commit_id);
3131 error = got_pathlist_append(&paths, "", NULL);
3134 cpa.worktree_path = worktree_path;
3135 cpa.had_base_commit_ref_error = 0;
3136 cpa.verbosity = verbosity;
3137 error = got_worktree_checkout_files(worktree, &paths, repo,
3138 checkout_progress, &cpa, check_cancelled, NULL);
3142 if (got_ref_is_symbolic(head_ref)) {
3143 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3146 refname = got_ref_get_name(ref);
3148 refname = got_ref_get_name(head_ref);
3149 printf("Checked out %s: %s\n", refname, commit_id_str);
3150 printf("Now shut up and hack\n");
3151 if (cpa.had_base_commit_ref_error)
3152 show_worktree_base_ref_warning();
3155 const struct got_error *pack_err =
3156 got_repo_pack_fds_close(pack_fds);
3161 got_ref_close(head_ref);
3164 got_pathlist_free(&paths);
3165 free(commit_id_str);
3168 free(worktree_path);
3173 struct got_update_progress_arg {
3185 print_update_progress_stats(struct got_update_progress_arg *upa)
3187 if (!upa->did_something)
3190 if (upa->conflicts > 0)
3191 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3192 if (upa->obstructed > 0)
3193 printf("File paths obstructed by a non-regular file: %d\n",
3195 if (upa->not_updated > 0)
3196 printf("Files not updated because of existing merge "
3197 "conflicts: %d\n", upa->not_updated);
3201 * The meaning of some status codes differs between merge-style operations and
3202 * update operations. For example, the ! status code means "file was missing"
3203 * if changes were merged into the work tree, and "missing file was restored"
3204 * if the work tree was updated. This function should be used by any operation
3205 * which merges changes into the work tree without updating the work tree.
3208 print_merge_progress_stats(struct got_update_progress_arg *upa)
3210 if (!upa->did_something)
3213 if (upa->conflicts > 0)
3214 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3215 if (upa->obstructed > 0)
3216 printf("File paths obstructed by a non-regular file: %d\n",
3218 if (upa->missing > 0)
3219 printf("Files which had incoming changes but could not be "
3220 "found in the work tree: %d\n", upa->missing);
3221 if (upa->not_deleted > 0)
3222 printf("Files not deleted due to differences in deleted "
3223 "content: %d\n", upa->not_deleted);
3224 if (upa->unversioned > 0)
3225 printf("Files not merged because an unversioned file was "
3226 "found in the work tree: %d\n", upa->unversioned);
3232 fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3233 "[path ...]\n", getprogname());
3237 static const struct got_error *
3238 update_progress(void *arg, unsigned char status, const char *path)
3240 struct got_update_progress_arg *upa = arg;
3242 if (status == GOT_STATUS_EXISTS ||
3243 status == GOT_STATUS_BASE_REF_ERR)
3246 upa->did_something = 1;
3248 /* Base commit bump happens silently. */
3249 if (status == GOT_STATUS_BUMP_BASE)
3252 if (status == GOT_STATUS_CONFLICT)
3254 if (status == GOT_STATUS_OBSTRUCTED)
3256 if (status == GOT_STATUS_CANNOT_UPDATE)
3258 if (status == GOT_STATUS_MISSING)
3260 if (status == GOT_STATUS_CANNOT_DELETE)
3262 if (status == GOT_STATUS_UNVERSIONED)
3265 while (path[0] == '/')
3267 if (upa->verbosity >= 0)
3268 printf("%c %s\n", status, path);
3273 static const struct got_error *
3274 switch_head_ref(struct got_reference *head_ref,
3275 struct got_object_id *commit_id, struct got_worktree *worktree,
3276 struct got_repository *repo)
3278 const struct got_error *err = NULL;
3280 int ref_has_moved = 0;
3282 /* Trivial case: switching between two different references. */
3283 if (strcmp(got_ref_get_name(head_ref),
3284 got_worktree_get_head_ref_name(worktree)) != 0) {
3285 printf("Switching work tree from %s to %s\n",
3286 got_worktree_get_head_ref_name(worktree),
3287 got_ref_get_name(head_ref));
3288 return got_worktree_set_head_ref(worktree, head_ref);
3291 err = check_linear_ancestry(commit_id,
3292 got_worktree_get_base_commit_id(worktree), 0, repo);
3294 if (err->code != GOT_ERR_ANCESTRY)
3301 /* Switching to a rebased branch with the same reference name. */
3302 err = got_object_id_str(&base_id_str,
3303 got_worktree_get_base_commit_id(worktree));
3306 printf("Reference %s now points at a different branch\n",
3307 got_worktree_get_head_ref_name(worktree));
3308 printf("Switching work tree from %s to %s\n", base_id_str,
3309 got_worktree_get_head_ref_name(worktree));
3313 static const struct got_error *
3314 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3316 const struct got_error *err;
3319 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3323 return got_error(GOT_ERR_REBASING);
3325 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3329 return got_error(GOT_ERR_HISTEDIT_BUSY);
3334 static const struct got_error *
3335 check_merge_in_progress(struct got_worktree *worktree,
3336 struct got_repository *repo)
3338 const struct got_error *err;
3341 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3345 return got_error(GOT_ERR_MERGE_BUSY);
3350 static const struct got_error *
3351 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3352 char *argv[], struct got_worktree *worktree)
3354 const struct got_error *err = NULL;
3356 struct got_pathlist_entry *new;
3362 return got_error_from_errno("strdup");
3363 return got_pathlist_append(paths, path, NULL);
3366 for (i = 0; i < argc; i++) {
3367 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3370 err = got_pathlist_insert(&new, paths, path, NULL);
3371 if (err || new == NULL /* duplicate */) {
3381 static const struct got_error *
3382 wrap_not_worktree_error(const struct got_error *orig_err,
3383 const char *cmdname, const char *path)
3385 const struct got_error *err;
3386 struct got_repository *repo;
3387 static char msg[512];
3388 int *pack_fds = NULL;
3390 err = got_repo_pack_fds_open(&pack_fds);
3394 err = got_repo_open(&repo, path, NULL, pack_fds);
3398 snprintf(msg, sizeof(msg),
3399 "'got %s' needs a work tree in addition to a git repository\n"
3400 "Work trees can be checked out from this Git repository with "
3402 "The got(1) manual page contains more information.", cmdname);
3403 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3404 got_repo_close(repo);
3406 const struct got_error *pack_err =
3407 got_repo_pack_fds_close(pack_fds);
3414 static const struct got_error *
3415 cmd_update(int argc, char *argv[])
3417 const struct got_error *error = NULL;
3418 struct got_repository *repo = NULL;
3419 struct got_worktree *worktree = NULL;
3420 char *worktree_path = NULL;
3421 struct got_object_id *commit_id = NULL;
3422 char *commit_id_str = NULL;
3423 const char *branch_name = NULL;
3424 struct got_reference *head_ref = NULL;
3425 struct got_pathlist_head paths;
3426 struct got_pathlist_entry *pe;
3427 int ch, verbosity = 0;
3428 struct got_update_progress_arg upa;
3429 int *pack_fds = NULL;
3433 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3436 branch_name = optarg;
3439 commit_id_str = strdup(optarg);
3440 if (commit_id_str == NULL)
3441 return got_error_from_errno("strdup");
3456 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3457 "unveil", NULL) == -1)
3460 worktree_path = getcwd(NULL, 0);
3461 if (worktree_path == NULL) {
3462 error = got_error_from_errno("getcwd");
3466 error = got_repo_pack_fds_open(&pack_fds);
3470 error = got_worktree_open(&worktree, worktree_path);
3472 if (error->code == GOT_ERR_NOT_WORKTREE)
3473 error = wrap_not_worktree_error(error, "update",
3478 error = check_rebase_or_histedit_in_progress(worktree);
3482 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3487 error = apply_unveil(got_repo_get_path(repo), 0,
3488 got_worktree_get_root_path(worktree));
3492 error = check_merge_in_progress(worktree, repo);
3496 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3500 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3501 got_worktree_get_head_ref_name(worktree), 0);
3504 if (commit_id_str == NULL) {
3505 error = got_ref_resolve(&commit_id, repo, head_ref);
3508 error = got_object_id_str(&commit_id_str, commit_id);
3512 struct got_reflist_head refs;
3514 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3518 error = got_repo_match_object_id(&commit_id, NULL,
3519 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3520 got_ref_list_free(&refs);
3521 free(commit_id_str);
3522 commit_id_str = NULL;
3525 error = got_object_id_str(&commit_id_str, commit_id);
3531 struct got_object_id *head_commit_id;
3532 TAILQ_FOREACH(pe, &paths, entry) {
3533 if (pe->path_len == 0)
3535 error = got_error_msg(GOT_ERR_BAD_PATH,
3536 "switching between branches requires that "
3537 "the entire work tree gets updated");
3540 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3543 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3545 free(head_commit_id);
3548 error = check_same_branch(commit_id, head_ref, NULL, repo);
3551 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3555 error = check_linear_ancestry(commit_id,
3556 got_worktree_get_base_commit_id(worktree), 0, repo);
3557 if (error != NULL) {
3558 if (error->code == GOT_ERR_ANCESTRY)
3559 error = got_error(GOT_ERR_BRANCH_MOVED);
3562 error = check_same_branch(commit_id, head_ref, NULL, repo);
3567 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3569 error = got_worktree_set_base_commit_id(worktree, repo,
3575 memset(&upa, 0, sizeof(upa));
3576 upa.verbosity = verbosity;
3577 error = got_worktree_checkout_files(worktree, &paths, repo,
3578 update_progress, &upa, check_cancelled, NULL);
3582 if (upa.did_something) {
3583 printf("Updated to %s: %s\n",
3584 got_worktree_get_head_ref_name(worktree), commit_id_str);
3586 printf("Already up-to-date\n");
3588 print_update_progress_stats(&upa);
3591 const struct got_error *pack_err =
3592 got_repo_pack_fds_close(pack_fds);
3596 free(worktree_path);
3597 TAILQ_FOREACH(pe, &paths, entry)
3598 free((char *)pe->path);
3599 got_pathlist_free(&paths);
3601 free(commit_id_str);
3605 static const struct got_error *
3606 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3607 const char *path, int diff_context, int ignore_whitespace,
3608 int force_text_diff, struct got_repository *repo, FILE *outfile)
3610 const struct got_error *err = NULL;
3611 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3612 FILE *f1 = NULL, *f2 = NULL;
3613 int fd1 = -1, fd2 = -1;
3615 fd1 = got_opentempfd();
3617 return got_error_from_errno("got_opentempfd");
3618 fd2 = got_opentempfd();
3620 err = got_error_from_errno("got_opentempfd");
3625 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3631 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3635 f1 = got_opentemp();
3637 err = got_error_from_errno("got_opentemp");
3640 f2 = got_opentemp();
3642 err = got_error_from_errno("got_opentemp");
3646 while (path[0] == '/')
3648 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3649 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3650 force_text_diff, outfile);
3652 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3653 err = got_error_from_errno("close");
3655 got_object_blob_close(blob1);
3656 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3657 err = got_error_from_errno("close");
3658 got_object_blob_close(blob2);
3659 if (f1 && fclose(f1) == EOF && err == NULL)
3660 err = got_error_from_errno("fclose");
3661 if (f2 && fclose(f2) == EOF && err == NULL)
3662 err = got_error_from_errno("fclose");
3666 static const struct got_error *
3667 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3668 const char *path, int diff_context, int ignore_whitespace,
3669 int force_text_diff, struct got_repository *repo, FILE *outfile)
3671 const struct got_error *err = NULL;
3672 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3673 struct got_diff_blob_output_unidiff_arg arg;
3674 FILE *f1 = NULL, *f2 = NULL;
3675 int fd1 = -1, fd2 = -1;
3678 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3681 fd1 = got_opentempfd();
3683 err = got_error_from_errno("got_opentempfd");
3688 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3692 f1 = got_opentemp();
3694 err = got_error_from_errno("got_opentemp");
3698 f2 = got_opentemp();
3700 err = got_error_from_errno("got_opentemp");
3703 fd2 = got_opentempfd();
3705 err = got_error_from_errno("got_opentempfd");
3708 arg.diff_context = diff_context;
3709 arg.ignore_whitespace = ignore_whitespace;
3710 arg.force_text_diff = force_text_diff;
3711 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3712 arg.outfile = outfile;
3715 while (path[0] == '/')
3717 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3718 got_diff_blob_output_unidiff, &arg, 1);
3721 got_object_tree_close(tree1);
3723 got_object_tree_close(tree2);
3724 if (f1 && fclose(f1) == EOF && err == NULL)
3725 err = got_error_from_errno("fclose");
3726 if (f2 && fclose(f2) == EOF && err == NULL)
3727 err = got_error_from_errno("fclose");
3728 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3729 err = got_error_from_errno("close");
3730 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3731 err = got_error_from_errno("close");
3735 static const struct got_error *
3736 get_changed_paths(struct got_pathlist_head *paths,
3737 struct got_commit_object *commit, struct got_repository *repo)
3739 const struct got_error *err = NULL;
3740 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3741 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3742 struct got_object_qid *qid;
3744 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3746 struct got_commit_object *pcommit;
3747 err = got_object_open_as_commit(&pcommit, repo,
3752 tree_id1 = got_object_id_dup(
3753 got_object_commit_get_tree_id(pcommit));
3754 if (tree_id1 == NULL) {
3755 got_object_commit_close(pcommit);
3756 return got_error_from_errno("got_object_id_dup");
3758 got_object_commit_close(pcommit);
3763 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3768 tree_id2 = got_object_commit_get_tree_id(commit);
3769 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3773 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
3774 got_diff_tree_collect_changed_paths, paths, 0);
3777 got_object_tree_close(tree1);
3779 got_object_tree_close(tree2);
3784 static const struct got_error *
3785 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3786 const char *path, int diff_context, struct got_repository *repo,
3789 const struct got_error *err = NULL;
3790 struct got_commit_object *pcommit = NULL;
3791 char *id_str1 = NULL, *id_str2 = NULL;
3792 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3793 struct got_object_qid *qid;
3795 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3797 err = got_object_open_as_commit(&pcommit, repo,
3801 err = got_object_id_str(&id_str1, &qid->id);
3806 err = got_object_id_str(&id_str2, id);
3810 if (path && path[0] != '\0') {
3812 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3816 err = got_object_id_by_path(&obj_id1, repo,
3819 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3825 err = got_object_get_type(&obj_type, repo, obj_id2);
3831 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3832 fprintf(outfile, "commit - %s\n",
3833 id_str1 ? id_str1 : "/dev/null");
3834 fprintf(outfile, "commit + %s\n", id_str2);
3836 case GOT_OBJ_TYPE_BLOB:
3837 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3838 0, 0, repo, outfile);
3840 case GOT_OBJ_TYPE_TREE:
3841 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3842 0, 0, repo, outfile);
3845 err = got_error(GOT_ERR_OBJ_TYPE);
3851 obj_id2 = got_object_commit_get_tree_id(commit);
3853 obj_id1 = got_object_commit_get_tree_id(pcommit);
3855 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3856 fprintf(outfile, "commit - %s\n",
3857 id_str1 ? id_str1 : "/dev/null");
3858 fprintf(outfile, "commit + %s\n", id_str2);
3859 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3866 got_object_commit_close(pcommit);
3871 get_datestr(time_t *time, char *datebuf)
3873 struct tm mytm, *tm;
3876 tm = gmtime_r(time, &mytm);
3879 s = asctime_r(tm, datebuf);
3882 p = strchr(s, '\n');
3888 static const struct got_error *
3889 match_commit(int *have_match, struct got_object_id *id,
3890 struct got_commit_object *commit, regex_t *regex)
3892 const struct got_error *err = NULL;
3893 regmatch_t regmatch;
3894 char *id_str = NULL, *logmsg = NULL;
3898 err = got_object_id_str(&id_str, id);
3902 err = got_object_commit_get_logmsg(&logmsg, commit);
3906 if (regexec(regex, got_object_commit_get_author(commit), 1,
3907 ®match, 0) == 0 ||
3908 regexec(regex, got_object_commit_get_committer(commit), 1,
3909 ®match, 0) == 0 ||
3910 regexec(regex, id_str, 1, ®match, 0) == 0 ||
3911 regexec(regex, logmsg, 1, ®match, 0) == 0)
3920 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3923 regmatch_t regmatch;
3924 struct got_pathlist_entry *pe;
3928 TAILQ_FOREACH(pe, changed_paths, entry) {
3929 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3936 static const struct got_error *
3937 match_patch(int *have_match, struct got_commit_object *commit,
3938 struct got_object_id *id, const char *path, int diff_context,
3939 struct got_repository *repo, regex_t *regex, FILE *f)
3941 const struct got_error *err = NULL;
3943 size_t linesize = 0;
3944 regmatch_t regmatch;
3948 err = got_opentemp_truncate(f);
3952 err = print_patch(commit, id, path, diff_context, repo, f);
3956 if (fseeko(f, 0L, SEEK_SET) == -1) {
3957 err = got_error_from_errno("fseeko");
3961 while (getline(&line, &linesize, f) != -1) {
3962 if (regexec(regex, line, 1, ®match, 0) == 0) {
3972 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3974 static const struct got_error*
3975 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3976 struct got_object_id *id, struct got_repository *repo,
3979 static const struct got_error *err = NULL;
3980 struct got_reflist_entry *re;
3986 TAILQ_FOREACH(re, refs, entry) {
3987 struct got_tag_object *tag = NULL;
3988 struct got_object_id *ref_id;
3991 name = got_ref_get_name(re->ref);
3992 if (strcmp(name, GOT_REF_HEAD) == 0)
3994 if (strncmp(name, "refs/", 5) == 0)
3996 if (strncmp(name, "got/", 4) == 0)
3998 if (strncmp(name, "heads/", 6) == 0)
4000 if (strncmp(name, "remotes/", 8) == 0) {
4004 s = strstr(name, "/" GOT_REF_HEAD);
4005 if (s != NULL && s[strlen(s)] == '\0')
4008 err = got_ref_resolve(&ref_id, repo, re->ref);
4011 if (strncmp(name, "tags/", 5) == 0) {
4012 err = got_object_open_as_tag(&tag, repo, ref_id);
4014 if (err->code != GOT_ERR_OBJ_TYPE) {
4018 /* Ref points at something other than a tag. */
4023 cmp = got_object_id_cmp(tag ?
4024 got_object_tag_get_object_id(tag) : ref_id, id);
4027 got_object_tag_close(tag);
4031 if (asprintf(refs_str, "%s%s%s", s ? s : "",
4032 s ? ", " : "", name) == -1) {
4033 err = got_error_from_errno("asprintf");
4044 static const struct got_error *
4045 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4046 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4048 const struct got_error *err = NULL;
4049 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4050 char *comma, *s, *nl;
4051 struct got_reflist_head *refs;
4052 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4054 time_t committer_time;
4056 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4058 err = build_refs_str(&ref_str, refs, id, repo, 1);
4062 /* Display the first matching ref only. */
4063 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4067 if (ref_str == NULL) {
4068 err = got_object_id_str(&id_str, id);
4073 committer_time = got_object_commit_get_committer_time(commit);
4074 if (gmtime_r(&committer_time, &tm) == NULL) {
4075 err = got_error_from_errno("gmtime_r");
4078 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4079 err = got_error(GOT_ERR_NO_SPACE);
4083 err = got_object_commit_get_logmsg(&logmsg0, commit);
4088 while (isspace((unsigned char)s[0]))
4091 nl = strchr(s, '\n');
4097 printf("%s%-7s %s\n", datebuf, ref_str, s);
4099 printf("%s%.7s %s\n", datebuf, id_str, s);
4101 if (fflush(stdout) != 0 && err == NULL)
4102 err = got_error_from_errno("fflush");
4110 static const struct got_error *
4111 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4112 struct got_repository *repo, const char *path,
4113 struct got_pathlist_head *changed_paths, int show_patch,
4114 int diff_context, struct got_reflist_object_id_map *refs_idmap,
4115 const char *custom_refs_str)
4117 const struct got_error *err = NULL;
4118 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4120 time_t committer_time;
4121 const char *author, *committer;
4122 char *refs_str = NULL;
4124 err = got_object_id_str(&id_str, id);
4128 if (custom_refs_str == NULL) {
4129 struct got_reflist_head *refs;
4130 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4132 err = build_refs_str(&refs_str, refs, id, repo, 0);
4138 printf(GOT_COMMIT_SEP_STR);
4139 if (custom_refs_str)
4140 printf("commit %s (%s)\n", id_str, custom_refs_str);
4142 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4143 refs_str ? refs_str : "", refs_str ? ")" : "");
4148 printf("from: %s\n", got_object_commit_get_author(commit));
4149 committer_time = got_object_commit_get_committer_time(commit);
4150 datestr = get_datestr(&committer_time, datebuf);
4152 printf("date: %s UTC\n", datestr);
4153 author = got_object_commit_get_author(commit);
4154 committer = got_object_commit_get_committer(commit);
4155 if (strcmp(author, committer) != 0)
4156 printf("via: %s\n", committer);
4157 if (got_object_commit_get_nparents(commit) > 1) {
4158 const struct got_object_id_queue *parent_ids;
4159 struct got_object_qid *qid;
4161 parent_ids = got_object_commit_get_parent_ids(commit);
4162 STAILQ_FOREACH(qid, parent_ids, entry) {
4163 err = got_object_id_str(&id_str, &qid->id);
4166 printf("parent %d: %s\n", n++, id_str);
4172 err = got_object_commit_get_logmsg(&logmsg0, commit);
4178 line = strsep(&logmsg, "\n");
4180 printf(" %s\n", line);
4184 if (changed_paths) {
4185 struct got_pathlist_entry *pe;
4186 TAILQ_FOREACH(pe, changed_paths, entry) {
4187 struct got_diff_changed_path *cp = pe->data;
4188 printf(" %c %s\n", cp->status, pe->path);
4193 err = print_patch(commit, id, path, diff_context, repo, stdout);
4198 if (fflush(stdout) != 0 && err == NULL)
4199 err = got_error_from_errno("fflush");
4206 static const struct got_error *
4207 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4208 struct got_repository *repo, const char *path, int show_changed_paths,
4209 int show_patch, const char *search_pattern, int diff_context, int limit,
4210 int log_branches, int reverse_display_order,
4211 struct got_reflist_object_id_map *refs_idmap, int one_line,
4214 const struct got_error *err;
4215 struct got_commit_graph *graph;
4218 struct got_object_id_queue reversed_commits;
4219 struct got_object_qid *qid;
4220 struct got_commit_object *commit;
4221 struct got_pathlist_head changed_paths;
4222 struct got_pathlist_entry *pe;
4224 STAILQ_INIT(&reversed_commits);
4225 TAILQ_INIT(&changed_paths);
4227 if (search_pattern && regcomp(®ex, search_pattern,
4228 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4229 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4231 err = got_commit_graph_open(&graph, path, !log_branches);
4234 err = got_commit_graph_iter_start(graph, root_id, repo,
4235 check_cancelled, NULL);
4239 struct got_object_id id;
4241 if (sigint_received || sigpipe_received)
4244 err = got_commit_graph_iter_next(&id, graph, repo,
4245 check_cancelled, NULL);
4247 if (err->code == GOT_ERR_ITER_COMPLETED)
4252 err = got_object_open_as_commit(&commit, repo, &id);
4256 if (show_changed_paths && !reverse_display_order) {
4257 err = get_changed_paths(&changed_paths, commit, repo);
4262 if (search_pattern) {
4263 err = match_commit(&have_match, &id, commit, ®ex);
4265 got_object_commit_close(commit);
4268 if (have_match == 0 && show_changed_paths)
4269 match_changed_paths(&have_match,
4270 &changed_paths, ®ex);
4271 if (have_match == 0 && show_patch) {
4272 err = match_patch(&have_match, commit, &id,
4273 path, diff_context, repo, ®ex,
4278 if (have_match == 0) {
4279 got_object_commit_close(commit);
4280 TAILQ_FOREACH(pe, &changed_paths, entry) {
4281 free((char *)pe->path);
4284 got_pathlist_free(&changed_paths);
4289 if (reverse_display_order) {
4290 err = got_object_qid_alloc(&qid, &id);
4293 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4294 got_object_commit_close(commit);
4297 err = print_commit_oneline(commit, &id,
4300 err = print_commit(commit, &id, repo, path,
4301 show_changed_paths ? &changed_paths : NULL,
4302 show_patch, diff_context, refs_idmap, NULL);
4303 got_object_commit_close(commit);
4307 if ((limit && --limit == 0) ||
4308 (end_id && got_object_id_cmp(&id, end_id) == 0))
4311 TAILQ_FOREACH(pe, &changed_paths, entry) {
4312 free((char *)pe->path);
4315 got_pathlist_free(&changed_paths);
4317 if (reverse_display_order) {
4318 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4319 err = got_object_open_as_commit(&commit, repo,
4323 if (show_changed_paths) {
4324 err = get_changed_paths(&changed_paths,
4330 err = print_commit_oneline(commit, &qid->id,
4333 err = print_commit(commit, &qid->id, repo, path,
4334 show_changed_paths ? &changed_paths : NULL,
4335 show_patch, diff_context, refs_idmap, NULL);
4336 got_object_commit_close(commit);
4339 TAILQ_FOREACH(pe, &changed_paths, entry) {
4340 free((char *)pe->path);
4343 got_pathlist_free(&changed_paths);
4347 while (!STAILQ_EMPTY(&reversed_commits)) {
4348 qid = STAILQ_FIRST(&reversed_commits);
4349 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4350 got_object_qid_free(qid);
4352 TAILQ_FOREACH(pe, &changed_paths, entry) {
4353 free((char *)pe->path);
4356 got_pathlist_free(&changed_paths);
4359 got_commit_graph_close(graph);
4366 fprintf(stderr, "usage: %s log [-bPpRs] [-C number] [-c commit] [-l N] "
4367 "[-r repository-path] [-S search-pattern] [-x commit] [path]\n",
4373 get_default_log_limit(void)
4375 const char *got_default_log_limit;
4379 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4380 if (got_default_log_limit == NULL)
4382 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4388 static const struct got_error *
4389 cmd_log(int argc, char *argv[])
4391 const struct got_error *error;
4392 struct got_repository *repo = NULL;
4393 struct got_worktree *worktree = NULL;
4394 struct got_object_id *start_id = NULL, *end_id = NULL;
4395 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4396 const char *start_commit = NULL, *end_commit = NULL;
4397 const char *search_pattern = NULL;
4398 int diff_context = -1, ch;
4399 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4400 int reverse_display_order = 0, one_line = 0;
4402 struct got_reflist_head refs;
4403 struct got_reflist_object_id_map *refs_idmap = NULL;
4404 FILE *tmpfile = NULL;
4405 int *pack_fds = NULL;
4410 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4416 limit = get_default_log_limit();
4418 while ((ch = getopt(argc, argv, "bC:c:l:PpRr:S:sx:")) != -1) {
4424 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4427 errx(1, "number of context lines is %s: %s",
4431 start_commit = optarg;
4434 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4436 errx(1, "number of commits is %s: %s",
4440 show_changed_paths = 1;
4446 reverse_display_order = 1;
4449 repo_path = realpath(optarg, NULL);
4450 if (repo_path == NULL)
4451 return got_error_from_errno2("realpath",
4453 got_path_strip_trailing_slashes(repo_path);
4456 search_pattern = optarg;
4462 end_commit = optarg;
4473 if (diff_context == -1)
4475 else if (!show_patch)
4476 errx(1, "-C requires -p");
4478 if (one_line && (show_patch || show_changed_paths))
4479 errx(1, "cannot use -s with -p or -P");
4481 cwd = getcwd(NULL, 0);
4483 error = got_error_from_errno("getcwd");
4487 error = got_repo_pack_fds_open(&pack_fds);
4491 if (repo_path == NULL) {
4492 error = got_worktree_open(&worktree, cwd);
4493 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4500 error = got_worktree_resolve_path(&path, worktree,
4505 path = strdup(argv[0]);
4507 error = got_error_from_errno("strdup");
4511 } else if (argc != 0)
4514 if (repo_path == NULL) {
4515 repo_path = worktree ?
4516 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4518 if (repo_path == NULL) {
4519 error = got_error_from_errno("strdup");
4523 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4527 error = apply_unveil(got_repo_get_path(repo), 1,
4528 worktree ? got_worktree_get_root_path(worktree) : NULL);
4532 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4536 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4540 if (start_commit == NULL) {
4541 struct got_reference *head_ref;
4542 struct got_commit_object *commit = NULL;
4543 error = got_ref_open(&head_ref, repo,
4544 worktree ? got_worktree_get_head_ref_name(worktree)
4548 error = got_ref_resolve(&start_id, repo, head_ref);
4549 got_ref_close(head_ref);
4552 error = got_object_open_as_commit(&commit, repo,
4556 got_object_commit_close(commit);
4558 error = got_repo_match_object_id(&start_id, NULL,
4559 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4563 if (end_commit != NULL) {
4564 error = got_repo_match_object_id(&end_id, NULL,
4565 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4572 * If a path was specified on the command line it was resolved
4573 * to a path in the work tree above. Prepend the work tree's
4574 * path prefix to obtain the corresponding in-repository path.
4578 prefix = got_worktree_get_path_prefix(worktree);
4579 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4580 (path[0] != '\0') ? "/" : "", path) == -1) {
4581 error = got_error_from_errno("asprintf");
4586 error = got_repo_map_path(&in_repo_path, repo,
4592 path = in_repo_path;
4596 /* Release work tree lock. */
4597 got_worktree_close(worktree);
4601 if (search_pattern && show_patch) {
4602 tmpfile = got_opentemp();
4603 if (tmpfile == NULL) {
4604 error = got_error_from_errno("got_opentemp");
4609 error = print_commits(start_id, end_id, repo, path ? path : "",
4610 show_changed_paths, show_patch, search_pattern, diff_context,
4611 limit, log_branches, reverse_display_order, refs_idmap, one_line,
4618 got_worktree_close(worktree);
4620 const struct got_error *close_err = got_repo_close(repo);
4625 const struct got_error *pack_err =
4626 got_repo_pack_fds_close(pack_fds);
4631 got_reflist_object_id_map_free(refs_idmap);
4632 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4633 error = got_error_from_errno("fclose");
4634 got_ref_list_free(&refs);
4641 fprintf(stderr, "usage: %s diff [-aPsw] [-C number] [-c commit] "
4642 "[-r repository-path] [object1 object2 | path ...]\n",
4647 struct print_diff_arg {
4648 struct got_repository *repo;
4649 struct got_worktree *worktree;
4654 enum got_diff_algorithm diff_algo;
4655 int ignore_whitespace;
4656 int force_text_diff;
4662 * Create a file which contains the target path of a symlink so we can feed
4663 * it as content to the diff engine.
4665 static const struct got_error *
4666 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4667 const char *abspath)
4669 const struct got_error *err = NULL;
4670 char target_path[PATH_MAX];
4671 ssize_t target_len, outlen;
4676 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4677 if (target_len == -1)
4678 return got_error_from_errno2("readlinkat", abspath);
4680 target_len = readlink(abspath, target_path, PATH_MAX);
4681 if (target_len == -1)
4682 return got_error_from_errno2("readlink", abspath);
4685 *fd = got_opentempfd();
4687 return got_error_from_errno("got_opentempfd");
4689 outlen = write(*fd, target_path, target_len);
4691 err = got_error_from_errno("got_opentempfd");
4695 if (lseek(*fd, 0, SEEK_SET) == -1) {
4696 err = got_error_from_errno2("lseek", abspath);
4707 static const struct got_error *
4708 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4709 const char *path, struct got_object_id *blob_id,
4710 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4711 int dirfd, const char *de_name)
4713 struct print_diff_arg *a = arg;
4714 const struct got_error *err = NULL;
4715 struct got_blob_object *blob1 = NULL;
4716 int fd = -1, fd1 = -1, fd2 = -1;
4718 char *abspath = NULL, *label1 = NULL;
4723 memset(&sb, 0, sizeof(sb));
4725 if (a->diff_staged) {
4726 if (staged_status != GOT_STATUS_MODIFY &&
4727 staged_status != GOT_STATUS_ADD &&
4728 staged_status != GOT_STATUS_DELETE)
4731 if (staged_status == GOT_STATUS_DELETE)
4733 if (status == GOT_STATUS_NONEXISTENT)
4734 return got_error_set_errno(ENOENT, path);
4735 if (status != GOT_STATUS_MODIFY &&
4736 status != GOT_STATUS_ADD &&
4737 status != GOT_STATUS_DELETE &&
4738 status != GOT_STATUS_CONFLICT)
4742 err = got_opentemp_truncate(a->f1);
4744 return got_error_from_errno("got_opentemp_truncate");
4745 err = got_opentemp_truncate(a->f2);
4747 return got_error_from_errno("got_opentemp_truncate");
4749 if (!a->header_shown) {
4750 printf("diff %s%s\n", a->diff_staged ? "-s " : "",
4751 got_worktree_get_root_path(a->worktree));
4752 printf("commit - %s\n", a->id_str);
4753 printf("path + %s%s\n",
4754 got_worktree_get_root_path(a->worktree),
4755 a->diff_staged ? " (staged changes)" : "");
4756 a->header_shown = 1;
4759 if (a->diff_staged) {
4760 const char *label1 = NULL, *label2 = NULL;
4761 switch (staged_status) {
4762 case GOT_STATUS_MODIFY:
4766 case GOT_STATUS_ADD:
4769 case GOT_STATUS_DELETE:
4773 return got_error(GOT_ERR_FILE_STATUS);
4775 fd1 = got_opentempfd();
4777 err = got_error_from_errno("got_opentempfd");
4780 fd2 = got_opentempfd();
4782 err = got_error_from_errno("got_opentempfd");
4785 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4786 fd1, fd2, blob_id, staged_blob_id, label1, label2,
4787 a->diff_algo, a->diff_context, a->ignore_whitespace,
4788 a->force_text_diff, a->repo, stdout);
4792 fd1 = got_opentempfd();
4794 err = got_error_from_errno("got_opentempfd");
4798 if (staged_status == GOT_STATUS_ADD ||
4799 staged_status == GOT_STATUS_MODIFY) {
4801 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4805 err = got_object_id_str(&id_str, staged_blob_id);
4808 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4809 err = got_error_from_errno("asprintf");
4814 } else if (status != GOT_STATUS_ADD) {
4815 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4821 if (status != GOT_STATUS_DELETE) {
4822 if (asprintf(&abspath, "%s/%s",
4823 got_worktree_get_root_path(a->worktree), path) == -1) {
4824 err = got_error_from_errno("asprintf");
4829 fd = openat(dirfd, de_name,
4830 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4832 if (!got_err_open_nofollow_on_symlink()) {
4833 err = got_error_from_errno2("openat",
4837 err = get_symlink_target_file(&fd, dirfd,
4843 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4845 if (!got_err_open_nofollow_on_symlink()) {
4846 err = got_error_from_errno2("open",
4850 err = get_symlink_target_file(&fd, dirfd,
4856 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4857 err = got_error_from_errno2("fstatat", abspath);
4860 f2 = fdopen(fd, "r");
4862 err = got_error_from_errno2("fdopen", abspath);
4870 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4876 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4877 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4878 a->ignore_whitespace, a->force_text_diff, stdout);
4880 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4881 err = got_error_from_errno("close");
4882 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4883 err = got_error_from_errno("close");
4885 got_object_blob_close(blob1);
4886 if (fd != -1 && close(fd) == -1 && err == NULL)
4887 err = got_error_from_errno("close");
4888 if (f2 && fclose(f2) == EOF && err == NULL)
4889 err = got_error_from_errno("fclose");
4894 static const struct got_error *
4895 cmd_diff(int argc, char *argv[])
4897 const struct got_error *error;
4898 struct got_repository *repo = NULL;
4899 struct got_worktree *worktree = NULL;
4900 char *cwd = NULL, *repo_path = NULL;
4901 const char *commit_args[2] = { NULL, NULL };
4902 int ncommit_args = 0;
4903 struct got_object_id *ids[2] = { NULL, NULL };
4904 char *labels[2] = { NULL, NULL };
4905 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4906 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4907 int force_text_diff = 0, force_path = 0, rflag = 0;
4909 struct got_reflist_head refs;
4910 struct got_pathlist_head paths;
4911 struct got_pathlist_entry *pe;
4912 FILE *f1 = NULL, *f2 = NULL;
4913 int fd1 = -1, fd2 = -1;
4914 int *pack_fds = NULL;
4920 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4925 while ((ch = getopt(argc, argv, "aC:c:Pr:sw")) != -1) {
4928 force_text_diff = 1;
4931 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4934 errx(1, "number of context lines is %s: %s",
4938 if (ncommit_args >= 2)
4939 errx(1, "too many -c options used");
4940 commit_args[ncommit_args++] = optarg;
4946 repo_path = realpath(optarg, NULL);
4947 if (repo_path == NULL)
4948 return got_error_from_errno2("realpath",
4950 got_path_strip_trailing_slashes(repo_path);
4957 ignore_whitespace = 1;
4968 cwd = getcwd(NULL, 0);
4970 error = got_error_from_errno("getcwd");
4974 error = got_repo_pack_fds_open(&pack_fds);
4978 if (repo_path == NULL) {
4979 error = got_worktree_open(&worktree, cwd);
4980 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4986 strdup(got_worktree_get_repo_path(worktree));
4987 if (repo_path == NULL) {
4988 error = got_error_from_errno("strdup");
4992 repo_path = strdup(cwd);
4993 if (repo_path == NULL) {
4994 error = got_error_from_errno("strdup");
5000 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5005 if (rflag || worktree == NULL || ncommit_args > 0) {
5007 error = got_error_msg(GOT_ERR_NOT_IMPL,
5008 "-P option can only be used when diffing "
5013 error = got_error_msg(GOT_ERR_NOT_IMPL,
5014 "-s option can only be used when diffing "
5020 error = apply_unveil(got_repo_get_path(repo), 1,
5021 worktree ? got_worktree_get_root_path(worktree) : NULL);
5025 if ((!force_path && argc == 2) || ncommit_args > 0) {
5026 int obj_type = (ncommit_args > 0 ?
5027 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5028 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5032 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5034 if (ncommit_args > 0)
5035 arg = commit_args[i];
5038 error = got_repo_match_object_id(&ids[i], &labels[i],
5039 arg, obj_type, &refs, repo);
5041 if (error->code != GOT_ERR_NOT_REF &&
5042 error->code != GOT_ERR_NO_OBJ)
5044 if (ncommit_args > 0)
5052 f1 = got_opentemp();
5054 error = got_error_from_errno("got_opentemp");
5058 f2 = got_opentemp();
5060 error = got_error_from_errno("got_opentemp");
5064 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5065 struct print_diff_arg arg;
5068 if (worktree == NULL) {
5069 if (argc == 2 && ids[0] == NULL) {
5070 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5072 } else if (argc == 2 && ids[1] == NULL) {
5073 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5075 } else if (argc > 0) {
5076 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5077 "%s", "specified paths cannot be resolved");
5080 error = got_error(GOT_ERR_NOT_WORKTREE);
5085 error = get_worktree_paths_from_argv(&paths, argc, argv,
5090 error = got_object_id_str(&id_str,
5091 got_worktree_get_base_commit_id(worktree));
5095 arg.worktree = worktree;
5096 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5097 arg.diff_context = diff_context;
5098 arg.id_str = id_str;
5099 arg.header_shown = 0;
5100 arg.diff_staged = diff_staged;
5101 arg.ignore_whitespace = ignore_whitespace;
5102 arg.force_text_diff = force_text_diff;
5106 error = got_worktree_status(worktree, &paths, repo, 0,
5107 print_diff, &arg, check_cancelled, NULL);
5112 if (ncommit_args == 1) {
5113 struct got_commit_object *commit;
5114 error = got_object_open_as_commit(&commit, repo, ids[0]);
5118 labels[1] = labels[0];
5120 if (got_object_commit_get_nparents(commit) > 0) {
5121 const struct got_object_id_queue *pids;
5122 struct got_object_qid *pid;
5123 pids = got_object_commit_get_parent_ids(commit);
5124 pid = STAILQ_FIRST(pids);
5125 ids[0] = got_object_id_dup(&pid->id);
5126 if (ids[0] == NULL) {
5127 error = got_error_from_errno(
5128 "got_object_id_dup");
5129 got_object_commit_close(commit);
5132 error = got_object_id_str(&labels[0], ids[0]);
5134 got_object_commit_close(commit);
5139 labels[0] = strdup("/dev/null");
5140 if (labels[0] == NULL) {
5141 error = got_error_from_errno("strdup");
5142 got_object_commit_close(commit);
5147 got_object_commit_close(commit);
5150 if (ncommit_args == 0 && argc > 2) {
5151 error = got_error_msg(GOT_ERR_BAD_PATH,
5152 "path arguments cannot be used when diffing two objects");
5157 error = got_object_get_type(&type1, repo, ids[0]);
5162 error = got_object_get_type(&type2, repo, ids[1]);
5165 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5166 error = got_error(GOT_ERR_OBJ_TYPE);
5169 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5170 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5171 "path arguments cannot be used when diffing blobs");
5175 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5177 struct got_pathlist_entry *new;
5181 error = got_worktree_resolve_path(&p, worktree,
5185 prefix = got_worktree_get_path_prefix(worktree);
5186 while (prefix[0] == '/')
5188 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5189 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5191 error = got_error_from_errno("asprintf");
5197 char *mapped_path, *s;
5198 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5204 in_repo_path = strdup(s);
5205 if (in_repo_path == NULL) {
5206 error = got_error_from_errno("asprintf");
5213 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5214 if (error || new == NULL /* duplicate */)
5221 /* Release work tree lock. */
5222 got_worktree_close(worktree);
5226 fd1 = got_opentempfd();
5228 error = got_error_from_errno("got_opentempfd");
5232 fd2 = got_opentempfd();
5234 error = got_error_from_errno("got_opentempfd");
5238 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5239 case GOT_OBJ_TYPE_BLOB:
5240 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5241 fd1, fd2, ids[0], ids[1], NULL, NULL,
5242 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5243 ignore_whitespace, force_text_diff, repo, stdout);
5245 case GOT_OBJ_TYPE_TREE:
5246 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5247 ids[0], ids[1], &paths, "", "",
5248 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5249 ignore_whitespace, force_text_diff, repo, stdout);
5251 case GOT_OBJ_TYPE_COMMIT:
5252 printf("diff %s %s\n", labels[0], labels[1]);
5253 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5254 fd1, fd2, ids[0], ids[1], &paths,
5255 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5256 ignore_whitespace, force_text_diff, repo, stdout);
5259 error = got_error(GOT_ERR_OBJ_TYPE);
5267 got_worktree_close(worktree);
5269 const struct got_error *close_err = got_repo_close(repo);
5274 const struct got_error *pack_err =
5275 got_repo_pack_fds_close(pack_fds);
5279 TAILQ_FOREACH(pe, &paths, entry)
5280 free((char *)pe->path);
5281 got_pathlist_free(&paths);
5282 got_ref_list_free(&refs);
5283 if (f1 && fclose(f1) == EOF && error == NULL)
5284 error = got_error_from_errno("fclose");
5285 if (f2 && fclose(f2) == EOF && error == NULL)
5286 error = got_error_from_errno("fclose");
5287 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5288 error = got_error_from_errno("close");
5289 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5290 error = got_error_from_errno("close");
5298 "usage: %s blame [-c commit] [-r repository-path] path\n",
5307 char datebuf[11]; /* YYYY-MM-DD + NUL */
5310 struct blame_cb_args {
5311 struct blame_line *lines;
5315 off_t *line_offsets;
5317 struct got_repository *repo;
5320 static const struct got_error *
5321 blame_cb(void *arg, int nlines, int lineno,
5322 struct got_commit_object *commit, struct got_object_id *id)
5324 const struct got_error *err = NULL;
5325 struct blame_cb_args *a = arg;
5326 struct blame_line *bline;
5328 size_t linesize = 0;
5331 time_t committer_time;
5333 if (nlines != a->nlines ||
5334 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5335 return got_error(GOT_ERR_RANGE);
5337 if (sigint_received)
5338 return got_error(GOT_ERR_ITER_COMPLETED);
5341 return NULL; /* no change in this commit */
5343 /* Annotate this line. */
5344 bline = &a->lines[lineno - 1];
5345 if (bline->annotated)
5347 err = got_object_id_str(&bline->id_str, id);
5351 bline->committer = strdup(got_object_commit_get_committer(commit));
5352 if (bline->committer == NULL) {
5353 err = got_error_from_errno("strdup");
5357 committer_time = got_object_commit_get_committer_time(commit);
5358 if (gmtime_r(&committer_time, &tm) == NULL)
5359 return got_error_from_errno("gmtime_r");
5360 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5362 err = got_error(GOT_ERR_NO_SPACE);
5365 bline->annotated = 1;
5367 /* Print lines annotated so far. */
5368 bline = &a->lines[a->lineno_cur - 1];
5369 if (!bline->annotated)
5372 offset = a->line_offsets[a->lineno_cur - 1];
5373 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5374 err = got_error_from_errno("fseeko");
5378 while (a->lineno_cur <= a->nlines && bline->annotated) {
5379 char *smallerthan, *at, *nl, *committer;
5382 if (getline(&line, &linesize, a->f) == -1) {
5384 err = got_error_from_errno("getline");
5388 committer = bline->committer;
5389 smallerthan = strchr(committer, '<');
5390 if (smallerthan && smallerthan[1] != '\0')
5391 committer = smallerthan + 1;
5392 at = strchr(committer, '@');
5395 len = strlen(committer);
5397 committer[8] = '\0';
5399 nl = strchr(line, '\n');
5402 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5403 bline->id_str, bline->datebuf, committer, line);
5406 bline = &a->lines[a->lineno_cur - 1];
5413 static const struct got_error *
5414 cmd_blame(int argc, char *argv[])
5416 const struct got_error *error;
5417 struct got_repository *repo = NULL;
5418 struct got_worktree *worktree = NULL;
5419 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5420 char *link_target = NULL;
5421 struct got_object_id *obj_id = NULL;
5422 struct got_object_id *commit_id = NULL;
5423 struct got_commit_object *commit = NULL;
5424 struct got_blob_object *blob = NULL;
5425 char *commit_id_str = NULL;
5426 struct blame_cb_args bca;
5427 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5429 int *pack_fds = NULL;
5430 FILE *f1 = NULL, *f2 = NULL;
5432 fd1 = got_opentempfd();
5434 return got_error_from_errno("got_opentempfd");
5436 memset(&bca, 0, sizeof(bca));
5439 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5444 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5447 commit_id_str = optarg;
5450 repo_path = realpath(optarg, NULL);
5451 if (repo_path == NULL)
5452 return got_error_from_errno2("realpath",
5454 got_path_strip_trailing_slashes(repo_path);
5470 cwd = getcwd(NULL, 0);
5472 error = got_error_from_errno("getcwd");
5476 error = got_repo_pack_fds_open(&pack_fds);
5480 if (repo_path == NULL) {
5481 error = got_worktree_open(&worktree, cwd);
5482 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5488 strdup(got_worktree_get_repo_path(worktree));
5489 if (repo_path == NULL) {
5490 error = got_error_from_errno("strdup");
5495 repo_path = strdup(cwd);
5496 if (repo_path == NULL) {
5497 error = got_error_from_errno("strdup");
5503 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5508 const char *prefix = got_worktree_get_path_prefix(worktree);
5511 error = got_worktree_resolve_path(&p, worktree, path);
5514 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5515 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5517 error = got_error_from_errno("asprintf");
5522 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5524 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5527 error = got_repo_map_path(&in_repo_path, repo, path);
5532 if (commit_id_str == NULL) {
5533 struct got_reference *head_ref;
5534 error = got_ref_open(&head_ref, repo, worktree ?
5535 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5538 error = got_ref_resolve(&commit_id, repo, head_ref);
5539 got_ref_close(head_ref);
5543 struct got_reflist_head refs;
5545 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5549 error = got_repo_match_object_id(&commit_id, NULL,
5550 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5551 got_ref_list_free(&refs);
5557 /* Release work tree lock. */
5558 got_worktree_close(worktree);
5562 error = got_object_open_as_commit(&commit, repo, commit_id);
5566 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5571 error = got_object_id_by_path(&obj_id, repo, commit,
5572 link_target ? link_target : in_repo_path);
5576 error = got_object_get_type(&obj_type, repo, obj_id);
5580 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5581 error = got_error_path(link_target ? link_target : in_repo_path,
5586 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5589 bca.f = got_opentemp();
5590 if (bca.f == NULL) {
5591 error = got_error_from_errno("got_opentemp");
5594 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5595 &bca.line_offsets, bca.f, blob);
5596 if (error || bca.nlines == 0)
5599 /* Don't include \n at EOF in the blame line count. */
5600 if (bca.line_offsets[bca.nlines - 1] == filesize)
5603 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5604 if (bca.lines == NULL) {
5605 error = got_error_from_errno("calloc");
5609 bca.nlines_prec = 0;
5617 fd2 = got_opentempfd();
5619 error = got_error_from_errno("got_opentempfd");
5622 fd3 = got_opentempfd();
5624 error = got_error_from_errno("got_opentempfd");
5627 f1 = got_opentemp();
5629 error = got_error_from_errno("got_opentemp");
5632 f2 = got_opentemp();
5634 error = got_error_from_errno("got_opentemp");
5637 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5638 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5639 check_cancelled, NULL, fd2, fd3, f1, f2);
5648 got_object_commit_close(commit);
5650 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5651 error = got_error_from_errno("close");
5652 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5653 error = got_error_from_errno("close");
5654 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5655 error = got_error_from_errno("close");
5656 if (f1 && fclose(f1) == EOF && error == NULL)
5657 error = got_error_from_errno("fclose");
5658 if (f2 && fclose(f2) == EOF && error == NULL)
5659 error = got_error_from_errno("fclose");
5662 got_object_blob_close(blob);
5664 got_worktree_close(worktree);
5666 const struct got_error *close_err = got_repo_close(repo);
5671 const struct got_error *pack_err =
5672 got_repo_pack_fds_close(pack_fds);
5677 for (i = 0; i < bca.nlines; i++) {
5678 struct blame_line *bline = &bca.lines[i];
5679 free(bline->id_str);
5680 free(bline->committer);
5684 free(bca.line_offsets);
5685 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5686 error = got_error_from_errno("fclose");
5693 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5694 "[path]\n", getprogname());
5698 static const struct got_error *
5699 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5700 const char *root_path, struct got_repository *repo)
5702 const struct got_error *err = NULL;
5703 int is_root_path = (strcmp(path, root_path) == 0);
5704 const char *modestr = "";
5705 mode_t mode = got_tree_entry_get_mode(te);
5706 char *link_target = NULL;
5708 path += strlen(root_path);
5709 while (path[0] == '/')
5712 if (got_object_tree_entry_is_submodule(te))
5714 else if (S_ISLNK(mode)) {
5717 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5720 for (i = 0; i < strlen(link_target); i++) {
5721 if (!isprint((unsigned char)link_target[i]))
5722 link_target[i] = '?';
5727 else if (S_ISDIR(mode))
5729 else if (mode & S_IXUSR)
5732 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5733 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5734 link_target ? " -> ": "", link_target ? link_target : "");
5740 static const struct got_error *
5741 print_tree(const char *path, struct got_commit_object *commit,
5742 int show_ids, int recurse, const char *root_path,
5743 struct got_repository *repo)
5745 const struct got_error *err = NULL;
5746 struct got_object_id *tree_id = NULL;
5747 struct got_tree_object *tree = NULL;
5750 err = got_object_id_by_path(&tree_id, repo, commit, path);
5754 err = got_object_open_as_tree(&tree, repo, tree_id);
5757 nentries = got_object_tree_get_nentries(tree);
5758 for (i = 0; i < nentries; i++) {
5759 struct got_tree_entry *te;
5762 if (sigint_received || sigpipe_received)
5765 te = got_object_tree_get_entry(tree, i);
5768 err = got_object_id_str(&id_str,
5769 got_tree_entry_get_id(te));
5772 if (asprintf(&id, "%s ", id_str) == -1) {
5773 err = got_error_from_errno("asprintf");
5779 err = print_entry(te, id, path, root_path, repo);
5784 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5786 if (asprintf(&child_path, "%s%s%s", path,
5787 path[0] == '/' && path[1] == '\0' ? "" : "/",
5788 got_tree_entry_get_name(te)) == -1) {
5789 err = got_error_from_errno("asprintf");
5792 err = print_tree(child_path, commit, show_ids, 1,
5801 got_object_tree_close(tree);
5806 static const struct got_error *
5807 cmd_tree(int argc, char *argv[])
5809 const struct got_error *error;
5810 struct got_repository *repo = NULL;
5811 struct got_worktree *worktree = NULL;
5812 const char *path, *refname = NULL;
5813 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5814 struct got_object_id *commit_id = NULL;
5815 struct got_commit_object *commit = NULL;
5816 char *commit_id_str = NULL;
5817 int show_ids = 0, recurse = 0;
5819 int *pack_fds = NULL;
5822 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5827 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
5830 commit_id_str = optarg;
5839 repo_path = realpath(optarg, NULL);
5840 if (repo_path == NULL)
5841 return got_error_from_errno2("realpath",
5843 got_path_strip_trailing_slashes(repo_path);
5861 cwd = getcwd(NULL, 0);
5863 error = got_error_from_errno("getcwd");
5867 error = got_repo_pack_fds_open(&pack_fds);
5871 if (repo_path == NULL) {
5872 error = got_worktree_open(&worktree, cwd);
5873 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5879 strdup(got_worktree_get_repo_path(worktree));
5880 if (repo_path == NULL)
5881 error = got_error_from_errno("strdup");
5885 repo_path = strdup(cwd);
5886 if (repo_path == NULL) {
5887 error = got_error_from_errno("strdup");
5893 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5898 const char *prefix = got_worktree_get_path_prefix(worktree);
5903 error = got_worktree_resolve_path(&p, worktree, path);
5906 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5907 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5909 error = got_error_from_errno("asprintf");
5914 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5918 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5923 error = got_repo_map_path(&in_repo_path, repo, path);
5928 if (commit_id_str == NULL) {
5929 struct got_reference *head_ref;
5931 refname = got_worktree_get_head_ref_name(worktree);
5933 refname = GOT_REF_HEAD;
5934 error = got_ref_open(&head_ref, repo, refname, 0);
5937 error = got_ref_resolve(&commit_id, repo, head_ref);
5938 got_ref_close(head_ref);
5942 struct got_reflist_head refs;
5944 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5948 error = got_repo_match_object_id(&commit_id, NULL,
5949 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5950 got_ref_list_free(&refs);
5956 /* Release work tree lock. */
5957 got_worktree_close(worktree);
5961 error = got_object_open_as_commit(&commit, repo, commit_id);
5965 error = print_tree(in_repo_path, commit, show_ids, recurse,
5966 in_repo_path, repo);
5973 got_object_commit_close(commit);
5975 got_worktree_close(worktree);
5977 const struct got_error *close_err = got_repo_close(repo);
5982 const struct got_error *pack_err =
5983 got_repo_pack_fds_close(pack_fds);
5993 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5994 "[-s status-codes] [path ...]\n", getprogname());
5998 struct got_status_arg {
6003 static const struct got_error *
6004 print_status(void *arg, unsigned char status, unsigned char staged_status,
6005 const char *path, struct got_object_id *blob_id,
6006 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6007 int dirfd, const char *de_name)
6009 struct got_status_arg *st = arg;
6011 if (status == staged_status && (status == GOT_STATUS_DELETE))
6012 status = GOT_STATUS_NO_CHANGE;
6013 if (st != NULL && st->status_codes) {
6014 size_t ncodes = strlen(st->status_codes);
6017 for (i = 0; i < ncodes ; i++) {
6019 if (status == st->status_codes[i] ||
6020 staged_status == st->status_codes[i]) {
6025 if (status == st->status_codes[i] ||
6026 staged_status == st->status_codes[i])
6031 if (st->suppress && j == 0)
6038 printf("%c%c %s\n", status, staged_status, path);
6042 static const struct got_error *
6043 cmd_status(int argc, char *argv[])
6045 const struct got_error *error = NULL;
6046 struct got_repository *repo = NULL;
6047 struct got_worktree *worktree = NULL;
6048 struct got_status_arg st;
6050 struct got_pathlist_head paths;
6051 struct got_pathlist_entry *pe;
6052 int ch, i, no_ignores = 0;
6053 int *pack_fds = NULL;
6057 memset(&st, 0, sizeof(st));
6058 st.status_codes = NULL;
6061 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6067 if (st.status_codes != NULL && st.suppress == 0)
6068 option_conflict('S', 's');
6072 for (i = 0; i < strlen(optarg); i++) {
6073 switch (optarg[i]) {
6074 case GOT_STATUS_MODIFY:
6075 case GOT_STATUS_ADD:
6076 case GOT_STATUS_DELETE:
6077 case GOT_STATUS_CONFLICT:
6078 case GOT_STATUS_MISSING:
6079 case GOT_STATUS_OBSTRUCTED:
6080 case GOT_STATUS_UNVERSIONED:
6081 case GOT_STATUS_MODE_CHANGE:
6082 case GOT_STATUS_NONEXISTENT:
6085 errx(1, "invalid status code '%c'",
6089 if (ch == 's' && st.suppress)
6090 option_conflict('s', 'S');
6091 st.status_codes = optarg;
6103 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6107 cwd = getcwd(NULL, 0);
6109 error = got_error_from_errno("getcwd");
6113 error = got_repo_pack_fds_open(&pack_fds);
6117 error = got_worktree_open(&worktree, cwd);
6119 if (error->code == GOT_ERR_NOT_WORKTREE)
6120 error = wrap_not_worktree_error(error, "status", cwd);
6124 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6129 error = apply_unveil(got_repo_get_path(repo), 1,
6130 got_worktree_get_root_path(worktree));
6134 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6138 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6139 print_status, &st, check_cancelled, NULL);
6142 const struct got_error *pack_err =
6143 got_repo_pack_fds_close(pack_fds);
6148 TAILQ_FOREACH(pe, &paths, entry)
6149 free((char *)pe->path);
6150 got_pathlist_free(&paths);
6158 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6159 "[-s reference] [name]\n", getprogname());
6163 static const struct got_error *
6164 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6166 static const struct got_error *err = NULL;
6167 struct got_reflist_head refs;
6168 struct got_reflist_entry *re;
6171 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6172 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6177 TAILQ_FOREACH(re, &refs, entry) {
6179 refstr = got_ref_to_str(re->ref);
6180 if (refstr == NULL) {
6181 err = got_error_from_errno("got_ref_to_str");
6184 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6188 got_ref_list_free(&refs);
6192 static const struct got_error *
6193 delete_ref_by_name(struct got_repository *repo, const char *refname)
6195 const struct got_error *err;
6196 struct got_reference *ref;
6198 err = got_ref_open(&ref, repo, refname, 0);
6202 err = delete_ref(repo, ref);
6207 static const struct got_error *
6208 add_ref(struct got_repository *repo, const char *refname, const char *target)
6210 const struct got_error *err = NULL;
6211 struct got_object_id *id = NULL;
6212 struct got_reference *ref = NULL;
6213 struct got_reflist_head refs;
6216 * Don't let the user create a reference name with a leading '-'.
6217 * While technically a valid reference name, this case is usually
6218 * an unintended typo.
6220 if (refname[0] == '-')
6221 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6224 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6227 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6229 got_ref_list_free(&refs);
6233 err = got_ref_alloc(&ref, refname, id);
6237 err = got_ref_write(ref, repo);
6245 static const struct got_error *
6246 add_symref(struct got_repository *repo, const char *refname, const char *target)
6248 const struct got_error *err = NULL;
6249 struct got_reference *ref = NULL;
6250 struct got_reference *target_ref = NULL;
6253 * Don't let the user create a reference name with a leading '-'.
6254 * While technically a valid reference name, this case is usually
6255 * an unintended typo.
6257 if (refname[0] == '-')
6258 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6260 err = got_ref_open(&target_ref, repo, target, 0);
6264 err = got_ref_alloc_symref(&ref, refname, target_ref);
6268 err = got_ref_write(ref, repo);
6271 got_ref_close(target_ref);
6277 static const struct got_error *
6278 cmd_ref(int argc, char *argv[])
6280 const struct got_error *error = NULL;
6281 struct got_repository *repo = NULL;
6282 struct got_worktree *worktree = NULL;
6283 char *cwd = NULL, *repo_path = NULL;
6284 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6285 const char *obj_arg = NULL, *symref_target= NULL;
6286 char *refname = NULL;
6287 int *pack_fds = NULL;
6289 while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6301 repo_path = realpath(optarg, NULL);
6302 if (repo_path == NULL)
6303 return got_error_from_errno2("realpath",
6305 got_path_strip_trailing_slashes(repo_path);
6308 symref_target = optarg;
6319 if (obj_arg && do_list)
6320 option_conflict('c', 'l');
6321 if (obj_arg && do_delete)
6322 option_conflict('c', 'd');
6323 if (obj_arg && symref_target)
6324 option_conflict('c', 's');
6325 if (symref_target && do_delete)
6326 option_conflict('s', 'd');
6327 if (symref_target && do_list)
6328 option_conflict('s', 'l');
6329 if (do_delete && do_list)
6330 option_conflict('d', 'l');
6331 if (sort_by_time && !do_list)
6332 errx(1, "-t option requires -l option");
6338 if (argc != 0 && argc != 1)
6341 refname = strdup(argv[0]);
6342 if (refname == NULL) {
6343 error = got_error_from_errno("strdup");
6350 refname = strdup(argv[0]);
6351 if (refname == NULL) {
6352 error = got_error_from_errno("strdup");
6358 got_path_strip_trailing_slashes(refname);
6361 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6362 "sendfd unveil", NULL) == -1)
6365 cwd = getcwd(NULL, 0);
6367 error = got_error_from_errno("getcwd");
6371 error = got_repo_pack_fds_open(&pack_fds);
6375 if (repo_path == NULL) {
6376 error = got_worktree_open(&worktree, cwd);
6377 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6383 strdup(got_worktree_get_repo_path(worktree));
6384 if (repo_path == NULL)
6385 error = got_error_from_errno("strdup");
6389 repo_path = strdup(cwd);
6390 if (repo_path == NULL) {
6391 error = got_error_from_errno("strdup");
6397 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6403 /* Remove "cpath" promise. */
6404 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6410 error = apply_unveil(got_repo_get_path(repo), do_list,
6411 worktree ? got_worktree_get_root_path(worktree) : NULL);
6416 error = list_refs(repo, refname, sort_by_time);
6418 error = delete_ref_by_name(repo, refname);
6419 else if (symref_target)
6420 error = add_symref(repo, refname, symref_target);
6422 if (obj_arg == NULL)
6424 error = add_ref(repo, refname, obj_arg);
6429 const struct got_error *close_err = got_repo_close(repo);
6434 got_worktree_close(worktree);
6436 const struct got_error *pack_err =
6437 got_repo_pack_fds_close(pack_fds);
6449 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6450 "[-r repository-path] [name]\n", getprogname());
6454 static const struct got_error *
6455 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6456 struct got_reference *ref)
6458 const struct got_error *err = NULL;
6459 const char *refname, *marker = " ";
6462 refname = got_ref_get_name(ref);
6463 if (worktree && strcmp(refname,
6464 got_worktree_get_head_ref_name(worktree)) == 0) {
6465 struct got_object_id *id = NULL;
6467 err = got_ref_resolve(&id, repo, ref);
6470 if (got_object_id_cmp(id,
6471 got_worktree_get_base_commit_id(worktree)) == 0)
6478 if (strncmp(refname, "refs/heads/", 11) == 0)
6480 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6482 if (strncmp(refname, "refs/remotes/", 13) == 0)
6485 refstr = got_ref_to_str(ref);
6487 return got_error_from_errno("got_ref_to_str");
6489 printf("%s%s: %s\n", marker, refname, refstr);
6494 static const struct got_error *
6495 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6497 const char *refname;
6499 if (worktree == NULL)
6500 return got_error(GOT_ERR_NOT_WORKTREE);
6502 refname = got_worktree_get_head_ref_name(worktree);
6504 if (strncmp(refname, "refs/heads/", 11) == 0)
6506 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6509 printf("%s\n", refname);
6514 static const struct got_error *
6515 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6518 static const struct got_error *err = NULL;
6519 struct got_reflist_head refs;
6520 struct got_reflist_entry *re;
6521 struct got_reference *temp_ref = NULL;
6522 int rebase_in_progress, histedit_in_progress;
6527 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6532 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6537 if (rebase_in_progress || histedit_in_progress) {
6538 err = got_ref_open(&temp_ref, repo,
6539 got_worktree_get_head_ref_name(worktree), 0);
6542 list_branch(repo, worktree, temp_ref);
6543 got_ref_close(temp_ref);
6547 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6548 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6553 TAILQ_FOREACH(re, &refs, entry)
6554 list_branch(repo, worktree, re->ref);
6556 got_ref_list_free(&refs);
6558 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6559 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6564 TAILQ_FOREACH(re, &refs, entry)
6565 list_branch(repo, worktree, re->ref);
6567 got_ref_list_free(&refs);
6572 static const struct got_error *
6573 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6574 const char *branch_name)
6576 const struct got_error *err = NULL;
6577 struct got_reference *ref = NULL;
6578 char *refname, *remote_refname = NULL;
6580 if (strncmp(branch_name, "refs/", 5) == 0)
6582 if (strncmp(branch_name, "heads/", 6) == 0)
6584 else if (strncmp(branch_name, "remotes/", 8) == 0)
6587 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6588 return got_error_from_errno("asprintf");
6590 if (asprintf(&remote_refname, "refs/remotes/%s",
6591 branch_name) == -1) {
6592 err = got_error_from_errno("asprintf");
6596 err = got_ref_open(&ref, repo, refname, 0);
6598 const struct got_error *err2;
6599 if (err->code != GOT_ERR_NOT_REF)
6602 * Keep 'err' intact such that if neither branch exists
6603 * we report "refs/heads" rather than "refs/remotes" in
6604 * our error message.
6606 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6613 strcmp(got_worktree_get_head_ref_name(worktree),
6614 got_ref_get_name(ref)) == 0) {
6615 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6616 "will not delete this work tree's current branch");
6620 err = delete_ref(repo, ref);
6625 free(remote_refname);
6629 static const struct got_error *
6630 add_branch(struct got_repository *repo, const char *branch_name,
6631 struct got_object_id *base_commit_id)
6633 const struct got_error *err = NULL;
6634 struct got_reference *ref = NULL;
6635 char *base_refname = NULL, *refname = NULL;
6638 * Don't let the user create a branch name with a leading '-'.
6639 * While technically a valid reference name, this case is usually
6640 * an unintended typo.
6642 if (branch_name[0] == '-')
6643 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6645 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6648 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6649 err = got_error_from_errno("asprintf");
6653 err = got_ref_open(&ref, repo, refname, 0);
6655 err = got_error(GOT_ERR_BRANCH_EXISTS);
6657 } else if (err->code != GOT_ERR_NOT_REF)
6660 err = got_ref_alloc(&ref, refname, base_commit_id);
6664 err = got_ref_write(ref, repo);
6673 static const struct got_error *
6674 cmd_branch(int argc, char *argv[])
6676 const struct got_error *error = NULL;
6677 struct got_repository *repo = NULL;
6678 struct got_worktree *worktree = NULL;
6679 char *cwd = NULL, *repo_path = NULL;
6680 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6681 const char *delref = NULL, *commit_id_arg = NULL;
6682 struct got_reference *ref = NULL;
6683 struct got_pathlist_head paths;
6684 struct got_pathlist_entry *pe;
6685 struct got_object_id *commit_id = NULL;
6686 char *commit_id_str = NULL;
6687 int *pack_fds = NULL;
6691 while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
6694 commit_id_arg = optarg;
6706 repo_path = realpath(optarg, NULL);
6707 if (repo_path == NULL)
6708 return got_error_from_errno2("realpath",
6710 got_path_strip_trailing_slashes(repo_path);
6721 if (do_list && delref)
6722 option_conflict('l', 'd');
6723 if (sort_by_time && !do_list)
6724 errx(1, "-t option requires -l option");
6729 if (!do_list && !delref && argc == 0)
6732 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6733 errx(1, "-c option can only be used when creating a branch");
6735 if (do_list || delref) {
6738 } else if (!do_show && argc != 1)
6742 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6743 "sendfd unveil", NULL) == -1)
6746 cwd = getcwd(NULL, 0);
6748 error = got_error_from_errno("getcwd");
6752 error = got_repo_pack_fds_open(&pack_fds);
6756 if (repo_path == NULL) {
6757 error = got_worktree_open(&worktree, cwd);
6758 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6764 strdup(got_worktree_get_repo_path(worktree));
6765 if (repo_path == NULL)
6766 error = got_error_from_errno("strdup");
6770 repo_path = strdup(cwd);
6771 if (repo_path == NULL) {
6772 error = got_error_from_errno("strdup");
6778 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6783 if (do_list || do_show) {
6784 /* Remove "cpath" promise. */
6785 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6791 error = apply_unveil(got_repo_get_path(repo), do_list,
6792 worktree ? got_worktree_get_root_path(worktree) : NULL);
6797 error = show_current_branch(repo, worktree);
6799 error = list_branches(repo, worktree, sort_by_time);
6801 error = delete_branch(repo, worktree, delref);
6803 struct got_reflist_head refs;
6805 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6809 if (commit_id_arg == NULL)
6810 commit_id_arg = worktree ?
6811 got_worktree_get_head_ref_name(worktree) :
6813 error = got_repo_match_object_id(&commit_id, NULL,
6814 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6815 got_ref_list_free(&refs);
6818 error = add_branch(repo, argv[0], commit_id);
6821 if (worktree && do_update) {
6822 struct got_update_progress_arg upa;
6823 char *branch_refname = NULL;
6825 error = got_object_id_str(&commit_id_str, commit_id);
6828 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6832 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6834 error = got_error_from_errno("asprintf");
6837 error = got_ref_open(&ref, repo, branch_refname, 0);
6838 free(branch_refname);
6841 error = switch_head_ref(ref, commit_id, worktree,
6845 error = got_worktree_set_base_commit_id(worktree, repo,
6849 memset(&upa, 0, sizeof(upa));
6850 error = got_worktree_checkout_files(worktree, &paths,
6851 repo, update_progress, &upa, check_cancelled,
6855 if (upa.did_something) {
6856 printf("Updated to %s: %s\n",
6857 got_worktree_get_head_ref_name(worktree),
6860 print_update_progress_stats(&upa);
6867 const struct got_error *close_err = got_repo_close(repo);
6872 got_worktree_close(worktree);
6874 const struct got_error *pack_err =
6875 got_repo_pack_fds_close(pack_fds);
6882 free(commit_id_str);
6883 TAILQ_FOREACH(pe, &paths, entry)
6884 free((char *)pe->path);
6885 got_pathlist_free(&paths);
6893 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
6894 "[-r repository-path] [-s signer-id] name\n", getprogname());
6899 static const struct got_error *
6900 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6902 const struct got_error *err = NULL;
6903 struct got_reflist_entry *re, *se, *new;
6904 struct got_object_id *re_id, *se_id;
6905 struct got_tag_object *re_tag, *se_tag;
6906 time_t re_time, se_time;
6908 STAILQ_FOREACH(re, tags, entry) {
6909 se = STAILQ_FIRST(sorted);
6911 err = got_reflist_entry_dup(&new, re);
6914 STAILQ_INSERT_HEAD(sorted, new, entry);
6917 err = got_ref_resolve(&re_id, repo, re->ref);
6920 err = got_object_open_as_tag(&re_tag, repo, re_id);
6924 re_time = got_object_tag_get_tagger_time(re_tag);
6925 got_object_tag_close(re_tag);
6929 err = got_ref_resolve(&se_id, repo, re->ref);
6932 err = got_object_open_as_tag(&se_tag, repo, se_id);
6936 se_time = got_object_tag_get_tagger_time(se_tag);
6937 got_object_tag_close(se_tag);
6939 if (se_time > re_time) {
6940 err = got_reflist_entry_dup(&new, re);
6943 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6946 se = STAILQ_NEXT(se, entry);
6955 static const struct got_error *
6956 get_tag_refname(char **refname, const char *tag_name)
6958 const struct got_error *err;
6960 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6961 *refname = strdup(tag_name);
6962 if (*refname == NULL)
6963 return got_error_from_errno("strdup");
6964 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
6965 err = got_error_from_errno("asprintf");
6973 static const struct got_error *
6974 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
6975 const char *allowed_signers, const char *revoked_signers, int verbosity)
6977 static const struct got_error *err = NULL;
6978 struct got_reflist_head refs;
6979 struct got_reflist_entry *re;
6980 char *wanted_refname = NULL;
6985 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6990 struct got_reference *ref;
6991 err = get_tag_refname(&wanted_refname, tag_name);
6994 /* Wanted tag reference should exist. */
6995 err = got_ref_open(&ref, repo, wanted_refname, 0);
7001 TAILQ_FOREACH(re, &refs, entry) {
7002 const char *refname;
7003 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7005 const char *tagger, *ssh_sig = NULL;
7006 char *sig_msg = NULL;
7008 struct got_object_id *id;
7009 struct got_tag_object *tag;
7010 struct got_commit_object *commit = NULL;
7012 refname = got_ref_get_name(re->ref);
7013 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7014 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7017 refstr = got_ref_to_str(re->ref);
7018 if (refstr == NULL) {
7019 err = got_error_from_errno("got_ref_to_str");
7023 err = got_ref_resolve(&id, repo, re->ref);
7026 err = got_object_open_as_tag(&tag, repo, id);
7028 if (err->code != GOT_ERR_OBJ_TYPE) {
7032 /* "lightweight" tag */
7033 err = got_object_open_as_commit(&commit, repo, id);
7038 tagger = got_object_commit_get_committer(commit);
7040 got_object_commit_get_committer_time(commit);
7041 err = got_object_id_str(&id_str, id);
7047 tagger = got_object_tag_get_tagger(tag);
7048 tagger_time = got_object_tag_get_tagger_time(tag);
7049 err = got_object_id_str(&id_str,
7050 got_object_tag_get_object_id(tag));
7055 if (tag && verify_tags) {
7056 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7057 got_object_tag_get_message(tag));
7058 if (ssh_sig && allowed_signers == NULL) {
7059 err = got_error_msg(
7060 GOT_ERR_VERIFY_TAG_SIGNATURE,
7061 "SSH signature verification requires "
7062 "setting allowed_signers in "
7068 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7070 printf("from: %s\n", tagger);
7071 datestr = get_datestr(&tagger_time, datebuf);
7073 printf("date: %s UTC\n", datestr);
7075 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7077 switch (got_object_tag_get_object_type(tag)) {
7078 case GOT_OBJ_TYPE_BLOB:
7079 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7082 case GOT_OBJ_TYPE_TREE:
7083 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7086 case GOT_OBJ_TYPE_COMMIT:
7087 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7090 case GOT_OBJ_TYPE_TAG:
7091 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7101 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7102 allowed_signers, revoked_signers, verbosity);
7103 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7107 printf("signature: %s", sig_msg);
7113 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7116 got_object_commit_close(commit);
7118 tagmsg0 = strdup(got_object_tag_get_message(tag));
7119 got_object_tag_close(tag);
7120 if (tagmsg0 == NULL) {
7121 err = got_error_from_errno("strdup");
7128 line = strsep(&tagmsg, "\n");
7130 printf(" %s\n", line);
7135 got_ref_list_free(&refs);
7136 free(wanted_refname);
7138 if (err == NULL && bad_sigs)
7139 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7143 static const struct got_error *
7144 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7145 const char *tag_name, const char *repo_path)
7147 const struct got_error *err = NULL;
7148 char *template = NULL, *initial_content = NULL;
7149 char *editor = NULL;
7150 int initial_content_len;
7153 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7154 err = got_error_from_errno("asprintf");
7158 initial_content_len = asprintf(&initial_content,
7159 "\n# tagging commit %s as %s\n",
7160 commit_id_str, tag_name);
7161 if (initial_content_len == -1) {
7162 err = got_error_from_errno("asprintf");
7166 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
7170 if (write(fd, initial_content, initial_content_len) == -1) {
7171 err = got_error_from_errno2("write", *tagmsg_path);
7175 err = get_editor(&editor);
7178 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7179 initial_content_len, 1);
7181 free(initial_content);
7185 if (fd != -1 && close(fd) == -1 && err == NULL)
7186 err = got_error_from_errno2("close", *tagmsg_path);
7195 static const struct got_error *
7196 add_tag(struct got_repository *repo, const char *tagger,
7197 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7198 const char *signer_id, int verbosity)
7200 const struct got_error *err = NULL;
7201 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7202 char *label = NULL, *commit_id_str = NULL;
7203 struct got_reference *ref = NULL;
7204 char *refname = NULL, *tagmsg = NULL;
7205 char *tagmsg_path = NULL, *tag_id_str = NULL;
7206 int preserve_tagmsg = 0;
7207 struct got_reflist_head refs;
7212 * Don't let the user create a tag name with a leading '-'.
7213 * While technically a valid reference name, this case is usually
7214 * an unintended typo.
7216 if (tag_name[0] == '-')
7217 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7219 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7223 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7224 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7228 err = got_object_id_str(&commit_id_str, commit_id);
7232 err = get_tag_refname(&refname, tag_name);
7235 if (strncmp("refs/tags/", tag_name, 10) == 0)
7238 err = got_ref_open(&ref, repo, refname, 0);
7240 err = got_error(GOT_ERR_TAG_EXISTS);
7242 } else if (err->code != GOT_ERR_NOT_REF)
7245 if (tagmsg_arg == NULL) {
7246 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7247 tag_name, got_repo_get_path(repo));
7249 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7250 tagmsg_path != NULL)
7251 preserve_tagmsg = 1;
7254 /* Editor is done; we can now apply unveil(2) */
7255 err = got_sigs_apply_unveil();
7258 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
7263 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7264 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7268 preserve_tagmsg = 1;
7272 err = got_ref_alloc(&ref, refname, tag_id);
7275 preserve_tagmsg = 1;
7279 err = got_ref_write(ref, repo);
7282 preserve_tagmsg = 1;
7286 err = got_object_id_str(&tag_id_str, tag_id);
7289 preserve_tagmsg = 1;
7292 printf("Created tag %s\n", tag_id_str);
7294 if (preserve_tagmsg) {
7295 fprintf(stderr, "%s: tag message preserved in %s\n",
7296 getprogname(), tagmsg_path);
7297 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7298 err = got_error_from_errno2("unlink", tagmsg_path);
7303 free(commit_id_str);
7307 got_ref_list_free(&refs);
7311 static const struct got_error *
7312 cmd_tag(int argc, char *argv[])
7314 const struct got_error *error = NULL;
7315 struct got_repository *repo = NULL;
7316 struct got_worktree *worktree = NULL;
7317 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7318 char *gitconfig_path = NULL, *tagger = NULL;
7319 char *allowed_signers = NULL, *revoked_signers = NULL;
7320 char *signer_id = NULL;
7321 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7322 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7323 int *pack_fds = NULL;
7325 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7328 commit_id_arg = optarg;
7337 repo_path = realpath(optarg, NULL);
7338 if (repo_path == NULL) {
7339 error = got_error_from_errno2("realpath",
7343 got_path_strip_trailing_slashes(repo_path);
7346 signer_id = strdup(optarg);
7347 if (signer_id == NULL) {
7348 error = got_error_from_errno("strdup");
7358 else if (verbosity < 3)
7370 if (do_list || verify_tags) {
7371 if (commit_id_arg != NULL)
7373 "-c option can only be used when creating a tag");
7376 option_conflict('l', 'm');
7378 option_conflict('V', 'm');
7382 option_conflict('l', 's');
7384 option_conflict('V', 's');
7388 } else if (argc != 1)
7395 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7396 "sendfd unveil", NULL) == -1)
7399 cwd = getcwd(NULL, 0);
7401 error = got_error_from_errno("getcwd");
7405 error = got_repo_pack_fds_open(&pack_fds);
7409 if (repo_path == NULL) {
7410 error = got_worktree_open(&worktree, cwd);
7411 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7417 strdup(got_worktree_get_repo_path(worktree));
7418 if (repo_path == NULL)
7419 error = got_error_from_errno("strdup");
7423 repo_path = strdup(cwd);
7424 if (repo_path == NULL) {
7425 error = got_error_from_errno("strdup");
7431 if (do_list || verify_tags) {
7432 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7435 error = get_allowed_signers(&allowed_signers, repo, worktree);
7438 error = get_revoked_signers(&revoked_signers, repo, worktree);
7442 /* Release work tree lock. */
7443 got_worktree_close(worktree);
7448 * Remove "cpath" promise unless needed for signature tmpfile
7452 got_sigs_apply_unveil();
7455 if (pledge("stdio rpath wpath flock proc exec sendfd "
7456 "unveil", NULL) == -1)
7460 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7463 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7464 revoked_signers, verbosity);
7466 error = get_gitconfig_path(&gitconfig_path);
7469 error = got_repo_open(&repo, repo_path, gitconfig_path,
7474 error = get_author(&tagger, repo, worktree);
7477 if (signer_id == NULL) {
7478 error = get_signer_id(&signer_id, repo, worktree);
7485 error = got_sigs_apply_unveil();
7489 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7494 if (commit_id_arg == NULL) {
7495 struct got_reference *head_ref;
7496 struct got_object_id *commit_id;
7497 error = got_ref_open(&head_ref, repo,
7498 worktree ? got_worktree_get_head_ref_name(worktree)
7502 error = got_ref_resolve(&commit_id, repo, head_ref);
7503 got_ref_close(head_ref);
7506 error = got_object_id_str(&commit_id_str, commit_id);
7513 /* Release work tree lock. */
7514 got_worktree_close(worktree);
7518 error = add_tag(repo, tagger, tag_name,
7519 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7520 signer_id, verbosity);
7524 const struct got_error *close_err = got_repo_close(repo);
7529 got_worktree_close(worktree);
7531 const struct got_error *pack_err =
7532 got_repo_pack_fds_close(pack_fds);
7538 free(gitconfig_path);
7539 free(commit_id_str);
7541 free(allowed_signers);
7542 free(revoked_signers);
7550 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
7554 static const struct got_error *
7555 add_progress(void *arg, unsigned char status, const char *path)
7557 while (path[0] == '/')
7559 printf("%c %s\n", status, path);
7563 static const struct got_error *
7564 cmd_add(int argc, char *argv[])
7566 const struct got_error *error = NULL;
7567 struct got_repository *repo = NULL;
7568 struct got_worktree *worktree = NULL;
7570 struct got_pathlist_head paths;
7571 struct got_pathlist_entry *pe;
7572 int ch, can_recurse = 0, no_ignores = 0;
7573 int *pack_fds = NULL;
7577 while ((ch = getopt(argc, argv, "IR")) != -1) {
7595 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7602 cwd = getcwd(NULL, 0);
7604 error = got_error_from_errno("getcwd");
7608 error = got_repo_pack_fds_open(&pack_fds);
7612 error = got_worktree_open(&worktree, cwd);
7614 if (error->code == GOT_ERR_NOT_WORKTREE)
7615 error = wrap_not_worktree_error(error, "add", cwd);
7619 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7624 error = apply_unveil(got_repo_get_path(repo), 1,
7625 got_worktree_get_root_path(worktree));
7629 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7636 TAILQ_FOREACH(pe, &paths, entry) {
7637 if (asprintf(&ondisk_path, "%s/%s",
7638 got_worktree_get_root_path(worktree),
7640 error = got_error_from_errno("asprintf");
7643 if (lstat(ondisk_path, &sb) == -1) {
7644 if (errno == ENOENT) {
7648 error = got_error_from_errno2("lstat",
7654 if (S_ISDIR(sb.st_mode)) {
7655 error = got_error_msg(GOT_ERR_BAD_PATH,
7656 "adding directories requires -R option");
7662 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7663 NULL, repo, no_ignores);
7666 const struct got_error *close_err = got_repo_close(repo);
7671 got_worktree_close(worktree);
7673 const struct got_error *pack_err =
7674 got_repo_pack_fds_close(pack_fds);
7678 TAILQ_FOREACH(pe, &paths, entry)
7679 free((char *)pe->path);
7680 got_pathlist_free(&paths);
7688 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
7693 static const struct got_error *
7694 print_remove_status(void *arg, unsigned char status,
7695 unsigned char staged_status, const char *path)
7697 while (path[0] == '/')
7699 if (status == GOT_STATUS_NONEXISTENT)
7701 if (status == staged_status && (status == GOT_STATUS_DELETE))
7702 status = GOT_STATUS_NO_CHANGE;
7703 printf("%c%c %s\n", status, staged_status, path);
7707 static const struct got_error *
7708 cmd_remove(int argc, char *argv[])
7710 const struct got_error *error = NULL;
7711 struct got_worktree *worktree = NULL;
7712 struct got_repository *repo = NULL;
7713 const char *status_codes = NULL;
7715 struct got_pathlist_head paths;
7716 struct got_pathlist_entry *pe;
7717 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7718 int ignore_missing_paths = 0;
7719 int *pack_fds = NULL;
7723 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7726 delete_local_mods = 1;
7727 ignore_missing_paths = 1;
7736 for (i = 0; i < strlen(optarg); i++) {
7737 switch (optarg[i]) {
7738 case GOT_STATUS_MODIFY:
7739 delete_local_mods = 1;
7741 case GOT_STATUS_MISSING:
7742 ignore_missing_paths = 1;
7745 errx(1, "invalid status code '%c'",
7749 status_codes = optarg;
7761 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7768 cwd = getcwd(NULL, 0);
7770 error = got_error_from_errno("getcwd");
7774 error = got_repo_pack_fds_open(&pack_fds);
7778 error = got_worktree_open(&worktree, cwd);
7780 if (error->code == GOT_ERR_NOT_WORKTREE)
7781 error = wrap_not_worktree_error(error, "remove", cwd);
7785 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7790 error = apply_unveil(got_repo_get_path(repo), 1,
7791 got_worktree_get_root_path(worktree));
7795 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7802 TAILQ_FOREACH(pe, &paths, entry) {
7803 if (asprintf(&ondisk_path, "%s/%s",
7804 got_worktree_get_root_path(worktree),
7806 error = got_error_from_errno("asprintf");
7809 if (lstat(ondisk_path, &sb) == -1) {
7810 if (errno == ENOENT) {
7814 error = got_error_from_errno2("lstat",
7820 if (S_ISDIR(sb.st_mode)) {
7821 error = got_error_msg(GOT_ERR_BAD_PATH,
7822 "removing directories requires -R option");
7828 error = got_worktree_schedule_delete(worktree, &paths,
7829 delete_local_mods, status_codes, print_remove_status, NULL,
7830 repo, keep_on_disk, ignore_missing_paths);
7833 const struct got_error *close_err = got_repo_close(repo);
7838 got_worktree_close(worktree);
7840 const struct got_error *pack_err =
7841 got_repo_pack_fds_close(pack_fds);
7845 TAILQ_FOREACH(pe, &paths, entry)
7846 free((char *)pe->path);
7847 got_pathlist_free(&paths);
7855 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
7856 "[patchfile]\n", getprogname());
7860 static const struct got_error *
7861 patch_from_stdin(int *patchfd)
7863 const struct got_error *err = NULL;
7866 sig_t sighup, sigint, sigquit;
7868 *patchfd = got_opentempfd();
7870 return got_error_from_errno("got_opentempfd");
7872 sighup = signal(SIGHUP, SIG_DFL);
7873 sigint = signal(SIGINT, SIG_DFL);
7874 sigquit = signal(SIGQUIT, SIG_DFL);
7877 r = read(0, buf, sizeof(buf));
7879 err = got_error_from_errno("read");
7884 if (write(*patchfd, buf, r) == -1) {
7885 err = got_error_from_errno("write");
7890 signal(SIGHUP, sighup);
7891 signal(SIGINT, sigint);
7892 signal(SIGQUIT, sigquit);
7894 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7895 err = got_error_from_errno("lseek");
7905 static const struct got_error *
7906 patch_progress(void *arg, const char *old, const char *new,
7907 unsigned char status, const struct got_error *error, int old_from,
7908 int old_lines, int new_from, int new_lines, int offset,
7909 int ws_mangled, const struct got_error *hunk_err)
7911 const char *path = new == NULL ? old : new;
7913 while (*path == '/')
7917 printf("%c %s\n", status, path);
7920 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7922 if (offset != 0 || hunk_err != NULL || ws_mangled) {
7923 printf("@@ -%d,%d +%d,%d @@ ", old_from,
7924 old_lines, new_from, new_lines);
7925 if (hunk_err != NULL)
7926 printf("%s\n", hunk_err->msg);
7927 else if (offset != 0)
7928 printf("applied with offset %d\n", offset);
7930 printf("hunk contains mangled whitespace\n");
7936 static const struct got_error *
7937 cmd_patch(int argc, char *argv[])
7939 const struct got_error *error = NULL, *close_error = NULL;
7940 struct got_worktree *worktree = NULL;
7941 struct got_repository *repo = NULL;
7942 struct got_reflist_head refs;
7943 struct got_object_id *commit_id = NULL;
7944 const char *commit_id_str = NULL;
7948 int ch, nop = 0, strip = -1, reverse = 0;
7950 int *pack_fds = NULL;
7955 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
7956 "unveil", NULL) == -1)
7960 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
7963 commit_id_str = optarg;
7969 strip = strtonum(optarg, 0, INT_MAX, &errstr);
7971 errx(1, "pathname strip count is %s: %s",
7987 error = patch_from_stdin(&patchfd);
7990 } else if (argc == 1) {
7991 patchfd = open(argv[0], O_RDONLY);
7992 if (patchfd == -1) {
7993 error = got_error_from_errno2("open", argv[0]);
7996 if (fstat(patchfd, &sb) == -1) {
7997 error = got_error_from_errno2("fstat", argv[0]);
8000 if (!S_ISREG(sb.st_mode)) {
8001 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8007 if ((cwd = getcwd(NULL, 0)) == NULL) {
8008 error = got_error_from_errno("getcwd");
8012 error = got_repo_pack_fds_open(&pack_fds);
8016 error = got_worktree_open(&worktree, cwd);
8020 const char *repo_path = got_worktree_get_repo_path(worktree);
8021 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8025 error = apply_unveil(got_repo_get_path(repo), 0,
8026 got_worktree_get_root_path(worktree));
8030 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8034 if (commit_id_str != NULL) {
8035 error = got_repo_match_object_id(&commit_id, NULL,
8036 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8041 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8042 commit_id, &patch_progress, NULL, check_cancelled, NULL);
8045 got_ref_list_free(&refs);
8048 close_error = got_repo_close(repo);
8050 error = close_error;
8052 if (worktree != NULL) {
8053 close_error = got_worktree_close(worktree);
8055 error = close_error;
8058 const struct got_error *pack_err =
8059 got_repo_pack_fds_close(pack_fds);
8070 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8075 static const struct got_error *
8076 revert_progress(void *arg, unsigned char status, const char *path)
8078 if (status == GOT_STATUS_UNVERSIONED)
8081 while (path[0] == '/')
8083 printf("%c %s\n", status, path);
8087 struct choose_patch_arg {
8088 FILE *patch_script_file;
8092 static const struct got_error *
8093 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8094 int nchanges, const char *action)
8096 const struct got_error *err;
8098 size_t linesize = 0;
8102 case GOT_STATUS_ADD:
8103 printf("A %s\n%s this addition? [y/n] ", path, action);
8105 case GOT_STATUS_DELETE:
8106 printf("D %s\n%s this deletion? [y/n] ", path, action);
8108 case GOT_STATUS_MODIFY:
8109 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8110 return got_error_from_errno("fseek");
8111 printf(GOT_COMMIT_SEP_STR);
8112 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8114 if (linelen == -1 && ferror(patch_file)) {
8115 err = got_error_from_errno("getline");
8120 printf(GOT_COMMIT_SEP_STR);
8121 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8122 path, n, nchanges, action);
8125 return got_error_path(path, GOT_ERR_FILE_STATUS);
8132 static const struct got_error *
8133 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8134 FILE *patch_file, int n, int nchanges)
8136 const struct got_error *err = NULL;
8138 size_t linesize = 0;
8141 struct choose_patch_arg *a = arg;
8143 *choice = GOT_PATCH_CHOICE_NONE;
8145 if (a->patch_script_file) {
8147 err = show_change(status, path, patch_file, n, nchanges,
8151 linelen = getline(&line, &linesize, a->patch_script_file);
8152 if (linelen == -1) {
8153 if (ferror(a->patch_script_file))
8154 return got_error_from_errno("getline");
8157 nl = strchr(line, '\n');
8160 if (strcmp(line, "y") == 0) {
8161 *choice = GOT_PATCH_CHOICE_YES;
8163 } else if (strcmp(line, "n") == 0) {
8164 *choice = GOT_PATCH_CHOICE_NO;
8166 } else if (strcmp(line, "q") == 0 &&
8167 status == GOT_STATUS_MODIFY) {
8168 *choice = GOT_PATCH_CHOICE_QUIT;
8171 printf("invalid response '%s'\n", line);
8176 while (resp != 'y' && resp != 'n' && resp != 'q') {
8177 err = show_change(status, path, patch_file, n, nchanges,
8184 if (status == GOT_STATUS_MODIFY) {
8185 if (resp != 'y' && resp != 'n' && resp != 'q') {
8186 printf("invalid response '%c'\n", resp);
8189 } else if (resp != 'y' && resp != 'n') {
8190 printf("invalid response '%c'\n", resp);
8196 *choice = GOT_PATCH_CHOICE_YES;
8197 else if (resp == 'n')
8198 *choice = GOT_PATCH_CHOICE_NO;
8199 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8200 *choice = GOT_PATCH_CHOICE_QUIT;
8205 static const struct got_error *
8206 cmd_revert(int argc, char *argv[])
8208 const struct got_error *error = NULL;
8209 struct got_worktree *worktree = NULL;
8210 struct got_repository *repo = NULL;
8211 char *cwd = NULL, *path = NULL;
8212 struct got_pathlist_head paths;
8213 struct got_pathlist_entry *pe;
8214 int ch, can_recurse = 0, pflag = 0;
8215 FILE *patch_script_file = NULL;
8216 const char *patch_script_path = NULL;
8217 struct choose_patch_arg cpa;
8218 int *pack_fds = NULL;
8222 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8225 patch_script_path = optarg;
8243 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8244 "unveil", NULL) == -1)
8249 if (patch_script_path && !pflag)
8250 errx(1, "-F option can only be used together with -p option");
8252 cwd = getcwd(NULL, 0);
8254 error = got_error_from_errno("getcwd");
8258 error = got_repo_pack_fds_open(&pack_fds);
8262 error = got_worktree_open(&worktree, cwd);
8264 if (error->code == GOT_ERR_NOT_WORKTREE)
8265 error = wrap_not_worktree_error(error, "revert", cwd);
8269 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8274 if (patch_script_path) {
8275 patch_script_file = fopen(patch_script_path, "re");
8276 if (patch_script_file == NULL) {
8277 error = got_error_from_errno2("fopen",
8282 error = apply_unveil(got_repo_get_path(repo), 1,
8283 got_worktree_get_root_path(worktree));
8287 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8294 TAILQ_FOREACH(pe, &paths, entry) {
8295 if (asprintf(&ondisk_path, "%s/%s",
8296 got_worktree_get_root_path(worktree),
8298 error = got_error_from_errno("asprintf");
8301 if (lstat(ondisk_path, &sb) == -1) {
8302 if (errno == ENOENT) {
8306 error = got_error_from_errno2("lstat",
8312 if (S_ISDIR(sb.st_mode)) {
8313 error = got_error_msg(GOT_ERR_BAD_PATH,
8314 "reverting directories requires -R option");
8320 cpa.patch_script_file = patch_script_file;
8321 cpa.action = "revert";
8322 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8323 pflag ? choose_patch : NULL, &cpa, repo);
8325 if (patch_script_file && fclose(patch_script_file) == EOF &&
8327 error = got_error_from_errno2("fclose", patch_script_path);
8329 const struct got_error *close_err = got_repo_close(repo);
8334 got_worktree_close(worktree);
8336 const struct got_error *pack_err =
8337 got_repo_pack_fds_close(pack_fds);
8349 fprintf(stderr, "usage: %s commit [-NS] [-A author] [-F path] "
8350 "[-m message] [path ...]\n", getprogname());
8354 struct collect_commit_logmsg_arg {
8355 const char *cmdline_log;
8356 const char *prepared_log;
8357 int non_interactive;
8359 const char *worktree_path;
8360 const char *branch_name;
8361 const char *repo_path;
8366 static const struct got_error *
8367 read_prepared_logmsg(char **logmsg, const char *path)
8369 const struct got_error *err = NULL;
8375 memset(&sb, 0, sizeof(sb));
8377 f = fopen(path, "re");
8379 return got_error_from_errno2("fopen", path);
8381 if (fstat(fileno(f), &sb) == -1) {
8382 err = got_error_from_errno2("fstat", path);
8385 if (sb.st_size == 0) {
8386 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8390 *logmsg = malloc(sb.st_size + 1);
8391 if (*logmsg == NULL) {
8392 err = got_error_from_errno("malloc");
8396 r = fread(*logmsg, 1, sb.st_size, f);
8397 if (r != sb.st_size) {
8399 err = got_error_from_errno2("fread", path);
8401 err = got_error(GOT_ERR_IO);
8404 (*logmsg)[sb.st_size] = '\0';
8406 if (fclose(f) == EOF && err == NULL)
8407 err = got_error_from_errno2("fclose", path);
8415 static const struct got_error *
8416 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
8419 char *initial_content = NULL;
8420 struct got_pathlist_entry *pe;
8421 const struct got_error *err = NULL;
8422 char *template = NULL;
8423 struct collect_commit_logmsg_arg *a = arg;
8424 int initial_content_len;
8428 /* if a message was specified on the command line, just use it */
8429 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
8430 len = strlen(a->cmdline_log) + 1;
8431 *logmsg = malloc(len + 1);
8432 if (*logmsg == NULL)
8433 return got_error_from_errno("malloc");
8434 strlcpy(*logmsg, a->cmdline_log, len);
8436 } else if (a->prepared_log != NULL && a->non_interactive)
8437 return read_prepared_logmsg(logmsg, a->prepared_log);
8439 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
8440 return got_error_from_errno("asprintf");
8442 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
8446 if (a->prepared_log) {
8448 err = read_prepared_logmsg(&msg, a->prepared_log);
8451 if (write(fd, msg, strlen(msg)) == -1) {
8452 err = got_error_from_errno2("write", a->logmsg_path);
8459 initial_content_len = asprintf(&initial_content,
8460 "\n# changes to be committed on branch %s:\n",
8462 if (initial_content_len == -1) {
8463 err = got_error_from_errno("asprintf");
8467 if (write(fd, initial_content, initial_content_len) == -1) {
8468 err = got_error_from_errno2("write", a->logmsg_path);
8472 TAILQ_FOREACH(pe, commitable_paths, entry) {
8473 struct got_commitable *ct = pe->data;
8474 dprintf(fd, "# %c %s\n",
8475 got_commitable_get_status(ct),
8476 got_commitable_get_path(ct));
8479 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
8480 initial_content_len, a->prepared_log ? 0 : 1);
8482 free(initial_content);
8485 if (fd != -1 && close(fd) == -1 && err == NULL)
8486 err = got_error_from_errno2("close", a->logmsg_path);
8488 /* Editor is done; we can now apply unveil(2) */
8490 err = apply_unveil(a->repo_path, 0, a->worktree_path);
8498 static const struct got_error *
8499 cmd_commit(int argc, char *argv[])
8501 const struct got_error *error = NULL;
8502 struct got_worktree *worktree = NULL;
8503 struct got_repository *repo = NULL;
8504 char *cwd = NULL, *id_str = NULL;
8505 struct got_object_id *id = NULL;
8506 const char *logmsg = NULL;
8507 char *prepared_logmsg = NULL;
8508 struct collect_commit_logmsg_arg cl_arg;
8509 const char *author = NULL;
8510 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
8511 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8512 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8513 struct got_pathlist_head paths;
8514 int *pack_fds = NULL;
8517 cl_arg.logmsg_path = NULL;
8519 while ((ch = getopt(argc, argv, "A:F:m:NS")) != -1) {
8523 error = valid_author(author);
8529 option_conflict('F', 'm');
8530 prepared_logmsg = realpath(optarg, NULL);
8531 if (prepared_logmsg == NULL)
8532 return got_error_from_errno2("realpath",
8536 if (prepared_logmsg)
8537 option_conflict('m', 'F');
8541 non_interactive = 1;
8544 allow_bad_symlinks = 1;
8556 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8557 "unveil", NULL) == -1)
8560 cwd = getcwd(NULL, 0);
8562 error = got_error_from_errno("getcwd");
8566 error = got_repo_pack_fds_open(&pack_fds);
8570 error = got_worktree_open(&worktree, cwd);
8572 if (error->code == GOT_ERR_NOT_WORKTREE)
8573 error = wrap_not_worktree_error(error, "commit", cwd);
8577 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8580 if (rebase_in_progress) {
8581 error = got_error(GOT_ERR_REBASING);
8585 error = got_worktree_histedit_in_progress(&histedit_in_progress,
8590 error = get_gitconfig_path(&gitconfig_path);
8593 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8594 gitconfig_path, pack_fds);
8598 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8601 if (merge_in_progress) {
8602 error = got_error(GOT_ERR_MERGE_BUSY);
8606 error = get_author(&committer, repo, worktree);
8610 if (author != NULL && !strcmp(committer, author)) {
8611 error = got_error(GOT_ERR_COMMIT_REDUNDANT_AUTHOR);
8619 * unveil(2) traverses exec(2); if an editor is used we have
8620 * to apply unveil after the log message has been written.
8622 if (logmsg == NULL || strlen(logmsg) == 0)
8623 error = get_editor(&editor);
8625 error = apply_unveil(got_repo_get_path(repo), 0,
8626 got_worktree_get_root_path(worktree));
8630 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8634 cl_arg.editor = editor;
8635 cl_arg.cmdline_log = logmsg;
8636 cl_arg.prepared_log = prepared_logmsg;
8637 cl_arg.non_interactive = non_interactive;
8638 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8639 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
8640 if (!histedit_in_progress) {
8641 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
8642 error = got_error(GOT_ERR_COMMIT_BRANCH);
8645 cl_arg.branch_name += 11;
8647 cl_arg.repo_path = got_repo_get_path(repo);
8648 error = got_worktree_commit(&id, worktree, &paths, author, committer,
8649 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
8650 print_status, NULL, repo);
8652 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8653 cl_arg.logmsg_path != NULL)
8654 preserve_logmsg = 1;
8658 error = got_object_id_str(&id_str, id);
8661 printf("Created commit %s\n", id_str);
8663 if (preserve_logmsg) {
8664 fprintf(stderr, "%s: log message preserved in %s\n",
8665 getprogname(), cl_arg.logmsg_path);
8666 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8668 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8669 free(cl_arg.logmsg_path);
8671 const struct got_error *close_err = got_repo_close(repo);
8676 got_worktree_close(worktree);
8678 const struct got_error *pack_err =
8679 got_repo_pack_fds_close(pack_fds);
8685 free(gitconfig_path);
8688 free(prepared_logmsg);
8695 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
8696 "[-r repository-path] [-t tag] [remote-repository]\n",
8702 print_load_info(int print_colored, int print_found, int print_trees,
8703 int ncolored, int nfound, int ntrees)
8705 if (print_colored) {
8706 printf("%d commit%s colored", ncolored,
8707 ncolored == 1 ? "" : "s");
8710 printf("%s%d object%s found",
8711 ncolored > 0 ? "; " : "",
8712 nfound, nfound == 1 ? "" : "s");
8715 printf("; %d tree%s scanned", ntrees,
8716 ntrees == 1 ? "" : "s");
8720 struct got_send_progress_arg {
8721 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8728 int last_nobj_total;
8732 int printed_something;
8734 struct got_pathlist_head *delete_branches;
8737 static const struct got_error *
8738 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8739 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8740 int nobj_written, off_t bytes_sent, const char *refname, int success)
8742 struct got_send_progress_arg *a = arg;
8743 char scaled_packsize[FMT_SCALED_STRSIZE];
8744 char scaled_sent[FMT_SCALED_STRSIZE];
8745 int p_deltify = 0, p_written = 0, p_sent = 0;
8746 int print_colored = 0, print_found = 0, print_trees = 0;
8747 int print_searching = 0, print_total = 0;
8748 int print_deltify = 0, print_written = 0, print_sent = 0;
8750 if (a->verbosity < 0)
8754 const char *status = success ? "accepted" : "rejected";
8757 struct got_pathlist_entry *pe;
8758 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8759 const char *branchname = pe->path;
8760 if (got_path_cmp(branchname, refname,
8761 strlen(branchname), strlen(refname)) == 0) {
8763 a->sent_something = 1;
8769 if (a->printed_something)
8771 printf("Server has %s %s", status, refname);
8772 a->printed_something = 1;
8776 if (a->last_ncolored != ncolored) {
8778 a->last_ncolored = ncolored;
8781 if (a->last_nfound != nfound) {
8784 a->last_nfound = nfound;
8787 if (a->last_ntrees != ntrees) {
8791 a->last_ntrees = ntrees;
8794 if ((print_colored || print_found || print_trees) &&
8797 print_load_info(print_colored, print_found, print_trees,
8798 ncolored, nfound, ntrees);
8799 a->printed_something = 1;
8802 } else if (!a->loading_done) {
8804 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8806 a->loading_done = 1;
8809 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8810 return got_error_from_errno("fmt_scaled");
8811 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8812 return got_error_from_errno("fmt_scaled");
8814 if (a->last_ncommits != ncommits) {
8815 print_searching = 1;
8816 a->last_ncommits = ncommits;
8819 if (a->last_nobj_total != nobj_total) {
8820 print_searching = 1;
8822 a->last_nobj_total = nobj_total;
8825 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8826 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8827 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8828 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8829 return got_error(GOT_ERR_NO_SPACE);
8832 if (nobj_deltify > 0 || nobj_written > 0) {
8833 if (nobj_deltify > 0) {
8834 p_deltify = (nobj_deltify * 100) / nobj_total;
8835 if (p_deltify != a->last_p_deltify) {
8836 a->last_p_deltify = p_deltify;
8837 print_searching = 1;
8842 if (nobj_written > 0) {
8843 p_written = (nobj_written * 100) / nobj_total;
8844 if (p_written != a->last_p_written) {
8845 a->last_p_written = p_written;
8846 print_searching = 1;
8854 if (bytes_sent > 0) {
8855 p_sent = (bytes_sent * 100) / packfile_size;
8856 if (p_sent != a->last_p_sent) {
8857 a->last_p_sent = p_sent;
8858 print_searching = 1;
8864 a->sent_something = 1;
8867 if (print_searching || print_total || print_deltify || print_written ||
8870 if (print_searching)
8871 printf("packing %d reference%s", ncommits,
8872 ncommits == 1 ? "" : "s");
8874 printf("; %d object%s", nobj_total,
8875 nobj_total == 1 ? "" : "s");
8877 printf("; deltify: %d%%", p_deltify);
8879 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8880 scaled_packsize, p_sent);
8881 else if (print_written)
8882 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8883 scaled_packsize, p_written);
8884 if (print_searching || print_total || print_deltify ||
8885 print_written || print_sent) {
8886 a->printed_something = 1;
8892 static const struct got_error *
8893 cmd_send(int argc, char *argv[])
8895 const struct got_error *error = NULL;
8896 char *cwd = NULL, *repo_path = NULL;
8897 const char *remote_name;
8898 char *proto = NULL, *host = NULL, *port = NULL;
8899 char *repo_name = NULL, *server_path = NULL;
8900 const struct got_remote_repo *remotes, *remote = NULL;
8901 int nremotes, nbranches = 0, ndelete_branches = 0;
8902 struct got_repository *repo = NULL;
8903 struct got_worktree *worktree = NULL;
8904 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8905 struct got_pathlist_head branches;
8906 struct got_pathlist_head tags;
8907 struct got_reflist_head all_branches;
8908 struct got_reflist_head all_tags;
8909 struct got_pathlist_head delete_args;
8910 struct got_pathlist_head delete_branches;
8911 struct got_reflist_entry *re;
8912 struct got_pathlist_entry *pe;
8913 int i, ch, sendfd = -1, sendstatus;
8915 struct got_send_progress_arg spa;
8916 int verbosity = 0, overwrite_refs = 0;
8917 int send_all_branches = 0, send_all_tags = 0;
8918 struct got_reference *ref = NULL;
8919 int *pack_fds = NULL;
8921 TAILQ_INIT(&branches);
8923 TAILQ_INIT(&all_branches);
8924 TAILQ_INIT(&all_tags);
8925 TAILQ_INIT(&delete_args);
8926 TAILQ_INIT(&delete_branches);
8928 while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
8931 send_all_branches = 1;
8934 error = got_pathlist_append(&branches, optarg, NULL);
8940 error = got_pathlist_append(&delete_args, optarg, NULL);
8951 repo_path = realpath(optarg, NULL);
8952 if (repo_path == NULL)
8953 return got_error_from_errno2("realpath",
8955 got_path_strip_trailing_slashes(repo_path);
8961 error = got_pathlist_append(&tags, optarg, NULL);
8968 else if (verbosity < 3)
8979 if (send_all_branches && !TAILQ_EMPTY(&branches))
8980 option_conflict('a', 'b');
8981 if (send_all_tags && !TAILQ_EMPTY(&tags))
8982 option_conflict('T', 't');
8986 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8988 remote_name = argv[0];
8992 cwd = getcwd(NULL, 0);
8994 error = got_error_from_errno("getcwd");
8998 error = got_repo_pack_fds_open(&pack_fds);
9002 if (repo_path == NULL) {
9003 error = got_worktree_open(&worktree, cwd);
9004 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9010 strdup(got_worktree_get_repo_path(worktree));
9011 if (repo_path == NULL)
9012 error = got_error_from_errno("strdup");
9016 repo_path = strdup(cwd);
9017 if (repo_path == NULL) {
9018 error = got_error_from_errno("strdup");
9024 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9029 worktree_conf = got_worktree_get_gotconfig(worktree);
9030 if (worktree_conf) {
9031 got_gotconfig_get_remotes(&nremotes, &remotes,
9033 for (i = 0; i < nremotes; i++) {
9034 if (strcmp(remotes[i].name, remote_name) == 0) {
9035 remote = &remotes[i];
9041 if (remote == NULL) {
9042 repo_conf = got_repo_get_gotconfig(repo);
9044 got_gotconfig_get_remotes(&nremotes, &remotes,
9046 for (i = 0; i < nremotes; i++) {
9047 if (strcmp(remotes[i].name, remote_name) == 0) {
9048 remote = &remotes[i];
9054 if (remote == NULL) {
9055 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9056 for (i = 0; i < nremotes; i++) {
9057 if (strcmp(remotes[i].name, remote_name) == 0) {
9058 remote = &remotes[i];
9063 if (remote == NULL) {
9064 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9068 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9069 &repo_name, remote->send_url);
9073 if (strcmp(proto, "git") == 0) {
9075 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9076 "sendfd dns inet unveil", NULL) == -1)
9079 } else if (strcmp(proto, "git+ssh") == 0 ||
9080 strcmp(proto, "ssh") == 0) {
9082 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9083 "sendfd unveil", NULL) == -1)
9086 } else if (strcmp(proto, "http") == 0 ||
9087 strcmp(proto, "git+http") == 0) {
9088 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9091 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9095 error = got_dial_apply_unveil(proto);
9099 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9103 if (send_all_branches) {
9104 error = got_ref_list(&all_branches, repo, "refs/heads",
9105 got_ref_cmp_by_name, NULL);
9108 TAILQ_FOREACH(re, &all_branches, entry) {
9109 const char *branchname = got_ref_get_name(re->ref);
9110 error = got_pathlist_append(&branches,
9116 } else if (nbranches == 0) {
9117 for (i = 0; i < remote->nsend_branches; i++) {
9118 got_pathlist_append(&branches,
9119 remote->send_branches[i], NULL);
9123 if (send_all_tags) {
9124 error = got_ref_list(&all_tags, repo, "refs/tags",
9125 got_ref_cmp_by_name, NULL);
9128 TAILQ_FOREACH(re, &all_tags, entry) {
9129 const char *tagname = got_ref_get_name(re->ref);
9130 error = got_pathlist_append(&tags,
9138 * To prevent accidents only branches in refs/heads/ can be deleted
9139 * with 'got send -d'.
9140 * Deleting anything else requires local repository access or Git.
9142 TAILQ_FOREACH(pe, &delete_args, entry) {
9143 const char *branchname = pe->path;
9145 struct got_pathlist_entry *new;
9146 if (strncmp(branchname, "refs/heads/", 11) == 0) {
9147 s = strdup(branchname);
9149 error = got_error_from_errno("strdup");
9153 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
9154 error = got_error_from_errno("asprintf");
9158 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
9159 if (error || new == NULL /* duplicate */)
9166 if (nbranches == 0 && ndelete_branches == 0) {
9167 struct got_reference *head_ref;
9169 error = got_ref_open(&head_ref, repo,
9170 got_worktree_get_head_ref_name(worktree), 0);
9172 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
9175 if (got_ref_is_symbolic(head_ref)) {
9176 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
9177 got_ref_close(head_ref);
9182 error = got_pathlist_append(&branches, got_ref_get_name(ref),
9190 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
9191 port ? ":" : "", port ? port : "");
9193 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
9194 server_path, verbosity);
9198 memset(&spa, 0, sizeof(spa));
9199 spa.last_scaled_packsize[0] = '\0';
9200 spa.last_p_deltify = -1;
9201 spa.last_p_written = -1;
9202 spa.verbosity = verbosity;
9203 spa.delete_branches = &delete_branches;
9204 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
9205 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
9206 check_cancelled, NULL);
9207 if (spa.printed_something)
9211 if (!spa.sent_something && verbosity >= 0)
9212 printf("Already up-to-date\n");
9215 if (kill(sendpid, SIGTERM) == -1)
9216 error = got_error_from_errno("kill");
9217 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
9218 error = got_error_from_errno("waitpid");
9220 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
9221 error = got_error_from_errno("close");
9223 const struct got_error *close_err = got_repo_close(repo);
9228 got_worktree_close(worktree);
9230 const struct got_error *pack_err =
9231 got_repo_pack_fds_close(pack_fds);
9237 got_pathlist_free(&branches);
9238 got_pathlist_free(&tags);
9239 got_ref_list_free(&all_branches);
9240 got_ref_list_free(&all_tags);
9241 got_pathlist_free(&delete_args);
9242 TAILQ_FOREACH(pe, &delete_branches, entry)
9243 free((char *)pe->path);
9244 got_pathlist_free(&delete_branches);
9256 usage_cherrypick(void)
9258 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
9262 static const struct got_error *
9263 cmd_cherrypick(int argc, char *argv[])
9265 const struct got_error *error = NULL;
9266 struct got_worktree *worktree = NULL;
9267 struct got_repository *repo = NULL;
9268 char *cwd = NULL, *commit_id_str = NULL;
9269 struct got_object_id *commit_id = NULL;
9270 struct got_commit_object *commit = NULL;
9271 struct got_object_qid *pid;
9273 struct got_update_progress_arg upa;
9274 int *pack_fds = NULL;
9276 while ((ch = getopt(argc, argv, "")) != -1) {
9288 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9289 "unveil", NULL) == -1)
9295 cwd = getcwd(NULL, 0);
9297 error = got_error_from_errno("getcwd");
9301 error = got_repo_pack_fds_open(&pack_fds);
9305 error = got_worktree_open(&worktree, cwd);
9307 if (error->code == GOT_ERR_NOT_WORKTREE)
9308 error = wrap_not_worktree_error(error, "cherrypick",
9313 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9318 error = apply_unveil(got_repo_get_path(repo), 0,
9319 got_worktree_get_root_path(worktree));
9323 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9324 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9327 error = got_object_id_str(&commit_id_str, commit_id);
9331 error = got_object_open_as_commit(&commit, repo, commit_id);
9334 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9335 memset(&upa, 0, sizeof(upa));
9336 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
9337 commit_id, repo, update_progress, &upa, check_cancelled,
9342 if (upa.did_something)
9343 printf("Merged commit %s\n", commit_id_str);
9344 print_merge_progress_stats(&upa);
9347 got_object_commit_close(commit);
9348 free(commit_id_str);
9350 got_worktree_close(worktree);
9352 const struct got_error *close_err = got_repo_close(repo);
9357 const struct got_error *pack_err =
9358 got_repo_pack_fds_close(pack_fds);
9369 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
9373 static const struct got_error *
9374 cmd_backout(int argc, char *argv[])
9376 const struct got_error *error = NULL;
9377 struct got_worktree *worktree = NULL;
9378 struct got_repository *repo = NULL;
9379 char *cwd = NULL, *commit_id_str = NULL;
9380 struct got_object_id *commit_id = NULL;
9381 struct got_commit_object *commit = NULL;
9382 struct got_object_qid *pid;
9384 struct got_update_progress_arg upa;
9385 int *pack_fds = NULL;
9387 while ((ch = getopt(argc, argv, "")) != -1) {
9399 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9400 "unveil", NULL) == -1)
9406 cwd = getcwd(NULL, 0);
9408 error = got_error_from_errno("getcwd");
9412 error = got_repo_pack_fds_open(&pack_fds);
9416 error = got_worktree_open(&worktree, cwd);
9418 if (error->code == GOT_ERR_NOT_WORKTREE)
9419 error = wrap_not_worktree_error(error, "backout", cwd);
9423 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9428 error = apply_unveil(got_repo_get_path(repo), 0,
9429 got_worktree_get_root_path(worktree));
9433 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9434 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9437 error = got_object_id_str(&commit_id_str, commit_id);
9441 error = got_object_open_as_commit(&commit, repo, commit_id);
9444 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9446 error = got_error(GOT_ERR_ROOT_COMMIT);
9450 memset(&upa, 0, sizeof(upa));
9451 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
9452 repo, update_progress, &upa, check_cancelled, NULL);
9456 if (upa.did_something)
9457 printf("Backed out commit %s\n", commit_id_str);
9458 print_merge_progress_stats(&upa);
9461 got_object_commit_close(commit);
9462 free(commit_id_str);
9464 got_worktree_close(worktree);
9466 const struct got_error *close_err = got_repo_close(repo);
9471 const struct got_error *pack_err =
9472 got_repo_pack_fds_close(pack_fds);
9482 fprintf(stderr, "usage: %s rebase [-aclX] [branch]\n", getprogname());
9487 trim_logmsg(char *logmsg, int limit)
9492 len = strlen(logmsg);
9496 nl = strchr(logmsg, '\n');
9501 static const struct got_error *
9502 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
9504 const struct got_error *err;
9505 char *logmsg0 = NULL;
9508 err = got_object_commit_get_logmsg(&logmsg0, commit);
9513 while (isspace((unsigned char)s[0]))
9516 *logmsg = strdup(s);
9517 if (*logmsg == NULL) {
9518 err = got_error_from_errno("strdup");
9522 trim_logmsg(*logmsg, limit);
9528 static const struct got_error *
9529 show_rebase_merge_conflict(struct got_object_id *id,
9530 struct got_repository *repo)
9532 const struct got_error *err;
9533 struct got_commit_object *commit = NULL;
9534 char *id_str = NULL, *logmsg = NULL;
9536 err = got_object_open_as_commit(&commit, repo, id);
9540 err = got_object_id_str(&id_str, id);
9546 err = get_short_logmsg(&logmsg, 42, commit);
9550 printf("%s -> merge conflict: %s\n", id_str, logmsg);
9553 got_object_commit_close(commit);
9558 static const struct got_error *
9559 show_rebase_progress(struct got_commit_object *commit,
9560 struct got_object_id *old_id, struct got_object_id *new_id)
9562 const struct got_error *err;
9563 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9565 err = got_object_id_str(&old_id_str, old_id);
9570 err = got_object_id_str(&new_id_str, new_id);
9575 old_id_str[12] = '\0';
9577 new_id_str[12] = '\0';
9579 err = get_short_logmsg(&logmsg, 42, commit);
9583 printf("%s -> %s: %s\n", old_id_str,
9584 new_id_str ? new_id_str : "no-op change", logmsg);
9592 static const struct got_error *
9593 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
9594 struct got_reference *branch, struct got_reference *new_base_branch,
9595 struct got_reference *tmp_branch, struct got_repository *repo,
9598 printf("Switching work tree to %s\n", got_ref_get_name(branch));
9599 return got_worktree_rebase_complete(worktree, fileindex,
9600 new_base_branch, tmp_branch, branch, repo, create_backup);
9603 static const struct got_error *
9604 rebase_commit(struct got_pathlist_head *merged_paths,
9605 struct got_worktree *worktree, struct got_fileindex *fileindex,
9606 struct got_reference *tmp_branch, const char *committer,
9607 struct got_object_id *commit_id, struct got_repository *repo)
9609 const struct got_error *error;
9610 struct got_commit_object *commit;
9611 struct got_object_id *new_commit_id;
9613 error = got_object_open_as_commit(&commit, repo, commit_id);
9617 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
9618 worktree, fileindex, tmp_branch, committer, commit, commit_id,
9621 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
9623 error = show_rebase_progress(commit, commit_id, NULL);
9625 error = show_rebase_progress(commit, commit_id, new_commit_id);
9626 free(new_commit_id);
9629 got_object_commit_close(commit);
9633 struct check_path_prefix_arg {
9634 const char *path_prefix;
9639 static const struct got_error *
9640 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
9641 struct got_blob_object *blob2, FILE *f1, FILE *f2,
9642 struct got_object_id *id1, struct got_object_id *id2,
9643 const char *path1, const char *path2,
9644 mode_t mode1, mode_t mode2, struct got_repository *repo)
9646 struct check_path_prefix_arg *a = arg;
9648 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
9649 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
9650 return got_error(a->errcode);
9655 static const struct got_error *
9656 check_path_prefix(struct got_object_id *parent_id,
9657 struct got_object_id *commit_id, const char *path_prefix,
9658 int errcode, struct got_repository *repo)
9660 const struct got_error *err;
9661 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
9662 struct got_commit_object *commit = NULL, *parent_commit = NULL;
9663 struct check_path_prefix_arg cpp_arg;
9665 if (got_path_is_root_dir(path_prefix))
9668 err = got_object_open_as_commit(&commit, repo, commit_id);
9672 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
9676 err = got_object_open_as_tree(&tree1, repo,
9677 got_object_commit_get_tree_id(parent_commit));
9681 err = got_object_open_as_tree(&tree2, repo,
9682 got_object_commit_get_tree_id(commit));
9686 cpp_arg.path_prefix = path_prefix;
9687 while (cpp_arg.path_prefix[0] == '/')
9688 cpp_arg.path_prefix++;
9689 cpp_arg.len = strlen(cpp_arg.path_prefix);
9690 cpp_arg.errcode = errcode;
9691 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
9692 check_path_prefix_in_diff, &cpp_arg, 0);
9695 got_object_tree_close(tree1);
9697 got_object_tree_close(tree2);
9699 got_object_commit_close(commit);
9701 got_object_commit_close(parent_commit);
9705 static const struct got_error *
9706 collect_commits(struct got_object_id_queue *commits,
9707 struct got_object_id *initial_commit_id,
9708 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
9709 const char *path_prefix, int path_prefix_errcode,
9710 struct got_repository *repo)
9712 const struct got_error *err = NULL;
9713 struct got_commit_graph *graph = NULL;
9714 struct got_object_id parent_id, commit_id;
9715 struct got_object_qid *qid;
9717 err = got_commit_graph_open(&graph, "/", 1);
9721 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
9722 check_cancelled, NULL);
9726 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
9727 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
9728 err = got_commit_graph_iter_next(&parent_id, graph, repo,
9729 check_cancelled, NULL);
9731 if (err->code == GOT_ERR_ITER_COMPLETED) {
9732 err = got_error_msg(GOT_ERR_ANCESTRY,
9733 "ran out of commits to rebase before "
9734 "youngest common ancestor commit has "
9739 err = check_path_prefix(&parent_id, &commit_id,
9740 path_prefix, path_prefix_errcode, repo);
9744 err = got_object_qid_alloc(&qid, &commit_id);
9747 STAILQ_INSERT_HEAD(commits, qid, entry);
9749 memcpy(&commit_id, &parent_id, sizeof(commit_id));
9753 got_commit_graph_close(graph);
9757 static const struct got_error *
9758 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9760 const struct got_error *err = NULL;
9761 time_t committer_time;
9763 char datebuf[11]; /* YYYY-MM-DD + NUL */
9764 char *author0 = NULL, *author, *smallerthan;
9765 char *logmsg0 = NULL, *logmsg, *newline;
9767 committer_time = got_object_commit_get_committer_time(commit);
9768 if (gmtime_r(&committer_time, &tm) == NULL)
9769 return got_error_from_errno("gmtime_r");
9770 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9771 return got_error(GOT_ERR_NO_SPACE);
9773 author0 = strdup(got_object_commit_get_author(commit));
9774 if (author0 == NULL)
9775 return got_error_from_errno("strdup");
9777 smallerthan = strchr(author, '<');
9778 if (smallerthan && smallerthan[1] != '\0')
9779 author = smallerthan + 1;
9780 author[strcspn(author, "@>")] = '\0';
9782 err = got_object_commit_get_logmsg(&logmsg0, commit);
9786 while (*logmsg == '\n')
9788 newline = strchr(logmsg, '\n');
9792 if (asprintf(brief_str, "%s %s %s",
9793 datebuf, author, logmsg) == -1)
9794 err = got_error_from_errno("asprintf");
9801 static const struct got_error *
9802 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9803 struct got_repository *repo)
9805 const struct got_error *err;
9808 err = got_object_id_str(&id_str, id);
9812 err = got_ref_delete(ref, repo);
9816 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
9822 static const struct got_error *
9823 print_backup_ref(const char *branch_name, const char *new_id_str,
9824 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
9825 struct got_reflist_object_id_map *refs_idmap,
9826 struct got_repository *repo)
9828 const struct got_error *err = NULL;
9829 struct got_reflist_head *refs;
9830 char *refs_str = NULL;
9831 struct got_object_id *new_commit_id = NULL;
9832 struct got_commit_object *new_commit = NULL;
9833 char *new_commit_brief_str = NULL;
9834 struct got_object_id *yca_id = NULL;
9835 struct got_commit_object *yca_commit = NULL;
9836 char *yca_id_str = NULL, *yca_brief_str = NULL;
9837 char *custom_refs_str;
9839 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9840 return got_error_from_errno("asprintf");
9842 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9843 0, 0, refs_idmap, custom_refs_str);
9847 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9851 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9853 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
9858 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9862 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9866 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9867 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9871 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9872 refs_str ? " (" : "", refs_str ? refs_str : "",
9873 refs_str ? ")" : "", new_commit_brief_str);
9874 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9875 got_object_id_cmp(yca_id, old_commit_id) != 0) {
9879 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9883 err = get_commit_brief_str(&yca_brief_str, yca_commit);
9887 err = got_object_id_str(&yca_id_str, yca_id);
9891 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9893 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
9897 printf("history forked at %s%s%s%s\n %s\n",
9899 refs_str ? " (" : "", refs_str ? refs_str : "",
9900 refs_str ? ")" : "", yca_brief_str);
9903 free(custom_refs_str);
9904 free(new_commit_id);
9908 free(yca_brief_str);
9910 got_object_commit_close(new_commit);
9912 got_object_commit_close(yca_commit);
9917 static const struct got_error *
9918 process_backup_refs(const char *backup_ref_prefix,
9919 const char *wanted_branch_name,
9920 int delete, struct got_repository *repo)
9922 const struct got_error *err;
9923 struct got_reflist_head refs, backup_refs;
9924 struct got_reflist_entry *re;
9925 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9926 struct got_object_id *old_commit_id = NULL;
9927 char *branch_name = NULL;
9928 struct got_commit_object *old_commit = NULL;
9929 struct got_reflist_object_id_map *refs_idmap = NULL;
9930 int wanted_branch_found = 0;
9933 TAILQ_INIT(&backup_refs);
9935 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9939 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9943 if (wanted_branch_name) {
9944 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9945 wanted_branch_name += 11;
9948 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9949 got_ref_cmp_by_commit_timestamp_descending, repo);
9953 TAILQ_FOREACH(re, &backup_refs, entry) {
9954 const char *refname = got_ref_get_name(re->ref);
9957 err = check_cancelled(NULL);
9961 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9965 err = got_object_open_as_commit(&old_commit, repo,
9970 if (strncmp(backup_ref_prefix, refname,
9971 backup_ref_prefix_len) == 0)
9972 refname += backup_ref_prefix_len;
9974 while (refname[0] == '/')
9977 branch_name = strdup(refname);
9978 if (branch_name == NULL) {
9979 err = got_error_from_errno("strdup");
9982 slash = strrchr(branch_name, '/');
9985 refname += strlen(branch_name) + 1;
9988 if (wanted_branch_name == NULL ||
9989 strcmp(wanted_branch_name, branch_name) == 0) {
9990 wanted_branch_found = 1;
9992 err = delete_backup_ref(re->ref,
9993 old_commit_id, repo);
9995 err = print_backup_ref(branch_name, refname,
9996 old_commit_id, old_commit, refs_idmap,
10003 free(old_commit_id);
10004 old_commit_id = NULL;
10006 branch_name = NULL;
10007 got_object_commit_close(old_commit);
10011 if (wanted_branch_name && !wanted_branch_found) {
10012 err = got_error_fmt(GOT_ERR_NOT_REF,
10013 "%s/%s/", backup_ref_prefix, wanted_branch_name);
10017 got_reflist_object_id_map_free(refs_idmap);
10018 got_ref_list_free(&refs);
10019 got_ref_list_free(&backup_refs);
10020 free(old_commit_id);
10023 got_object_commit_close(old_commit);
10027 static const struct got_error *
10028 abort_progress(void *arg, unsigned char status, const char *path)
10031 * Unversioned files should not clutter progress output when
10032 * an operation is aborted.
10034 if (status == GOT_STATUS_UNVERSIONED)
10037 return update_progress(arg, status, path);
10040 static const struct got_error *
10041 cmd_rebase(int argc, char *argv[])
10043 const struct got_error *error = NULL;
10044 struct got_worktree *worktree = NULL;
10045 struct got_repository *repo = NULL;
10046 struct got_fileindex *fileindex = NULL;
10047 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
10048 struct got_reference *branch = NULL;
10049 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
10050 struct got_object_id *commit_id = NULL, *parent_id = NULL;
10051 struct got_object_id *resume_commit_id = NULL;
10052 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
10053 struct got_commit_object *commit = NULL;
10054 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
10055 int histedit_in_progress = 0, merge_in_progress = 0;
10056 int create_backup = 1, list_backups = 0, delete_backups = 0;
10057 struct got_object_id_queue commits;
10058 struct got_pathlist_head merged_paths;
10059 const struct got_object_id_queue *parent_ids;
10060 struct got_object_qid *qid, *pid;
10061 struct got_update_progress_arg upa;
10062 int *pack_fds = NULL;
10064 STAILQ_INIT(&commits);
10065 TAILQ_INIT(&merged_paths);
10066 memset(&upa, 0, sizeof(upa));
10068 while ((ch = getopt(argc, argv, "aclX")) != -1) {
10074 continue_rebase = 1;
10080 delete_backups = 1;
10092 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10093 "unveil", NULL) == -1)
10096 if (list_backups) {
10098 option_conflict('l', 'a');
10099 if (continue_rebase)
10100 option_conflict('l', 'c');
10101 if (delete_backups)
10102 option_conflict('l', 'X');
10103 if (argc != 0 && argc != 1)
10105 } else if (delete_backups) {
10107 option_conflict('X', 'a');
10108 if (continue_rebase)
10109 option_conflict('X', 'c');
10111 option_conflict('l', 'X');
10112 if (argc != 0 && argc != 1)
10115 if (abort_rebase && continue_rebase)
10117 else if (abort_rebase || continue_rebase) {
10120 } else if (argc != 1)
10124 cwd = getcwd(NULL, 0);
10126 error = got_error_from_errno("getcwd");
10130 error = got_repo_pack_fds_open(&pack_fds);
10134 error = got_worktree_open(&worktree, cwd);
10136 if (list_backups || delete_backups) {
10137 if (error->code != GOT_ERR_NOT_WORKTREE)
10140 if (error->code == GOT_ERR_NOT_WORKTREE)
10141 error = wrap_not_worktree_error(error,
10147 error = get_gitconfig_path(&gitconfig_path);
10150 error = got_repo_open(&repo,
10151 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10152 gitconfig_path, pack_fds);
10156 error = get_author(&committer, repo, worktree);
10157 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
10160 error = apply_unveil(got_repo_get_path(repo), 0,
10161 worktree ? got_worktree_get_root_path(worktree) : NULL);
10165 if (list_backups || delete_backups) {
10166 error = process_backup_refs(
10167 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
10168 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10169 goto done; /* nothing else to do */
10172 error = got_worktree_histedit_in_progress(&histedit_in_progress,
10176 if (histedit_in_progress) {
10177 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10181 error = got_worktree_merge_in_progress(&merge_in_progress,
10185 if (merge_in_progress) {
10186 error = got_error(GOT_ERR_MERGE_BUSY);
10190 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10194 if (abort_rebase) {
10195 if (!rebase_in_progress) {
10196 error = got_error(GOT_ERR_NOT_REBASING);
10199 error = got_worktree_rebase_continue(&resume_commit_id,
10200 &new_base_branch, &tmp_branch, &branch, &fileindex,
10204 printf("Switching work tree to %s\n",
10205 got_ref_get_symref_target(new_base_branch));
10206 error = got_worktree_rebase_abort(worktree, fileindex, repo,
10207 new_base_branch, abort_progress, &upa);
10210 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
10211 print_merge_progress_stats(&upa);
10212 goto done; /* nothing else to do */
10215 if (continue_rebase) {
10216 if (!rebase_in_progress) {
10217 error = got_error(GOT_ERR_NOT_REBASING);
10220 error = got_worktree_rebase_continue(&resume_commit_id,
10221 &new_base_branch, &tmp_branch, &branch, &fileindex,
10226 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
10227 committer, resume_commit_id, repo);
10231 yca_id = got_object_id_dup(resume_commit_id);
10232 if (yca_id == NULL) {
10233 error = got_error_from_errno("got_object_id_dup");
10237 error = got_ref_open(&branch, repo, argv[0], 0);
10240 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10241 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10242 "will not rebase a branch which lives outside "
10243 "the \"refs/heads/\" reference namespace");
10248 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
10252 if (!continue_rebase) {
10253 struct got_object_id *base_commit_id;
10255 base_commit_id = got_worktree_get_base_commit_id(worktree);
10256 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10257 base_commit_id, branch_head_commit_id, 1, repo,
10258 check_cancelled, NULL);
10261 if (yca_id == NULL) {
10262 error = got_error_msg(GOT_ERR_ANCESTRY,
10263 "specified branch shares no common ancestry "
10264 "with work tree's branch");
10268 error = check_same_branch(base_commit_id, branch, yca_id, repo);
10270 if (error->code != GOT_ERR_ANCESTRY)
10274 struct got_pathlist_head paths;
10275 printf("%s is already based on %s\n",
10276 got_ref_get_name(branch),
10277 got_worktree_get_head_ref_name(worktree));
10278 error = switch_head_ref(branch, branch_head_commit_id,
10282 error = got_worktree_set_base_commit_id(worktree, repo,
10283 branch_head_commit_id);
10286 TAILQ_INIT(&paths);
10287 error = got_pathlist_append(&paths, "", NULL);
10290 error = got_worktree_checkout_files(worktree,
10291 &paths, repo, update_progress, &upa,
10292 check_cancelled, NULL);
10293 got_pathlist_free(&paths);
10296 if (upa.did_something) {
10298 error = got_object_id_str(&id_str,
10299 branch_head_commit_id);
10302 printf("Updated to %s: %s\n",
10303 got_worktree_get_head_ref_name(worktree),
10307 printf("Already up-to-date\n");
10308 print_update_progress_stats(&upa);
10313 commit_id = branch_head_commit_id;
10314 error = got_object_open_as_commit(&commit, repo, commit_id);
10318 parent_ids = got_object_commit_get_parent_ids(commit);
10319 pid = STAILQ_FIRST(parent_ids);
10321 error = got_error(GOT_ERR_EMPTY_REBASE);
10324 error = collect_commits(&commits, commit_id, &pid->id,
10325 yca_id, got_worktree_get_path_prefix(worktree),
10326 GOT_ERR_REBASE_PATH, repo);
10327 got_object_commit_close(commit);
10332 if (!continue_rebase) {
10333 error = got_worktree_rebase_prepare(&new_base_branch,
10334 &tmp_branch, &fileindex, worktree, branch, repo);
10339 if (STAILQ_EMPTY(&commits)) {
10340 if (continue_rebase) {
10341 error = rebase_complete(worktree, fileindex,
10342 branch, new_base_branch, tmp_branch, repo,
10346 /* Fast-forward the reference of the branch. */
10347 struct got_object_id *new_head_commit_id;
10349 error = got_ref_resolve(&new_head_commit_id, repo,
10353 error = got_object_id_str(&id_str, new_head_commit_id);
10356 printf("Forwarding %s to commit %s\n",
10357 got_ref_get_name(branch), id_str);
10359 error = got_ref_change_ref(branch,
10360 new_head_commit_id);
10363 /* No backup needed since objects did not change. */
10369 STAILQ_FOREACH(qid, &commits, entry) {
10371 commit_id = &qid->id;
10372 parent_id = pid ? &pid->id : yca_id;
10375 memset(&upa, 0, sizeof(upa));
10376 error = got_worktree_rebase_merge_files(&merged_paths,
10377 worktree, fileindex, parent_id, commit_id, repo,
10378 update_progress, &upa, check_cancelled, NULL);
10382 print_merge_progress_stats(&upa);
10383 if (upa.conflicts > 0 || upa.missing > 0 ||
10384 upa.not_deleted > 0 || upa.unversioned > 0) {
10385 if (upa.conflicts > 0) {
10386 error = show_rebase_merge_conflict(&qid->id,
10391 got_worktree_rebase_pathlist_free(&merged_paths);
10395 error = rebase_commit(&merged_paths, worktree, fileindex,
10396 tmp_branch, committer, commit_id, repo);
10397 got_worktree_rebase_pathlist_free(&merged_paths);
10402 if (upa.conflicts > 0 || upa.missing > 0 ||
10403 upa.not_deleted > 0 || upa.unversioned > 0) {
10404 error = got_worktree_rebase_postpone(worktree, fileindex);
10407 if (upa.conflicts > 0 && upa.missing == 0 &&
10408 upa.not_deleted == 0 && upa.unversioned == 0) {
10409 error = got_error_msg(GOT_ERR_CONFLICTS,
10410 "conflicts must be resolved before rebasing "
10412 } else if (upa.conflicts > 0) {
10413 error = got_error_msg(GOT_ERR_CONFLICTS,
10414 "conflicts must be resolved before rebasing "
10415 "can continue; changes destined for some "
10416 "files were not yet merged and should be "
10417 "merged manually if required before the "
10418 "rebase operation is continued");
10420 error = got_error_msg(GOT_ERR_CONFLICTS,
10421 "changes destined for some files were not "
10422 "yet merged and should be merged manually "
10423 "if required before the rebase operation "
10427 error = rebase_complete(worktree, fileindex, branch,
10428 new_base_branch, tmp_branch, repo, create_backup);
10432 free(gitconfig_path);
10433 got_object_id_queue_free(&commits);
10434 free(branch_head_commit_id);
10435 free(resume_commit_id);
10438 got_object_commit_close(commit);
10440 got_ref_close(branch);
10441 if (new_base_branch)
10442 got_ref_close(new_base_branch);
10444 got_ref_close(tmp_branch);
10446 got_worktree_close(worktree);
10448 const struct got_error *close_err = got_repo_close(repo);
10453 const struct got_error *pack_err =
10454 got_repo_pack_fds_close(pack_fds);
10462 usage_histedit(void)
10464 fprintf(stderr, "usage: %s histedit [-aceflmX] [-F histedit-script] "
10465 "[branch]\n", getprogname());
10469 #define GOT_HISTEDIT_PICK 'p'
10470 #define GOT_HISTEDIT_EDIT 'e'
10471 #define GOT_HISTEDIT_FOLD 'f'
10472 #define GOT_HISTEDIT_DROP 'd'
10473 #define GOT_HISTEDIT_MESG 'm'
10475 static const struct got_histedit_cmd {
10476 unsigned char code;
10479 } got_histedit_cmds[] = {
10480 { GOT_HISTEDIT_PICK, "pick", "use commit" },
10481 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
10482 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
10484 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
10485 { GOT_HISTEDIT_MESG, "mesg",
10486 "single-line log message for commit above (open editor if empty)" },
10489 struct got_histedit_list_entry {
10490 TAILQ_ENTRY(got_histedit_list_entry) entry;
10491 struct got_object_id *commit_id;
10492 const struct got_histedit_cmd *cmd;
10495 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
10497 static const struct got_error *
10498 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
10499 FILE *f, struct got_repository *repo)
10501 const struct got_error *err = NULL;
10502 char *logmsg = NULL, *id_str = NULL;
10503 struct got_commit_object *commit = NULL;
10506 err = got_object_open_as_commit(&commit, repo, commit_id);
10510 err = get_short_logmsg(&logmsg, 34, commit);
10514 err = got_object_id_str(&id_str, commit_id);
10518 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
10520 err = got_ferror(f, GOT_ERR_IO);
10523 got_object_commit_close(commit);
10529 static const struct got_error *
10530 histedit_write_commit_list(struct got_object_id_queue *commits,
10531 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
10532 struct got_repository *repo)
10534 const struct got_error *err = NULL;
10535 struct got_object_qid *qid;
10536 const char *histedit_cmd = NULL;
10538 if (STAILQ_EMPTY(commits))
10539 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10541 STAILQ_FOREACH(qid, commits, entry) {
10542 histedit_cmd = got_histedit_cmds[0].name;
10544 histedit_cmd = "edit";
10545 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
10546 histedit_cmd = "fold";
10547 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
10550 if (edit_logmsg_only) {
10551 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
10553 err = got_ferror(f, GOT_ERR_IO);
10562 static const struct got_error *
10563 write_cmd_list(FILE *f, const char *branch_name,
10564 struct got_object_id_queue *commits)
10566 const struct got_error *err = NULL;
10570 struct got_object_qid *qid;
10572 qid = STAILQ_FIRST(commits);
10573 err = got_object_id_str(&id_str, &qid->id);
10578 "# Editing the history of branch '%s' starting at\n"
10580 "# Commits will be processed in order from top to "
10581 "bottom of this file.\n", branch_name, id_str);
10583 err = got_ferror(f, GOT_ERR_IO);
10587 n = fprintf(f, "# Available histedit commands:\n");
10589 err = got_ferror(f, GOT_ERR_IO);
10593 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10594 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
10595 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
10598 err = got_ferror(f, GOT_ERR_IO);
10607 static const struct got_error *
10608 histedit_syntax_error(int lineno)
10610 static char msg[42];
10613 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
10615 if (ret < 0 || (size_t)ret >= sizeof(msg))
10616 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
10618 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
10621 static const struct got_error *
10622 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
10623 char *logmsg, struct got_repository *repo)
10625 const struct got_error *err;
10626 struct got_commit_object *folded_commit = NULL;
10627 char *id_str, *folded_logmsg = NULL;
10629 err = got_object_id_str(&id_str, hle->commit_id);
10633 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
10637 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
10640 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
10641 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
10642 folded_logmsg) == -1) {
10643 err = got_error_from_errno("asprintf");
10647 got_object_commit_close(folded_commit);
10649 free(folded_logmsg);
10653 static struct got_histedit_list_entry *
10654 get_folded_commits(struct got_histedit_list_entry *hle)
10656 struct got_histedit_list_entry *prev, *folded = NULL;
10658 prev = TAILQ_PREV(hle, got_histedit_list, entry);
10659 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
10660 prev->cmd->code == GOT_HISTEDIT_DROP)) {
10661 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
10663 prev = TAILQ_PREV(prev, got_histedit_list, entry);
10669 static const struct got_error *
10670 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
10671 struct got_repository *repo)
10673 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
10674 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
10675 const struct got_error *err = NULL;
10676 struct got_commit_object *commit = NULL;
10679 struct got_histedit_list_entry *folded = NULL;
10681 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10685 folded = get_folded_commits(hle);
10687 while (folded != hle) {
10688 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
10689 folded = TAILQ_NEXT(folded, entry);
10692 err = append_folded_commit_msg(&new_msg, folded,
10698 folded = TAILQ_NEXT(folded, entry);
10702 err = got_object_id_str(&id_str, hle->commit_id);
10705 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
10708 logmsg_len = asprintf(&new_msg,
10709 "%s\n# original log message of commit %s: %s",
10710 logmsg ? logmsg : "", id_str, orig_logmsg);
10711 if (logmsg_len == -1) {
10712 err = got_error_from_errno("asprintf");
10718 err = got_object_id_str(&id_str, hle->commit_id);
10722 err = got_opentemp_named_fd(&logmsg_path, &fd,
10723 GOT_TMPDIR_STR "/got-logmsg");
10727 write(fd, logmsg, logmsg_len);
10730 err = get_editor(&editor);
10734 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
10737 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
10740 hle->logmsg = strdup(new_msg);
10741 if (hle->logmsg == NULL)
10742 err = got_error_from_errno("strdup");
10745 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
10746 err = got_error_from_errno2("unlink", logmsg_path);
10752 got_object_commit_close(commit);
10756 static const struct got_error *
10757 histedit_parse_list(struct got_histedit_list *histedit_cmds,
10758 FILE *f, struct got_repository *repo)
10760 const struct got_error *err = NULL;
10761 char *line = NULL, *p, *end;
10764 int lineno = 0, lastcmd = -1;
10765 const struct got_histedit_cmd *cmd;
10766 struct got_object_id *commit_id = NULL;
10767 struct got_histedit_list_entry *hle = NULL;
10770 len = getline(&line, &size, f);
10772 const struct got_error *getline_err;
10775 getline_err = got_error_from_errno("getline");
10776 err = got_ferror(f, getline_err->code);
10781 while (isspace((unsigned char)p[0]))
10783 if (p[0] == '#' || p[0] == '\0') {
10789 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10790 cmd = &got_histedit_cmds[i];
10791 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10792 isspace((unsigned char)p[strlen(cmd->name)])) {
10793 p += strlen(cmd->name);
10796 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
10801 if (i == nitems(got_histedit_cmds)) {
10802 err = histedit_syntax_error(lineno);
10805 while (isspace((unsigned char)p[0]))
10807 if (cmd->code == GOT_HISTEDIT_MESG) {
10808 if (lastcmd != GOT_HISTEDIT_PICK &&
10809 lastcmd != GOT_HISTEDIT_EDIT) {
10810 err = got_error(GOT_ERR_HISTEDIT_CMD);
10813 if (p[0] == '\0') {
10814 err = histedit_edit_logmsg(hle, repo);
10818 hle->logmsg = strdup(p);
10819 if (hle->logmsg == NULL) {
10820 err = got_error_from_errno("strdup");
10826 lastcmd = cmd->code;
10830 while (end[0] && !isspace((unsigned char)end[0]))
10834 err = got_object_resolve_id_str(&commit_id, repo, p);
10836 /* override error code */
10837 err = histedit_syntax_error(lineno);
10841 hle = malloc(sizeof(*hle));
10843 err = got_error_from_errno("malloc");
10847 hle->commit_id = commit_id;
10848 hle->logmsg = NULL;
10852 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10853 lastcmd = cmd->code;
10861 static const struct got_error *
10862 histedit_check_script(struct got_histedit_list *histedit_cmds,
10863 struct got_object_id_queue *commits, struct got_repository *repo)
10865 const struct got_error *err = NULL;
10866 struct got_object_qid *qid;
10867 struct got_histedit_list_entry *hle;
10868 static char msg[92];
10871 if (TAILQ_EMPTY(histedit_cmds))
10872 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10873 "histedit script contains no commands");
10874 if (STAILQ_EMPTY(commits))
10875 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10877 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10878 struct got_histedit_list_entry *hle2;
10879 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10882 if (got_object_id_cmp(hle->commit_id,
10883 hle2->commit_id) != 0)
10885 err = got_object_id_str(&id_str, hle->commit_id);
10888 snprintf(msg, sizeof(msg), "commit %s is listed "
10889 "more than once in histedit script", id_str);
10891 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10895 STAILQ_FOREACH(qid, commits, entry) {
10896 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10897 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
10901 err = got_object_id_str(&id_str, &qid->id);
10904 snprintf(msg, sizeof(msg),
10905 "commit %s missing from histedit script", id_str);
10907 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10911 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10912 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10913 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10914 "last commit in histedit script cannot be folded");
10919 static const struct got_error *
10920 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10921 const char *path, struct got_object_id_queue *commits,
10922 struct got_repository *repo)
10924 const struct got_error *err = NULL;
10928 err = get_editor(&editor);
10932 if (spawn_editor(editor, path) == -1) {
10933 err = got_error_from_errno("failed spawning editor");
10937 f = fopen(path, "re");
10939 err = got_error_from_errno("fopen");
10942 err = histedit_parse_list(histedit_cmds, f, repo);
10946 err = histedit_check_script(histedit_cmds, commits, repo);
10948 if (f && fclose(f) == EOF && err == NULL)
10949 err = got_error_from_errno("fclose");
10954 static const struct got_error *
10955 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10956 struct got_object_id_queue *, const char *, const char *,
10957 struct got_repository *);
10959 static const struct got_error *
10960 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10961 struct got_object_id_queue *commits, const char *branch_name,
10962 int edit_logmsg_only, int fold_only, int edit_only,
10963 struct got_repository *repo)
10965 const struct got_error *err;
10969 err = got_opentemp_named(&path, &f, "got-histedit");
10973 err = write_cmd_list(f, branch_name, commits);
10977 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10978 fold_only, edit_only, repo);
10982 if (edit_logmsg_only || fold_only || edit_only) {
10984 err = histedit_parse_list(histedit_cmds, f, repo);
10986 if (fclose(f) == EOF) {
10987 err = got_error_from_errno("fclose");
10991 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10993 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10994 err->code != GOT_ERR_HISTEDIT_CMD)
10996 err = histedit_edit_list_retry(histedit_cmds, err,
10997 commits, path, branch_name, repo);
11001 if (f && fclose(f) == EOF && err == NULL)
11002 err = got_error_from_errno("fclose");
11003 if (path && unlink(path) != 0 && err == NULL)
11004 err = got_error_from_errno2("unlink", path);
11009 static const struct got_error *
11010 histedit_save_list(struct got_histedit_list *histedit_cmds,
11011 struct got_worktree *worktree, struct got_repository *repo)
11013 const struct got_error *err = NULL;
11016 struct got_histedit_list_entry *hle;
11017 struct got_commit_object *commit = NULL;
11019 err = got_worktree_get_histedit_script_path(&path, worktree);
11023 f = fopen(path, "we");
11025 err = got_error_from_errno2("fopen", path);
11028 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11029 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
11035 int n = fprintf(f, "%c %s\n",
11036 GOT_HISTEDIT_MESG, hle->logmsg);
11038 err = got_ferror(f, GOT_ERR_IO);
11044 if (f && fclose(f) == EOF && err == NULL)
11045 err = got_error_from_errno("fclose");
11048 got_object_commit_close(commit);
11053 histedit_free_list(struct got_histedit_list *histedit_cmds)
11055 struct got_histedit_list_entry *hle;
11057 while ((hle = TAILQ_FIRST(histedit_cmds))) {
11058 TAILQ_REMOVE(histedit_cmds, hle, entry);
11063 static const struct got_error *
11064 histedit_load_list(struct got_histedit_list *histedit_cmds,
11065 const char *path, struct got_repository *repo)
11067 const struct got_error *err = NULL;
11070 f = fopen(path, "re");
11072 err = got_error_from_errno2("fopen", path);
11076 err = histedit_parse_list(histedit_cmds, f, repo);
11078 if (f && fclose(f) == EOF && err == NULL)
11079 err = got_error_from_errno("fclose");
11083 static const struct got_error *
11084 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
11085 const struct got_error *edit_err, struct got_object_id_queue *commits,
11086 const char *path, const char *branch_name, struct got_repository *repo)
11088 const struct got_error *err = NULL, *prev_err = edit_err;
11091 while (resp != 'c' && resp != 'r' && resp != 'a') {
11092 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
11093 "or (a)bort: ", getprogname(), prev_err->msg);
11098 histedit_free_list(histedit_cmds);
11099 err = histedit_run_editor(histedit_cmds, path, commits,
11102 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11103 err->code != GOT_ERR_HISTEDIT_CMD)
11110 } else if (resp == 'r') {
11111 histedit_free_list(histedit_cmds);
11112 err = histedit_edit_script(histedit_cmds,
11113 commits, branch_name, 0, 0, 0, repo);
11115 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11116 err->code != GOT_ERR_HISTEDIT_CMD)
11123 } else if (resp == 'a') {
11124 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
11127 printf("invalid response '%c'\n", resp);
11133 static const struct got_error *
11134 histedit_complete(struct got_worktree *worktree,
11135 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
11136 struct got_reference *branch, struct got_repository *repo)
11138 printf("Switching work tree to %s\n",
11139 got_ref_get_symref_target(branch));
11140 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
11144 static const struct got_error *
11145 show_histedit_progress(struct got_commit_object *commit,
11146 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
11148 const struct got_error *err;
11149 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
11151 err = got_object_id_str(&old_id_str, hle->commit_id);
11156 err = got_object_id_str(&new_id_str, new_id);
11161 old_id_str[12] = '\0';
11163 new_id_str[12] = '\0';
11166 logmsg = strdup(hle->logmsg);
11167 if (logmsg == NULL) {
11168 err = got_error_from_errno("strdup");
11171 trim_logmsg(logmsg, 42);
11173 err = get_short_logmsg(&logmsg, 42, commit);
11178 switch (hle->cmd->code) {
11179 case GOT_HISTEDIT_PICK:
11180 case GOT_HISTEDIT_EDIT:
11181 printf("%s -> %s: %s\n", old_id_str,
11182 new_id_str ? new_id_str : "no-op change", logmsg);
11184 case GOT_HISTEDIT_DROP:
11185 case GOT_HISTEDIT_FOLD:
11186 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
11198 static const struct got_error *
11199 histedit_commit(struct got_pathlist_head *merged_paths,
11200 struct got_worktree *worktree, struct got_fileindex *fileindex,
11201 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
11202 const char *committer, struct got_repository *repo)
11204 const struct got_error *err;
11205 struct got_commit_object *commit;
11206 struct got_object_id *new_commit_id;
11208 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
11209 && hle->logmsg == NULL) {
11210 err = histedit_edit_logmsg(hle, repo);
11215 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
11219 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
11220 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
11221 hle->logmsg, repo);
11223 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
11225 err = show_histedit_progress(commit, hle, NULL);
11227 err = show_histedit_progress(commit, hle, new_commit_id);
11228 free(new_commit_id);
11231 got_object_commit_close(commit);
11235 static const struct got_error *
11236 histedit_skip_commit(struct got_histedit_list_entry *hle,
11237 struct got_worktree *worktree, struct got_repository *repo)
11239 const struct got_error *error;
11240 struct got_commit_object *commit;
11242 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
11247 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
11251 error = show_histedit_progress(commit, hle, NULL);
11252 got_object_commit_close(commit);
11256 static const struct got_error *
11257 check_local_changes(void *arg, unsigned char status,
11258 unsigned char staged_status, const char *path,
11259 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11260 struct got_object_id *commit_id, int dirfd, const char *de_name)
11262 int *have_local_changes = arg;
11265 case GOT_STATUS_ADD:
11266 case GOT_STATUS_DELETE:
11267 case GOT_STATUS_MODIFY:
11268 case GOT_STATUS_CONFLICT:
11269 *have_local_changes = 1;
11270 return got_error(GOT_ERR_CANCELLED);
11275 switch (staged_status) {
11276 case GOT_STATUS_ADD:
11277 case GOT_STATUS_DELETE:
11278 case GOT_STATUS_MODIFY:
11279 *have_local_changes = 1;
11280 return got_error(GOT_ERR_CANCELLED);
11288 static const struct got_error *
11289 cmd_histedit(int argc, char *argv[])
11291 const struct got_error *error = NULL;
11292 struct got_worktree *worktree = NULL;
11293 struct got_fileindex *fileindex = NULL;
11294 struct got_repository *repo = NULL;
11295 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11296 struct got_reference *branch = NULL;
11297 struct got_reference *tmp_branch = NULL;
11298 struct got_object_id *resume_commit_id = NULL;
11299 struct got_object_id *base_commit_id = NULL;
11300 struct got_object_id *head_commit_id = NULL;
11301 struct got_commit_object *commit = NULL;
11302 int ch, rebase_in_progress = 0, merge_in_progress = 0;
11303 struct got_update_progress_arg upa;
11304 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
11305 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
11306 int list_backups = 0, delete_backups = 0;
11307 const char *edit_script_path = NULL;
11308 struct got_object_id_queue commits;
11309 struct got_pathlist_head merged_paths;
11310 const struct got_object_id_queue *parent_ids;
11311 struct got_object_qid *pid;
11312 struct got_histedit_list histedit_cmds;
11313 struct got_histedit_list_entry *hle;
11314 int *pack_fds = NULL;
11316 STAILQ_INIT(&commits);
11317 TAILQ_INIT(&histedit_cmds);
11318 TAILQ_INIT(&merged_paths);
11319 memset(&upa, 0, sizeof(upa));
11321 while ((ch = getopt(argc, argv, "aceF:flmX")) != -1) {
11333 edit_script_path = optarg;
11342 edit_logmsg_only = 1;
11345 delete_backups = 1;
11357 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11358 "unveil", NULL) == -1)
11361 if (abort_edit && continue_edit)
11362 option_conflict('a', 'c');
11363 if (edit_script_path && edit_logmsg_only)
11364 option_conflict('F', 'm');
11365 if (abort_edit && edit_logmsg_only)
11366 option_conflict('a', 'm');
11367 if (continue_edit && edit_logmsg_only)
11368 option_conflict('c', 'm');
11369 if (abort_edit && fold_only)
11370 option_conflict('a', 'f');
11371 if (continue_edit && fold_only)
11372 option_conflict('c', 'f');
11373 if (fold_only && edit_logmsg_only)
11374 option_conflict('f', 'm');
11375 if (edit_script_path && fold_only)
11376 option_conflict('F', 'f');
11377 if (abort_edit && edit_only)
11378 option_conflict('a', 'e');
11379 if (continue_edit && edit_only)
11380 option_conflict('c', 'e');
11381 if (edit_only && edit_logmsg_only)
11382 option_conflict('e', 'm');
11383 if (edit_script_path && edit_only)
11384 option_conflict('F', 'e');
11385 if (list_backups) {
11387 option_conflict('l', 'a');
11389 option_conflict('l', 'c');
11390 if (edit_script_path)
11391 option_conflict('l', 'F');
11392 if (edit_logmsg_only)
11393 option_conflict('l', 'm');
11395 option_conflict('l', 'f');
11397 option_conflict('l', 'e');
11398 if (delete_backups)
11399 option_conflict('l', 'X');
11400 if (argc != 0 && argc != 1)
11402 } else if (delete_backups) {
11404 option_conflict('X', 'a');
11406 option_conflict('X', 'c');
11407 if (edit_script_path)
11408 option_conflict('X', 'F');
11409 if (edit_logmsg_only)
11410 option_conflict('X', 'm');
11412 option_conflict('X', 'f');
11414 option_conflict('X', 'e');
11416 option_conflict('X', 'l');
11417 if (argc != 0 && argc != 1)
11419 } else if (argc != 0)
11423 * This command cannot apply unveil(2) in all cases because the
11424 * user may choose to run an editor to edit the histedit script
11425 * and to edit individual commit log messages.
11426 * unveil(2) traverses exec(2); if an editor is used we have to
11427 * apply unveil after edit script and log messages have been written.
11428 * XXX TODO: Make use of unveil(2) where possible.
11431 cwd = getcwd(NULL, 0);
11433 error = got_error_from_errno("getcwd");
11437 error = got_repo_pack_fds_open(&pack_fds);
11441 error = got_worktree_open(&worktree, cwd);
11443 if (list_backups || delete_backups) {
11444 if (error->code != GOT_ERR_NOT_WORKTREE)
11447 if (error->code == GOT_ERR_NOT_WORKTREE)
11448 error = wrap_not_worktree_error(error,
11454 if (list_backups || delete_backups) {
11455 error = got_repo_open(&repo,
11456 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11460 error = apply_unveil(got_repo_get_path(repo), 0,
11461 worktree ? got_worktree_get_root_path(worktree) : NULL);
11464 error = process_backup_refs(
11465 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
11466 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11467 goto done; /* nothing else to do */
11470 error = get_gitconfig_path(&gitconfig_path);
11473 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11474 gitconfig_path, pack_fds);
11478 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11481 if (rebase_in_progress) {
11482 error = got_error(GOT_ERR_REBASING);
11486 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11490 if (merge_in_progress) {
11491 error = got_error(GOT_ERR_MERGE_BUSY);
11495 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
11499 if (edit_in_progress && edit_logmsg_only) {
11500 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11501 "histedit operation is in progress in this "
11502 "work tree and must be continued or aborted "
11503 "before the -m option can be used");
11506 if (edit_in_progress && fold_only) {
11507 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11508 "histedit operation is in progress in this "
11509 "work tree and must be continued or aborted "
11510 "before the -f option can be used");
11513 if (edit_in_progress && edit_only) {
11514 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11515 "histedit operation is in progress in this "
11516 "work tree and must be continued or aborted "
11517 "before the -e option can be used");
11521 if (edit_in_progress && abort_edit) {
11522 error = got_worktree_histedit_continue(&resume_commit_id,
11523 &tmp_branch, &branch, &base_commit_id, &fileindex,
11527 printf("Switching work tree to %s\n",
11528 got_ref_get_symref_target(branch));
11529 error = got_worktree_histedit_abort(worktree, fileindex, repo,
11530 branch, base_commit_id, abort_progress, &upa);
11533 printf("Histedit of %s aborted\n",
11534 got_ref_get_symref_target(branch));
11535 print_merge_progress_stats(&upa);
11536 goto done; /* nothing else to do */
11537 } else if (abort_edit) {
11538 error = got_error(GOT_ERR_NOT_HISTEDIT);
11542 error = get_author(&committer, repo, worktree);
11546 if (continue_edit) {
11549 if (!edit_in_progress) {
11550 error = got_error(GOT_ERR_NOT_HISTEDIT);
11554 error = got_worktree_get_histedit_script_path(&path, worktree);
11558 error = histedit_load_list(&histedit_cmds, path, repo);
11563 error = got_worktree_histedit_continue(&resume_commit_id,
11564 &tmp_branch, &branch, &base_commit_id, &fileindex,
11569 error = got_ref_resolve(&head_commit_id, repo, branch);
11573 error = got_object_open_as_commit(&commit, repo,
11577 parent_ids = got_object_commit_get_parent_ids(commit);
11578 pid = STAILQ_FIRST(parent_ids);
11580 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11583 error = collect_commits(&commits, head_commit_id, &pid->id,
11584 base_commit_id, got_worktree_get_path_prefix(worktree),
11585 GOT_ERR_HISTEDIT_PATH, repo);
11586 got_object_commit_close(commit);
11591 if (edit_in_progress) {
11592 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11596 error = got_ref_open(&branch, repo,
11597 got_worktree_get_head_ref_name(worktree), 0);
11601 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11602 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11603 "will not edit commit history of a branch outside "
11604 "the \"refs/heads/\" reference namespace");
11608 error = got_ref_resolve(&head_commit_id, repo, branch);
11609 got_ref_close(branch);
11614 error = got_object_open_as_commit(&commit, repo,
11618 parent_ids = got_object_commit_get_parent_ids(commit);
11619 pid = STAILQ_FIRST(parent_ids);
11621 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11624 error = collect_commits(&commits, head_commit_id, &pid->id,
11625 got_worktree_get_base_commit_id(worktree),
11626 got_worktree_get_path_prefix(worktree),
11627 GOT_ERR_HISTEDIT_PATH, repo);
11628 got_object_commit_close(commit);
11633 if (STAILQ_EMPTY(&commits)) {
11634 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11638 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
11639 &base_commit_id, &fileindex, worktree, repo);
11643 if (edit_script_path) {
11644 error = histedit_load_list(&histedit_cmds,
11645 edit_script_path, repo);
11647 got_worktree_histedit_abort(worktree, fileindex,
11648 repo, branch, base_commit_id,
11649 abort_progress, &upa);
11650 print_merge_progress_stats(&upa);
11654 const char *branch_name;
11655 branch_name = got_ref_get_symref_target(branch);
11656 if (strncmp(branch_name, "refs/heads/", 11) == 0)
11658 error = histedit_edit_script(&histedit_cmds, &commits,
11659 branch_name, edit_logmsg_only, fold_only,
11662 got_worktree_histedit_abort(worktree, fileindex,
11663 repo, branch, base_commit_id,
11664 abort_progress, &upa);
11665 print_merge_progress_stats(&upa);
11671 error = histedit_save_list(&histedit_cmds, worktree,
11674 got_worktree_histedit_abort(worktree, fileindex,
11675 repo, branch, base_commit_id,
11676 abort_progress, &upa);
11677 print_merge_progress_stats(&upa);
11683 error = histedit_check_script(&histedit_cmds, &commits, repo);
11687 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
11688 if (resume_commit_id) {
11689 if (got_object_id_cmp(hle->commit_id,
11690 resume_commit_id) != 0)
11693 resume_commit_id = NULL;
11694 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
11695 hle->cmd->code == GOT_HISTEDIT_FOLD) {
11696 error = histedit_skip_commit(hle, worktree,
11701 struct got_pathlist_head paths;
11702 int have_changes = 0;
11704 TAILQ_INIT(&paths);
11705 error = got_pathlist_append(&paths, "", NULL);
11708 error = got_worktree_status(worktree, &paths,
11709 repo, 0, check_local_changes, &have_changes,
11710 check_cancelled, NULL);
11711 got_pathlist_free(&paths);
11713 if (error->code != GOT_ERR_CANCELLED)
11715 if (sigint_received || sigpipe_received)
11718 if (have_changes) {
11719 error = histedit_commit(NULL, worktree,
11720 fileindex, tmp_branch, hle,
11725 error = got_object_open_as_commit(
11726 &commit, repo, hle->commit_id);
11729 error = show_histedit_progress(commit,
11731 got_object_commit_close(commit);
11740 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
11741 error = histedit_skip_commit(hle, worktree, repo);
11747 error = got_object_open_as_commit(&commit, repo,
11751 parent_ids = got_object_commit_get_parent_ids(commit);
11752 pid = STAILQ_FIRST(parent_ids);
11754 error = got_worktree_histedit_merge_files(&merged_paths,
11755 worktree, fileindex, &pid->id, hle->commit_id, repo,
11756 update_progress, &upa, check_cancelled, NULL);
11759 got_object_commit_close(commit);
11762 print_merge_progress_stats(&upa);
11763 if (upa.conflicts > 0 || upa.missing > 0 ||
11764 upa.not_deleted > 0 || upa.unversioned > 0) {
11765 if (upa.conflicts > 0) {
11766 error = show_rebase_merge_conflict(
11767 hle->commit_id, repo);
11771 got_worktree_rebase_pathlist_free(&merged_paths);
11775 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
11777 error = got_object_id_str(&id_str, hle->commit_id);
11780 printf("Stopping histedit for amending commit %s\n",
11783 got_worktree_rebase_pathlist_free(&merged_paths);
11784 error = got_worktree_histedit_postpone(worktree,
11789 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11790 error = histedit_skip_commit(hle, worktree, repo);
11796 error = histedit_commit(&merged_paths, worktree, fileindex,
11797 tmp_branch, hle, committer, repo);
11798 got_worktree_rebase_pathlist_free(&merged_paths);
11803 if (upa.conflicts > 0 || upa.missing > 0 ||
11804 upa.not_deleted > 0 || upa.unversioned > 0) {
11805 error = got_worktree_histedit_postpone(worktree, fileindex);
11808 if (upa.conflicts > 0 && upa.missing == 0 &&
11809 upa.not_deleted == 0 && upa.unversioned == 0) {
11810 error = got_error_msg(GOT_ERR_CONFLICTS,
11811 "conflicts must be resolved before histedit "
11813 } else if (upa.conflicts > 0) {
11814 error = got_error_msg(GOT_ERR_CONFLICTS,
11815 "conflicts must be resolved before histedit "
11816 "can continue; changes destined for some "
11817 "files were not yet merged and should be "
11818 "merged manually if required before the "
11819 "histedit operation is continued");
11821 error = got_error_msg(GOT_ERR_CONFLICTS,
11822 "changes destined for some files were not "
11823 "yet merged and should be merged manually "
11824 "if required before the histedit operation "
11828 error = histedit_complete(worktree, fileindex, tmp_branch,
11833 free(gitconfig_path);
11834 got_object_id_queue_free(&commits);
11835 histedit_free_list(&histedit_cmds);
11836 free(head_commit_id);
11837 free(base_commit_id);
11838 free(resume_commit_id);
11840 got_object_commit_close(commit);
11842 got_ref_close(branch);
11844 got_ref_close(tmp_branch);
11846 got_worktree_close(worktree);
11848 const struct got_error *close_err = got_repo_close(repo);
11853 const struct got_error *pack_err =
11854 got_repo_pack_fds_close(pack_fds);
11862 usage_integrate(void)
11864 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
11868 static const struct got_error *
11869 cmd_integrate(int argc, char *argv[])
11871 const struct got_error *error = NULL;
11872 struct got_repository *repo = NULL;
11873 struct got_worktree *worktree = NULL;
11874 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
11875 const char *branch_arg = NULL;
11876 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11877 struct got_fileindex *fileindex = NULL;
11878 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11880 struct got_update_progress_arg upa;
11881 int *pack_fds = NULL;
11883 while ((ch = getopt(argc, argv, "")) != -1) {
11896 branch_arg = argv[0];
11898 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11899 "unveil", NULL) == -1)
11902 cwd = getcwd(NULL, 0);
11904 error = got_error_from_errno("getcwd");
11908 error = got_repo_pack_fds_open(&pack_fds);
11912 error = got_worktree_open(&worktree, cwd);
11914 if (error->code == GOT_ERR_NOT_WORKTREE)
11915 error = wrap_not_worktree_error(error, "integrate",
11920 error = check_rebase_or_histedit_in_progress(worktree);
11924 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11929 error = apply_unveil(got_repo_get_path(repo), 0,
11930 got_worktree_get_root_path(worktree));
11934 error = check_merge_in_progress(worktree, repo);
11938 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11939 error = got_error_from_errno("asprintf");
11943 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11944 &base_branch_ref, worktree, refname, repo);
11948 refname = strdup(got_ref_get_name(branch_ref));
11949 if (refname == NULL) {
11950 error = got_error_from_errno("strdup");
11951 got_worktree_integrate_abort(worktree, fileindex, repo,
11952 branch_ref, base_branch_ref);
11955 base_refname = strdup(got_ref_get_name(base_branch_ref));
11956 if (base_refname == NULL) {
11957 error = got_error_from_errno("strdup");
11958 got_worktree_integrate_abort(worktree, fileindex, repo,
11959 branch_ref, base_branch_ref);
11962 if (strncmp(base_refname, "refs/heads/", 11) != 0) {
11963 error = got_error(GOT_ERR_INTEGRATE_BRANCH);
11964 got_worktree_integrate_abort(worktree, fileindex, repo,
11965 branch_ref, base_branch_ref);
11969 error = got_ref_resolve(&commit_id, repo, branch_ref);
11973 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11977 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11978 error = got_error_msg(GOT_ERR_SAME_BRANCH,
11979 "specified branch has already been integrated");
11980 got_worktree_integrate_abort(worktree, fileindex, repo,
11981 branch_ref, base_branch_ref);
11985 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11987 if (error->code == GOT_ERR_ANCESTRY)
11988 error = got_error(GOT_ERR_REBASE_REQUIRED);
11989 got_worktree_integrate_abort(worktree, fileindex, repo,
11990 branch_ref, base_branch_ref);
11994 memset(&upa, 0, sizeof(upa));
11995 error = got_worktree_integrate_continue(worktree, fileindex, repo,
11996 branch_ref, base_branch_ref, update_progress, &upa,
11997 check_cancelled, NULL);
12001 printf("Integrated %s into %s\n", refname, base_refname);
12002 print_update_progress_stats(&upa);
12005 const struct got_error *close_err = got_repo_close(repo);
12010 got_worktree_close(worktree);
12012 const struct got_error *pack_err =
12013 got_repo_pack_fds_close(pack_fds);
12018 free(base_commit_id);
12021 free(base_refname);
12028 fprintf(stderr, "usage: %s merge [-acn] [branch]\n", getprogname());
12032 static const struct got_error *
12033 cmd_merge(int argc, char *argv[])
12035 const struct got_error *error = NULL;
12036 struct got_worktree *worktree = NULL;
12037 struct got_repository *repo = NULL;
12038 struct got_fileindex *fileindex = NULL;
12039 char *cwd = NULL, *id_str = NULL, *author = NULL;
12040 struct got_reference *branch = NULL, *wt_branch = NULL;
12041 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
12042 struct got_object_id *wt_branch_tip = NULL;
12043 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
12044 int interrupt_merge = 0;
12045 struct got_update_progress_arg upa;
12046 struct got_object_id *merge_commit_id = NULL;
12047 char *branch_name = NULL;
12048 int *pack_fds = NULL;
12050 memset(&upa, 0, sizeof(upa));
12052 while ((ch = getopt(argc, argv, "acn")) != -1) {
12058 continue_merge = 1;
12061 interrupt_merge = 1;
12073 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12074 "unveil", NULL) == -1)
12078 if (abort_merge && continue_merge)
12079 option_conflict('a', 'c');
12080 if (abort_merge || continue_merge) {
12083 } else if (argc != 1)
12086 cwd = getcwd(NULL, 0);
12088 error = got_error_from_errno("getcwd");
12092 error = got_repo_pack_fds_open(&pack_fds);
12096 error = got_worktree_open(&worktree, cwd);
12098 if (error->code == GOT_ERR_NOT_WORKTREE)
12099 error = wrap_not_worktree_error(error,
12104 error = got_repo_open(&repo,
12105 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
12110 error = apply_unveil(got_repo_get_path(repo), 0,
12111 worktree ? got_worktree_get_root_path(worktree) : NULL);
12115 error = check_rebase_or_histedit_in_progress(worktree);
12119 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12125 if (!merge_in_progress) {
12126 error = got_error(GOT_ERR_NOT_MERGING);
12129 error = got_worktree_merge_continue(&branch_name,
12130 &branch_tip, &fileindex, worktree, repo);
12133 error = got_worktree_merge_abort(worktree, fileindex, repo,
12134 abort_progress, &upa);
12137 printf("Merge of %s aborted\n", branch_name);
12138 goto done; /* nothing else to do */
12141 error = get_author(&author, repo, worktree);
12145 if (continue_merge) {
12146 if (!merge_in_progress) {
12147 error = got_error(GOT_ERR_NOT_MERGING);
12150 error = got_worktree_merge_continue(&branch_name,
12151 &branch_tip, &fileindex, worktree, repo);
12155 error = got_ref_open(&branch, repo, argv[0], 0);
12158 branch_name = strdup(got_ref_get_name(branch));
12159 if (branch_name == NULL) {
12160 error = got_error_from_errno("strdup");
12163 error = got_ref_resolve(&branch_tip, repo, branch);
12168 error = got_ref_open(&wt_branch, repo,
12169 got_worktree_get_head_ref_name(worktree), 0);
12172 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
12175 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
12176 wt_branch_tip, branch_tip, 0, repo,
12177 check_cancelled, NULL);
12178 if (error && error->code != GOT_ERR_ANCESTRY)
12181 if (!continue_merge) {
12182 error = check_path_prefix(wt_branch_tip, branch_tip,
12183 got_worktree_get_path_prefix(worktree),
12184 GOT_ERR_MERGE_PATH, repo);
12188 error = check_same_branch(wt_branch_tip, branch,
12191 if (error->code != GOT_ERR_ANCESTRY)
12195 static char msg[512];
12196 snprintf(msg, sizeof(msg),
12197 "cannot create a merge commit because "
12198 "%s is based on %s; %s can be integrated "
12199 "with 'got integrate' instead", branch_name,
12200 got_worktree_get_head_ref_name(worktree),
12202 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
12206 error = got_worktree_merge_prepare(&fileindex, worktree,
12211 error = got_worktree_merge_branch(worktree, fileindex,
12212 yca_id, branch_tip, repo, update_progress, &upa,
12213 check_cancelled, NULL);
12216 print_merge_progress_stats(&upa);
12217 if (!upa.did_something) {
12218 error = got_worktree_merge_abort(worktree, fileindex,
12219 repo, abort_progress, &upa);
12222 printf("Already up-to-date\n");
12227 if (interrupt_merge) {
12228 error = got_worktree_merge_postpone(worktree, fileindex);
12231 printf("Merge of %s interrupted on request\n", branch_name);
12232 } else if (upa.conflicts > 0 || upa.missing > 0 ||
12233 upa.not_deleted > 0 || upa.unversioned > 0) {
12234 error = got_worktree_merge_postpone(worktree, fileindex);
12237 if (upa.conflicts > 0 && upa.missing == 0 &&
12238 upa.not_deleted == 0 && upa.unversioned == 0) {
12239 error = got_error_msg(GOT_ERR_CONFLICTS,
12240 "conflicts must be resolved before merging "
12242 } else if (upa.conflicts > 0) {
12243 error = got_error_msg(GOT_ERR_CONFLICTS,
12244 "conflicts must be resolved before merging "
12245 "can continue; changes destined for some "
12246 "files were not yet merged and "
12247 "should be merged manually if required before the "
12248 "merge operation is continued");
12250 error = got_error_msg(GOT_ERR_CONFLICTS,
12251 "changes destined for some "
12252 "files were not yet merged and should be "
12253 "merged manually if required before the "
12254 "merge operation is continued");
12258 error = got_worktree_merge_commit(&merge_commit_id, worktree,
12259 fileindex, author, NULL, 1, branch_tip, branch_name,
12260 repo, continue_merge ? print_status : NULL, NULL);
12263 error = got_worktree_merge_complete(worktree, fileindex, repo);
12266 error = got_object_id_str(&id_str, merge_commit_id);
12269 printf("Merged %s into %s: %s\n", branch_name,
12270 got_worktree_get_head_ref_name(worktree),
12276 free(merge_commit_id);
12282 got_ref_close(branch);
12284 got_ref_close(wt_branch);
12286 got_worktree_close(worktree);
12288 const struct got_error *close_err = got_repo_close(repo);
12293 const struct got_error *pack_err =
12294 got_repo_pack_fds_close(pack_fds);
12304 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
12305 "[path ...]\n", getprogname());
12309 static const struct got_error *
12310 print_stage(void *arg, unsigned char status, unsigned char staged_status,
12311 const char *path, struct got_object_id *blob_id,
12312 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
12313 int dirfd, const char *de_name)
12315 const struct got_error *err = NULL;
12316 char *id_str = NULL;
12318 if (staged_status != GOT_STATUS_ADD &&
12319 staged_status != GOT_STATUS_MODIFY &&
12320 staged_status != GOT_STATUS_DELETE)
12323 if (staged_status == GOT_STATUS_ADD ||
12324 staged_status == GOT_STATUS_MODIFY)
12325 err = got_object_id_str(&id_str, staged_blob_id);
12327 err = got_object_id_str(&id_str, blob_id);
12331 printf("%s %c %s\n", id_str, staged_status, path);
12336 static const struct got_error *
12337 cmd_stage(int argc, char *argv[])
12339 const struct got_error *error = NULL;
12340 struct got_repository *repo = NULL;
12341 struct got_worktree *worktree = NULL;
12343 struct got_pathlist_head paths;
12344 struct got_pathlist_entry *pe;
12345 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
12346 FILE *patch_script_file = NULL;
12347 const char *patch_script_path = NULL;
12348 struct choose_patch_arg cpa;
12349 int *pack_fds = NULL;
12351 TAILQ_INIT(&paths);
12353 while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
12356 patch_script_path = optarg;
12365 allow_bad_symlinks = 1;
12377 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12378 "unveil", NULL) == -1)
12381 if (list_stage && (pflag || patch_script_path))
12382 errx(1, "-l option cannot be used with other options");
12383 if (patch_script_path && !pflag)
12384 errx(1, "-F option can only be used together with -p option");
12386 cwd = getcwd(NULL, 0);
12388 error = got_error_from_errno("getcwd");
12392 error = got_repo_pack_fds_open(&pack_fds);
12396 error = got_worktree_open(&worktree, cwd);
12398 if (error->code == GOT_ERR_NOT_WORKTREE)
12399 error = wrap_not_worktree_error(error, "stage", cwd);
12403 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12408 if (patch_script_path) {
12409 patch_script_file = fopen(patch_script_path, "re");
12410 if (patch_script_file == NULL) {
12411 error = got_error_from_errno2("fopen",
12412 patch_script_path);
12416 error = apply_unveil(got_repo_get_path(repo), 0,
12417 got_worktree_get_root_path(worktree));
12421 error = check_merge_in_progress(worktree, repo);
12425 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12430 error = got_worktree_status(worktree, &paths, repo, 0,
12431 print_stage, NULL, check_cancelled, NULL);
12433 cpa.patch_script_file = patch_script_file;
12434 cpa.action = "stage";
12435 error = got_worktree_stage(worktree, &paths,
12436 pflag ? NULL : print_status, NULL,
12437 pflag ? choose_patch : NULL, &cpa,
12438 allow_bad_symlinks, repo);
12441 if (patch_script_file && fclose(patch_script_file) == EOF &&
12443 error = got_error_from_errno2("fclose", patch_script_path);
12445 const struct got_error *close_err = got_repo_close(repo);
12450 got_worktree_close(worktree);
12452 const struct got_error *pack_err =
12453 got_repo_pack_fds_close(pack_fds);
12457 TAILQ_FOREACH(pe, &paths, entry)
12458 free((char *)pe->path);
12459 got_pathlist_free(&paths);
12465 usage_unstage(void)
12467 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
12468 "[path ...]\n", getprogname());
12473 static const struct got_error *
12474 cmd_unstage(int argc, char *argv[])
12476 const struct got_error *error = NULL;
12477 struct got_repository *repo = NULL;
12478 struct got_worktree *worktree = NULL;
12480 struct got_pathlist_head paths;
12481 struct got_pathlist_entry *pe;
12483 struct got_update_progress_arg upa;
12484 FILE *patch_script_file = NULL;
12485 const char *patch_script_path = NULL;
12486 struct choose_patch_arg cpa;
12487 int *pack_fds = NULL;
12489 TAILQ_INIT(&paths);
12491 while ((ch = getopt(argc, argv, "F:p")) != -1) {
12494 patch_script_path = optarg;
12509 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12510 "unveil", NULL) == -1)
12513 if (patch_script_path && !pflag)
12514 errx(1, "-F option can only be used together with -p option");
12516 cwd = getcwd(NULL, 0);
12518 error = got_error_from_errno("getcwd");
12522 error = got_repo_pack_fds_open(&pack_fds);
12526 error = got_worktree_open(&worktree, cwd);
12528 if (error->code == GOT_ERR_NOT_WORKTREE)
12529 error = wrap_not_worktree_error(error, "unstage", cwd);
12533 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12538 if (patch_script_path) {
12539 patch_script_file = fopen(patch_script_path, "re");
12540 if (patch_script_file == NULL) {
12541 error = got_error_from_errno2("fopen",
12542 patch_script_path);
12547 error = apply_unveil(got_repo_get_path(repo), 0,
12548 got_worktree_get_root_path(worktree));
12552 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12556 cpa.patch_script_file = patch_script_file;
12557 cpa.action = "unstage";
12558 memset(&upa, 0, sizeof(upa));
12559 error = got_worktree_unstage(worktree, &paths, update_progress,
12560 &upa, pflag ? choose_patch : NULL, &cpa, repo);
12562 print_merge_progress_stats(&upa);
12564 if (patch_script_file && fclose(patch_script_file) == EOF &&
12566 error = got_error_from_errno2("fclose", patch_script_path);
12568 const struct got_error *close_err = got_repo_close(repo);
12573 got_worktree_close(worktree);
12575 const struct got_error *pack_err =
12576 got_repo_pack_fds_close(pack_fds);
12580 TAILQ_FOREACH(pe, &paths, entry)
12581 free((char *)pe->path);
12582 got_pathlist_free(&paths);
12590 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
12591 "arg ...\n", getprogname());
12595 static const struct got_error *
12596 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12598 const struct got_error *err;
12599 struct got_blob_object *blob;
12602 fd = got_opentempfd();
12604 return got_error_from_errno("got_opentempfd");
12606 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
12610 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
12612 if (fd != -1 && close(fd) == -1 && err == NULL)
12613 err = got_error_from_errno("close");
12615 got_object_blob_close(blob);
12619 static const struct got_error *
12620 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12622 const struct got_error *err;
12623 struct got_tree_object *tree;
12626 err = got_object_open_as_tree(&tree, repo, id);
12630 nentries = got_object_tree_get_nentries(tree);
12631 for (i = 0; i < nentries; i++) {
12632 struct got_tree_entry *te;
12634 if (sigint_received || sigpipe_received)
12636 te = got_object_tree_get_entry(tree, i);
12637 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
12640 fprintf(outfile, "%s %.7o %s\n", id_str,
12641 got_tree_entry_get_mode(te),
12642 got_tree_entry_get_name(te));
12646 got_object_tree_close(tree);
12650 static const struct got_error *
12651 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12653 const struct got_error *err;
12654 struct got_commit_object *commit;
12655 const struct got_object_id_queue *parent_ids;
12656 struct got_object_qid *pid;
12657 char *id_str = NULL;
12658 const char *logmsg = NULL;
12661 err = got_object_open_as_commit(&commit, repo, id);
12665 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
12669 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
12670 parent_ids = got_object_commit_get_parent_ids(commit);
12671 fprintf(outfile, "numparents %d\n",
12672 got_object_commit_get_nparents(commit));
12673 STAILQ_FOREACH(pid, parent_ids, entry) {
12675 err = got_object_id_str(&pid_str, &pid->id);
12678 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
12681 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12682 got_object_commit_get_author_gmtoff(commit));
12683 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
12684 got_object_commit_get_author(commit),
12685 (long long)got_object_commit_get_author_time(commit),
12688 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12689 got_object_commit_get_committer_gmtoff(commit));
12690 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
12691 got_object_commit_get_committer(commit),
12692 (long long)got_object_commit_get_committer_time(commit),
12695 logmsg = got_object_commit_get_logmsg_raw(commit);
12696 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
12697 fprintf(outfile, "%s", logmsg);
12700 got_object_commit_close(commit);
12704 static const struct got_error *
12705 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12707 const struct got_error *err;
12708 struct got_tag_object *tag;
12709 char *id_str = NULL;
12710 const char *tagmsg = NULL;
12713 err = got_object_open_as_tag(&tag, repo, id);
12717 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
12721 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
12723 switch (got_object_tag_get_object_type(tag)) {
12724 case GOT_OBJ_TYPE_BLOB:
12725 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12726 GOT_OBJ_LABEL_BLOB);
12728 case GOT_OBJ_TYPE_TREE:
12729 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12730 GOT_OBJ_LABEL_TREE);
12732 case GOT_OBJ_TYPE_COMMIT:
12733 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12734 GOT_OBJ_LABEL_COMMIT);
12736 case GOT_OBJ_TYPE_TAG:
12737 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12738 GOT_OBJ_LABEL_TAG);
12744 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
12745 got_object_tag_get_name(tag));
12747 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12748 got_object_tag_get_tagger_gmtoff(tag));
12749 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
12750 got_object_tag_get_tagger(tag),
12751 (long long)got_object_tag_get_tagger_time(tag),
12754 tagmsg = got_object_tag_get_message(tag);
12755 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
12756 fprintf(outfile, "%s", tagmsg);
12759 got_object_tag_close(tag);
12763 static const struct got_error *
12764 cmd_cat(int argc, char *argv[])
12766 const struct got_error *error;
12767 struct got_repository *repo = NULL;
12768 struct got_worktree *worktree = NULL;
12769 char *cwd = NULL, *repo_path = NULL, *label = NULL;
12770 const char *commit_id_str = NULL;
12771 struct got_object_id *id = NULL, *commit_id = NULL;
12772 struct got_commit_object *commit = NULL;
12773 int ch, obj_type, i, force_path = 0;
12774 struct got_reflist_head refs;
12775 int *pack_fds = NULL;
12780 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12785 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
12788 commit_id_str = optarg;
12794 repo_path = realpath(optarg, NULL);
12795 if (repo_path == NULL)
12796 return got_error_from_errno2("realpath",
12798 got_path_strip_trailing_slashes(repo_path);
12809 cwd = getcwd(NULL, 0);
12811 error = got_error_from_errno("getcwd");
12815 error = got_repo_pack_fds_open(&pack_fds);
12819 if (repo_path == NULL) {
12820 error = got_worktree_open(&worktree, cwd);
12821 if (error && error->code != GOT_ERR_NOT_WORKTREE)
12824 repo_path = strdup(
12825 got_worktree_get_repo_path(worktree));
12826 if (repo_path == NULL) {
12827 error = got_error_from_errno("strdup");
12831 /* Release work tree lock. */
12832 got_worktree_close(worktree);
12837 if (repo_path == NULL) {
12838 repo_path = strdup(cwd);
12839 if (repo_path == NULL)
12840 return got_error_from_errno("strdup");
12843 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
12848 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
12852 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
12856 if (commit_id_str == NULL)
12857 commit_id_str = GOT_REF_HEAD;
12858 error = got_repo_match_object_id(&commit_id, NULL,
12859 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
12863 error = got_object_open_as_commit(&commit, repo, commit_id);
12867 for (i = 0; i < argc; i++) {
12869 error = got_object_id_by_path(&id, repo, commit,
12874 error = got_repo_match_object_id(&id, &label, argv[i],
12875 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
12878 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
12879 error->code != GOT_ERR_NOT_REF)
12881 error = got_object_id_by_path(&id, repo,
12888 error = got_object_get_type(&obj_type, repo, id);
12892 switch (obj_type) {
12893 case GOT_OBJ_TYPE_BLOB:
12894 error = cat_blob(id, repo, stdout);
12896 case GOT_OBJ_TYPE_TREE:
12897 error = cat_tree(id, repo, stdout);
12899 case GOT_OBJ_TYPE_COMMIT:
12900 error = cat_commit(id, repo, stdout);
12902 case GOT_OBJ_TYPE_TAG:
12903 error = cat_tag(id, repo, stdout);
12906 error = got_error(GOT_ERR_OBJ_TYPE);
12921 got_object_commit_close(commit);
12923 got_worktree_close(worktree);
12925 const struct got_error *close_err = got_repo_close(repo);
12930 const struct got_error *pack_err =
12931 got_repo_pack_fds_close(pack_fds);
12936 got_ref_list_free(&refs);
12943 fprintf(stderr, "usage: %s info [path ...]\n",
12948 static const struct got_error *
12949 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12950 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12951 struct got_object_id *commit_id)
12953 const struct got_error *err = NULL;
12954 char *id_str = NULL;
12956 struct tm mytm, *tm;
12957 struct got_pathlist_head *paths = arg;
12958 struct got_pathlist_entry *pe;
12961 * Clear error indication from any of the path arguments which
12962 * would cause this file index entry to be displayed.
12964 TAILQ_FOREACH(pe, paths, entry) {
12965 if (got_path_cmp(path, pe->path, strlen(path),
12966 pe->path_len) == 0 ||
12967 got_path_is_child(path, pe->path, pe->path_len))
12968 pe->data = NULL; /* no error */
12971 printf(GOT_COMMIT_SEP_STR);
12973 printf("symlink: %s\n", path);
12974 else if (S_ISREG(mode)) {
12975 printf("file: %s\n", path);
12976 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12977 } else if (S_ISDIR(mode))
12978 printf("directory: %s\n", path);
12980 printf("something: %s\n", path);
12982 tm = localtime_r(&mtime, &mytm);
12985 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12986 return got_error(GOT_ERR_NO_SPACE);
12987 printf("timestamp: %s\n", datebuf);
12990 err = got_object_id_str(&id_str, blob_id);
12993 printf("based on blob: %s\n", id_str);
12997 if (staged_blob_id) {
12998 err = got_object_id_str(&id_str, staged_blob_id);
13001 printf("based on staged blob: %s\n", id_str);
13006 err = got_object_id_str(&id_str, commit_id);
13009 printf("based on commit: %s\n", id_str);
13016 static const struct got_error *
13017 cmd_info(int argc, char *argv[])
13019 const struct got_error *error = NULL;
13020 struct got_worktree *worktree = NULL;
13021 char *cwd = NULL, *id_str = NULL;
13022 struct got_pathlist_head paths;
13023 struct got_pathlist_entry *pe;
13024 char *uuidstr = NULL;
13025 int ch, show_files = 0;
13027 TAILQ_INIT(&paths);
13029 while ((ch = getopt(argc, argv, "")) != -1) {
13041 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
13045 cwd = getcwd(NULL, 0);
13047 error = got_error_from_errno("getcwd");
13051 error = got_worktree_open(&worktree, cwd);
13053 if (error->code == GOT_ERR_NOT_WORKTREE)
13054 error = wrap_not_worktree_error(error, "info", cwd);
13059 /* Remove "wpath cpath proc exec sendfd" promises. */
13060 if (pledge("stdio rpath flock unveil", NULL) == -1)
13063 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
13068 error = get_worktree_paths_from_argv(&paths, argc, argv,
13075 error = got_object_id_str(&id_str,
13076 got_worktree_get_base_commit_id(worktree));
13080 error = got_worktree_get_uuid(&uuidstr, worktree);
13084 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
13085 printf("work tree base commit: %s\n", id_str);
13086 printf("work tree path prefix: %s\n",
13087 got_worktree_get_path_prefix(worktree));
13088 printf("work tree branch reference: %s\n",
13089 got_worktree_get_head_ref_name(worktree));
13090 printf("work tree UUID: %s\n", uuidstr);
13091 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
13094 struct got_pathlist_entry *pe;
13095 TAILQ_FOREACH(pe, &paths, entry) {
13096 if (pe->path_len == 0)
13099 * Assume this path will fail. This will be corrected
13100 * in print_path_info() in case the path does suceeed.
13102 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
13104 error = got_worktree_path_info(worktree, &paths,
13105 print_path_info, &paths, check_cancelled, NULL);
13108 TAILQ_FOREACH(pe, &paths, entry) {
13109 if (pe->data != NULL) {
13110 const struct got_error *perr;
13113 error = got_error_fmt(perr->code, "%s",
13121 got_worktree_close(worktree);
13122 TAILQ_FOREACH(pe, &paths, entry)
13123 free((char *)pe->path);
13124 got_pathlist_free(&paths);