2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/queue.h>
21 #include <sys/types.h>
42 #include "got_compat.h"
44 #include "got_version.h"
45 #include "got_error.h"
46 #include "got_object.h"
47 #include "got_reference.h"
48 #include "got_repository.h"
50 #include "got_cancel.h"
51 #include "got_worktree.h"
53 #include "got_commit_graph.h"
54 #include "got_fetch.h"
56 #include "got_blame.h"
57 #include "got_privsep.h"
58 #include "got_opentemp.h"
59 #include "got_gotconfig.h"
61 #include "got_patch.h"
66 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
69 static volatile sig_atomic_t sigint_received;
70 static volatile sig_atomic_t sigpipe_received;
73 catch_sigint(int signo)
79 catch_sigpipe(int signo)
87 const struct got_error *(*cmd_main)(int, char *[]);
88 void (*cmd_usage)(void);
89 const char *cmd_alias;
92 __dead static void usage(int, int);
93 __dead static void usage_import(void);
94 __dead static void usage_clone(void);
95 __dead static void usage_fetch(void);
96 __dead static void usage_checkout(void);
97 __dead static void usage_update(void);
98 __dead static void usage_log(void);
99 __dead static void usage_diff(void);
100 __dead static void usage_blame(void);
101 __dead static void usage_tree(void);
102 __dead static void usage_status(void);
103 __dead static void usage_ref(void);
104 __dead static void usage_branch(void);
105 __dead static void usage_tag(void);
106 __dead static void usage_add(void);
107 __dead static void usage_remove(void);
108 __dead static void usage_patch(void);
109 __dead static void usage_revert(void);
110 __dead static void usage_commit(void);
111 __dead static void usage_send(void);
112 __dead static void usage_cherrypick(void);
113 __dead static void usage_backout(void);
114 __dead static void usage_rebase(void);
115 __dead static void usage_histedit(void);
116 __dead static void usage_integrate(void);
117 __dead static void usage_merge(void);
118 __dead static void usage_stage(void);
119 __dead static void usage_unstage(void);
120 __dead static void usage_cat(void);
121 __dead static void usage_info(void);
123 static const struct got_error* cmd_import(int, char *[]);
124 static const struct got_error* cmd_clone(int, char *[]);
125 static const struct got_error* cmd_fetch(int, char *[]);
126 static const struct got_error* cmd_checkout(int, char *[]);
127 static const struct got_error* cmd_update(int, char *[]);
128 static const struct got_error* cmd_log(int, char *[]);
129 static const struct got_error* cmd_diff(int, char *[]);
130 static const struct got_error* cmd_blame(int, char *[]);
131 static const struct got_error* cmd_tree(int, char *[]);
132 static const struct got_error* cmd_status(int, char *[]);
133 static const struct got_error* cmd_ref(int, char *[]);
134 static const struct got_error* cmd_branch(int, char *[]);
135 static const struct got_error* cmd_tag(int, char *[]);
136 static const struct got_error* cmd_add(int, char *[]);
137 static const struct got_error* cmd_remove(int, char *[]);
138 static const struct got_error* cmd_patch(int, char *[]);
139 static const struct got_error* cmd_revert(int, char *[]);
140 static const struct got_error* cmd_commit(int, char *[]);
141 static const struct got_error* cmd_send(int, char *[]);
142 static const struct got_error* cmd_cherrypick(int, char *[]);
143 static const struct got_error* cmd_backout(int, char *[]);
144 static const struct got_error* cmd_rebase(int, char *[]);
145 static const struct got_error* cmd_histedit(int, char *[]);
146 static const struct got_error* cmd_integrate(int, char *[]);
147 static const struct got_error* cmd_merge(int, char *[]);
148 static const struct got_error* cmd_stage(int, char *[]);
149 static const struct got_error* cmd_unstage(int, char *[]);
150 static const struct got_error* cmd_cat(int, char *[]);
151 static const struct got_error* cmd_info(int, char *[]);
153 static const struct got_cmd got_commands[] = {
154 { "import", cmd_import, usage_import, "im" },
155 { "clone", cmd_clone, usage_clone, "cl" },
156 { "fetch", cmd_fetch, usage_fetch, "fe" },
157 { "checkout", cmd_checkout, usage_checkout, "co" },
158 { "update", cmd_update, usage_update, "up" },
159 { "log", cmd_log, usage_log, "" },
160 { "diff", cmd_diff, usage_diff, "di" },
161 { "blame", cmd_blame, usage_blame, "bl" },
162 { "tree", cmd_tree, usage_tree, "tr" },
163 { "status", cmd_status, usage_status, "st" },
164 { "ref", cmd_ref, usage_ref, "" },
165 { "branch", cmd_branch, usage_branch, "br" },
166 { "tag", cmd_tag, usage_tag, "" },
167 { "add", cmd_add, usage_add, "" },
168 { "remove", cmd_remove, usage_remove, "rm" },
169 { "patch", cmd_patch, usage_patch, "pa" },
170 { "revert", cmd_revert, usage_revert, "rv" },
171 { "commit", cmd_commit, usage_commit, "ci" },
172 { "send", cmd_send, usage_send, "se" },
173 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
174 { "backout", cmd_backout, usage_backout, "bo" },
175 { "rebase", cmd_rebase, usage_rebase, "rb" },
176 { "histedit", cmd_histedit, usage_histedit, "he" },
177 { "integrate", cmd_integrate, usage_integrate,"ig" },
178 { "merge", cmd_merge, usage_merge, "mg" },
179 { "stage", cmd_stage, usage_stage, "sg" },
180 { "unstage", cmd_unstage, usage_unstage, "ug" },
181 { "cat", cmd_cat, usage_cat, "" },
182 { "info", cmd_info, usage_info, "" },
186 list_commands(FILE *fp)
190 fprintf(fp, "commands:");
191 for (i = 0; i < nitems(got_commands); i++) {
192 const struct got_cmd *cmd = &got_commands[i];
193 fprintf(fp, " %s", cmd->cmd_name);
199 option_conflict(char a, char b)
201 errx(1, "-%c and -%c options are mutually exclusive", a, b);
205 main(int argc, char *argv[])
207 const struct got_cmd *cmd;
210 int hflag = 0, Vflag = 0;
211 static const struct option longopts[] = {
212 { "version", no_argument, NULL, 'V' },
216 setlocale(LC_CTYPE, "");
218 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
238 got_version_print_str();
243 usage(hflag, hflag ? 0 : 1);
245 signal(SIGINT, catch_sigint);
246 signal(SIGPIPE, catch_sigpipe);
248 for (i = 0; i < nitems(got_commands); i++) {
249 const struct got_error *error;
251 cmd = &got_commands[i];
253 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
254 strcmp(cmd->cmd_alias, argv[0]) != 0)
260 error = cmd->cmd_main(argc, argv);
261 if (error && error->code != GOT_ERR_CANCELLED &&
262 error->code != GOT_ERR_PRIVSEP_EXIT &&
263 !(sigpipe_received &&
264 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
266 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
267 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
274 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
275 list_commands(stderr);
280 usage(int hflag, int status)
282 FILE *fp = (status == 0) ? stdout : stderr;
284 fprintf(fp, "usage: %s [-h] [-V | --version] 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 = "main";
763 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
764 struct got_repository *repo = NULL;
765 struct got_reference *branch_ref = NULL, *head_ref = NULL;
766 struct got_object_id *new_commit_id = NULL;
768 struct got_pathlist_head ignores;
769 struct got_pathlist_entry *pe;
770 int preserve_logmsg = 0;
771 int *pack_fds = NULL;
773 TAILQ_INIT(&ignores);
775 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
778 branch_name = optarg;
781 logmsg = strdup(optarg);
782 if (logmsg == NULL) {
783 error = got_error_from_errno("strdup");
788 repo_path = realpath(optarg, NULL);
789 if (repo_path == NULL) {
790 error = got_error_from_errno2("realpath",
796 if (optarg[0] == '\0')
798 error = got_pathlist_insert(&pe, &ignores, optarg,
813 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
821 if (repo_path == NULL) {
822 repo_path = getcwd(NULL, 0);
823 if (repo_path == NULL)
824 return got_error_from_errno("getcwd");
826 got_path_strip_trailing_slashes(repo_path);
827 error = get_gitconfig_path(&gitconfig_path);
830 error = got_repo_pack_fds_open(&pack_fds);
833 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
837 error = get_author(&author, repo, NULL);
842 * Don't let the user create a branch name with a leading '-'.
843 * While technically a valid reference name, this case is usually
844 * an unintended typo.
846 if (branch_name[0] == '-')
847 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
849 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
850 error = got_error_from_errno("asprintf");
854 error = got_ref_open(&branch_ref, repo, refname, 0);
856 if (error->code != GOT_ERR_NOT_REF)
859 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
860 "import target branch already exists");
864 path_dir = realpath(argv[0], NULL);
865 if (path_dir == NULL) {
866 error = got_error_from_errno2("realpath", argv[0]);
869 got_path_strip_trailing_slashes(path_dir);
872 * unveil(2) traverses exec(2); if an editor is used we have
873 * to apply unveil after the log message has been written.
875 if (logmsg == NULL || strlen(logmsg) == 0) {
876 error = get_editor(&editor);
880 error = collect_import_msg(&logmsg, &logmsg_path, editor,
883 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
890 if (unveil(path_dir, "r") != 0) {
891 error = got_error_from_errno2("unveil", path_dir);
897 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
904 error = got_repo_import(&new_commit_id, path_dir, logmsg,
905 author, &ignores, repo, import_progress, NULL);
912 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
919 error = got_ref_write(branch_ref, repo);
926 error = got_object_id_str(&id_str, new_commit_id);
933 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
935 if (error->code != GOT_ERR_NOT_REF) {
941 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
949 error = got_ref_write(head_ref, repo);
957 printf("Created branch %s with commit %s\n",
958 got_ref_get_name(branch_ref), id_str);
961 const struct got_error *pack_err =
962 got_repo_pack_fds_close(pack_fds);
966 if (preserve_logmsg) {
967 fprintf(stderr, "%s: log message preserved in %s\n",
968 getprogname(), logmsg_path);
969 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
970 error = got_error_from_errno2("unlink", logmsg_path);
979 free(gitconfig_path);
981 got_ref_close(branch_ref);
983 got_ref_close(head_ref);
990 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
991 "repository-URL [directory]\n", getprogname());
995 struct got_fetch_progress_arg {
996 char last_scaled_size[FMT_SCALED_STRSIZE];
1001 struct got_repository *repo;
1004 int configs_created;
1006 struct got_pathlist_head *symrefs;
1007 struct got_pathlist_head *wanted_branches;
1008 struct got_pathlist_head *wanted_refs;
1012 const char *remote_repo_path;
1013 const char *git_url;
1014 int fetch_all_branches;
1015 int mirror_references;
1019 /* XXX forward declaration */
1020 static const struct got_error *
1021 create_config_files(const char *proto, const char *host, const char *port,
1022 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1023 int mirror_references, struct got_pathlist_head *symrefs,
1024 struct got_pathlist_head *wanted_branches,
1025 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1027 static const struct got_error *
1028 fetch_progress(void *arg, const char *message, off_t packfile_size,
1029 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1031 const struct got_error *err = NULL;
1032 struct got_fetch_progress_arg *a = arg;
1033 char scaled_size[FMT_SCALED_STRSIZE];
1034 int p_indexed, p_resolved;
1035 int print_size = 0, print_indexed = 0, print_resolved = 0;
1038 * In order to allow a failed clone to be resumed with 'got fetch'
1039 * we try to create configuration files as soon as possible.
1040 * Once the server has sent information about its default branch
1041 * we have all required information.
1043 if (a->create_configs && !a->configs_created &&
1044 !TAILQ_EMPTY(a->config_info.symrefs)) {
1045 err = create_config_files(a->config_info.proto,
1046 a->config_info.host, a->config_info.port,
1047 a->config_info.remote_repo_path,
1048 a->config_info.git_url,
1049 a->config_info.fetch_all_branches,
1050 a->config_info.mirror_references,
1051 a->config_info.symrefs,
1052 a->config_info.wanted_branches,
1053 a->config_info.wanted_refs, a->repo);
1056 a->configs_created = 1;
1059 if (a->verbosity < 0)
1062 if (message && message[0] != '\0') {
1063 printf("\rserver: %s", message);
1068 if (packfile_size > 0 || nobj_indexed > 0) {
1069 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1070 (a->last_scaled_size[0] == '\0' ||
1071 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1073 if (strlcpy(a->last_scaled_size, scaled_size,
1074 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1075 return got_error(GOT_ERR_NO_SPACE);
1077 if (nobj_indexed > 0) {
1078 p_indexed = (nobj_indexed * 100) / nobj_total;
1079 if (p_indexed != a->last_p_indexed) {
1080 a->last_p_indexed = p_indexed;
1085 if (nobj_resolved > 0) {
1086 p_resolved = (nobj_resolved * 100) /
1087 (nobj_total - nobj_loose);
1088 if (p_resolved != a->last_p_resolved) {
1089 a->last_p_resolved = p_resolved;
1097 if (print_size || print_indexed || print_resolved)
1100 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1102 printf("; indexing %d%%", p_indexed);
1104 printf("; resolving deltas %d%%", p_resolved);
1105 if (print_size || print_indexed || print_resolved)
1111 static const struct got_error *
1112 create_symref(const char *refname, struct got_reference *target_ref,
1113 int verbosity, struct got_repository *repo)
1115 const struct got_error *err;
1116 struct got_reference *head_symref;
1118 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1122 err = got_ref_write(head_symref, repo);
1123 if (err == NULL && verbosity > 0) {
1124 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1125 got_ref_get_name(target_ref));
1127 got_ref_close(head_symref);
1131 static const struct got_error *
1132 list_remote_refs(struct got_pathlist_head *symrefs,
1133 struct got_pathlist_head *refs)
1135 const struct got_error *err;
1136 struct got_pathlist_entry *pe;
1138 TAILQ_FOREACH(pe, symrefs, entry) {
1139 const char *refname = pe->path;
1140 const char *targetref = pe->data;
1142 printf("%s: %s\n", refname, targetref);
1145 TAILQ_FOREACH(pe, refs, entry) {
1146 const char *refname = pe->path;
1147 struct got_object_id *id = pe->data;
1150 err = got_object_id_str(&id_str, id);
1153 printf("%s: %s\n", refname, id_str);
1160 static const struct got_error *
1161 create_ref(const char *refname, struct got_object_id *id,
1162 int verbosity, struct got_repository *repo)
1164 const struct got_error *err = NULL;
1165 struct got_reference *ref;
1168 err = got_object_id_str(&id_str, id);
1172 err = got_ref_alloc(&ref, refname, id);
1176 err = got_ref_write(ref, repo);
1179 if (err == NULL && verbosity >= 0)
1180 printf("Created reference %s: %s\n", refname, id_str);
1187 match_wanted_ref(const char *refname, const char *wanted_ref)
1189 if (strncmp(refname, "refs/", 5) != 0)
1194 * Prevent fetching of references that won't make any
1195 * sense outside of the remote repository's context.
1197 if (strncmp(refname, "got/", 4) == 0)
1199 if (strncmp(refname, "remotes/", 8) == 0)
1202 if (strncmp(wanted_ref, "refs/", 5) == 0)
1205 /* Allow prefix match. */
1206 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1209 /* Allow exact match. */
1210 return (strcmp(refname, wanted_ref) == 0);
1214 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1216 struct got_pathlist_entry *pe;
1218 TAILQ_FOREACH(pe, wanted_refs, entry) {
1219 if (match_wanted_ref(refname, pe->path))
1226 static const struct got_error *
1227 create_wanted_ref(const char *refname, struct got_object_id *id,
1228 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1230 const struct got_error *err;
1231 char *remote_refname;
1233 if (strncmp("refs/", refname, 5) == 0)
1236 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1237 remote_repo_name, refname) == -1)
1238 return got_error_from_errno("asprintf");
1240 err = create_ref(remote_refname, id, verbosity, repo);
1241 free(remote_refname);
1245 static const struct got_error *
1246 create_gotconfig(const char *proto, const char *host, const char *port,
1247 const char *remote_repo_path, const char *default_branch,
1248 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1249 struct got_pathlist_head *wanted_refs, int mirror_references,
1250 struct got_repository *repo)
1252 const struct got_error *err = NULL;
1253 char *gotconfig_path = NULL;
1254 char *gotconfig = NULL;
1255 FILE *gotconfig_file = NULL;
1256 const char *branchname = NULL;
1257 char *branches = NULL, *refs = NULL;
1260 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1261 struct got_pathlist_entry *pe;
1262 TAILQ_FOREACH(pe, wanted_branches, entry) {
1264 branchname = pe->path;
1265 if (strncmp(branchname, "refs/heads/", 11) == 0)
1267 if (asprintf(&s, "%s\"%s\" ",
1268 branches ? branches : "", branchname) == -1) {
1269 err = got_error_from_errno("asprintf");
1275 } else if (!fetch_all_branches && default_branch) {
1276 branchname = default_branch;
1277 if (strncmp(branchname, "refs/heads/", 11) == 0)
1279 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1280 err = got_error_from_errno("asprintf");
1284 if (!TAILQ_EMPTY(wanted_refs)) {
1285 struct got_pathlist_entry *pe;
1286 TAILQ_FOREACH(pe, wanted_refs, entry) {
1288 const char *refname = pe->path;
1289 if (strncmp(refname, "refs/", 5) == 0)
1291 if (asprintf(&s, "%s\"%s\" ",
1292 refs ? refs : "", refname) == -1) {
1293 err = got_error_from_errno("asprintf");
1301 /* Create got.conf(5). */
1302 gotconfig_path = got_repo_get_path_gotconfig(repo);
1303 if (gotconfig_path == NULL) {
1304 err = got_error_from_errno("got_repo_get_path_gotconfig");
1307 gotconfig_file = fopen(gotconfig_path, "ae");
1308 if (gotconfig_file == NULL) {
1309 err = got_error_from_errno2("fopen", gotconfig_path);
1312 if (asprintf(&gotconfig,
1317 "\trepository \"%s\"\n"
1323 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1324 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1325 remote_repo_path, branches ? "\tbranch { " : "",
1326 branches ? branches : "", branches ? "}\n" : "",
1327 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1328 mirror_references ? "\tmirror_references yes\n" : "",
1329 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1330 err = got_error_from_errno("asprintf");
1333 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1334 if (n != strlen(gotconfig)) {
1335 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1340 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1341 err = got_error_from_errno2("fclose", gotconfig_path);
1342 free(gotconfig_path);
1347 static const struct got_error *
1348 create_gitconfig(const char *git_url, const char *default_branch,
1349 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1350 struct got_pathlist_head *wanted_refs, int mirror_references,
1351 struct got_repository *repo)
1353 const struct got_error *err = NULL;
1354 char *gitconfig_path = NULL;
1355 char *gitconfig = NULL;
1356 FILE *gitconfig_file = NULL;
1357 char *branches = NULL, *refs = NULL;
1358 const char *branchname;
1361 /* Create a config file Git can understand. */
1362 gitconfig_path = got_repo_get_path_gitconfig(repo);
1363 if (gitconfig_path == NULL) {
1364 err = got_error_from_errno("got_repo_get_path_gitconfig");
1367 gitconfig_file = fopen(gitconfig_path, "ae");
1368 if (gitconfig_file == NULL) {
1369 err = got_error_from_errno2("fopen", gitconfig_path);
1372 if (fetch_all_branches) {
1373 if (mirror_references) {
1374 if (asprintf(&branches,
1375 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1376 err = got_error_from_errno("asprintf");
1379 } else if (asprintf(&branches,
1380 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1381 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1382 err = got_error_from_errno("asprintf");
1385 } else if (!TAILQ_EMPTY(wanted_branches)) {
1386 struct got_pathlist_entry *pe;
1387 TAILQ_FOREACH(pe, wanted_branches, entry) {
1389 branchname = pe->path;
1390 if (strncmp(branchname, "refs/heads/", 11) == 0)
1392 if (mirror_references) {
1394 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1395 branches ? branches : "",
1396 branchname, branchname) == -1) {
1397 err = got_error_from_errno("asprintf");
1400 } else if (asprintf(&s,
1401 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1402 branches ? branches : "",
1403 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1404 branchname) == -1) {
1405 err = got_error_from_errno("asprintf");
1413 * If the server specified a default branch, use just that one.
1414 * Otherwise fall back to fetching all branches on next fetch.
1416 if (default_branch) {
1417 branchname = default_branch;
1418 if (strncmp(branchname, "refs/heads/", 11) == 0)
1421 branchname = "*"; /* fall back to all branches */
1422 if (mirror_references) {
1423 if (asprintf(&branches,
1424 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1425 branchname, branchname) == -1) {
1426 err = got_error_from_errno("asprintf");
1429 } else if (asprintf(&branches,
1430 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1431 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1432 branchname) == -1) {
1433 err = got_error_from_errno("asprintf");
1437 if (!TAILQ_EMPTY(wanted_refs)) {
1438 struct got_pathlist_entry *pe;
1439 TAILQ_FOREACH(pe, wanted_refs, entry) {
1441 const char *refname = pe->path;
1442 if (strncmp(refname, "refs/", 5) == 0)
1444 if (mirror_references) {
1446 "%s\tfetch = refs/%s:refs/%s\n",
1447 refs ? refs : "", refname, refname) == -1) {
1448 err = got_error_from_errno("asprintf");
1451 } else if (asprintf(&s,
1452 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1454 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1456 err = got_error_from_errno("asprintf");
1464 if (asprintf(&gitconfig,
1469 "\tfetch = refs/tags/*:refs/tags/*\n",
1470 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1471 refs ? refs : "") == -1) {
1472 err = got_error_from_errno("asprintf");
1475 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1476 if (n != strlen(gitconfig)) {
1477 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1481 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1482 err = got_error_from_errno2("fclose", gitconfig_path);
1483 free(gitconfig_path);
1488 static const struct got_error *
1489 create_config_files(const char *proto, const char *host, const char *port,
1490 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1491 int mirror_references, struct got_pathlist_head *symrefs,
1492 struct got_pathlist_head *wanted_branches,
1493 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1495 const struct got_error *err = NULL;
1496 const char *default_branch = NULL;
1497 struct got_pathlist_entry *pe;
1500 * If we asked for a set of wanted branches then use the first
1503 if (!TAILQ_EMPTY(wanted_branches)) {
1504 pe = TAILQ_FIRST(wanted_branches);
1505 default_branch = pe->path;
1507 /* First HEAD ref listed by server is the default branch. */
1508 TAILQ_FOREACH(pe, symrefs, entry) {
1509 const char *refname = pe->path;
1510 const char *target = pe->data;
1512 if (strcmp(refname, GOT_REF_HEAD) != 0)
1515 default_branch = target;
1520 /* Create got.conf(5). */
1521 err = create_gotconfig(proto, host, port, remote_repo_path,
1522 default_branch, fetch_all_branches, wanted_branches,
1523 wanted_refs, mirror_references, repo);
1527 /* Create a config file Git can understand. */
1528 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1529 wanted_branches, wanted_refs, mirror_references, repo);
1532 static const struct got_error *
1533 cmd_clone(int argc, char *argv[])
1535 const struct got_error *error = NULL;
1536 const char *uri, *dirname;
1537 char *proto, *host, *port, *repo_name, *server_path;
1538 char *default_destdir = NULL, *id_str = NULL;
1539 const char *repo_path;
1540 struct got_repository *repo = NULL;
1541 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1542 struct got_pathlist_entry *pe;
1543 struct got_object_id *pack_hash = NULL;
1544 int ch, fetchfd = -1, fetchstatus;
1545 pid_t fetchpid = -1;
1546 struct got_fetch_progress_arg fpa;
1547 char *git_url = NULL;
1548 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1549 int list_refs_only = 0;
1550 int *pack_fds = NULL;
1553 TAILQ_INIT(&symrefs);
1554 TAILQ_INIT(&wanted_branches);
1555 TAILQ_INIT(&wanted_refs);
1557 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1560 fetch_all_branches = 1;
1563 error = got_pathlist_append(&wanted_branches,
1572 mirror_references = 1;
1577 else if (verbosity < 3)
1584 error = got_pathlist_append(&wanted_refs,
1597 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1598 option_conflict('a', 'b');
1599 if (list_refs_only) {
1600 if (!TAILQ_EMPTY(&wanted_branches))
1601 option_conflict('l', 'b');
1602 if (fetch_all_branches)
1603 option_conflict('l', 'a');
1604 if (mirror_references)
1605 option_conflict('l', 'm');
1606 if (!TAILQ_EMPTY(&wanted_refs))
1607 option_conflict('l', 'R');
1619 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1624 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1625 host, port ? ":" : "", port ? port : "",
1626 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1627 error = got_error_from_errno("asprintf");
1631 if (strcmp(proto, "git") == 0) {
1633 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1634 "sendfd dns inet unveil", NULL) == -1)
1637 } else if (strcmp(proto, "git+ssh") == 0 ||
1638 strcmp(proto, "ssh") == 0) {
1640 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1641 "sendfd unveil", NULL) == -1)
1644 } else if (strcmp(proto, "http") == 0 ||
1645 strcmp(proto, "git+http") == 0) {
1646 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1649 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1652 if (dirname == NULL) {
1653 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1654 error = got_error_from_errno("asprintf");
1657 repo_path = default_destdir;
1659 repo_path = dirname;
1661 if (!list_refs_only) {
1662 error = got_path_mkdir(repo_path);
1664 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1665 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1667 if (!got_path_dir_is_empty(repo_path)) {
1668 error = got_error_path(repo_path,
1669 GOT_ERR_DIR_NOT_EMPTY);
1674 error = got_dial_apply_unveil(proto);
1678 error = apply_unveil(repo_path, 0, NULL);
1683 printf("Connecting to %s%s%s\n", host,
1684 port ? ":" : "", port ? port : "");
1686 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1687 server_path, verbosity);
1691 if (!list_refs_only) {
1692 error = got_repo_init(repo_path);
1695 error = got_repo_pack_fds_open(&pack_fds);
1698 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1703 fpa.last_scaled_size[0] = '\0';
1704 fpa.last_p_indexed = -1;
1705 fpa.last_p_resolved = -1;
1706 fpa.verbosity = verbosity;
1707 fpa.create_configs = 1;
1708 fpa.configs_created = 0;
1710 fpa.config_info.symrefs = &symrefs;
1711 fpa.config_info.wanted_branches = &wanted_branches;
1712 fpa.config_info.wanted_refs = &wanted_refs;
1713 fpa.config_info.proto = proto;
1714 fpa.config_info.host = host;
1715 fpa.config_info.port = port;
1716 fpa.config_info.remote_repo_path = server_path;
1717 fpa.config_info.git_url = git_url;
1718 fpa.config_info.fetch_all_branches = fetch_all_branches;
1719 fpa.config_info.mirror_references = mirror_references;
1720 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1721 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1722 fetch_all_branches, &wanted_branches, &wanted_refs,
1723 list_refs_only, verbosity, fetchfd, repo,
1724 fetch_progress, &fpa);
1728 if (list_refs_only) {
1729 error = list_remote_refs(&symrefs, &refs);
1733 if (pack_hash == NULL) {
1734 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1735 "server sent an empty pack file");
1738 error = got_object_id_str(&id_str, pack_hash);
1742 printf("\nFetched %s.pack\n", id_str);
1745 /* Set up references provided with the pack file. */
1746 TAILQ_FOREACH(pe, &refs, entry) {
1747 const char *refname = pe->path;
1748 struct got_object_id *id = pe->data;
1749 char *remote_refname;
1751 if (is_wanted_ref(&wanted_refs, refname) &&
1752 !mirror_references) {
1753 error = create_wanted_ref(refname, id,
1754 GOT_FETCH_DEFAULT_REMOTE_NAME,
1755 verbosity - 1, repo);
1761 error = create_ref(refname, id, verbosity - 1, repo);
1765 if (mirror_references)
1768 if (strncmp("refs/heads/", refname, 11) != 0)
1771 if (asprintf(&remote_refname,
1772 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1773 refname + 11) == -1) {
1774 error = got_error_from_errno("asprintf");
1777 error = create_ref(remote_refname, id, verbosity - 1, repo);
1778 free(remote_refname);
1783 /* Set the HEAD reference if the server provided one. */
1784 TAILQ_FOREACH(pe, &symrefs, entry) {
1785 struct got_reference *target_ref;
1786 const char *refname = pe->path;
1787 const char *target = pe->data;
1788 char *remote_refname = NULL, *remote_target = NULL;
1790 if (strcmp(refname, GOT_REF_HEAD) != 0)
1793 error = got_ref_open(&target_ref, repo, target, 0);
1795 if (error->code == GOT_ERR_NOT_REF) {
1802 error = create_symref(refname, target_ref, verbosity, repo);
1803 got_ref_close(target_ref);
1807 if (mirror_references)
1810 if (strncmp("refs/heads/", target, 11) != 0)
1813 if (asprintf(&remote_refname,
1814 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1816 error = got_error_from_errno("asprintf");
1819 if (asprintf(&remote_target,
1820 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1821 target + 11) == -1) {
1822 error = got_error_from_errno("asprintf");
1823 free(remote_refname);
1826 error = got_ref_open(&target_ref, repo, remote_target, 0);
1828 free(remote_refname);
1829 free(remote_target);
1830 if (error->code == GOT_ERR_NOT_REF) {
1836 error = create_symref(remote_refname, target_ref,
1837 verbosity - 1, repo);
1838 free(remote_refname);
1839 free(remote_target);
1840 got_ref_close(target_ref);
1846 * We failed to set the HEAD reference. If we asked for
1847 * a set of wanted branches use the first of one of those
1848 * which could be fetched instead.
1850 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1851 const char *target = pe->path;
1852 struct got_reference *target_ref;
1854 error = got_ref_open(&target_ref, repo, target, 0);
1856 if (error->code == GOT_ERR_NOT_REF) {
1863 error = create_symref(GOT_REF_HEAD, target_ref,
1865 got_ref_close(target_ref);
1873 printf("Created %s repository '%s'\n",
1874 mirror_references ? "mirrored" : "cloned", repo_path);
1877 const struct got_error *pack_err =
1878 got_repo_pack_fds_close(pack_fds);
1883 if (kill(fetchpid, SIGTERM) == -1)
1884 error = got_error_from_errno("kill");
1885 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1886 error = got_error_from_errno("waitpid");
1888 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1889 error = got_error_from_errno("close");
1891 const struct got_error *close_err = got_repo_close(repo);
1895 TAILQ_FOREACH(pe, &refs, entry) {
1896 free((void *)pe->path);
1899 got_pathlist_free(&refs);
1900 TAILQ_FOREACH(pe, &symrefs, entry) {
1901 free((void *)pe->path);
1904 got_pathlist_free(&symrefs);
1905 got_pathlist_free(&wanted_branches);
1906 got_pathlist_free(&wanted_refs);
1913 free(default_destdir);
1918 static const struct got_error *
1919 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1920 int replace_tags, int verbosity, struct got_repository *repo)
1922 const struct got_error *err = NULL;
1923 char *new_id_str = NULL;
1924 struct got_object_id *old_id = NULL;
1926 err = got_object_id_str(&new_id_str, new_id);
1930 if (!replace_tags &&
1931 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1932 err = got_ref_resolve(&old_id, repo, ref);
1935 if (got_object_id_cmp(old_id, new_id) == 0)
1937 if (verbosity >= 0) {
1938 printf("Rejecting update of existing tag %s: %s\n",
1939 got_ref_get_name(ref), new_id_str);
1944 if (got_ref_is_symbolic(ref)) {
1945 if (verbosity >= 0) {
1946 printf("Replacing reference %s: %s\n",
1947 got_ref_get_name(ref),
1948 got_ref_get_symref_target(ref));
1950 err = got_ref_change_symref_to_ref(ref, new_id);
1953 err = got_ref_write(ref, repo);
1957 err = got_ref_resolve(&old_id, repo, ref);
1960 if (got_object_id_cmp(old_id, new_id) == 0)
1963 err = got_ref_change_ref(ref, new_id);
1966 err = got_ref_write(ref, repo);
1972 printf("Updated %s: %s\n", got_ref_get_name(ref),
1980 static const struct got_error *
1981 update_symref(const char *refname, struct got_reference *target_ref,
1982 int verbosity, struct got_repository *repo)
1984 const struct got_error *err = NULL, *unlock_err;
1985 struct got_reference *symref;
1986 int symref_is_locked = 0;
1988 err = got_ref_open(&symref, repo, refname, 1);
1990 if (err->code != GOT_ERR_NOT_REF)
1992 err = got_ref_alloc_symref(&symref, refname, target_ref);
1996 err = got_ref_write(symref, repo);
2001 printf("Created reference %s: %s\n",
2002 got_ref_get_name(symref),
2003 got_ref_get_symref_target(symref));
2005 symref_is_locked = 1;
2007 if (strcmp(got_ref_get_symref_target(symref),
2008 got_ref_get_name(target_ref)) == 0)
2011 err = got_ref_change_symref(symref,
2012 got_ref_get_name(target_ref));
2016 err = got_ref_write(symref, repo);
2021 printf("Updated %s: %s\n", got_ref_get_name(symref),
2022 got_ref_get_symref_target(symref));
2026 if (symref_is_locked) {
2027 unlock_err = got_ref_unlock(symref);
2028 if (unlock_err && err == NULL)
2031 got_ref_close(symref);
2038 fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2039 "[-R reference] [-r repository-path] [remote-repository]\n",
2044 static const struct got_error *
2045 delete_missing_ref(struct got_reference *ref,
2046 int verbosity, struct got_repository *repo)
2048 const struct got_error *err = NULL;
2049 struct got_object_id *id = NULL;
2050 char *id_str = NULL;
2052 if (got_ref_is_symbolic(ref)) {
2053 err = got_ref_delete(ref, repo);
2056 if (verbosity >= 0) {
2057 printf("Deleted %s: %s\n",
2058 got_ref_get_name(ref),
2059 got_ref_get_symref_target(ref));
2062 err = got_ref_resolve(&id, repo, ref);
2065 err = got_object_id_str(&id_str, id);
2069 err = got_ref_delete(ref, repo);
2072 if (verbosity >= 0) {
2073 printf("Deleted %s: %s\n",
2074 got_ref_get_name(ref), id_str);
2083 static const struct got_error *
2084 delete_missing_refs(struct got_pathlist_head *their_refs,
2085 struct got_pathlist_head *their_symrefs,
2086 const struct got_remote_repo *remote,
2087 int verbosity, struct got_repository *repo)
2089 const struct got_error *err = NULL, *unlock_err;
2090 struct got_reflist_head my_refs;
2091 struct got_reflist_entry *re;
2092 struct got_pathlist_entry *pe;
2093 char *remote_namespace = NULL;
2094 char *local_refname = NULL;
2096 TAILQ_INIT(&my_refs);
2098 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2100 return got_error_from_errno("asprintf");
2102 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2106 TAILQ_FOREACH(re, &my_refs, entry) {
2107 const char *refname = got_ref_get_name(re->ref);
2108 const char *their_refname;
2110 if (remote->mirror_references) {
2111 their_refname = refname;
2113 if (strncmp(refname, remote_namespace,
2114 strlen(remote_namespace)) == 0) {
2115 if (strcmp(refname + strlen(remote_namespace),
2118 if (asprintf(&local_refname, "refs/heads/%s",
2119 refname + strlen(remote_namespace)) == -1) {
2120 err = got_error_from_errno("asprintf");
2123 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2126 their_refname = local_refname;
2129 TAILQ_FOREACH(pe, their_refs, entry) {
2130 if (strcmp(their_refname, pe->path) == 0)
2136 TAILQ_FOREACH(pe, their_symrefs, entry) {
2137 if (strcmp(their_refname, pe->path) == 0)
2143 err = delete_missing_ref(re->ref, verbosity, repo);
2147 if (local_refname) {
2148 struct got_reference *ref;
2149 err = got_ref_open(&ref, repo, local_refname, 1);
2151 if (err->code != GOT_ERR_NOT_REF)
2153 free(local_refname);
2154 local_refname = NULL;
2157 err = delete_missing_ref(ref, verbosity, repo);
2160 unlock_err = got_ref_unlock(ref);
2162 if (unlock_err && err == NULL) {
2167 free(local_refname);
2168 local_refname = NULL;
2172 free(remote_namespace);
2173 free(local_refname);
2177 static const struct got_error *
2178 update_wanted_ref(const char *refname, struct got_object_id *id,
2179 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2181 const struct got_error *err, *unlock_err;
2182 char *remote_refname;
2183 struct got_reference *ref;
2185 if (strncmp("refs/", refname, 5) == 0)
2188 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2189 remote_repo_name, refname) == -1)
2190 return got_error_from_errno("asprintf");
2192 err = got_ref_open(&ref, repo, remote_refname, 1);
2194 if (err->code != GOT_ERR_NOT_REF)
2196 err = create_ref(remote_refname, id, verbosity, repo);
2198 err = update_ref(ref, id, 0, verbosity, repo);
2199 unlock_err = got_ref_unlock(ref);
2200 if (unlock_err && err == NULL)
2205 free(remote_refname);
2209 static const struct got_error *
2210 delete_ref(struct got_repository *repo, struct got_reference *ref)
2212 const struct got_error *err = NULL;
2213 struct got_object_id *id = NULL;
2214 char *id_str = NULL;
2217 if (got_ref_is_symbolic(ref)) {
2218 target = got_ref_get_symref_target(ref);
2220 err = got_ref_resolve(&id, repo, ref);
2223 err = got_object_id_str(&id_str, id);
2229 err = got_ref_delete(ref, repo);
2233 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2240 static const struct got_error *
2241 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2243 const struct got_error *err = NULL;
2244 struct got_reflist_head refs;
2245 struct got_reflist_entry *re;
2250 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2251 err = got_error_from_errno("asprintf");
2254 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2258 TAILQ_FOREACH(re, &refs, entry)
2259 delete_ref(repo, re->ref);
2261 got_ref_list_free(&refs);
2265 static const struct got_error *
2266 cmd_fetch(int argc, char *argv[])
2268 const struct got_error *error = NULL, *unlock_err;
2269 char *cwd = NULL, *repo_path = NULL;
2270 const char *remote_name;
2271 char *proto = NULL, *host = NULL, *port = NULL;
2272 char *repo_name = NULL, *server_path = NULL;
2273 const struct got_remote_repo *remotes, *remote = NULL;
2275 char *id_str = NULL;
2276 struct got_repository *repo = NULL;
2277 struct got_worktree *worktree = NULL;
2278 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2279 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2280 struct got_pathlist_entry *pe;
2281 struct got_object_id *pack_hash = NULL;
2282 int i, ch, fetchfd = -1, fetchstatus;
2283 pid_t fetchpid = -1;
2284 struct got_fetch_progress_arg fpa;
2285 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2286 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2287 int *pack_fds = NULL;
2290 TAILQ_INIT(&symrefs);
2291 TAILQ_INIT(&wanted_branches);
2292 TAILQ_INIT(&wanted_refs);
2294 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:X")) != -1) {
2297 fetch_all_branches = 1;
2300 error = got_pathlist_append(&wanted_branches,
2312 repo_path = realpath(optarg, NULL);
2313 if (repo_path == NULL)
2314 return got_error_from_errno2("realpath",
2316 got_path_strip_trailing_slashes(repo_path);
2324 else if (verbosity < 3)
2331 error = got_pathlist_append(&wanted_refs,
2347 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2348 option_conflict('a', 'b');
2349 if (list_refs_only) {
2350 if (!TAILQ_EMPTY(&wanted_branches))
2351 option_conflict('l', 'b');
2352 if (fetch_all_branches)
2353 option_conflict('l', 'a');
2355 option_conflict('l', 'd');
2357 option_conflict('l', 'X');
2359 if (delete_remote) {
2360 if (fetch_all_branches)
2361 option_conflict('X', 'a');
2362 if (!TAILQ_EMPTY(&wanted_branches))
2363 option_conflict('X', 'b');
2365 option_conflict('X', 'd');
2367 option_conflict('X', 't');
2368 if (!TAILQ_EMPTY(&wanted_refs))
2369 option_conflict('X', 'R');
2374 errx(1, "-X option requires a remote name");
2375 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2376 } else if (argc == 1)
2377 remote_name = argv[0];
2381 cwd = getcwd(NULL, 0);
2383 error = got_error_from_errno("getcwd");
2387 error = got_repo_pack_fds_open(&pack_fds);
2391 if (repo_path == NULL) {
2392 error = got_worktree_open(&worktree, cwd);
2393 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2399 strdup(got_worktree_get_repo_path(worktree));
2400 if (repo_path == NULL)
2401 error = got_error_from_errno("strdup");
2405 repo_path = strdup(cwd);
2406 if (repo_path == NULL) {
2407 error = got_error_from_errno("strdup");
2413 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2417 if (delete_remote) {
2418 error = delete_refs_for_remote(repo, remote_name);
2419 goto done; /* nothing else to do */
2423 worktree_conf = got_worktree_get_gotconfig(worktree);
2424 if (worktree_conf) {
2425 got_gotconfig_get_remotes(&nremotes, &remotes,
2427 for (i = 0; i < nremotes; i++) {
2428 if (strcmp(remotes[i].name, remote_name) == 0) {
2429 remote = &remotes[i];
2435 if (remote == NULL) {
2436 repo_conf = got_repo_get_gotconfig(repo);
2438 got_gotconfig_get_remotes(&nremotes, &remotes,
2440 for (i = 0; i < nremotes; i++) {
2441 if (strcmp(remotes[i].name, remote_name) == 0) {
2442 remote = &remotes[i];
2448 if (remote == NULL) {
2449 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2450 for (i = 0; i < nremotes; i++) {
2451 if (strcmp(remotes[i].name, remote_name) == 0) {
2452 remote = &remotes[i];
2457 if (remote == NULL) {
2458 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2462 if (TAILQ_EMPTY(&wanted_branches)) {
2463 if (!fetch_all_branches)
2464 fetch_all_branches = remote->fetch_all_branches;
2465 for (i = 0; i < remote->nfetch_branches; i++) {
2466 got_pathlist_append(&wanted_branches,
2467 remote->fetch_branches[i], NULL);
2470 if (TAILQ_EMPTY(&wanted_refs)) {
2471 for (i = 0; i < remote->nfetch_refs; i++) {
2472 got_pathlist_append(&wanted_refs,
2473 remote->fetch_refs[i], NULL);
2477 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2478 &repo_name, remote->fetch_url);
2482 if (strcmp(proto, "git") == 0) {
2484 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2485 "sendfd dns inet unveil", NULL) == -1)
2488 } else if (strcmp(proto, "git+ssh") == 0 ||
2489 strcmp(proto, "ssh") == 0) {
2491 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2492 "sendfd unveil", NULL) == -1)
2495 } else if (strcmp(proto, "http") == 0 ||
2496 strcmp(proto, "git+http") == 0) {
2497 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2500 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2504 error = got_dial_apply_unveil(proto);
2508 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2513 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2514 port ? ":" : "", port ? port : "");
2516 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2517 server_path, verbosity);
2521 fpa.last_scaled_size[0] = '\0';
2522 fpa.last_p_indexed = -1;
2523 fpa.last_p_resolved = -1;
2524 fpa.verbosity = verbosity;
2526 fpa.create_configs = 0;
2527 fpa.configs_created = 0;
2528 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2529 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2530 remote->mirror_references, fetch_all_branches, &wanted_branches,
2531 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2532 fetch_progress, &fpa);
2536 if (list_refs_only) {
2537 error = list_remote_refs(&symrefs, &refs);
2541 if (pack_hash == NULL) {
2543 printf("Already up-to-date\n");
2544 } else if (verbosity >= 0) {
2545 error = got_object_id_str(&id_str, pack_hash);
2548 printf("\nFetched %s.pack\n", id_str);
2553 /* Update references provided with the pack file. */
2554 TAILQ_FOREACH(pe, &refs, entry) {
2555 const char *refname = pe->path;
2556 struct got_object_id *id = pe->data;
2557 struct got_reference *ref;
2558 char *remote_refname;
2560 if (is_wanted_ref(&wanted_refs, refname) &&
2561 !remote->mirror_references) {
2562 error = update_wanted_ref(refname, id,
2563 remote->name, verbosity, repo);
2569 if (remote->mirror_references ||
2570 strncmp("refs/tags/", refname, 10) == 0) {
2571 error = got_ref_open(&ref, repo, refname, 1);
2573 if (error->code != GOT_ERR_NOT_REF)
2575 error = create_ref(refname, id, verbosity,
2580 error = update_ref(ref, id, replace_tags,
2582 unlock_err = got_ref_unlock(ref);
2583 if (unlock_err && error == NULL)
2589 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2590 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2591 remote_name, refname + 11) == -1) {
2592 error = got_error_from_errno("asprintf");
2596 error = got_ref_open(&ref, repo, remote_refname, 1);
2598 if (error->code != GOT_ERR_NOT_REF)
2600 error = create_ref(remote_refname, id,
2605 error = update_ref(ref, id, replace_tags,
2607 unlock_err = got_ref_unlock(ref);
2608 if (unlock_err && error == NULL)
2615 /* Also create a local branch if none exists yet. */
2616 error = got_ref_open(&ref, repo, refname, 1);
2618 if (error->code != GOT_ERR_NOT_REF)
2620 error = create_ref(refname, id, verbosity,
2625 unlock_err = got_ref_unlock(ref);
2626 if (unlock_err && error == NULL)
2633 error = delete_missing_refs(&refs, &symrefs, remote,
2639 if (!remote->mirror_references) {
2640 /* Update remote HEAD reference if the server provided one. */
2641 TAILQ_FOREACH(pe, &symrefs, entry) {
2642 struct got_reference *target_ref;
2643 const char *refname = pe->path;
2644 const char *target = pe->data;
2645 char *remote_refname = NULL, *remote_target = NULL;
2647 if (strcmp(refname, GOT_REF_HEAD) != 0)
2650 if (strncmp("refs/heads/", target, 11) != 0)
2653 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2654 remote->name, refname) == -1) {
2655 error = got_error_from_errno("asprintf");
2658 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2659 remote->name, target + 11) == -1) {
2660 error = got_error_from_errno("asprintf");
2661 free(remote_refname);
2665 error = got_ref_open(&target_ref, repo, remote_target,
2668 free(remote_refname);
2669 free(remote_target);
2670 if (error->code == GOT_ERR_NOT_REF) {
2676 error = update_symref(remote_refname, target_ref,
2678 free(remote_refname);
2679 free(remote_target);
2680 got_ref_close(target_ref);
2687 if (kill(fetchpid, SIGTERM) == -1)
2688 error = got_error_from_errno("kill");
2689 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2690 error = got_error_from_errno("waitpid");
2692 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2693 error = got_error_from_errno("close");
2695 const struct got_error *close_err = got_repo_close(repo);
2700 got_worktree_close(worktree);
2702 const struct got_error *pack_err =
2703 got_repo_pack_fds_close(pack_fds);
2707 TAILQ_FOREACH(pe, &refs, entry) {
2708 free((void *)pe->path);
2711 got_pathlist_free(&refs);
2712 TAILQ_FOREACH(pe, &symrefs, entry) {
2713 free((void *)pe->path);
2716 got_pathlist_free(&symrefs);
2717 got_pathlist_free(&wanted_branches);
2718 got_pathlist_free(&wanted_refs);
2733 usage_checkout(void)
2735 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2736 "[-p path-prefix] repository-path [work-tree-path]\n",
2742 show_worktree_base_ref_warning(void)
2744 fprintf(stderr, "%s: warning: could not create a reference "
2745 "to the work tree's base commit; the commit could be "
2746 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2747 "repository writable and running 'got update' will prevent this\n",
2751 struct got_checkout_progress_arg {
2752 const char *worktree_path;
2753 int had_base_commit_ref_error;
2757 static const struct got_error *
2758 checkout_progress(void *arg, unsigned char status, const char *path)
2760 struct got_checkout_progress_arg *a = arg;
2762 /* Base commit bump happens silently. */
2763 if (status == GOT_STATUS_BUMP_BASE)
2766 if (status == GOT_STATUS_BASE_REF_ERR) {
2767 a->had_base_commit_ref_error = 1;
2771 while (path[0] == '/')
2774 if (a->verbosity >= 0)
2775 printf("%c %s/%s\n", status, a->worktree_path, path);
2780 static const struct got_error *
2781 check_cancelled(void *arg)
2783 if (sigint_received || sigpipe_received)
2784 return got_error(GOT_ERR_CANCELLED);
2788 static const struct got_error *
2789 check_linear_ancestry(struct got_object_id *commit_id,
2790 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2791 struct got_repository *repo)
2793 const struct got_error *err = NULL;
2794 struct got_object_id *yca_id;
2796 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2797 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2802 return got_error(GOT_ERR_ANCESTRY);
2805 * Require a straight line of history between the target commit
2806 * and the work tree's base commit.
2808 * Non-linear situations such as this require a rebase:
2810 * (commit) D F (base_commit)
2818 * 'got update' only handles linear cases:
2819 * Update forwards in time: A (base/yca) - B - C - D (commit)
2820 * Update backwards in time: D (base) - C - B - A (commit/yca)
2822 if (allow_forwards_in_time_only) {
2823 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2824 return got_error(GOT_ERR_ANCESTRY);
2825 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2826 got_object_id_cmp(base_commit_id, yca_id) != 0)
2827 return got_error(GOT_ERR_ANCESTRY);
2833 static const struct got_error *
2834 check_same_branch(struct got_object_id *commit_id,
2835 struct got_reference *head_ref, struct got_object_id *yca_id,
2836 struct got_repository *repo)
2838 const struct got_error *err = NULL;
2839 struct got_commit_graph *graph = NULL;
2840 struct got_object_id *head_commit_id = NULL;
2841 int is_same_branch = 0;
2843 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2847 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2851 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2856 err = got_commit_graph_open(&graph, "/", 1);
2860 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2861 check_cancelled, NULL);
2866 struct got_object_id id;
2868 err = got_commit_graph_iter_next(&id, graph, repo,
2869 check_cancelled, NULL);
2871 if (err->code == GOT_ERR_ITER_COMPLETED)
2876 if (yca_id && got_object_id_cmp(&id, yca_id) == 0)
2878 if (got_object_id_cmp(&id, commit_id) == 0) {
2885 got_commit_graph_close(graph);
2886 free(head_commit_id);
2887 if (!err && !is_same_branch)
2888 err = got_error(GOT_ERR_ANCESTRY);
2892 static const struct got_error *
2893 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2895 static char msg[512];
2896 const char *branch_name;
2898 if (got_ref_is_symbolic(ref))
2899 branch_name = got_ref_get_symref_target(ref);
2901 branch_name = got_ref_get_name(ref);
2903 if (strncmp("refs/heads/", branch_name, 11) == 0)
2906 snprintf(msg, sizeof(msg),
2907 "target commit is not contained in branch '%s'; "
2908 "the branch to use must be specified with -b; "
2909 "if necessary a new branch can be created for "
2910 "this commit with 'got branch -c %s BRANCH_NAME'",
2911 branch_name, commit_id_str);
2913 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2916 static const struct got_error *
2917 cmd_checkout(int argc, char *argv[])
2919 const struct got_error *error = NULL;
2920 struct got_repository *repo = NULL;
2921 struct got_reference *head_ref = NULL, *ref = NULL;
2922 struct got_worktree *worktree = NULL;
2923 char *repo_path = NULL;
2924 char *worktree_path = NULL;
2925 const char *path_prefix = "";
2926 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2927 char *commit_id_str = NULL;
2928 struct got_object_id *commit_id = NULL;
2930 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2931 struct got_pathlist_head paths;
2932 struct got_checkout_progress_arg cpa;
2933 int *pack_fds = NULL;
2937 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2940 branch_name = optarg;
2943 commit_id_str = strdup(optarg);
2944 if (commit_id_str == NULL)
2945 return got_error_from_errno("strdup");
2951 path_prefix = optarg;
2966 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2967 "unveil", NULL) == -1)
2971 char *base, *dotgit;
2973 repo_path = realpath(argv[0], NULL);
2974 if (repo_path == NULL)
2975 return got_error_from_errno2("realpath", argv[0]);
2976 cwd = getcwd(NULL, 0);
2978 error = got_error_from_errno("getcwd");
2985 error = got_path_basename(&base, path);
2988 dotgit = strstr(base, ".git");
2991 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2992 error = got_error_from_errno("asprintf");
2997 } else if (argc == 2) {
2998 repo_path = realpath(argv[0], NULL);
2999 if (repo_path == NULL) {
3000 error = got_error_from_errno2("realpath", argv[0]);
3003 worktree_path = realpath(argv[1], NULL);
3004 if (worktree_path == NULL) {
3005 if (errno != ENOENT) {
3006 error = got_error_from_errno2("realpath",
3010 worktree_path = strdup(argv[1]);
3011 if (worktree_path == NULL) {
3012 error = got_error_from_errno("strdup");
3019 got_path_strip_trailing_slashes(repo_path);
3020 got_path_strip_trailing_slashes(worktree_path);
3022 error = got_repo_pack_fds_open(&pack_fds);
3026 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3030 /* Pre-create work tree path for unveil(2) */
3031 error = got_path_mkdir(worktree_path);
3033 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3034 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3036 if (!allow_nonempty &&
3037 !got_path_dir_is_empty(worktree_path)) {
3038 error = got_error_path(worktree_path,
3039 GOT_ERR_DIR_NOT_EMPTY);
3044 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3048 error = got_ref_open(&head_ref, repo, branch_name, 0);
3052 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
3053 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3056 error = got_worktree_open(&worktree, worktree_path);
3060 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3064 if (!same_path_prefix) {
3065 error = got_error(GOT_ERR_PATH_PREFIX);
3069 if (commit_id_str) {
3070 struct got_reflist_head refs;
3072 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3076 error = got_repo_match_object_id(&commit_id, NULL,
3077 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3078 got_ref_list_free(&refs);
3081 error = check_linear_ancestry(commit_id,
3082 got_worktree_get_base_commit_id(worktree), 0, repo);
3083 if (error != NULL) {
3084 if (error->code == GOT_ERR_ANCESTRY) {
3085 error = checkout_ancestry_error(
3086 head_ref, commit_id_str);
3090 error = check_same_branch(commit_id, head_ref, NULL, repo);
3092 if (error->code == GOT_ERR_ANCESTRY) {
3093 error = checkout_ancestry_error(
3094 head_ref, commit_id_str);
3098 error = got_worktree_set_base_commit_id(worktree, repo,
3102 /* Expand potentially abbreviated commit ID string. */
3103 free(commit_id_str);
3104 error = got_object_id_str(&commit_id_str, commit_id);
3108 commit_id = got_object_id_dup(
3109 got_worktree_get_base_commit_id(worktree));
3110 if (commit_id == NULL) {
3111 error = got_error_from_errno("got_object_id_dup");
3114 error = got_object_id_str(&commit_id_str, commit_id);
3119 error = got_pathlist_append(&paths, "", NULL);
3122 cpa.worktree_path = worktree_path;
3123 cpa.had_base_commit_ref_error = 0;
3124 cpa.verbosity = verbosity;
3125 error = got_worktree_checkout_files(worktree, &paths, repo,
3126 checkout_progress, &cpa, check_cancelled, NULL);
3130 if (got_ref_is_symbolic(head_ref)) {
3131 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3134 refname = got_ref_get_name(ref);
3136 refname = got_ref_get_name(head_ref);
3137 printf("Checked out %s: %s\n", refname, commit_id_str);
3138 printf("Now shut up and hack\n");
3139 if (cpa.had_base_commit_ref_error)
3140 show_worktree_base_ref_warning();
3143 const struct got_error *pack_err =
3144 got_repo_pack_fds_close(pack_fds);
3149 got_ref_close(head_ref);
3152 got_pathlist_free(&paths);
3153 free(commit_id_str);
3156 free(worktree_path);
3161 struct got_update_progress_arg {
3173 print_update_progress_stats(struct got_update_progress_arg *upa)
3175 if (!upa->did_something)
3178 if (upa->conflicts > 0)
3179 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3180 if (upa->obstructed > 0)
3181 printf("File paths obstructed by a non-regular file: %d\n",
3183 if (upa->not_updated > 0)
3184 printf("Files not updated because of existing merge "
3185 "conflicts: %d\n", upa->not_updated);
3189 * The meaning of some status codes differs between merge-style operations and
3190 * update operations. For example, the ! status code means "file was missing"
3191 * if changes were merged into the work tree, and "missing file was restored"
3192 * if the work tree was updated. This function should be used by any operation
3193 * which merges changes into the work tree without updating the work tree.
3196 print_merge_progress_stats(struct got_update_progress_arg *upa)
3198 if (!upa->did_something)
3201 if (upa->conflicts > 0)
3202 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3203 if (upa->obstructed > 0)
3204 printf("File paths obstructed by a non-regular file: %d\n",
3206 if (upa->missing > 0)
3207 printf("Files which had incoming changes but could not be "
3208 "found in the work tree: %d\n", upa->missing);
3209 if (upa->not_deleted > 0)
3210 printf("Files not deleted due to differences in deleted "
3211 "content: %d\n", upa->not_deleted);
3212 if (upa->unversioned > 0)
3213 printf("Files not merged because an unversioned file was "
3214 "found in the work tree: %d\n", upa->unversioned);
3220 fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3221 "[path ...]\n", getprogname());
3225 static const struct got_error *
3226 update_progress(void *arg, unsigned char status, const char *path)
3228 struct got_update_progress_arg *upa = arg;
3230 if (status == GOT_STATUS_EXISTS ||
3231 status == GOT_STATUS_BASE_REF_ERR)
3234 upa->did_something = 1;
3236 /* Base commit bump happens silently. */
3237 if (status == GOT_STATUS_BUMP_BASE)
3240 if (status == GOT_STATUS_CONFLICT)
3242 if (status == GOT_STATUS_OBSTRUCTED)
3244 if (status == GOT_STATUS_CANNOT_UPDATE)
3246 if (status == GOT_STATUS_MISSING)
3248 if (status == GOT_STATUS_CANNOT_DELETE)
3250 if (status == GOT_STATUS_UNVERSIONED)
3253 while (path[0] == '/')
3255 if (upa->verbosity >= 0)
3256 printf("%c %s\n", status, path);
3261 static const struct got_error *
3262 switch_head_ref(struct got_reference *head_ref,
3263 struct got_object_id *commit_id, struct got_worktree *worktree,
3264 struct got_repository *repo)
3266 const struct got_error *err = NULL;
3268 int ref_has_moved = 0;
3270 /* Trivial case: switching between two different references. */
3271 if (strcmp(got_ref_get_name(head_ref),
3272 got_worktree_get_head_ref_name(worktree)) != 0) {
3273 printf("Switching work tree from %s to %s\n",
3274 got_worktree_get_head_ref_name(worktree),
3275 got_ref_get_name(head_ref));
3276 return got_worktree_set_head_ref(worktree, head_ref);
3279 err = check_linear_ancestry(commit_id,
3280 got_worktree_get_base_commit_id(worktree), 0, repo);
3282 if (err->code != GOT_ERR_ANCESTRY)
3289 /* Switching to a rebased branch with the same reference name. */
3290 err = got_object_id_str(&base_id_str,
3291 got_worktree_get_base_commit_id(worktree));
3294 printf("Reference %s now points at a different branch\n",
3295 got_worktree_get_head_ref_name(worktree));
3296 printf("Switching work tree from %s to %s\n", base_id_str,
3297 got_worktree_get_head_ref_name(worktree));
3301 static const struct got_error *
3302 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3304 const struct got_error *err;
3307 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3311 return got_error(GOT_ERR_REBASING);
3313 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3317 return got_error(GOT_ERR_HISTEDIT_BUSY);
3322 static const struct got_error *
3323 check_merge_in_progress(struct got_worktree *worktree,
3324 struct got_repository *repo)
3326 const struct got_error *err;
3329 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3333 return got_error(GOT_ERR_MERGE_BUSY);
3338 static const struct got_error *
3339 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3340 char *argv[], struct got_worktree *worktree)
3342 const struct got_error *err = NULL;
3344 struct got_pathlist_entry *new;
3350 return got_error_from_errno("strdup");
3351 return got_pathlist_append(paths, path, NULL);
3354 for (i = 0; i < argc; i++) {
3355 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3358 err = got_pathlist_insert(&new, paths, path, NULL);
3359 if (err || new == NULL /* duplicate */) {
3369 static const struct got_error *
3370 wrap_not_worktree_error(const struct got_error *orig_err,
3371 const char *cmdname, const char *path)
3373 const struct got_error *err;
3374 struct got_repository *repo;
3375 static char msg[512];
3376 int *pack_fds = NULL;
3378 err = got_repo_pack_fds_open(&pack_fds);
3382 err = got_repo_open(&repo, path, NULL, pack_fds);
3386 snprintf(msg, sizeof(msg),
3387 "'got %s' needs a work tree in addition to a git repository\n"
3388 "Work trees can be checked out from this Git repository with "
3390 "The got(1) manual page contains more information.", cmdname);
3391 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3392 got_repo_close(repo);
3394 const struct got_error *pack_err =
3395 got_repo_pack_fds_close(pack_fds);
3402 static const struct got_error *
3403 cmd_update(int argc, char *argv[])
3405 const struct got_error *error = NULL;
3406 struct got_repository *repo = NULL;
3407 struct got_worktree *worktree = NULL;
3408 char *worktree_path = NULL;
3409 struct got_object_id *commit_id = NULL;
3410 char *commit_id_str = NULL;
3411 const char *branch_name = NULL;
3412 struct got_reference *head_ref = NULL;
3413 struct got_pathlist_head paths;
3414 struct got_pathlist_entry *pe;
3415 int ch, verbosity = 0;
3416 struct got_update_progress_arg upa;
3417 int *pack_fds = NULL;
3421 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3424 branch_name = optarg;
3427 commit_id_str = strdup(optarg);
3428 if (commit_id_str == NULL)
3429 return got_error_from_errno("strdup");
3444 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3445 "unveil", NULL) == -1)
3448 worktree_path = getcwd(NULL, 0);
3449 if (worktree_path == NULL) {
3450 error = got_error_from_errno("getcwd");
3454 error = got_repo_pack_fds_open(&pack_fds);
3458 error = got_worktree_open(&worktree, worktree_path);
3460 if (error->code == GOT_ERR_NOT_WORKTREE)
3461 error = wrap_not_worktree_error(error, "update",
3466 error = check_rebase_or_histedit_in_progress(worktree);
3470 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3475 error = apply_unveil(got_repo_get_path(repo), 0,
3476 got_worktree_get_root_path(worktree));
3480 error = check_merge_in_progress(worktree, repo);
3484 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3488 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3489 got_worktree_get_head_ref_name(worktree), 0);
3492 if (commit_id_str == NULL) {
3493 error = got_ref_resolve(&commit_id, repo, head_ref);
3496 error = got_object_id_str(&commit_id_str, commit_id);
3500 struct got_reflist_head refs;
3502 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3506 error = got_repo_match_object_id(&commit_id, NULL,
3507 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3508 got_ref_list_free(&refs);
3509 free(commit_id_str);
3510 commit_id_str = NULL;
3513 error = got_object_id_str(&commit_id_str, commit_id);
3519 struct got_object_id *head_commit_id;
3520 TAILQ_FOREACH(pe, &paths, entry) {
3521 if (pe->path_len == 0)
3523 error = got_error_msg(GOT_ERR_BAD_PATH,
3524 "switching between branches requires that "
3525 "the entire work tree gets updated");
3528 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3531 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3533 free(head_commit_id);
3536 error = check_same_branch(commit_id, head_ref, NULL, repo);
3539 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3543 error = check_linear_ancestry(commit_id,
3544 got_worktree_get_base_commit_id(worktree), 0, repo);
3545 if (error != NULL) {
3546 if (error->code == GOT_ERR_ANCESTRY)
3547 error = got_error(GOT_ERR_BRANCH_MOVED);
3550 error = check_same_branch(commit_id, head_ref, NULL, repo);
3555 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3557 error = got_worktree_set_base_commit_id(worktree, repo,
3563 memset(&upa, 0, sizeof(upa));
3564 upa.verbosity = verbosity;
3565 error = got_worktree_checkout_files(worktree, &paths, repo,
3566 update_progress, &upa, check_cancelled, NULL);
3570 if (upa.did_something) {
3571 printf("Updated to %s: %s\n",
3572 got_worktree_get_head_ref_name(worktree), commit_id_str);
3574 printf("Already up-to-date\n");
3576 print_update_progress_stats(&upa);
3579 const struct got_error *pack_err =
3580 got_repo_pack_fds_close(pack_fds);
3584 free(worktree_path);
3585 TAILQ_FOREACH(pe, &paths, entry)
3586 free((char *)pe->path);
3587 got_pathlist_free(&paths);
3589 free(commit_id_str);
3593 static const struct got_error *
3594 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3595 const char *path, int diff_context, int ignore_whitespace,
3596 int force_text_diff, struct got_repository *repo, FILE *outfile)
3598 const struct got_error *err = NULL;
3599 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3600 FILE *f1 = NULL, *f2 = NULL;
3601 int fd1 = -1, fd2 = -1;
3603 fd1 = got_opentempfd();
3605 return got_error_from_errno("got_opentempfd");
3606 fd2 = got_opentempfd();
3608 err = got_error_from_errno("got_opentempfd");
3613 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3619 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3623 f1 = got_opentemp();
3625 err = got_error_from_errno("got_opentemp");
3628 f2 = got_opentemp();
3630 err = got_error_from_errno("got_opentemp");
3634 while (path[0] == '/')
3636 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3637 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3638 force_text_diff, outfile);
3640 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3641 err = got_error_from_errno("close");
3643 got_object_blob_close(blob1);
3644 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3645 err = got_error_from_errno("close");
3646 got_object_blob_close(blob2);
3647 if (f1 && fclose(f1) == EOF && err == NULL)
3648 err = got_error_from_errno("fclose");
3649 if (f2 && fclose(f2) == EOF && err == NULL)
3650 err = got_error_from_errno("fclose");
3654 static const struct got_error *
3655 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3656 const char *path, int diff_context, int ignore_whitespace,
3657 int force_text_diff, struct got_repository *repo, FILE *outfile)
3659 const struct got_error *err = NULL;
3660 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3661 struct got_diff_blob_output_unidiff_arg arg;
3662 FILE *f1 = NULL, *f2 = NULL;
3663 int fd1 = -1, fd2 = -1;
3666 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3669 fd1 = got_opentempfd();
3671 err = got_error_from_errno("got_opentempfd");
3676 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3680 f1 = got_opentemp();
3682 err = got_error_from_errno("got_opentemp");
3686 f2 = got_opentemp();
3688 err = got_error_from_errno("got_opentemp");
3691 fd2 = got_opentempfd();
3693 err = got_error_from_errno("got_opentempfd");
3696 arg.diff_context = diff_context;
3697 arg.ignore_whitespace = ignore_whitespace;
3698 arg.force_text_diff = force_text_diff;
3699 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3700 arg.outfile = outfile;
3703 while (path[0] == '/')
3705 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3706 got_diff_blob_output_unidiff, &arg, 1);
3709 got_object_tree_close(tree1);
3711 got_object_tree_close(tree2);
3712 if (f1 && fclose(f1) == EOF && err == NULL)
3713 err = got_error_from_errno("fclose");
3714 if (f2 && fclose(f2) == EOF && err == NULL)
3715 err = got_error_from_errno("fclose");
3716 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3717 err = got_error_from_errno("close");
3718 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3719 err = got_error_from_errno("close");
3723 static const struct got_error *
3724 get_changed_paths(struct got_pathlist_head *paths,
3725 struct got_commit_object *commit, struct got_repository *repo)
3727 const struct got_error *err = NULL;
3728 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3729 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3730 struct got_object_qid *qid;
3732 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3734 struct got_commit_object *pcommit;
3735 err = got_object_open_as_commit(&pcommit, repo,
3740 tree_id1 = got_object_id_dup(
3741 got_object_commit_get_tree_id(pcommit));
3742 if (tree_id1 == NULL) {
3743 got_object_commit_close(pcommit);
3744 return got_error_from_errno("got_object_id_dup");
3746 got_object_commit_close(pcommit);
3751 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3756 tree_id2 = got_object_commit_get_tree_id(commit);
3757 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3761 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
3762 got_diff_tree_collect_changed_paths, paths, 0);
3765 got_object_tree_close(tree1);
3767 got_object_tree_close(tree2);
3772 static const struct got_error *
3773 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3774 const char *path, int diff_context, struct got_repository *repo,
3777 const struct got_error *err = NULL;
3778 struct got_commit_object *pcommit = NULL;
3779 char *id_str1 = NULL, *id_str2 = NULL;
3780 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3781 struct got_object_qid *qid;
3783 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3785 err = got_object_open_as_commit(&pcommit, repo,
3789 err = got_object_id_str(&id_str1, &qid->id);
3794 err = got_object_id_str(&id_str2, id);
3798 if (path && path[0] != '\0') {
3800 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3804 err = got_object_id_by_path(&obj_id1, repo,
3807 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3813 err = got_object_get_type(&obj_type, repo, obj_id2);
3819 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3820 fprintf(outfile, "commit - %s\n",
3821 id_str1 ? id_str1 : "/dev/null");
3822 fprintf(outfile, "commit + %s\n", id_str2);
3824 case GOT_OBJ_TYPE_BLOB:
3825 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3826 0, 0, repo, outfile);
3828 case GOT_OBJ_TYPE_TREE:
3829 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3830 0, 0, repo, outfile);
3833 err = got_error(GOT_ERR_OBJ_TYPE);
3839 obj_id2 = got_object_commit_get_tree_id(commit);
3841 obj_id1 = got_object_commit_get_tree_id(pcommit);
3843 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3844 fprintf(outfile, "commit - %s\n",
3845 id_str1 ? id_str1 : "/dev/null");
3846 fprintf(outfile, "commit + %s\n", id_str2);
3847 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3854 got_object_commit_close(pcommit);
3859 get_datestr(time_t *time, char *datebuf)
3861 struct tm mytm, *tm;
3864 tm = gmtime_r(time, &mytm);
3867 s = asctime_r(tm, datebuf);
3870 p = strchr(s, '\n');
3876 static const struct got_error *
3877 match_commit(int *have_match, struct got_object_id *id,
3878 struct got_commit_object *commit, regex_t *regex)
3880 const struct got_error *err = NULL;
3881 regmatch_t regmatch;
3882 char *id_str = NULL, *logmsg = NULL;
3886 err = got_object_id_str(&id_str, id);
3890 err = got_object_commit_get_logmsg(&logmsg, commit);
3894 if (regexec(regex, got_object_commit_get_author(commit), 1,
3895 ®match, 0) == 0 ||
3896 regexec(regex, got_object_commit_get_committer(commit), 1,
3897 ®match, 0) == 0 ||
3898 regexec(regex, id_str, 1, ®match, 0) == 0 ||
3899 regexec(regex, logmsg, 1, ®match, 0) == 0)
3908 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3911 regmatch_t regmatch;
3912 struct got_pathlist_entry *pe;
3916 TAILQ_FOREACH(pe, changed_paths, entry) {
3917 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3924 static const struct got_error *
3925 match_patch(int *have_match, struct got_commit_object *commit,
3926 struct got_object_id *id, const char *path, int diff_context,
3927 struct got_repository *repo, regex_t *regex, FILE *f)
3929 const struct got_error *err = NULL;
3931 size_t linesize = 0;
3932 regmatch_t regmatch;
3936 err = got_opentemp_truncate(f);
3940 err = print_patch(commit, id, path, diff_context, repo, f);
3944 if (fseeko(f, 0L, SEEK_SET) == -1) {
3945 err = got_error_from_errno("fseeko");
3949 while (getline(&line, &linesize, f) != -1) {
3950 if (regexec(regex, line, 1, ®match, 0) == 0) {
3960 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3962 static const struct got_error*
3963 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3964 struct got_object_id *id, struct got_repository *repo,
3967 static const struct got_error *err = NULL;
3968 struct got_reflist_entry *re;
3974 TAILQ_FOREACH(re, refs, entry) {
3975 struct got_tag_object *tag = NULL;
3976 struct got_object_id *ref_id;
3979 name = got_ref_get_name(re->ref);
3980 if (strcmp(name, GOT_REF_HEAD) == 0)
3982 if (strncmp(name, "refs/", 5) == 0)
3984 if (strncmp(name, "got/", 4) == 0)
3986 if (strncmp(name, "heads/", 6) == 0)
3988 if (strncmp(name, "remotes/", 8) == 0) {
3992 s = strstr(name, "/" GOT_REF_HEAD);
3993 if (s != NULL && s[strlen(s)] == '\0')
3996 err = got_ref_resolve(&ref_id, repo, re->ref);
3999 if (strncmp(name, "tags/", 5) == 0) {
4000 err = got_object_open_as_tag(&tag, repo, ref_id);
4002 if (err->code != GOT_ERR_OBJ_TYPE) {
4006 /* Ref points at something other than a tag. */
4011 cmp = got_object_id_cmp(tag ?
4012 got_object_tag_get_object_id(tag) : ref_id, id);
4015 got_object_tag_close(tag);
4019 if (asprintf(refs_str, "%s%s%s", s ? s : "",
4020 s ? ", " : "", name) == -1) {
4021 err = got_error_from_errno("asprintf");
4032 static const struct got_error *
4033 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4034 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4036 const struct got_error *err = NULL;
4037 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4038 char *comma, *s, *nl;
4039 struct got_reflist_head *refs;
4040 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4042 time_t committer_time;
4044 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4046 err = build_refs_str(&ref_str, refs, id, repo, 1);
4050 /* Display the first matching ref only. */
4051 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4055 if (ref_str == NULL) {
4056 err = got_object_id_str(&id_str, id);
4061 committer_time = got_object_commit_get_committer_time(commit);
4062 if (gmtime_r(&committer_time, &tm) == NULL) {
4063 err = got_error_from_errno("gmtime_r");
4066 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4067 err = got_error(GOT_ERR_NO_SPACE);
4071 err = got_object_commit_get_logmsg(&logmsg0, commit);
4076 while (isspace((unsigned char)s[0]))
4079 nl = strchr(s, '\n');
4085 printf("%s%-7s %s\n", datebuf, ref_str, s);
4087 printf("%s%.7s %s\n", datebuf, id_str, s);
4089 if (fflush(stdout) != 0 && err == NULL)
4090 err = got_error_from_errno("fflush");
4098 static const struct got_error *
4099 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4100 struct got_repository *repo, const char *path,
4101 struct got_pathlist_head *changed_paths, int show_patch,
4102 int diff_context, struct got_reflist_object_id_map *refs_idmap,
4103 const char *custom_refs_str)
4105 const struct got_error *err = NULL;
4106 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4108 time_t committer_time;
4109 const char *author, *committer;
4110 char *refs_str = NULL;
4112 err = got_object_id_str(&id_str, id);
4116 if (custom_refs_str == NULL) {
4117 struct got_reflist_head *refs;
4118 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4120 err = build_refs_str(&refs_str, refs, id, repo, 0);
4126 printf(GOT_COMMIT_SEP_STR);
4127 if (custom_refs_str)
4128 printf("commit %s (%s)\n", id_str, custom_refs_str);
4130 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4131 refs_str ? refs_str : "", refs_str ? ")" : "");
4136 printf("from: %s\n", got_object_commit_get_author(commit));
4137 committer_time = got_object_commit_get_committer_time(commit);
4138 datestr = get_datestr(&committer_time, datebuf);
4140 printf("date: %s UTC\n", datestr);
4141 author = got_object_commit_get_author(commit);
4142 committer = got_object_commit_get_committer(commit);
4143 if (strcmp(author, committer) != 0)
4144 printf("via: %s\n", committer);
4145 if (got_object_commit_get_nparents(commit) > 1) {
4146 const struct got_object_id_queue *parent_ids;
4147 struct got_object_qid *qid;
4149 parent_ids = got_object_commit_get_parent_ids(commit);
4150 STAILQ_FOREACH(qid, parent_ids, entry) {
4151 err = got_object_id_str(&id_str, &qid->id);
4154 printf("parent %d: %s\n", n++, id_str);
4160 err = got_object_commit_get_logmsg(&logmsg0, commit);
4166 line = strsep(&logmsg, "\n");
4168 printf(" %s\n", line);
4172 if (changed_paths) {
4173 struct got_pathlist_entry *pe;
4174 TAILQ_FOREACH(pe, changed_paths, entry) {
4175 struct got_diff_changed_path *cp = pe->data;
4176 printf(" %c %s\n", cp->status, pe->path);
4181 err = print_patch(commit, id, path, diff_context, repo, stdout);
4186 if (fflush(stdout) != 0 && err == NULL)
4187 err = got_error_from_errno("fflush");
4194 static const struct got_error *
4195 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4196 struct got_repository *repo, const char *path, int show_changed_paths,
4197 int show_patch, const char *search_pattern, int diff_context, int limit,
4198 int log_branches, int reverse_display_order,
4199 struct got_reflist_object_id_map *refs_idmap, int one_line,
4202 const struct got_error *err;
4203 struct got_commit_graph *graph;
4206 struct got_object_id_queue reversed_commits;
4207 struct got_object_qid *qid;
4208 struct got_commit_object *commit;
4209 struct got_pathlist_head changed_paths;
4210 struct got_pathlist_entry *pe;
4212 STAILQ_INIT(&reversed_commits);
4213 TAILQ_INIT(&changed_paths);
4215 if (search_pattern && regcomp(®ex, search_pattern,
4216 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4217 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4219 err = got_commit_graph_open(&graph, path, !log_branches);
4222 err = got_commit_graph_iter_start(graph, root_id, repo,
4223 check_cancelled, NULL);
4227 struct got_object_id id;
4229 if (sigint_received || sigpipe_received)
4232 err = got_commit_graph_iter_next(&id, graph, repo,
4233 check_cancelled, NULL);
4235 if (err->code == GOT_ERR_ITER_COMPLETED)
4240 err = got_object_open_as_commit(&commit, repo, &id);
4244 if (show_changed_paths && !reverse_display_order) {
4245 err = get_changed_paths(&changed_paths, commit, repo);
4250 if (search_pattern) {
4251 err = match_commit(&have_match, &id, commit, ®ex);
4253 got_object_commit_close(commit);
4256 if (have_match == 0 && show_changed_paths)
4257 match_changed_paths(&have_match,
4258 &changed_paths, ®ex);
4259 if (have_match == 0 && show_patch) {
4260 err = match_patch(&have_match, commit, &id,
4261 path, diff_context, repo, ®ex,
4266 if (have_match == 0) {
4267 got_object_commit_close(commit);
4268 TAILQ_FOREACH(pe, &changed_paths, entry) {
4269 free((char *)pe->path);
4272 got_pathlist_free(&changed_paths);
4277 if (reverse_display_order) {
4278 err = got_object_qid_alloc(&qid, &id);
4281 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4282 got_object_commit_close(commit);
4285 err = print_commit_oneline(commit, &id,
4288 err = print_commit(commit, &id, repo, path,
4289 show_changed_paths ? &changed_paths : NULL,
4290 show_patch, diff_context, refs_idmap, NULL);
4291 got_object_commit_close(commit);
4295 if ((limit && --limit == 0) ||
4296 (end_id && got_object_id_cmp(&id, end_id) == 0))
4299 TAILQ_FOREACH(pe, &changed_paths, entry) {
4300 free((char *)pe->path);
4303 got_pathlist_free(&changed_paths);
4305 if (reverse_display_order) {
4306 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4307 err = got_object_open_as_commit(&commit, repo,
4311 if (show_changed_paths) {
4312 err = get_changed_paths(&changed_paths,
4318 err = print_commit_oneline(commit, &qid->id,
4321 err = print_commit(commit, &qid->id, repo, path,
4322 show_changed_paths ? &changed_paths : NULL,
4323 show_patch, diff_context, refs_idmap, NULL);
4324 got_object_commit_close(commit);
4327 TAILQ_FOREACH(pe, &changed_paths, entry) {
4328 free((char *)pe->path);
4331 got_pathlist_free(&changed_paths);
4335 while (!STAILQ_EMPTY(&reversed_commits)) {
4336 qid = STAILQ_FIRST(&reversed_commits);
4337 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4338 got_object_qid_free(qid);
4340 TAILQ_FOREACH(pe, &changed_paths, entry) {
4341 free((char *)pe->path);
4344 got_pathlist_free(&changed_paths);
4347 got_commit_graph_close(graph);
4354 fprintf(stderr, "usage: %s log [-bPpRs] [-C number] [-c commit] [-l N] "
4355 "[-r repository-path] [-S search-pattern] [-x commit] [path]\n",
4361 get_default_log_limit(void)
4363 const char *got_default_log_limit;
4367 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4368 if (got_default_log_limit == NULL)
4370 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4376 static const struct got_error *
4377 cmd_log(int argc, char *argv[])
4379 const struct got_error *error;
4380 struct got_repository *repo = NULL;
4381 struct got_worktree *worktree = NULL;
4382 struct got_object_id *start_id = NULL, *end_id = NULL;
4383 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4384 const char *start_commit = NULL, *end_commit = NULL;
4385 const char *search_pattern = NULL;
4386 int diff_context = -1, ch;
4387 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4388 int reverse_display_order = 0, one_line = 0;
4390 struct got_reflist_head refs;
4391 struct got_reflist_object_id_map *refs_idmap = NULL;
4392 FILE *tmpfile = NULL;
4393 int *pack_fds = NULL;
4398 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4404 limit = get_default_log_limit();
4406 while ((ch = getopt(argc, argv, "bpPc:C:l:r:RsS:x:")) != -1) {
4412 show_changed_paths = 1;
4415 start_commit = optarg;
4418 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4421 errx(1, "number of context lines is %s: %s",
4425 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4427 errx(1, "number of commits is %s: %s",
4434 repo_path = realpath(optarg, NULL);
4435 if (repo_path == NULL)
4436 return got_error_from_errno2("realpath",
4438 got_path_strip_trailing_slashes(repo_path);
4441 reverse_display_order = 1;
4447 search_pattern = optarg;
4450 end_commit = optarg;
4461 if (diff_context == -1)
4463 else if (!show_patch)
4464 errx(1, "-C requires -p");
4466 if (one_line && (show_patch || show_changed_paths))
4467 errx(1, "cannot use -s with -p or -P");
4469 cwd = getcwd(NULL, 0);
4471 error = got_error_from_errno("getcwd");
4475 error = got_repo_pack_fds_open(&pack_fds);
4479 if (repo_path == NULL) {
4480 error = got_worktree_open(&worktree, cwd);
4481 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4488 error = got_worktree_resolve_path(&path, worktree,
4493 path = strdup(argv[0]);
4495 error = got_error_from_errno("strdup");
4499 } else if (argc != 0)
4502 if (repo_path == NULL) {
4503 repo_path = worktree ?
4504 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4506 if (repo_path == NULL) {
4507 error = got_error_from_errno("strdup");
4511 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4515 error = apply_unveil(got_repo_get_path(repo), 1,
4516 worktree ? got_worktree_get_root_path(worktree) : NULL);
4520 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4524 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4528 if (start_commit == NULL) {
4529 struct got_reference *head_ref;
4530 struct got_commit_object *commit = NULL;
4531 error = got_ref_open(&head_ref, repo,
4532 worktree ? got_worktree_get_head_ref_name(worktree)
4536 error = got_ref_resolve(&start_id, repo, head_ref);
4537 got_ref_close(head_ref);
4540 error = got_object_open_as_commit(&commit, repo,
4544 got_object_commit_close(commit);
4546 error = got_repo_match_object_id(&start_id, NULL,
4547 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4551 if (end_commit != NULL) {
4552 error = got_repo_match_object_id(&end_id, NULL,
4553 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4560 * If a path was specified on the command line it was resolved
4561 * to a path in the work tree above. Prepend the work tree's
4562 * path prefix to obtain the corresponding in-repository path.
4566 prefix = got_worktree_get_path_prefix(worktree);
4567 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4568 (path[0] != '\0') ? "/" : "", path) == -1) {
4569 error = got_error_from_errno("asprintf");
4574 error = got_repo_map_path(&in_repo_path, repo,
4580 path = in_repo_path;
4584 /* Release work tree lock. */
4585 got_worktree_close(worktree);
4589 if (search_pattern && show_patch) {
4590 tmpfile = got_opentemp();
4591 if (tmpfile == NULL) {
4592 error = got_error_from_errno("got_opentemp");
4597 error = print_commits(start_id, end_id, repo, path ? path : "",
4598 show_changed_paths, show_patch, search_pattern, diff_context,
4599 limit, log_branches, reverse_display_order, refs_idmap, one_line,
4606 got_worktree_close(worktree);
4608 const struct got_error *close_err = got_repo_close(repo);
4613 const struct got_error *pack_err =
4614 got_repo_pack_fds_close(pack_fds);
4619 got_reflist_object_id_map_free(refs_idmap);
4620 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4621 error = got_error_from_errno("fclose");
4622 got_ref_list_free(&refs);
4629 fprintf(stderr, "usage: %s diff [-aPsw] [-C number] [-c commit] "
4630 "[-r repository-path] [object1 object2 | path ...]\n",
4635 struct print_diff_arg {
4636 struct got_repository *repo;
4637 struct got_worktree *worktree;
4642 enum got_diff_algorithm diff_algo;
4643 int ignore_whitespace;
4644 int force_text_diff;
4650 * Create a file which contains the target path of a symlink so we can feed
4651 * it as content to the diff engine.
4653 static const struct got_error *
4654 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4655 const char *abspath)
4657 const struct got_error *err = NULL;
4658 char target_path[PATH_MAX];
4659 ssize_t target_len, outlen;
4664 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4665 if (target_len == -1)
4666 return got_error_from_errno2("readlinkat", abspath);
4668 target_len = readlink(abspath, target_path, PATH_MAX);
4669 if (target_len == -1)
4670 return got_error_from_errno2("readlink", abspath);
4673 *fd = got_opentempfd();
4675 return got_error_from_errno("got_opentempfd");
4677 outlen = write(*fd, target_path, target_len);
4679 err = got_error_from_errno("got_opentempfd");
4683 if (lseek(*fd, 0, SEEK_SET) == -1) {
4684 err = got_error_from_errno2("lseek", abspath);
4695 static const struct got_error *
4696 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4697 const char *path, struct got_object_id *blob_id,
4698 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4699 int dirfd, const char *de_name)
4701 struct print_diff_arg *a = arg;
4702 const struct got_error *err = NULL;
4703 struct got_blob_object *blob1 = NULL;
4704 int fd = -1, fd1 = -1, fd2 = -1;
4706 char *abspath = NULL, *label1 = NULL;
4711 if (a->diff_staged) {
4712 if (staged_status != GOT_STATUS_MODIFY &&
4713 staged_status != GOT_STATUS_ADD &&
4714 staged_status != GOT_STATUS_DELETE)
4717 if (staged_status == GOT_STATUS_DELETE)
4719 if (status == GOT_STATUS_NONEXISTENT)
4720 return got_error_set_errno(ENOENT, path);
4721 if (status != GOT_STATUS_MODIFY &&
4722 status != GOT_STATUS_ADD &&
4723 status != GOT_STATUS_DELETE &&
4724 status != GOT_STATUS_CONFLICT)
4728 err = got_opentemp_truncate(a->f1);
4730 return got_error_from_errno("got_opentemp_truncate");
4731 err = got_opentemp_truncate(a->f2);
4733 return got_error_from_errno("got_opentemp_truncate");
4735 if (!a->header_shown) {
4736 printf("diff %s%s\n", a->diff_staged ? "-s " : "",
4737 got_worktree_get_root_path(a->worktree));
4738 printf("commit - %s\n", a->id_str);
4739 printf("path + %s%s\n",
4740 got_worktree_get_root_path(a->worktree),
4741 a->diff_staged ? " (staged changes)" : "");
4742 a->header_shown = 1;
4745 if (a->diff_staged) {
4746 const char *label1 = NULL, *label2 = NULL;
4747 switch (staged_status) {
4748 case GOT_STATUS_MODIFY:
4752 case GOT_STATUS_ADD:
4755 case GOT_STATUS_DELETE:
4759 return got_error(GOT_ERR_FILE_STATUS);
4761 fd1 = got_opentempfd();
4763 err = got_error_from_errno("got_opentempfd");
4766 fd2 = got_opentempfd();
4768 err = got_error_from_errno("got_opentempfd");
4771 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4772 fd1, fd2, blob_id, staged_blob_id, label1, label2,
4773 a->diff_algo, a->diff_context, a->ignore_whitespace,
4774 a->force_text_diff, a->repo, stdout);
4778 fd1 = got_opentempfd();
4780 err = got_error_from_errno("got_opentempfd");
4784 if (staged_status == GOT_STATUS_ADD ||
4785 staged_status == GOT_STATUS_MODIFY) {
4787 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4791 err = got_object_id_str(&id_str, staged_blob_id);
4794 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4795 err = got_error_from_errno("asprintf");
4800 } else if (status != GOT_STATUS_ADD) {
4801 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4807 if (status != GOT_STATUS_DELETE) {
4808 if (asprintf(&abspath, "%s/%s",
4809 got_worktree_get_root_path(a->worktree), path) == -1) {
4810 err = got_error_from_errno("asprintf");
4815 fd = openat(dirfd, de_name,
4816 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4818 if (!got_err_open_nofollow_on_symlink()) {
4819 err = got_error_from_errno2("openat",
4823 err = get_symlink_target_file(&fd, dirfd,
4829 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4831 if (!got_err_open_nofollow_on_symlink()) {
4832 err = got_error_from_errno2("open",
4836 err = get_symlink_target_file(&fd, dirfd,
4842 if (fstat(fd, &sb) == -1) {
4843 err = got_error_from_errno2("fstat", abspath);
4846 f2 = fdopen(fd, "r");
4848 err = got_error_from_errno2("fdopen", abspath);
4858 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4864 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4865 f2_exists, sb.st_size, path, GOT_DIFF_ALGORITHM_PATIENCE,
4866 a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4868 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4869 err = got_error_from_errno("close");
4870 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4871 err = got_error_from_errno("close");
4873 got_object_blob_close(blob1);
4874 if (fd != -1 && close(fd) == -1 && err == NULL)
4875 err = got_error_from_errno("close");
4876 if (f2 && fclose(f2) == EOF && err == NULL)
4877 err = got_error_from_errno("fclose");
4882 static const struct got_error *
4883 cmd_diff(int argc, char *argv[])
4885 const struct got_error *error;
4886 struct got_repository *repo = NULL;
4887 struct got_worktree *worktree = NULL;
4888 char *cwd = NULL, *repo_path = NULL;
4889 const char *commit_args[2] = { NULL, NULL };
4890 int ncommit_args = 0;
4891 struct got_object_id *ids[2] = { NULL, NULL };
4892 char *labels[2] = { NULL, NULL };
4893 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4894 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4895 int force_text_diff = 0, force_path = 0, rflag = 0;
4897 struct got_reflist_head refs;
4898 struct got_pathlist_head paths;
4899 struct got_pathlist_entry *pe;
4900 FILE *f1 = NULL, *f2 = NULL;
4901 int fd1 = -1, fd2 = -1;
4902 int *pack_fds = NULL;
4908 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4913 while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4916 force_text_diff = 1;
4919 if (ncommit_args >= 2)
4920 errx(1, "too many -c options used");
4921 commit_args[ncommit_args++] = optarg;
4924 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4927 errx(1, "number of context lines is %s: %s",
4931 repo_path = realpath(optarg, NULL);
4932 if (repo_path == NULL)
4933 return got_error_from_errno2("realpath",
4935 got_path_strip_trailing_slashes(repo_path);
4942 ignore_whitespace = 1;
4956 cwd = getcwd(NULL, 0);
4958 error = got_error_from_errno("getcwd");
4962 error = got_repo_pack_fds_open(&pack_fds);
4966 if (repo_path == NULL) {
4967 error = got_worktree_open(&worktree, cwd);
4968 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4974 strdup(got_worktree_get_repo_path(worktree));
4975 if (repo_path == NULL) {
4976 error = got_error_from_errno("strdup");
4980 repo_path = strdup(cwd);
4981 if (repo_path == NULL) {
4982 error = got_error_from_errno("strdup");
4988 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4993 if (rflag || worktree == NULL || ncommit_args > 0) {
4995 error = got_error_msg(GOT_ERR_NOT_IMPL,
4996 "-P option can only be used when diffing "
5001 error = got_error_msg(GOT_ERR_NOT_IMPL,
5002 "-s option can only be used when diffing "
5008 error = apply_unveil(got_repo_get_path(repo), 1,
5009 worktree ? got_worktree_get_root_path(worktree) : NULL);
5013 if ((!force_path && argc == 2) || ncommit_args > 0) {
5014 int obj_type = (ncommit_args > 0 ?
5015 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5016 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5020 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5022 if (ncommit_args > 0)
5023 arg = commit_args[i];
5026 error = got_repo_match_object_id(&ids[i], &labels[i],
5027 arg, obj_type, &refs, repo);
5029 if (error->code != GOT_ERR_NOT_REF &&
5030 error->code != GOT_ERR_NO_OBJ)
5032 if (ncommit_args > 0)
5040 f1 = got_opentemp();
5042 error = got_error_from_errno("got_opentemp");
5046 f2 = got_opentemp();
5048 error = got_error_from_errno("got_opentemp");
5052 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5053 struct print_diff_arg arg;
5056 if (worktree == NULL) {
5057 if (argc == 2 && ids[0] == NULL) {
5058 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5060 } else if (argc == 2 && ids[1] == NULL) {
5061 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5063 } else if (argc > 0) {
5064 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5065 "%s", "specified paths cannot be resolved");
5068 error = got_error(GOT_ERR_NOT_WORKTREE);
5073 error = get_worktree_paths_from_argv(&paths, argc, argv,
5078 error = got_object_id_str(&id_str,
5079 got_worktree_get_base_commit_id(worktree));
5083 arg.worktree = worktree;
5084 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5085 arg.diff_context = diff_context;
5086 arg.id_str = id_str;
5087 arg.header_shown = 0;
5088 arg.diff_staged = diff_staged;
5089 arg.ignore_whitespace = ignore_whitespace;
5090 arg.force_text_diff = force_text_diff;
5094 error = got_worktree_status(worktree, &paths, repo, 0,
5095 print_diff, &arg, check_cancelled, NULL);
5100 if (ncommit_args == 1) {
5101 struct got_commit_object *commit;
5102 error = got_object_open_as_commit(&commit, repo, ids[0]);
5106 labels[1] = labels[0];
5108 if (got_object_commit_get_nparents(commit) > 0) {
5109 const struct got_object_id_queue *pids;
5110 struct got_object_qid *pid;
5111 pids = got_object_commit_get_parent_ids(commit);
5112 pid = STAILQ_FIRST(pids);
5113 ids[0] = got_object_id_dup(&pid->id);
5114 if (ids[0] == NULL) {
5115 error = got_error_from_errno(
5116 "got_object_id_dup");
5117 got_object_commit_close(commit);
5120 error = got_object_id_str(&labels[0], ids[0]);
5122 got_object_commit_close(commit);
5127 labels[0] = strdup("/dev/null");
5128 if (labels[0] == NULL) {
5129 error = got_error_from_errno("strdup");
5130 got_object_commit_close(commit);
5135 got_object_commit_close(commit);
5138 if (ncommit_args == 0 && argc > 2) {
5139 error = got_error_msg(GOT_ERR_BAD_PATH,
5140 "path arguments cannot be used when diffing two objects");
5145 error = got_object_get_type(&type1, repo, ids[0]);
5150 error = got_object_get_type(&type2, repo, ids[1]);
5153 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5154 error = got_error(GOT_ERR_OBJ_TYPE);
5157 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5158 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5159 "path arguments cannot be used when diffing blobs");
5163 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5165 struct got_pathlist_entry *new;
5169 error = got_worktree_resolve_path(&p, worktree,
5173 prefix = got_worktree_get_path_prefix(worktree);
5174 while (prefix[0] == '/')
5176 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5177 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5179 error = got_error_from_errno("asprintf");
5185 char *mapped_path, *s;
5186 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5192 in_repo_path = strdup(s);
5193 if (in_repo_path == NULL) {
5194 error = got_error_from_errno("asprintf");
5201 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5202 if (error || new == NULL /* duplicate */)
5209 /* Release work tree lock. */
5210 got_worktree_close(worktree);
5214 fd1 = got_opentempfd();
5216 error = got_error_from_errno("got_opentempfd");
5220 fd2 = got_opentempfd();
5222 error = got_error_from_errno("got_opentempfd");
5226 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5227 case GOT_OBJ_TYPE_BLOB:
5228 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5229 fd1, fd2, ids[0], ids[1], NULL, NULL,
5230 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5231 ignore_whitespace, force_text_diff, repo, stdout);
5233 case GOT_OBJ_TYPE_TREE:
5234 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5235 ids[0], ids[1], &paths, "", "",
5236 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5237 ignore_whitespace, force_text_diff, repo, stdout);
5239 case GOT_OBJ_TYPE_COMMIT:
5240 printf("diff %s %s\n", labels[0], labels[1]);
5241 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5242 fd1, fd2, ids[0], ids[1], &paths,
5243 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5244 ignore_whitespace, force_text_diff, repo, stdout);
5247 error = got_error(GOT_ERR_OBJ_TYPE);
5255 got_worktree_close(worktree);
5257 const struct got_error *close_err = got_repo_close(repo);
5262 const struct got_error *pack_err =
5263 got_repo_pack_fds_close(pack_fds);
5267 TAILQ_FOREACH(pe, &paths, entry)
5268 free((char *)pe->path);
5269 got_pathlist_free(&paths);
5270 got_ref_list_free(&refs);
5271 if (f1 && fclose(f1) == EOF && error == NULL)
5272 error = got_error_from_errno("fclose");
5273 if (f2 && fclose(f2) == EOF && error == NULL)
5274 error = got_error_from_errno("fclose");
5275 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5276 error = got_error_from_errno("close");
5277 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5278 error = got_error_from_errno("close");
5286 "usage: %s blame [-c commit] [-r repository-path] path\n",
5295 char datebuf[11]; /* YYYY-MM-DD + NUL */
5298 struct blame_cb_args {
5299 struct blame_line *lines;
5303 off_t *line_offsets;
5305 struct got_repository *repo;
5308 static const struct got_error *
5309 blame_cb(void *arg, int nlines, int lineno,
5310 struct got_commit_object *commit, struct got_object_id *id)
5312 const struct got_error *err = NULL;
5313 struct blame_cb_args *a = arg;
5314 struct blame_line *bline;
5316 size_t linesize = 0;
5319 time_t committer_time;
5321 if (nlines != a->nlines ||
5322 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5323 return got_error(GOT_ERR_RANGE);
5325 if (sigint_received)
5326 return got_error(GOT_ERR_ITER_COMPLETED);
5329 return NULL; /* no change in this commit */
5331 /* Annotate this line. */
5332 bline = &a->lines[lineno - 1];
5333 if (bline->annotated)
5335 err = got_object_id_str(&bline->id_str, id);
5339 bline->committer = strdup(got_object_commit_get_committer(commit));
5340 if (bline->committer == NULL) {
5341 err = got_error_from_errno("strdup");
5345 committer_time = got_object_commit_get_committer_time(commit);
5346 if (gmtime_r(&committer_time, &tm) == NULL)
5347 return got_error_from_errno("gmtime_r");
5348 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5350 err = got_error(GOT_ERR_NO_SPACE);
5353 bline->annotated = 1;
5355 /* Print lines annotated so far. */
5356 bline = &a->lines[a->lineno_cur - 1];
5357 if (!bline->annotated)
5360 offset = a->line_offsets[a->lineno_cur - 1];
5361 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5362 err = got_error_from_errno("fseeko");
5366 while (a->lineno_cur <= a->nlines && bline->annotated) {
5367 char *smallerthan, *at, *nl, *committer;
5370 if (getline(&line, &linesize, a->f) == -1) {
5372 err = got_error_from_errno("getline");
5376 committer = bline->committer;
5377 smallerthan = strchr(committer, '<');
5378 if (smallerthan && smallerthan[1] != '\0')
5379 committer = smallerthan + 1;
5380 at = strchr(committer, '@');
5383 len = strlen(committer);
5385 committer[8] = '\0';
5387 nl = strchr(line, '\n');
5390 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5391 bline->id_str, bline->datebuf, committer, line);
5394 bline = &a->lines[a->lineno_cur - 1];
5401 static const struct got_error *
5402 cmd_blame(int argc, char *argv[])
5404 const struct got_error *error;
5405 struct got_repository *repo = NULL;
5406 struct got_worktree *worktree = NULL;
5407 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5408 char *link_target = NULL;
5409 struct got_object_id *obj_id = NULL;
5410 struct got_object_id *commit_id = NULL;
5411 struct got_commit_object *commit = NULL;
5412 struct got_blob_object *blob = NULL;
5413 char *commit_id_str = NULL;
5414 struct blame_cb_args bca;
5415 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5417 int *pack_fds = NULL;
5418 FILE *f1 = NULL, *f2 = NULL;
5420 fd1 = got_opentempfd();
5422 return got_error_from_errno("got_opentempfd");
5424 memset(&bca, 0, sizeof(bca));
5427 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5432 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5435 commit_id_str = optarg;
5438 repo_path = realpath(optarg, NULL);
5439 if (repo_path == NULL)
5440 return got_error_from_errno2("realpath",
5442 got_path_strip_trailing_slashes(repo_path);
5458 cwd = getcwd(NULL, 0);
5460 error = got_error_from_errno("getcwd");
5464 error = got_repo_pack_fds_open(&pack_fds);
5468 if (repo_path == NULL) {
5469 error = got_worktree_open(&worktree, cwd);
5470 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5476 strdup(got_worktree_get_repo_path(worktree));
5477 if (repo_path == NULL) {
5478 error = got_error_from_errno("strdup");
5483 repo_path = strdup(cwd);
5484 if (repo_path == NULL) {
5485 error = got_error_from_errno("strdup");
5491 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5496 const char *prefix = got_worktree_get_path_prefix(worktree);
5499 error = got_worktree_resolve_path(&p, worktree, path);
5502 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5503 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5505 error = got_error_from_errno("asprintf");
5510 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5512 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5515 error = got_repo_map_path(&in_repo_path, repo, path);
5520 if (commit_id_str == NULL) {
5521 struct got_reference *head_ref;
5522 error = got_ref_open(&head_ref, repo, worktree ?
5523 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5526 error = got_ref_resolve(&commit_id, repo, head_ref);
5527 got_ref_close(head_ref);
5531 struct got_reflist_head refs;
5533 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5537 error = got_repo_match_object_id(&commit_id, NULL,
5538 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5539 got_ref_list_free(&refs);
5545 /* Release work tree lock. */
5546 got_worktree_close(worktree);
5550 error = got_object_open_as_commit(&commit, repo, commit_id);
5554 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5559 error = got_object_id_by_path(&obj_id, repo, commit,
5560 link_target ? link_target : in_repo_path);
5564 error = got_object_get_type(&obj_type, repo, obj_id);
5568 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5569 error = got_error_path(link_target ? link_target : in_repo_path,
5574 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5577 bca.f = got_opentemp();
5578 if (bca.f == NULL) {
5579 error = got_error_from_errno("got_opentemp");
5582 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5583 &bca.line_offsets, bca.f, blob);
5584 if (error || bca.nlines == 0)
5587 /* Don't include \n at EOF in the blame line count. */
5588 if (bca.line_offsets[bca.nlines - 1] == filesize)
5591 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5592 if (bca.lines == NULL) {
5593 error = got_error_from_errno("calloc");
5597 bca.nlines_prec = 0;
5605 fd2 = got_opentempfd();
5607 error = got_error_from_errno("got_opentempfd");
5610 fd3 = got_opentempfd();
5612 error = got_error_from_errno("got_opentempfd");
5615 f1 = got_opentemp();
5617 error = got_error_from_errno("got_opentemp");
5620 f2 = got_opentemp();
5622 error = got_error_from_errno("got_opentemp");
5625 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5626 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5627 check_cancelled, NULL, fd2, fd3, f1, f2);
5636 got_object_commit_close(commit);
5638 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5639 error = got_error_from_errno("close");
5640 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5641 error = got_error_from_errno("close");
5642 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5643 error = got_error_from_errno("close");
5644 if (f1 && fclose(f1) == EOF && error == NULL)
5645 error = got_error_from_errno("fclose");
5646 if (f2 && fclose(f2) == EOF && error == NULL)
5647 error = got_error_from_errno("fclose");
5650 got_object_blob_close(blob);
5652 got_worktree_close(worktree);
5654 const struct got_error *close_err = got_repo_close(repo);
5659 const struct got_error *pack_err =
5660 got_repo_pack_fds_close(pack_fds);
5665 for (i = 0; i < bca.nlines; i++) {
5666 struct blame_line *bline = &bca.lines[i];
5667 free(bline->id_str);
5668 free(bline->committer);
5672 free(bca.line_offsets);
5673 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5674 error = got_error_from_errno("fclose");
5681 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5682 "[path]\n", getprogname());
5686 static const struct got_error *
5687 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5688 const char *root_path, struct got_repository *repo)
5690 const struct got_error *err = NULL;
5691 int is_root_path = (strcmp(path, root_path) == 0);
5692 const char *modestr = "";
5693 mode_t mode = got_tree_entry_get_mode(te);
5694 char *link_target = NULL;
5696 path += strlen(root_path);
5697 while (path[0] == '/')
5700 if (got_object_tree_entry_is_submodule(te))
5702 else if (S_ISLNK(mode)) {
5705 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5708 for (i = 0; i < strlen(link_target); i++) {
5709 if (!isprint((unsigned char)link_target[i]))
5710 link_target[i] = '?';
5715 else if (S_ISDIR(mode))
5717 else if (mode & S_IXUSR)
5720 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5721 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5722 link_target ? " -> ": "", link_target ? link_target : "");
5728 static const struct got_error *
5729 print_tree(const char *path, struct got_commit_object *commit,
5730 int show_ids, int recurse, const char *root_path,
5731 struct got_repository *repo)
5733 const struct got_error *err = NULL;
5734 struct got_object_id *tree_id = NULL;
5735 struct got_tree_object *tree = NULL;
5738 err = got_object_id_by_path(&tree_id, repo, commit, path);
5742 err = got_object_open_as_tree(&tree, repo, tree_id);
5745 nentries = got_object_tree_get_nentries(tree);
5746 for (i = 0; i < nentries; i++) {
5747 struct got_tree_entry *te;
5750 if (sigint_received || sigpipe_received)
5753 te = got_object_tree_get_entry(tree, i);
5756 err = got_object_id_str(&id_str,
5757 got_tree_entry_get_id(te));
5760 if (asprintf(&id, "%s ", id_str) == -1) {
5761 err = got_error_from_errno("asprintf");
5767 err = print_entry(te, id, path, root_path, repo);
5772 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5774 if (asprintf(&child_path, "%s%s%s", path,
5775 path[0] == '/' && path[1] == '\0' ? "" : "/",
5776 got_tree_entry_get_name(te)) == -1) {
5777 err = got_error_from_errno("asprintf");
5780 err = print_tree(child_path, commit, show_ids, 1,
5789 got_object_tree_close(tree);
5794 static const struct got_error *
5795 cmd_tree(int argc, char *argv[])
5797 const struct got_error *error;
5798 struct got_repository *repo = NULL;
5799 struct got_worktree *worktree = NULL;
5800 const char *path, *refname = NULL;
5801 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5802 struct got_object_id *commit_id = NULL;
5803 struct got_commit_object *commit = NULL;
5804 char *commit_id_str = NULL;
5805 int show_ids = 0, recurse = 0;
5807 int *pack_fds = NULL;
5810 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5815 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5818 commit_id_str = optarg;
5821 repo_path = realpath(optarg, NULL);
5822 if (repo_path == NULL)
5823 return got_error_from_errno2("realpath",
5825 got_path_strip_trailing_slashes(repo_path);
5849 cwd = getcwd(NULL, 0);
5851 error = got_error_from_errno("getcwd");
5855 error = got_repo_pack_fds_open(&pack_fds);
5859 if (repo_path == NULL) {
5860 error = got_worktree_open(&worktree, cwd);
5861 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5867 strdup(got_worktree_get_repo_path(worktree));
5868 if (repo_path == NULL)
5869 error = got_error_from_errno("strdup");
5873 repo_path = strdup(cwd);
5874 if (repo_path == NULL) {
5875 error = got_error_from_errno("strdup");
5881 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5886 const char *prefix = got_worktree_get_path_prefix(worktree);
5891 error = got_worktree_resolve_path(&p, worktree, path);
5894 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5895 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5897 error = got_error_from_errno("asprintf");
5902 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5906 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5911 error = got_repo_map_path(&in_repo_path, repo, path);
5916 if (commit_id_str == NULL) {
5917 struct got_reference *head_ref;
5919 refname = got_worktree_get_head_ref_name(worktree);
5921 refname = GOT_REF_HEAD;
5922 error = got_ref_open(&head_ref, repo, refname, 0);
5925 error = got_ref_resolve(&commit_id, repo, head_ref);
5926 got_ref_close(head_ref);
5930 struct got_reflist_head refs;
5932 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5936 error = got_repo_match_object_id(&commit_id, NULL,
5937 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5938 got_ref_list_free(&refs);
5944 /* Release work tree lock. */
5945 got_worktree_close(worktree);
5949 error = got_object_open_as_commit(&commit, repo, commit_id);
5953 error = print_tree(in_repo_path, commit, show_ids, recurse,
5954 in_repo_path, repo);
5961 got_object_commit_close(commit);
5963 got_worktree_close(worktree);
5965 const struct got_error *close_err = got_repo_close(repo);
5970 const struct got_error *pack_err =
5971 got_repo_pack_fds_close(pack_fds);
5981 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5982 "[-s status-codes] [path ...]\n", getprogname());
5986 struct got_status_arg {
5991 static const struct got_error *
5992 print_status(void *arg, unsigned char status, unsigned char staged_status,
5993 const char *path, struct got_object_id *blob_id,
5994 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5995 int dirfd, const char *de_name)
5997 struct got_status_arg *st = arg;
5999 if (status == staged_status && (status == GOT_STATUS_DELETE))
6000 status = GOT_STATUS_NO_CHANGE;
6001 if (st != NULL && st->status_codes) {
6002 size_t ncodes = strlen(st->status_codes);
6005 for (i = 0; i < ncodes ; i++) {
6007 if (status == st->status_codes[i] ||
6008 staged_status == st->status_codes[i]) {
6013 if (status == st->status_codes[i] ||
6014 staged_status == st->status_codes[i])
6019 if (st->suppress && j == 0)
6026 printf("%c%c %s\n", status, staged_status, path);
6030 static const struct got_error *
6031 cmd_status(int argc, char *argv[])
6033 const struct got_error *error = NULL;
6034 struct got_repository *repo = NULL;
6035 struct got_worktree *worktree = NULL;
6036 struct got_status_arg st;
6038 struct got_pathlist_head paths;
6039 struct got_pathlist_entry *pe;
6040 int ch, i, no_ignores = 0;
6041 int *pack_fds = NULL;
6045 memset(&st, 0, sizeof(st));
6046 st.status_codes = NULL;
6049 while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
6055 if (st.status_codes != NULL && st.suppress == 0)
6056 option_conflict('S', 's');
6060 for (i = 0; i < strlen(optarg); i++) {
6061 switch (optarg[i]) {
6062 case GOT_STATUS_MODIFY:
6063 case GOT_STATUS_ADD:
6064 case GOT_STATUS_DELETE:
6065 case GOT_STATUS_CONFLICT:
6066 case GOT_STATUS_MISSING:
6067 case GOT_STATUS_OBSTRUCTED:
6068 case GOT_STATUS_UNVERSIONED:
6069 case GOT_STATUS_MODE_CHANGE:
6070 case GOT_STATUS_NONEXISTENT:
6073 errx(1, "invalid status code '%c'",
6077 if (ch == 's' && st.suppress)
6078 option_conflict('s', 'S');
6079 st.status_codes = optarg;
6091 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6095 cwd = getcwd(NULL, 0);
6097 error = got_error_from_errno("getcwd");
6101 error = got_repo_pack_fds_open(&pack_fds);
6105 error = got_worktree_open(&worktree, cwd);
6107 if (error->code == GOT_ERR_NOT_WORKTREE)
6108 error = wrap_not_worktree_error(error, "status", cwd);
6112 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6117 error = apply_unveil(got_repo_get_path(repo), 1,
6118 got_worktree_get_root_path(worktree));
6122 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6126 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6127 print_status, &st, check_cancelled, NULL);
6130 const struct got_error *pack_err =
6131 got_repo_pack_fds_close(pack_fds);
6136 TAILQ_FOREACH(pe, &paths, entry)
6137 free((char *)pe->path);
6138 got_pathlist_free(&paths);
6146 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6147 "[-s reference] [name]\n", getprogname());
6151 static const struct got_error *
6152 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6154 static const struct got_error *err = NULL;
6155 struct got_reflist_head refs;
6156 struct got_reflist_entry *re;
6159 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6160 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6165 TAILQ_FOREACH(re, &refs, entry) {
6167 refstr = got_ref_to_str(re->ref);
6168 if (refstr == NULL) {
6169 err = got_error_from_errno("got_ref_to_str");
6172 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6176 got_ref_list_free(&refs);
6180 static const struct got_error *
6181 delete_ref_by_name(struct got_repository *repo, const char *refname)
6183 const struct got_error *err;
6184 struct got_reference *ref;
6186 err = got_ref_open(&ref, repo, refname, 0);
6190 err = delete_ref(repo, ref);
6195 static const struct got_error *
6196 add_ref(struct got_repository *repo, const char *refname, const char *target)
6198 const struct got_error *err = NULL;
6199 struct got_object_id *id = NULL;
6200 struct got_reference *ref = NULL;
6201 struct got_reflist_head refs;
6204 * Don't let the user create a reference name with a leading '-'.
6205 * While technically a valid reference name, this case is usually
6206 * an unintended typo.
6208 if (refname[0] == '-')
6209 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6212 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6215 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6217 got_ref_list_free(&refs);
6221 err = got_ref_alloc(&ref, refname, id);
6225 err = got_ref_write(ref, repo);
6233 static const struct got_error *
6234 add_symref(struct got_repository *repo, const char *refname, const char *target)
6236 const struct got_error *err = NULL;
6237 struct got_reference *ref = NULL;
6238 struct got_reference *target_ref = NULL;
6241 * Don't let the user create a reference name with a leading '-'.
6242 * While technically a valid reference name, this case is usually
6243 * an unintended typo.
6245 if (refname[0] == '-')
6246 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6248 err = got_ref_open(&target_ref, repo, target, 0);
6252 err = got_ref_alloc_symref(&ref, refname, target_ref);
6256 err = got_ref_write(ref, repo);
6259 got_ref_close(target_ref);
6265 static const struct got_error *
6266 cmd_ref(int argc, char *argv[])
6268 const struct got_error *error = NULL;
6269 struct got_repository *repo = NULL;
6270 struct got_worktree *worktree = NULL;
6271 char *cwd = NULL, *repo_path = NULL;
6272 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6273 const char *obj_arg = NULL, *symref_target= NULL;
6274 char *refname = NULL;
6275 int *pack_fds = NULL;
6277 while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
6286 repo_path = realpath(optarg, NULL);
6287 if (repo_path == NULL)
6288 return got_error_from_errno2("realpath",
6290 got_path_strip_trailing_slashes(repo_path);
6296 symref_target = optarg;
6307 if (obj_arg && do_list)
6308 option_conflict('c', 'l');
6309 if (obj_arg && do_delete)
6310 option_conflict('c', 'd');
6311 if (obj_arg && symref_target)
6312 option_conflict('c', 's');
6313 if (symref_target && do_delete)
6314 option_conflict('s', 'd');
6315 if (symref_target && do_list)
6316 option_conflict('s', 'l');
6317 if (do_delete && do_list)
6318 option_conflict('d', 'l');
6319 if (sort_by_time && !do_list)
6320 errx(1, "-t option requires -l option");
6326 if (argc != 0 && argc != 1)
6329 refname = strdup(argv[0]);
6330 if (refname == NULL) {
6331 error = got_error_from_errno("strdup");
6338 refname = strdup(argv[0]);
6339 if (refname == NULL) {
6340 error = got_error_from_errno("strdup");
6346 got_path_strip_trailing_slashes(refname);
6349 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6350 "sendfd unveil", NULL) == -1)
6353 cwd = getcwd(NULL, 0);
6355 error = got_error_from_errno("getcwd");
6359 error = got_repo_pack_fds_open(&pack_fds);
6363 if (repo_path == NULL) {
6364 error = got_worktree_open(&worktree, cwd);
6365 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6371 strdup(got_worktree_get_repo_path(worktree));
6372 if (repo_path == NULL)
6373 error = got_error_from_errno("strdup");
6377 repo_path = strdup(cwd);
6378 if (repo_path == NULL) {
6379 error = got_error_from_errno("strdup");
6385 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6391 /* Remove "cpath" promise. */
6392 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6398 error = apply_unveil(got_repo_get_path(repo), do_list,
6399 worktree ? got_worktree_get_root_path(worktree) : NULL);
6404 error = list_refs(repo, refname, sort_by_time);
6406 error = delete_ref_by_name(repo, refname);
6407 else if (symref_target)
6408 error = add_symref(repo, refname, symref_target);
6410 if (obj_arg == NULL)
6412 error = add_ref(repo, refname, obj_arg);
6417 const struct got_error *close_err = got_repo_close(repo);
6422 got_worktree_close(worktree);
6424 const struct got_error *pack_err =
6425 got_repo_pack_fds_close(pack_fds);
6437 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6438 "[-r repository-path] [name]\n", getprogname());
6442 static const struct got_error *
6443 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6444 struct got_reference *ref)
6446 const struct got_error *err = NULL;
6447 const char *refname, *marker = " ";
6450 refname = got_ref_get_name(ref);
6451 if (worktree && strcmp(refname,
6452 got_worktree_get_head_ref_name(worktree)) == 0) {
6453 struct got_object_id *id = NULL;
6455 err = got_ref_resolve(&id, repo, ref);
6458 if (got_object_id_cmp(id,
6459 got_worktree_get_base_commit_id(worktree)) == 0)
6466 if (strncmp(refname, "refs/heads/", 11) == 0)
6468 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6470 if (strncmp(refname, "refs/remotes/", 13) == 0)
6473 refstr = got_ref_to_str(ref);
6475 return got_error_from_errno("got_ref_to_str");
6477 printf("%s%s: %s\n", marker, refname, refstr);
6482 static const struct got_error *
6483 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6485 const char *refname;
6487 if (worktree == NULL)
6488 return got_error(GOT_ERR_NOT_WORKTREE);
6490 refname = got_worktree_get_head_ref_name(worktree);
6492 if (strncmp(refname, "refs/heads/", 11) == 0)
6494 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6497 printf("%s\n", refname);
6502 static const struct got_error *
6503 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6506 static const struct got_error *err = NULL;
6507 struct got_reflist_head refs;
6508 struct got_reflist_entry *re;
6509 struct got_reference *temp_ref = NULL;
6510 int rebase_in_progress, histedit_in_progress;
6515 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6520 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6525 if (rebase_in_progress || histedit_in_progress) {
6526 err = got_ref_open(&temp_ref, repo,
6527 got_worktree_get_head_ref_name(worktree), 0);
6530 list_branch(repo, worktree, temp_ref);
6531 got_ref_close(temp_ref);
6535 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6536 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6541 TAILQ_FOREACH(re, &refs, entry)
6542 list_branch(repo, worktree, re->ref);
6544 got_ref_list_free(&refs);
6546 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6547 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6552 TAILQ_FOREACH(re, &refs, entry)
6553 list_branch(repo, worktree, re->ref);
6555 got_ref_list_free(&refs);
6560 static const struct got_error *
6561 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6562 const char *branch_name)
6564 const struct got_error *err = NULL;
6565 struct got_reference *ref = NULL;
6566 char *refname, *remote_refname = NULL;
6568 if (strncmp(branch_name, "refs/", 5) == 0)
6570 if (strncmp(branch_name, "heads/", 6) == 0)
6572 else if (strncmp(branch_name, "remotes/", 8) == 0)
6575 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6576 return got_error_from_errno("asprintf");
6578 if (asprintf(&remote_refname, "refs/remotes/%s",
6579 branch_name) == -1) {
6580 err = got_error_from_errno("asprintf");
6584 err = got_ref_open(&ref, repo, refname, 0);
6586 const struct got_error *err2;
6587 if (err->code != GOT_ERR_NOT_REF)
6590 * Keep 'err' intact such that if neither branch exists
6591 * we report "refs/heads" rather than "refs/remotes" in
6592 * our error message.
6594 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6601 strcmp(got_worktree_get_head_ref_name(worktree),
6602 got_ref_get_name(ref)) == 0) {
6603 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6604 "will not delete this work tree's current branch");
6608 err = delete_ref(repo, ref);
6613 free(remote_refname);
6617 static const struct got_error *
6618 add_branch(struct got_repository *repo, const char *branch_name,
6619 struct got_object_id *base_commit_id)
6621 const struct got_error *err = NULL;
6622 struct got_reference *ref = NULL;
6623 char *base_refname = NULL, *refname = NULL;
6626 * Don't let the user create a branch name with a leading '-'.
6627 * While technically a valid reference name, this case is usually
6628 * an unintended typo.
6630 if (branch_name[0] == '-')
6631 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6633 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6636 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6637 err = got_error_from_errno("asprintf");
6641 err = got_ref_open(&ref, repo, refname, 0);
6643 err = got_error(GOT_ERR_BRANCH_EXISTS);
6645 } else if (err->code != GOT_ERR_NOT_REF)
6648 err = got_ref_alloc(&ref, refname, base_commit_id);
6652 err = got_ref_write(ref, repo);
6661 static const struct got_error *
6662 cmd_branch(int argc, char *argv[])
6664 const struct got_error *error = NULL;
6665 struct got_repository *repo = NULL;
6666 struct got_worktree *worktree = NULL;
6667 char *cwd = NULL, *repo_path = NULL;
6668 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6669 const char *delref = NULL, *commit_id_arg = NULL;
6670 struct got_reference *ref = NULL;
6671 struct got_pathlist_head paths;
6672 struct got_pathlist_entry *pe;
6673 struct got_object_id *commit_id = NULL;
6674 char *commit_id_str = NULL;
6675 int *pack_fds = NULL;
6679 while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6682 commit_id_arg = optarg;
6688 repo_path = realpath(optarg, NULL);
6689 if (repo_path == NULL)
6690 return got_error_from_errno2("realpath",
6692 got_path_strip_trailing_slashes(repo_path);
6709 if (do_list && delref)
6710 option_conflict('l', 'd');
6711 if (sort_by_time && !do_list)
6712 errx(1, "-t option requires -l option");
6717 if (!do_list && !delref && argc == 0)
6720 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6721 errx(1, "-c option can only be used when creating a branch");
6723 if (do_list || delref) {
6726 } else if (!do_show && argc != 1)
6730 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6731 "sendfd unveil", NULL) == -1)
6734 cwd = getcwd(NULL, 0);
6736 error = got_error_from_errno("getcwd");
6740 error = got_repo_pack_fds_open(&pack_fds);
6744 if (repo_path == NULL) {
6745 error = got_worktree_open(&worktree, cwd);
6746 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6752 strdup(got_worktree_get_repo_path(worktree));
6753 if (repo_path == NULL)
6754 error = got_error_from_errno("strdup");
6758 repo_path = strdup(cwd);
6759 if (repo_path == NULL) {
6760 error = got_error_from_errno("strdup");
6766 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6771 if (do_list || do_show) {
6772 /* Remove "cpath" promise. */
6773 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6779 error = apply_unveil(got_repo_get_path(repo), do_list,
6780 worktree ? got_worktree_get_root_path(worktree) : NULL);
6785 error = show_current_branch(repo, worktree);
6787 error = list_branches(repo, worktree, sort_by_time);
6789 error = delete_branch(repo, worktree, delref);
6791 struct got_reflist_head refs;
6793 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6797 if (commit_id_arg == NULL)
6798 commit_id_arg = worktree ?
6799 got_worktree_get_head_ref_name(worktree) :
6801 error = got_repo_match_object_id(&commit_id, NULL,
6802 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6803 got_ref_list_free(&refs);
6806 error = add_branch(repo, argv[0], commit_id);
6809 if (worktree && do_update) {
6810 struct got_update_progress_arg upa;
6811 char *branch_refname = NULL;
6813 error = got_object_id_str(&commit_id_str, commit_id);
6816 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6820 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6822 error = got_error_from_errno("asprintf");
6825 error = got_ref_open(&ref, repo, branch_refname, 0);
6826 free(branch_refname);
6829 error = switch_head_ref(ref, commit_id, worktree,
6833 error = got_worktree_set_base_commit_id(worktree, repo,
6837 memset(&upa, 0, sizeof(upa));
6838 error = got_worktree_checkout_files(worktree, &paths,
6839 repo, update_progress, &upa, check_cancelled,
6843 if (upa.did_something) {
6844 printf("Updated to %s: %s\n",
6845 got_worktree_get_head_ref_name(worktree),
6848 print_update_progress_stats(&upa);
6855 const struct got_error *close_err = got_repo_close(repo);
6860 got_worktree_close(worktree);
6862 const struct got_error *pack_err =
6863 got_repo_pack_fds_close(pack_fds);
6870 free(commit_id_str);
6871 TAILQ_FOREACH(pe, &paths, entry)
6872 free((char *)pe->path);
6873 got_pathlist_free(&paths);
6881 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
6882 "[-r repository-path] [-s signer-id] name\n", getprogname());
6887 static const struct got_error *
6888 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6890 const struct got_error *err = NULL;
6891 struct got_reflist_entry *re, *se, *new;
6892 struct got_object_id *re_id, *se_id;
6893 struct got_tag_object *re_tag, *se_tag;
6894 time_t re_time, se_time;
6896 STAILQ_FOREACH(re, tags, entry) {
6897 se = STAILQ_FIRST(sorted);
6899 err = got_reflist_entry_dup(&new, re);
6902 STAILQ_INSERT_HEAD(sorted, new, entry);
6905 err = got_ref_resolve(&re_id, repo, re->ref);
6908 err = got_object_open_as_tag(&re_tag, repo, re_id);
6912 re_time = got_object_tag_get_tagger_time(re_tag);
6913 got_object_tag_close(re_tag);
6917 err = got_ref_resolve(&se_id, repo, re->ref);
6920 err = got_object_open_as_tag(&se_tag, repo, se_id);
6924 se_time = got_object_tag_get_tagger_time(se_tag);
6925 got_object_tag_close(se_tag);
6927 if (se_time > re_time) {
6928 err = got_reflist_entry_dup(&new, re);
6931 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6934 se = STAILQ_NEXT(se, entry);
6943 static const struct got_error *
6944 get_tag_refname(char **refname, const char *tag_name)
6946 const struct got_error *err;
6948 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6949 *refname = strdup(tag_name);
6950 if (*refname == NULL)
6951 return got_error_from_errno("strdup");
6952 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
6953 err = got_error_from_errno("asprintf");
6961 static const struct got_error *
6962 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
6963 const char *allowed_signers, const char *revoked_signers, int verbosity)
6965 static const struct got_error *err = NULL;
6966 struct got_reflist_head refs;
6967 struct got_reflist_entry *re;
6968 char *wanted_refname = NULL;
6973 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6978 struct got_reference *ref;
6979 err = get_tag_refname(&wanted_refname, tag_name);
6982 /* Wanted tag reference should exist. */
6983 err = got_ref_open(&ref, repo, wanted_refname, 0);
6989 TAILQ_FOREACH(re, &refs, entry) {
6990 const char *refname;
6991 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6993 const char *tagger, *ssh_sig = NULL;
6994 char *sig_msg = NULL;
6996 struct got_object_id *id;
6997 struct got_tag_object *tag;
6998 struct got_commit_object *commit = NULL;
7000 refname = got_ref_get_name(re->ref);
7001 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7002 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7005 refstr = got_ref_to_str(re->ref);
7006 if (refstr == NULL) {
7007 err = got_error_from_errno("got_ref_to_str");
7011 err = got_ref_resolve(&id, repo, re->ref);
7014 err = got_object_open_as_tag(&tag, repo, id);
7016 if (err->code != GOT_ERR_OBJ_TYPE) {
7020 /* "lightweight" tag */
7021 err = got_object_open_as_commit(&commit, repo, id);
7026 tagger = got_object_commit_get_committer(commit);
7028 got_object_commit_get_committer_time(commit);
7029 err = got_object_id_str(&id_str, id);
7035 tagger = got_object_tag_get_tagger(tag);
7036 tagger_time = got_object_tag_get_tagger_time(tag);
7037 err = got_object_id_str(&id_str,
7038 got_object_tag_get_object_id(tag));
7043 if (tag && verify_tags) {
7044 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7045 got_object_tag_get_message(tag));
7046 if (ssh_sig && allowed_signers == NULL) {
7047 err = got_error_msg(
7048 GOT_ERR_VERIFY_TAG_SIGNATURE,
7049 "SSH signature verification requires "
7050 "setting allowed_signers in "
7056 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7058 printf("from: %s\n", tagger);
7059 datestr = get_datestr(&tagger_time, datebuf);
7061 printf("date: %s UTC\n", datestr);
7063 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7065 switch (got_object_tag_get_object_type(tag)) {
7066 case GOT_OBJ_TYPE_BLOB:
7067 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7070 case GOT_OBJ_TYPE_TREE:
7071 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7074 case GOT_OBJ_TYPE_COMMIT:
7075 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7078 case GOT_OBJ_TYPE_TAG:
7079 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7089 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7090 allowed_signers, revoked_signers, verbosity);
7091 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7095 printf("signature: %s", sig_msg);
7101 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7104 got_object_commit_close(commit);
7106 tagmsg0 = strdup(got_object_tag_get_message(tag));
7107 got_object_tag_close(tag);
7108 if (tagmsg0 == NULL) {
7109 err = got_error_from_errno("strdup");
7116 line = strsep(&tagmsg, "\n");
7118 printf(" %s\n", line);
7123 got_ref_list_free(&refs);
7124 free(wanted_refname);
7126 if (err == NULL && bad_sigs)
7127 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7131 static const struct got_error *
7132 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7133 const char *tag_name, const char *repo_path)
7135 const struct got_error *err = NULL;
7136 char *template = NULL, *initial_content = NULL;
7137 char *editor = NULL;
7138 int initial_content_len;
7141 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7142 err = got_error_from_errno("asprintf");
7146 initial_content_len = asprintf(&initial_content,
7147 "\n# tagging commit %s as %s\n",
7148 commit_id_str, tag_name);
7149 if (initial_content_len == -1) {
7150 err = got_error_from_errno("asprintf");
7154 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
7158 if (write(fd, initial_content, initial_content_len) == -1) {
7159 err = got_error_from_errno2("write", *tagmsg_path);
7163 err = get_editor(&editor);
7166 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7167 initial_content_len, 1);
7169 free(initial_content);
7173 if (fd != -1 && close(fd) == -1 && err == NULL)
7174 err = got_error_from_errno2("close", *tagmsg_path);
7183 static const struct got_error *
7184 add_tag(struct got_repository *repo, const char *tagger,
7185 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7186 const char *signer_id, int verbosity)
7188 const struct got_error *err = NULL;
7189 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7190 char *label = NULL, *commit_id_str = NULL;
7191 struct got_reference *ref = NULL;
7192 char *refname = NULL, *tagmsg = NULL;
7193 char *tagmsg_path = NULL, *tag_id_str = NULL;
7194 int preserve_tagmsg = 0;
7195 struct got_reflist_head refs;
7200 * Don't let the user create a tag name with a leading '-'.
7201 * While technically a valid reference name, this case is usually
7202 * an unintended typo.
7204 if (tag_name[0] == '-')
7205 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7207 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7211 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7212 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7216 err = got_object_id_str(&commit_id_str, commit_id);
7220 err = get_tag_refname(&refname, tag_name);
7223 if (strncmp("refs/tags/", tag_name, 10) == 0)
7226 err = got_ref_open(&ref, repo, refname, 0);
7228 err = got_error(GOT_ERR_TAG_EXISTS);
7230 } else if (err->code != GOT_ERR_NOT_REF)
7233 if (tagmsg_arg == NULL) {
7234 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7235 tag_name, got_repo_get_path(repo));
7237 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7238 tagmsg_path != NULL)
7239 preserve_tagmsg = 1;
7242 /* Editor is done; we can now apply unveil(2) */
7243 err = got_sigs_apply_unveil();
7246 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
7251 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7252 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7256 preserve_tagmsg = 1;
7260 err = got_ref_alloc(&ref, refname, tag_id);
7263 preserve_tagmsg = 1;
7267 err = got_ref_write(ref, repo);
7270 preserve_tagmsg = 1;
7274 err = got_object_id_str(&tag_id_str, tag_id);
7277 preserve_tagmsg = 1;
7280 printf("Created tag %s\n", tag_id_str);
7282 if (preserve_tagmsg) {
7283 fprintf(stderr, "%s: tag message preserved in %s\n",
7284 getprogname(), tagmsg_path);
7285 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7286 err = got_error_from_errno2("unlink", tagmsg_path);
7291 free(commit_id_str);
7295 got_ref_list_free(&refs);
7299 static const struct got_error *
7300 cmd_tag(int argc, char *argv[])
7302 const struct got_error *error = NULL;
7303 struct got_repository *repo = NULL;
7304 struct got_worktree *worktree = NULL;
7305 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7306 char *gitconfig_path = NULL, *tagger = NULL;
7307 char *allowed_signers = NULL, *revoked_signers = NULL;
7308 char *signer_id = NULL;
7309 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7310 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7311 int *pack_fds = NULL;
7313 while ((ch = getopt(argc, argv, "c:m:r:ls:Vv")) != -1) {
7316 commit_id_arg = optarg;
7322 repo_path = realpath(optarg, NULL);
7323 if (repo_path == NULL) {
7324 error = got_error_from_errno2("realpath",
7328 got_path_strip_trailing_slashes(repo_path);
7334 signer_id = strdup(optarg);
7335 if (signer_id == NULL) {
7336 error = got_error_from_errno("strdup");
7346 else if (verbosity < 3)
7358 if (do_list || verify_tags) {
7359 if (commit_id_arg != NULL)
7361 "-c option can only be used when creating a tag");
7364 option_conflict('l', 'm');
7366 option_conflict('V', 'm');
7370 option_conflict('l', 's');
7372 option_conflict('V', 's');
7376 } else if (argc != 1)
7383 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7384 "sendfd unveil", NULL) == -1)
7387 cwd = getcwd(NULL, 0);
7389 error = got_error_from_errno("getcwd");
7393 error = got_repo_pack_fds_open(&pack_fds);
7397 if (repo_path == NULL) {
7398 error = got_worktree_open(&worktree, cwd);
7399 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7405 strdup(got_worktree_get_repo_path(worktree));
7406 if (repo_path == NULL)
7407 error = got_error_from_errno("strdup");
7411 repo_path = strdup(cwd);
7412 if (repo_path == NULL) {
7413 error = got_error_from_errno("strdup");
7419 if (do_list || verify_tags) {
7420 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7423 error = get_allowed_signers(&allowed_signers, repo, worktree);
7426 error = get_revoked_signers(&revoked_signers, repo, worktree);
7430 /* Release work tree lock. */
7431 got_worktree_close(worktree);
7436 * Remove "cpath" promise unless needed for signature tmpfile
7440 got_sigs_apply_unveil();
7443 if (pledge("stdio rpath wpath flock proc exec sendfd "
7444 "unveil", NULL) == -1)
7448 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7451 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7452 revoked_signers, verbosity);
7454 error = get_gitconfig_path(&gitconfig_path);
7457 error = got_repo_open(&repo, repo_path, gitconfig_path,
7462 error = get_author(&tagger, repo, worktree);
7465 if (signer_id == NULL) {
7466 error = get_signer_id(&signer_id, repo, worktree);
7473 error = got_sigs_apply_unveil();
7477 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7482 if (commit_id_arg == NULL) {
7483 struct got_reference *head_ref;
7484 struct got_object_id *commit_id;
7485 error = got_ref_open(&head_ref, repo,
7486 worktree ? got_worktree_get_head_ref_name(worktree)
7490 error = got_ref_resolve(&commit_id, repo, head_ref);
7491 got_ref_close(head_ref);
7494 error = got_object_id_str(&commit_id_str, commit_id);
7501 /* Release work tree lock. */
7502 got_worktree_close(worktree);
7506 error = add_tag(repo, tagger, tag_name,
7507 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7508 signer_id, verbosity);
7512 const struct got_error *close_err = got_repo_close(repo);
7517 got_worktree_close(worktree);
7519 const struct got_error *pack_err =
7520 got_repo_pack_fds_close(pack_fds);
7526 free(gitconfig_path);
7527 free(commit_id_str);
7529 free(allowed_signers);
7530 free(revoked_signers);
7538 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
7542 static const struct got_error *
7543 add_progress(void *arg, unsigned char status, const char *path)
7545 while (path[0] == '/')
7547 printf("%c %s\n", status, path);
7551 static const struct got_error *
7552 cmd_add(int argc, char *argv[])
7554 const struct got_error *error = NULL;
7555 struct got_repository *repo = NULL;
7556 struct got_worktree *worktree = NULL;
7558 struct got_pathlist_head paths;
7559 struct got_pathlist_entry *pe;
7560 int ch, can_recurse = 0, no_ignores = 0;
7561 int *pack_fds = NULL;
7565 while ((ch = getopt(argc, argv, "IR")) != -1) {
7583 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7590 cwd = getcwd(NULL, 0);
7592 error = got_error_from_errno("getcwd");
7596 error = got_repo_pack_fds_open(&pack_fds);
7600 error = got_worktree_open(&worktree, cwd);
7602 if (error->code == GOT_ERR_NOT_WORKTREE)
7603 error = wrap_not_worktree_error(error, "add", cwd);
7607 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7612 error = apply_unveil(got_repo_get_path(repo), 1,
7613 got_worktree_get_root_path(worktree));
7617 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7624 TAILQ_FOREACH(pe, &paths, entry) {
7625 if (asprintf(&ondisk_path, "%s/%s",
7626 got_worktree_get_root_path(worktree),
7628 error = got_error_from_errno("asprintf");
7631 if (lstat(ondisk_path, &sb) == -1) {
7632 if (errno == ENOENT) {
7636 error = got_error_from_errno2("lstat",
7642 if (S_ISDIR(sb.st_mode)) {
7643 error = got_error_msg(GOT_ERR_BAD_PATH,
7644 "adding directories requires -R option");
7650 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7651 NULL, repo, no_ignores);
7654 const struct got_error *close_err = got_repo_close(repo);
7659 got_worktree_close(worktree);
7661 const struct got_error *pack_err =
7662 got_repo_pack_fds_close(pack_fds);
7666 TAILQ_FOREACH(pe, &paths, entry)
7667 free((char *)pe->path);
7668 got_pathlist_free(&paths);
7676 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
7681 static const struct got_error *
7682 print_remove_status(void *arg, unsigned char status,
7683 unsigned char staged_status, const char *path)
7685 while (path[0] == '/')
7687 if (status == GOT_STATUS_NONEXISTENT)
7689 if (status == staged_status && (status == GOT_STATUS_DELETE))
7690 status = GOT_STATUS_NO_CHANGE;
7691 printf("%c%c %s\n", status, staged_status, path);
7695 static const struct got_error *
7696 cmd_remove(int argc, char *argv[])
7698 const struct got_error *error = NULL;
7699 struct got_worktree *worktree = NULL;
7700 struct got_repository *repo = NULL;
7701 const char *status_codes = NULL;
7703 struct got_pathlist_head paths;
7704 struct got_pathlist_entry *pe;
7705 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7706 int ignore_missing_paths = 0;
7707 int *pack_fds = NULL;
7711 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7714 delete_local_mods = 1;
7715 ignore_missing_paths = 1;
7724 for (i = 0; i < strlen(optarg); i++) {
7725 switch (optarg[i]) {
7726 case GOT_STATUS_MODIFY:
7727 delete_local_mods = 1;
7729 case GOT_STATUS_MISSING:
7730 ignore_missing_paths = 1;
7733 errx(1, "invalid status code '%c'",
7737 status_codes = optarg;
7749 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7756 cwd = getcwd(NULL, 0);
7758 error = got_error_from_errno("getcwd");
7762 error = got_repo_pack_fds_open(&pack_fds);
7766 error = got_worktree_open(&worktree, cwd);
7768 if (error->code == GOT_ERR_NOT_WORKTREE)
7769 error = wrap_not_worktree_error(error, "remove", cwd);
7773 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7778 error = apply_unveil(got_repo_get_path(repo), 1,
7779 got_worktree_get_root_path(worktree));
7783 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7790 TAILQ_FOREACH(pe, &paths, entry) {
7791 if (asprintf(&ondisk_path, "%s/%s",
7792 got_worktree_get_root_path(worktree),
7794 error = got_error_from_errno("asprintf");
7797 if (lstat(ondisk_path, &sb) == -1) {
7798 if (errno == ENOENT) {
7802 error = got_error_from_errno2("lstat",
7808 if (S_ISDIR(sb.st_mode)) {
7809 error = got_error_msg(GOT_ERR_BAD_PATH,
7810 "removing directories requires -R option");
7816 error = got_worktree_schedule_delete(worktree, &paths,
7817 delete_local_mods, status_codes, print_remove_status, NULL,
7818 repo, keep_on_disk, ignore_missing_paths);
7821 const struct got_error *close_err = got_repo_close(repo);
7826 got_worktree_close(worktree);
7828 const struct got_error *pack_err =
7829 got_repo_pack_fds_close(pack_fds);
7833 TAILQ_FOREACH(pe, &paths, entry)
7834 free((char *)pe->path);
7835 got_pathlist_free(&paths);
7843 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
7844 "[patchfile]\n", getprogname());
7848 static const struct got_error *
7849 patch_from_stdin(int *patchfd)
7851 const struct got_error *err = NULL;
7853 char *path, buf[BUFSIZ];
7854 sig_t sighup, sigint, sigquit;
7856 err = got_opentemp_named_fd(&path, patchfd,
7857 GOT_TMPDIR_STR "/got-patch");
7863 sighup = signal(SIGHUP, SIG_DFL);
7864 sigint = signal(SIGINT, SIG_DFL);
7865 sigquit = signal(SIGQUIT, SIG_DFL);
7868 r = read(0, buf, sizeof(buf));
7870 err = got_error_from_errno("read");
7875 if (write(*patchfd, buf, r) == -1) {
7876 err = got_error_from_errno("write");
7881 signal(SIGHUP, sighup);
7882 signal(SIGINT, sigint);
7883 signal(SIGQUIT, sigquit);
7885 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7886 err = got_error_from_errno("lseek");
7896 static const struct got_error *
7897 patch_progress(void *arg, const char *old, const char *new,
7898 unsigned char status, const struct got_error *error, int old_from,
7899 int old_lines, int new_from, int new_lines, int offset,
7900 int ws_mangled, const struct got_error *hunk_err)
7902 const char *path = new == NULL ? old : new;
7904 while (*path == '/')
7908 printf("%c %s\n", status, path);
7911 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7913 if (offset != 0 || hunk_err != NULL || ws_mangled) {
7914 printf("@@ -%d,%d +%d,%d @@ ", old_from,
7915 old_lines, new_from, new_lines);
7916 if (hunk_err != NULL)
7917 printf("%s\n", hunk_err->msg);
7918 else if (offset != 0)
7919 printf("applied with offset %d\n", offset);
7921 printf("hunk contains mangled whitespace\n");
7927 static const struct got_error *
7928 cmd_patch(int argc, char *argv[])
7930 const struct got_error *error = NULL, *close_error = NULL;
7931 struct got_worktree *worktree = NULL;
7932 struct got_repository *repo = NULL;
7933 struct got_reflist_head refs;
7934 struct got_object_id *commit_id = NULL;
7935 const char *commit_id_str = NULL;
7939 int ch, nop = 0, strip = -1, reverse = 0;
7941 int *pack_fds = NULL;
7946 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
7947 "unveil", NULL) == -1)
7951 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
7954 commit_id_str = optarg;
7960 strip = strtonum(optarg, 0, INT_MAX, &errstr);
7962 errx(1, "pathname strip count is %s: %s",
7978 error = patch_from_stdin(&patchfd);
7981 } else if (argc == 1) {
7982 patchfd = open(argv[0], O_RDONLY);
7983 if (patchfd == -1) {
7984 error = got_error_from_errno2("open", argv[0]);
7987 if (fstat(patchfd, &sb) == -1) {
7988 error = got_error_from_errno2("fstat", argv[0]);
7991 if (!S_ISREG(sb.st_mode)) {
7992 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
7998 if ((cwd = getcwd(NULL, 0)) == NULL) {
7999 error = got_error_from_errno("getcwd");
8003 error = got_repo_pack_fds_open(&pack_fds);
8007 error = got_worktree_open(&worktree, cwd);
8011 const char *repo_path = got_worktree_get_repo_path(worktree);
8012 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8016 error = apply_unveil(got_repo_get_path(repo), 0,
8017 got_worktree_get_root_path(worktree));
8021 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8025 if (commit_id_str != NULL) {
8026 error = got_repo_match_object_id(&commit_id, NULL,
8027 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8032 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8033 commit_id, &patch_progress, NULL, check_cancelled, NULL);
8036 got_ref_list_free(&refs);
8039 close_error = got_repo_close(repo);
8041 error = close_error;
8043 if (worktree != NULL) {
8044 close_error = got_worktree_close(worktree);
8046 error = close_error;
8049 const struct got_error *pack_err =
8050 got_repo_pack_fds_close(pack_fds);
8061 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8066 static const struct got_error *
8067 revert_progress(void *arg, unsigned char status, const char *path)
8069 if (status == GOT_STATUS_UNVERSIONED)
8072 while (path[0] == '/')
8074 printf("%c %s\n", status, path);
8078 struct choose_patch_arg {
8079 FILE *patch_script_file;
8083 static const struct got_error *
8084 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8085 int nchanges, const char *action)
8087 const struct got_error *err;
8089 size_t linesize = 0;
8093 case GOT_STATUS_ADD:
8094 printf("A %s\n%s this addition? [y/n] ", path, action);
8096 case GOT_STATUS_DELETE:
8097 printf("D %s\n%s this deletion? [y/n] ", path, action);
8099 case GOT_STATUS_MODIFY:
8100 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8101 return got_error_from_errno("fseek");
8102 printf(GOT_COMMIT_SEP_STR);
8103 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8105 if (linelen == -1 && ferror(patch_file)) {
8106 err = got_error_from_errno("getline");
8111 printf(GOT_COMMIT_SEP_STR);
8112 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8113 path, n, nchanges, action);
8116 return got_error_path(path, GOT_ERR_FILE_STATUS);
8123 static const struct got_error *
8124 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8125 FILE *patch_file, int n, int nchanges)
8127 const struct got_error *err = NULL;
8129 size_t linesize = 0;
8132 struct choose_patch_arg *a = arg;
8134 *choice = GOT_PATCH_CHOICE_NONE;
8136 if (a->patch_script_file) {
8138 err = show_change(status, path, patch_file, n, nchanges,
8142 linelen = getline(&line, &linesize, a->patch_script_file);
8143 if (linelen == -1) {
8144 if (ferror(a->patch_script_file))
8145 return got_error_from_errno("getline");
8148 nl = strchr(line, '\n');
8151 if (strcmp(line, "y") == 0) {
8152 *choice = GOT_PATCH_CHOICE_YES;
8154 } else if (strcmp(line, "n") == 0) {
8155 *choice = GOT_PATCH_CHOICE_NO;
8157 } else if (strcmp(line, "q") == 0 &&
8158 status == GOT_STATUS_MODIFY) {
8159 *choice = GOT_PATCH_CHOICE_QUIT;
8162 printf("invalid response '%s'\n", line);
8167 while (resp != 'y' && resp != 'n' && resp != 'q') {
8168 err = show_change(status, path, patch_file, n, nchanges,
8175 if (status == GOT_STATUS_MODIFY) {
8176 if (resp != 'y' && resp != 'n' && resp != 'q') {
8177 printf("invalid response '%c'\n", resp);
8180 } else if (resp != 'y' && resp != 'n') {
8181 printf("invalid response '%c'\n", resp);
8187 *choice = GOT_PATCH_CHOICE_YES;
8188 else if (resp == 'n')
8189 *choice = GOT_PATCH_CHOICE_NO;
8190 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8191 *choice = GOT_PATCH_CHOICE_QUIT;
8196 static const struct got_error *
8197 cmd_revert(int argc, char *argv[])
8199 const struct got_error *error = NULL;
8200 struct got_worktree *worktree = NULL;
8201 struct got_repository *repo = NULL;
8202 char *cwd = NULL, *path = NULL;
8203 struct got_pathlist_head paths;
8204 struct got_pathlist_entry *pe;
8205 int ch, can_recurse = 0, pflag = 0;
8206 FILE *patch_script_file = NULL;
8207 const char *patch_script_path = NULL;
8208 struct choose_patch_arg cpa;
8209 int *pack_fds = NULL;
8213 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
8219 patch_script_path = optarg;
8234 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8235 "unveil", NULL) == -1)
8240 if (patch_script_path && !pflag)
8241 errx(1, "-F option can only be used together with -p option");
8243 cwd = getcwd(NULL, 0);
8245 error = got_error_from_errno("getcwd");
8249 error = got_repo_pack_fds_open(&pack_fds);
8253 error = got_worktree_open(&worktree, cwd);
8255 if (error->code == GOT_ERR_NOT_WORKTREE)
8256 error = wrap_not_worktree_error(error, "revert", cwd);
8260 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8265 if (patch_script_path) {
8266 patch_script_file = fopen(patch_script_path, "re");
8267 if (patch_script_file == NULL) {
8268 error = got_error_from_errno2("fopen",
8273 error = apply_unveil(got_repo_get_path(repo), 1,
8274 got_worktree_get_root_path(worktree));
8278 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8285 TAILQ_FOREACH(pe, &paths, entry) {
8286 if (asprintf(&ondisk_path, "%s/%s",
8287 got_worktree_get_root_path(worktree),
8289 error = got_error_from_errno("asprintf");
8292 if (lstat(ondisk_path, &sb) == -1) {
8293 if (errno == ENOENT) {
8297 error = got_error_from_errno2("lstat",
8303 if (S_ISDIR(sb.st_mode)) {
8304 error = got_error_msg(GOT_ERR_BAD_PATH,
8305 "reverting directories requires -R option");
8311 cpa.patch_script_file = patch_script_file;
8312 cpa.action = "revert";
8313 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8314 pflag ? choose_patch : NULL, &cpa, repo);
8316 if (patch_script_file && fclose(patch_script_file) == EOF &&
8318 error = got_error_from_errno2("fclose", patch_script_path);
8320 const struct got_error *close_err = got_repo_close(repo);
8325 got_worktree_close(worktree);
8327 const struct got_error *pack_err =
8328 got_repo_pack_fds_close(pack_fds);
8340 fprintf(stderr, "usage: %s commit [-NS] [-A author] [-F path] "
8341 "[-m message] [path ...]\n", getprogname());
8345 struct collect_commit_logmsg_arg {
8346 const char *cmdline_log;
8347 const char *prepared_log;
8348 int non_interactive;
8350 const char *worktree_path;
8351 const char *branch_name;
8352 const char *repo_path;
8357 static const struct got_error *
8358 read_prepared_logmsg(char **logmsg, const char *path)
8360 const struct got_error *err = NULL;
8366 memset(&sb, 0, sizeof(sb));
8368 f = fopen(path, "re");
8370 return got_error_from_errno2("fopen", path);
8372 if (fstat(fileno(f), &sb) == -1) {
8373 err = got_error_from_errno2("fstat", path);
8376 if (sb.st_size == 0) {
8377 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8381 *logmsg = malloc(sb.st_size + 1);
8382 if (*logmsg == NULL) {
8383 err = got_error_from_errno("malloc");
8387 r = fread(*logmsg, 1, sb.st_size, f);
8388 if (r != sb.st_size) {
8390 err = got_error_from_errno2("fread", path);
8392 err = got_error(GOT_ERR_IO);
8395 (*logmsg)[sb.st_size] = '\0';
8397 if (fclose(f) == EOF && err == NULL)
8398 err = got_error_from_errno2("fclose", path);
8406 static const struct got_error *
8407 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
8410 char *initial_content = NULL;
8411 struct got_pathlist_entry *pe;
8412 const struct got_error *err = NULL;
8413 char *template = NULL;
8414 struct collect_commit_logmsg_arg *a = arg;
8415 int initial_content_len;
8419 /* if a message was specified on the command line, just use it */
8420 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
8421 len = strlen(a->cmdline_log) + 1;
8422 *logmsg = malloc(len + 1);
8423 if (*logmsg == NULL)
8424 return got_error_from_errno("malloc");
8425 strlcpy(*logmsg, a->cmdline_log, len);
8427 } else if (a->prepared_log != NULL && a->non_interactive)
8428 return read_prepared_logmsg(logmsg, a->prepared_log);
8430 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
8431 return got_error_from_errno("asprintf");
8433 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
8437 if (a->prepared_log) {
8439 err = read_prepared_logmsg(&msg, a->prepared_log);
8442 if (write(fd, msg, strlen(msg)) == -1) {
8443 err = got_error_from_errno2("write", a->logmsg_path);
8450 initial_content_len = asprintf(&initial_content,
8451 "\n# changes to be committed on branch %s:\n",
8453 if (initial_content_len == -1) {
8454 err = got_error_from_errno("asprintf");
8458 if (write(fd, initial_content, initial_content_len) == -1) {
8459 err = got_error_from_errno2("write", a->logmsg_path);
8463 TAILQ_FOREACH(pe, commitable_paths, entry) {
8464 struct got_commitable *ct = pe->data;
8465 dprintf(fd, "# %c %s\n",
8466 got_commitable_get_status(ct),
8467 got_commitable_get_path(ct));
8470 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
8471 initial_content_len, a->prepared_log ? 0 : 1);
8473 free(initial_content);
8476 if (fd != -1 && close(fd) == -1 && err == NULL)
8477 err = got_error_from_errno2("close", a->logmsg_path);
8479 /* Editor is done; we can now apply unveil(2) */
8481 err = apply_unveil(a->repo_path, 0, a->worktree_path);
8489 static const struct got_error *
8490 cmd_commit(int argc, char *argv[])
8492 const struct got_error *error = NULL;
8493 struct got_worktree *worktree = NULL;
8494 struct got_repository *repo = NULL;
8495 char *cwd = NULL, *id_str = NULL;
8496 struct got_object_id *id = NULL;
8497 const char *logmsg = NULL;
8498 char *prepared_logmsg = NULL;
8499 struct collect_commit_logmsg_arg cl_arg;
8500 const char *author = NULL;
8501 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
8502 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8503 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8504 struct got_pathlist_head paths;
8505 int *pack_fds = NULL;
8508 cl_arg.logmsg_path = NULL;
8510 while ((ch = getopt(argc, argv, "A:F:m:NS")) != -1) {
8514 error = valid_author(author);
8520 option_conflict('F', 'm');
8521 prepared_logmsg = realpath(optarg, NULL);
8522 if (prepared_logmsg == NULL)
8523 return got_error_from_errno2("realpath",
8527 if (prepared_logmsg)
8528 option_conflict('m', 'F');
8532 non_interactive = 1;
8535 allow_bad_symlinks = 1;
8547 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8548 "unveil", NULL) == -1)
8551 cwd = getcwd(NULL, 0);
8553 error = got_error_from_errno("getcwd");
8557 error = got_repo_pack_fds_open(&pack_fds);
8561 error = got_worktree_open(&worktree, cwd);
8563 if (error->code == GOT_ERR_NOT_WORKTREE)
8564 error = wrap_not_worktree_error(error, "commit", cwd);
8568 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8571 if (rebase_in_progress) {
8572 error = got_error(GOT_ERR_REBASING);
8576 error = got_worktree_histedit_in_progress(&histedit_in_progress,
8581 error = get_gitconfig_path(&gitconfig_path);
8584 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8585 gitconfig_path, pack_fds);
8589 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8592 if (merge_in_progress) {
8593 error = got_error(GOT_ERR_MERGE_BUSY);
8597 error = get_author(&committer, repo, worktree);
8601 if (author != NULL && !strcmp(committer, author)) {
8602 error = got_error(GOT_ERR_COMMIT_REDUNDANT_AUTHOR);
8610 * unveil(2) traverses exec(2); if an editor is used we have
8611 * to apply unveil after the log message has been written.
8613 if (logmsg == NULL || strlen(logmsg) == 0)
8614 error = get_editor(&editor);
8616 error = apply_unveil(got_repo_get_path(repo), 0,
8617 got_worktree_get_root_path(worktree));
8621 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8625 cl_arg.editor = editor;
8626 cl_arg.cmdline_log = logmsg;
8627 cl_arg.prepared_log = prepared_logmsg;
8628 cl_arg.non_interactive = non_interactive;
8629 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8630 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
8631 if (!histedit_in_progress) {
8632 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
8633 error = got_error(GOT_ERR_COMMIT_BRANCH);
8636 cl_arg.branch_name += 11;
8638 cl_arg.repo_path = got_repo_get_path(repo);
8639 error = got_worktree_commit(&id, worktree, &paths, author, committer,
8640 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
8641 print_status, NULL, repo);
8643 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8644 cl_arg.logmsg_path != NULL)
8645 preserve_logmsg = 1;
8649 error = got_object_id_str(&id_str, id);
8652 printf("Created commit %s\n", id_str);
8654 if (preserve_logmsg) {
8655 fprintf(stderr, "%s: log message preserved in %s\n",
8656 getprogname(), cl_arg.logmsg_path);
8657 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8659 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8660 free(cl_arg.logmsg_path);
8662 const struct got_error *close_err = got_repo_close(repo);
8667 got_worktree_close(worktree);
8669 const struct got_error *pack_err =
8670 got_repo_pack_fds_close(pack_fds);
8676 free(gitconfig_path);
8679 free(prepared_logmsg);
8686 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
8687 "[-r repository-path] [-t tag] [remote-repository]\n",
8693 print_load_info(int print_colored, int print_found, int print_trees,
8694 int ncolored, int nfound, int ntrees)
8696 if (print_colored) {
8697 printf("%d commit%s colored", ncolored,
8698 ncolored == 1 ? "" : "s");
8701 printf("%s%d object%s found",
8702 ncolored > 0 ? "; " : "",
8703 nfound, nfound == 1 ? "" : "s");
8706 printf("; %d tree%s scanned", ntrees,
8707 ntrees == 1 ? "" : "s");
8711 struct got_send_progress_arg {
8712 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8719 int last_nobj_total;
8723 int printed_something;
8725 struct got_pathlist_head *delete_branches;
8728 static const struct got_error *
8729 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8730 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8731 int nobj_written, off_t bytes_sent, const char *refname, int success)
8733 struct got_send_progress_arg *a = arg;
8734 char scaled_packsize[FMT_SCALED_STRSIZE];
8735 char scaled_sent[FMT_SCALED_STRSIZE];
8736 int p_deltify = 0, p_written = 0, p_sent = 0;
8737 int print_colored = 0, print_found = 0, print_trees = 0;
8738 int print_searching = 0, print_total = 0;
8739 int print_deltify = 0, print_written = 0, print_sent = 0;
8741 if (a->verbosity < 0)
8745 const char *status = success ? "accepted" : "rejected";
8748 struct got_pathlist_entry *pe;
8749 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8750 const char *branchname = pe->path;
8751 if (got_path_cmp(branchname, refname,
8752 strlen(branchname), strlen(refname)) == 0) {
8754 a->sent_something = 1;
8760 if (a->printed_something)
8762 printf("Server has %s %s", status, refname);
8763 a->printed_something = 1;
8767 if (a->last_ncolored != ncolored) {
8769 a->last_ncolored = ncolored;
8772 if (a->last_nfound != nfound) {
8775 a->last_nfound = nfound;
8778 if (a->last_ntrees != ntrees) {
8782 a->last_ntrees = ntrees;
8785 if ((print_colored || print_found || print_trees) &&
8788 print_load_info(print_colored, print_found, print_trees,
8789 ncolored, nfound, ntrees);
8790 a->printed_something = 1;
8793 } else if (!a->loading_done) {
8795 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8797 a->loading_done = 1;
8800 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8801 return got_error_from_errno("fmt_scaled");
8802 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8803 return got_error_from_errno("fmt_scaled");
8805 if (a->last_ncommits != ncommits) {
8806 print_searching = 1;
8807 a->last_ncommits = ncommits;
8810 if (a->last_nobj_total != nobj_total) {
8811 print_searching = 1;
8813 a->last_nobj_total = nobj_total;
8816 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8817 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8818 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8819 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8820 return got_error(GOT_ERR_NO_SPACE);
8823 if (nobj_deltify > 0 || nobj_written > 0) {
8824 if (nobj_deltify > 0) {
8825 p_deltify = (nobj_deltify * 100) / nobj_total;
8826 if (p_deltify != a->last_p_deltify) {
8827 a->last_p_deltify = p_deltify;
8828 print_searching = 1;
8833 if (nobj_written > 0) {
8834 p_written = (nobj_written * 100) / nobj_total;
8835 if (p_written != a->last_p_written) {
8836 a->last_p_written = p_written;
8837 print_searching = 1;
8845 if (bytes_sent > 0) {
8846 p_sent = (bytes_sent * 100) / packfile_size;
8847 if (p_sent != a->last_p_sent) {
8848 a->last_p_sent = p_sent;
8849 print_searching = 1;
8855 a->sent_something = 1;
8858 if (print_searching || print_total || print_deltify || print_written ||
8861 if (print_searching)
8862 printf("packing %d reference%s", ncommits,
8863 ncommits == 1 ? "" : "s");
8865 printf("; %d object%s", nobj_total,
8866 nobj_total == 1 ? "" : "s");
8868 printf("; deltify: %d%%", p_deltify);
8870 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8871 scaled_packsize, p_sent);
8872 else if (print_written)
8873 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8874 scaled_packsize, p_written);
8875 if (print_searching || print_total || print_deltify ||
8876 print_written || print_sent) {
8877 a->printed_something = 1;
8883 static const struct got_error *
8884 cmd_send(int argc, char *argv[])
8886 const struct got_error *error = NULL;
8887 char *cwd = NULL, *repo_path = NULL;
8888 const char *remote_name;
8889 char *proto = NULL, *host = NULL, *port = NULL;
8890 char *repo_name = NULL, *server_path = NULL;
8891 const struct got_remote_repo *remotes, *remote = NULL;
8892 int nremotes, nbranches = 0, ndelete_branches = 0;
8893 struct got_repository *repo = NULL;
8894 struct got_worktree *worktree = NULL;
8895 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8896 struct got_pathlist_head branches;
8897 struct got_pathlist_head tags;
8898 struct got_reflist_head all_branches;
8899 struct got_reflist_head all_tags;
8900 struct got_pathlist_head delete_args;
8901 struct got_pathlist_head delete_branches;
8902 struct got_reflist_entry *re;
8903 struct got_pathlist_entry *pe;
8904 int i, ch, sendfd = -1, sendstatus;
8906 struct got_send_progress_arg spa;
8907 int verbosity = 0, overwrite_refs = 0;
8908 int send_all_branches = 0, send_all_tags = 0;
8909 struct got_reference *ref = NULL;
8910 int *pack_fds = NULL;
8912 TAILQ_INIT(&branches);
8914 TAILQ_INIT(&all_branches);
8915 TAILQ_INIT(&all_tags);
8916 TAILQ_INIT(&delete_args);
8917 TAILQ_INIT(&delete_branches);
8919 while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8922 send_all_branches = 1;
8925 error = got_pathlist_append(&branches, optarg, NULL);
8931 error = got_pathlist_append(&delete_args, optarg, NULL);
8939 repo_path = realpath(optarg, NULL);
8940 if (repo_path == NULL)
8941 return got_error_from_errno2("realpath",
8943 got_path_strip_trailing_slashes(repo_path);
8946 error = got_pathlist_append(&tags, optarg, NULL);
8956 else if (verbosity < 3)
8970 if (send_all_branches && !TAILQ_EMPTY(&branches))
8971 option_conflict('a', 'b');
8972 if (send_all_tags && !TAILQ_EMPTY(&tags))
8973 option_conflict('T', 't');
8977 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8979 remote_name = argv[0];
8983 cwd = getcwd(NULL, 0);
8985 error = got_error_from_errno("getcwd");
8989 error = got_repo_pack_fds_open(&pack_fds);
8993 if (repo_path == NULL) {
8994 error = got_worktree_open(&worktree, cwd);
8995 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9001 strdup(got_worktree_get_repo_path(worktree));
9002 if (repo_path == NULL)
9003 error = got_error_from_errno("strdup");
9007 repo_path = strdup(cwd);
9008 if (repo_path == NULL) {
9009 error = got_error_from_errno("strdup");
9015 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9020 worktree_conf = got_worktree_get_gotconfig(worktree);
9021 if (worktree_conf) {
9022 got_gotconfig_get_remotes(&nremotes, &remotes,
9024 for (i = 0; i < nremotes; i++) {
9025 if (strcmp(remotes[i].name, remote_name) == 0) {
9026 remote = &remotes[i];
9032 if (remote == NULL) {
9033 repo_conf = got_repo_get_gotconfig(repo);
9035 got_gotconfig_get_remotes(&nremotes, &remotes,
9037 for (i = 0; i < nremotes; i++) {
9038 if (strcmp(remotes[i].name, remote_name) == 0) {
9039 remote = &remotes[i];
9045 if (remote == NULL) {
9046 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9047 for (i = 0; i < nremotes; i++) {
9048 if (strcmp(remotes[i].name, remote_name) == 0) {
9049 remote = &remotes[i];
9054 if (remote == NULL) {
9055 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9059 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9060 &repo_name, remote->send_url);
9064 if (strcmp(proto, "git") == 0) {
9066 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9067 "sendfd dns inet unveil", NULL) == -1)
9070 } else if (strcmp(proto, "git+ssh") == 0 ||
9071 strcmp(proto, "ssh") == 0) {
9073 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9074 "sendfd unveil", NULL) == -1)
9077 } else if (strcmp(proto, "http") == 0 ||
9078 strcmp(proto, "git+http") == 0) {
9079 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9082 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9086 error = got_dial_apply_unveil(proto);
9090 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9094 if (send_all_branches) {
9095 error = got_ref_list(&all_branches, repo, "refs/heads",
9096 got_ref_cmp_by_name, NULL);
9099 TAILQ_FOREACH(re, &all_branches, entry) {
9100 const char *branchname = got_ref_get_name(re->ref);
9101 error = got_pathlist_append(&branches,
9107 } else if (nbranches == 0) {
9108 for (i = 0; i < remote->nsend_branches; i++) {
9109 got_pathlist_append(&branches,
9110 remote->send_branches[i], NULL);
9114 if (send_all_tags) {
9115 error = got_ref_list(&all_tags, repo, "refs/tags",
9116 got_ref_cmp_by_name, NULL);
9119 TAILQ_FOREACH(re, &all_tags, entry) {
9120 const char *tagname = got_ref_get_name(re->ref);
9121 error = got_pathlist_append(&tags,
9129 * To prevent accidents only branches in refs/heads/ can be deleted
9130 * with 'got send -d'.
9131 * Deleting anything else requires local repository access or Git.
9133 TAILQ_FOREACH(pe, &delete_args, entry) {
9134 const char *branchname = pe->path;
9136 struct got_pathlist_entry *new;
9137 if (strncmp(branchname, "refs/heads/", 11) == 0) {
9138 s = strdup(branchname);
9140 error = got_error_from_errno("strdup");
9144 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
9145 error = got_error_from_errno("asprintf");
9149 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
9150 if (error || new == NULL /* duplicate */)
9157 if (nbranches == 0 && ndelete_branches == 0) {
9158 struct got_reference *head_ref;
9160 error = got_ref_open(&head_ref, repo,
9161 got_worktree_get_head_ref_name(worktree), 0);
9163 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
9166 if (got_ref_is_symbolic(head_ref)) {
9167 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
9168 got_ref_close(head_ref);
9173 error = got_pathlist_append(&branches, got_ref_get_name(ref),
9181 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
9182 port ? ":" : "", port ? port : "");
9184 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
9185 server_path, verbosity);
9189 memset(&spa, 0, sizeof(spa));
9190 spa.last_scaled_packsize[0] = '\0';
9191 spa.last_p_deltify = -1;
9192 spa.last_p_written = -1;
9193 spa.verbosity = verbosity;
9194 spa.delete_branches = &delete_branches;
9195 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
9196 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
9197 check_cancelled, NULL);
9198 if (spa.printed_something)
9202 if (!spa.sent_something && verbosity >= 0)
9203 printf("Already up-to-date\n");
9206 if (kill(sendpid, SIGTERM) == -1)
9207 error = got_error_from_errno("kill");
9208 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
9209 error = got_error_from_errno("waitpid");
9211 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
9212 error = got_error_from_errno("close");
9214 const struct got_error *close_err = got_repo_close(repo);
9219 got_worktree_close(worktree);
9221 const struct got_error *pack_err =
9222 got_repo_pack_fds_close(pack_fds);
9228 got_pathlist_free(&branches);
9229 got_pathlist_free(&tags);
9230 got_ref_list_free(&all_branches);
9231 got_ref_list_free(&all_tags);
9232 got_pathlist_free(&delete_args);
9233 TAILQ_FOREACH(pe, &delete_branches, entry)
9234 free((char *)pe->path);
9235 got_pathlist_free(&delete_branches);
9247 usage_cherrypick(void)
9249 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
9253 static const struct got_error *
9254 cmd_cherrypick(int argc, char *argv[])
9256 const struct got_error *error = NULL;
9257 struct got_worktree *worktree = NULL;
9258 struct got_repository *repo = NULL;
9259 char *cwd = NULL, *commit_id_str = NULL;
9260 struct got_object_id *commit_id = NULL;
9261 struct got_commit_object *commit = NULL;
9262 struct got_object_qid *pid;
9264 struct got_update_progress_arg upa;
9265 int *pack_fds = NULL;
9267 while ((ch = getopt(argc, argv, "")) != -1) {
9279 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9280 "unveil", NULL) == -1)
9286 cwd = getcwd(NULL, 0);
9288 error = got_error_from_errno("getcwd");
9292 error = got_repo_pack_fds_open(&pack_fds);
9296 error = got_worktree_open(&worktree, cwd);
9298 if (error->code == GOT_ERR_NOT_WORKTREE)
9299 error = wrap_not_worktree_error(error, "cherrypick",
9304 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9309 error = apply_unveil(got_repo_get_path(repo), 0,
9310 got_worktree_get_root_path(worktree));
9314 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9315 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9318 error = got_object_id_str(&commit_id_str, commit_id);
9322 error = got_object_open_as_commit(&commit, repo, commit_id);
9325 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9326 memset(&upa, 0, sizeof(upa));
9327 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
9328 commit_id, repo, update_progress, &upa, check_cancelled,
9333 if (upa.did_something)
9334 printf("Merged commit %s\n", commit_id_str);
9335 print_merge_progress_stats(&upa);
9338 got_object_commit_close(commit);
9339 free(commit_id_str);
9341 got_worktree_close(worktree);
9343 const struct got_error *close_err = got_repo_close(repo);
9348 const struct got_error *pack_err =
9349 got_repo_pack_fds_close(pack_fds);
9360 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
9364 static const struct got_error *
9365 cmd_backout(int argc, char *argv[])
9367 const struct got_error *error = NULL;
9368 struct got_worktree *worktree = NULL;
9369 struct got_repository *repo = NULL;
9370 char *cwd = NULL, *commit_id_str = NULL;
9371 struct got_object_id *commit_id = NULL;
9372 struct got_commit_object *commit = NULL;
9373 struct got_object_qid *pid;
9375 struct got_update_progress_arg upa;
9376 int *pack_fds = NULL;
9378 while ((ch = getopt(argc, argv, "")) != -1) {
9390 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9391 "unveil", NULL) == -1)
9397 cwd = getcwd(NULL, 0);
9399 error = got_error_from_errno("getcwd");
9403 error = got_repo_pack_fds_open(&pack_fds);
9407 error = got_worktree_open(&worktree, cwd);
9409 if (error->code == GOT_ERR_NOT_WORKTREE)
9410 error = wrap_not_worktree_error(error, "backout", cwd);
9414 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9419 error = apply_unveil(got_repo_get_path(repo), 0,
9420 got_worktree_get_root_path(worktree));
9424 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9425 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9428 error = got_object_id_str(&commit_id_str, commit_id);
9432 error = got_object_open_as_commit(&commit, repo, commit_id);
9435 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9437 error = got_error(GOT_ERR_ROOT_COMMIT);
9441 memset(&upa, 0, sizeof(upa));
9442 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
9443 repo, update_progress, &upa, check_cancelled, NULL);
9447 if (upa.did_something)
9448 printf("Backed out commit %s\n", commit_id_str);
9449 print_merge_progress_stats(&upa);
9452 got_object_commit_close(commit);
9453 free(commit_id_str);
9455 got_worktree_close(worktree);
9457 const struct got_error *close_err = got_repo_close(repo);
9462 const struct got_error *pack_err =
9463 got_repo_pack_fds_close(pack_fds);
9473 fprintf(stderr, "usage: %s rebase [-aclX] [branch]\n", getprogname());
9478 trim_logmsg(char *logmsg, int limit)
9483 len = strlen(logmsg);
9487 nl = strchr(logmsg, '\n');
9492 static const struct got_error *
9493 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
9495 const struct got_error *err;
9496 char *logmsg0 = NULL;
9499 err = got_object_commit_get_logmsg(&logmsg0, commit);
9504 while (isspace((unsigned char)s[0]))
9507 *logmsg = strdup(s);
9508 if (*logmsg == NULL) {
9509 err = got_error_from_errno("strdup");
9513 trim_logmsg(*logmsg, limit);
9519 static const struct got_error *
9520 show_rebase_merge_conflict(struct got_object_id *id,
9521 struct got_repository *repo)
9523 const struct got_error *err;
9524 struct got_commit_object *commit = NULL;
9525 char *id_str = NULL, *logmsg = NULL;
9527 err = got_object_open_as_commit(&commit, repo, id);
9531 err = got_object_id_str(&id_str, id);
9537 err = get_short_logmsg(&logmsg, 42, commit);
9541 printf("%s -> merge conflict: %s\n", id_str, logmsg);
9544 got_object_commit_close(commit);
9549 static const struct got_error *
9550 show_rebase_progress(struct got_commit_object *commit,
9551 struct got_object_id *old_id, struct got_object_id *new_id)
9553 const struct got_error *err;
9554 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9556 err = got_object_id_str(&old_id_str, old_id);
9561 err = got_object_id_str(&new_id_str, new_id);
9566 old_id_str[12] = '\0';
9568 new_id_str[12] = '\0';
9570 err = get_short_logmsg(&logmsg, 42, commit);
9574 printf("%s -> %s: %s\n", old_id_str,
9575 new_id_str ? new_id_str : "no-op change", logmsg);
9583 static const struct got_error *
9584 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
9585 struct got_reference *branch, struct got_reference *new_base_branch,
9586 struct got_reference *tmp_branch, struct got_repository *repo,
9589 printf("Switching work tree to %s\n", got_ref_get_name(branch));
9590 return got_worktree_rebase_complete(worktree, fileindex,
9591 new_base_branch, tmp_branch, branch, repo, create_backup);
9594 static const struct got_error *
9595 rebase_commit(struct got_pathlist_head *merged_paths,
9596 struct got_worktree *worktree, struct got_fileindex *fileindex,
9597 struct got_reference *tmp_branch, const char *committer,
9598 struct got_object_id *commit_id, struct got_repository *repo)
9600 const struct got_error *error;
9601 struct got_commit_object *commit;
9602 struct got_object_id *new_commit_id;
9604 error = got_object_open_as_commit(&commit, repo, commit_id);
9608 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
9609 worktree, fileindex, tmp_branch, committer, commit, commit_id,
9612 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
9614 error = show_rebase_progress(commit, commit_id, NULL);
9616 error = show_rebase_progress(commit, commit_id, new_commit_id);
9617 free(new_commit_id);
9620 got_object_commit_close(commit);
9624 struct check_path_prefix_arg {
9625 const char *path_prefix;
9630 static const struct got_error *
9631 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
9632 struct got_blob_object *blob2, FILE *f1, FILE *f2,
9633 struct got_object_id *id1, struct got_object_id *id2,
9634 const char *path1, const char *path2,
9635 mode_t mode1, mode_t mode2, struct got_repository *repo)
9637 struct check_path_prefix_arg *a = arg;
9639 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
9640 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
9641 return got_error(a->errcode);
9646 static const struct got_error *
9647 check_path_prefix(struct got_object_id *parent_id,
9648 struct got_object_id *commit_id, const char *path_prefix,
9649 int errcode, struct got_repository *repo)
9651 const struct got_error *err;
9652 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
9653 struct got_commit_object *commit = NULL, *parent_commit = NULL;
9654 struct check_path_prefix_arg cpp_arg;
9656 if (got_path_is_root_dir(path_prefix))
9659 err = got_object_open_as_commit(&commit, repo, commit_id);
9663 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
9667 err = got_object_open_as_tree(&tree1, repo,
9668 got_object_commit_get_tree_id(parent_commit));
9672 err = got_object_open_as_tree(&tree2, repo,
9673 got_object_commit_get_tree_id(commit));
9677 cpp_arg.path_prefix = path_prefix;
9678 while (cpp_arg.path_prefix[0] == '/')
9679 cpp_arg.path_prefix++;
9680 cpp_arg.len = strlen(cpp_arg.path_prefix);
9681 cpp_arg.errcode = errcode;
9682 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
9683 check_path_prefix_in_diff, &cpp_arg, 0);
9686 got_object_tree_close(tree1);
9688 got_object_tree_close(tree2);
9690 got_object_commit_close(commit);
9692 got_object_commit_close(parent_commit);
9696 static const struct got_error *
9697 collect_commits(struct got_object_id_queue *commits,
9698 struct got_object_id *initial_commit_id,
9699 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
9700 const char *path_prefix, int path_prefix_errcode,
9701 struct got_repository *repo)
9703 const struct got_error *err = NULL;
9704 struct got_commit_graph *graph = NULL;
9705 struct got_object_id parent_id, commit_id;
9706 struct got_object_qid *qid;
9708 err = got_commit_graph_open(&graph, "/", 1);
9712 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
9713 check_cancelled, NULL);
9717 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
9718 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
9719 err = got_commit_graph_iter_next(&parent_id, graph, repo,
9720 check_cancelled, NULL);
9722 if (err->code == GOT_ERR_ITER_COMPLETED) {
9723 err = got_error_msg(GOT_ERR_ANCESTRY,
9724 "ran out of commits to rebase before "
9725 "youngest common ancestor commit has "
9730 err = check_path_prefix(&parent_id, &commit_id,
9731 path_prefix, path_prefix_errcode, repo);
9735 err = got_object_qid_alloc(&qid, &commit_id);
9738 STAILQ_INSERT_HEAD(commits, qid, entry);
9740 memcpy(&commit_id, &parent_id, sizeof(commit_id));
9744 got_commit_graph_close(graph);
9748 static const struct got_error *
9749 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9751 const struct got_error *err = NULL;
9752 time_t committer_time;
9754 char datebuf[11]; /* YYYY-MM-DD + NUL */
9755 char *author0 = NULL, *author, *smallerthan;
9756 char *logmsg0 = NULL, *logmsg, *newline;
9758 committer_time = got_object_commit_get_committer_time(commit);
9759 if (gmtime_r(&committer_time, &tm) == NULL)
9760 return got_error_from_errno("gmtime_r");
9761 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9762 return got_error(GOT_ERR_NO_SPACE);
9764 author0 = strdup(got_object_commit_get_author(commit));
9765 if (author0 == NULL)
9766 return got_error_from_errno("strdup");
9768 smallerthan = strchr(author, '<');
9769 if (smallerthan && smallerthan[1] != '\0')
9770 author = smallerthan + 1;
9771 author[strcspn(author, "@>")] = '\0';
9773 err = got_object_commit_get_logmsg(&logmsg0, commit);
9777 while (*logmsg == '\n')
9779 newline = strchr(logmsg, '\n');
9783 if (asprintf(brief_str, "%s %s %s",
9784 datebuf, author, logmsg) == -1)
9785 err = got_error_from_errno("asprintf");
9792 static const struct got_error *
9793 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9794 struct got_repository *repo)
9796 const struct got_error *err;
9799 err = got_object_id_str(&id_str, id);
9803 err = got_ref_delete(ref, repo);
9807 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
9813 static const struct got_error *
9814 print_backup_ref(const char *branch_name, const char *new_id_str,
9815 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
9816 struct got_reflist_object_id_map *refs_idmap,
9817 struct got_repository *repo)
9819 const struct got_error *err = NULL;
9820 struct got_reflist_head *refs;
9821 char *refs_str = NULL;
9822 struct got_object_id *new_commit_id = NULL;
9823 struct got_commit_object *new_commit = NULL;
9824 char *new_commit_brief_str = NULL;
9825 struct got_object_id *yca_id = NULL;
9826 struct got_commit_object *yca_commit = NULL;
9827 char *yca_id_str = NULL, *yca_brief_str = NULL;
9828 char *custom_refs_str;
9830 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9831 return got_error_from_errno("asprintf");
9833 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9834 0, 0, refs_idmap, custom_refs_str);
9838 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9842 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9844 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
9849 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9853 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9857 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9858 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9862 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9863 refs_str ? " (" : "", refs_str ? refs_str : "",
9864 refs_str ? ")" : "", new_commit_brief_str);
9865 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9866 got_object_id_cmp(yca_id, old_commit_id) != 0) {
9870 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9874 err = get_commit_brief_str(&yca_brief_str, yca_commit);
9878 err = got_object_id_str(&yca_id_str, yca_id);
9882 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9884 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
9888 printf("history forked at %s%s%s%s\n %s\n",
9890 refs_str ? " (" : "", refs_str ? refs_str : "",
9891 refs_str ? ")" : "", yca_brief_str);
9894 free(custom_refs_str);
9895 free(new_commit_id);
9899 free(yca_brief_str);
9901 got_object_commit_close(new_commit);
9903 got_object_commit_close(yca_commit);
9908 static const struct got_error *
9909 process_backup_refs(const char *backup_ref_prefix,
9910 const char *wanted_branch_name,
9911 int delete, struct got_repository *repo)
9913 const struct got_error *err;
9914 struct got_reflist_head refs, backup_refs;
9915 struct got_reflist_entry *re;
9916 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9917 struct got_object_id *old_commit_id = NULL;
9918 char *branch_name = NULL;
9919 struct got_commit_object *old_commit = NULL;
9920 struct got_reflist_object_id_map *refs_idmap = NULL;
9921 int wanted_branch_found = 0;
9924 TAILQ_INIT(&backup_refs);
9926 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9930 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9934 if (wanted_branch_name) {
9935 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9936 wanted_branch_name += 11;
9939 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9940 got_ref_cmp_by_commit_timestamp_descending, repo);
9944 TAILQ_FOREACH(re, &backup_refs, entry) {
9945 const char *refname = got_ref_get_name(re->ref);
9948 err = check_cancelled(NULL);
9952 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9956 err = got_object_open_as_commit(&old_commit, repo,
9961 if (strncmp(backup_ref_prefix, refname,
9962 backup_ref_prefix_len) == 0)
9963 refname += backup_ref_prefix_len;
9965 while (refname[0] == '/')
9968 branch_name = strdup(refname);
9969 if (branch_name == NULL) {
9970 err = got_error_from_errno("strdup");
9973 slash = strrchr(branch_name, '/');
9976 refname += strlen(branch_name) + 1;
9979 if (wanted_branch_name == NULL ||
9980 strcmp(wanted_branch_name, branch_name) == 0) {
9981 wanted_branch_found = 1;
9983 err = delete_backup_ref(re->ref,
9984 old_commit_id, repo);
9986 err = print_backup_ref(branch_name, refname,
9987 old_commit_id, old_commit, refs_idmap,
9994 free(old_commit_id);
9995 old_commit_id = NULL;
9998 got_object_commit_close(old_commit);
10002 if (wanted_branch_name && !wanted_branch_found) {
10003 err = got_error_fmt(GOT_ERR_NOT_REF,
10004 "%s/%s/", backup_ref_prefix, wanted_branch_name);
10008 got_reflist_object_id_map_free(refs_idmap);
10009 got_ref_list_free(&refs);
10010 got_ref_list_free(&backup_refs);
10011 free(old_commit_id);
10014 got_object_commit_close(old_commit);
10018 static const struct got_error *
10019 abort_progress(void *arg, unsigned char status, const char *path)
10022 * Unversioned files should not clutter progress output when
10023 * an operation is aborted.
10025 if (status == GOT_STATUS_UNVERSIONED)
10028 return update_progress(arg, status, path);
10031 static const struct got_error *
10032 cmd_rebase(int argc, char *argv[])
10034 const struct got_error *error = NULL;
10035 struct got_worktree *worktree = NULL;
10036 struct got_repository *repo = NULL;
10037 struct got_fileindex *fileindex = NULL;
10038 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
10039 struct got_reference *branch = NULL;
10040 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
10041 struct got_object_id *commit_id = NULL, *parent_id = NULL;
10042 struct got_object_id *resume_commit_id = NULL;
10043 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
10044 struct got_commit_object *commit = NULL;
10045 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
10046 int histedit_in_progress = 0, merge_in_progress = 0;
10047 int create_backup = 1, list_backups = 0, delete_backups = 0;
10048 struct got_object_id_queue commits;
10049 struct got_pathlist_head merged_paths;
10050 const struct got_object_id_queue *parent_ids;
10051 struct got_object_qid *qid, *pid;
10052 struct got_update_progress_arg upa;
10053 int *pack_fds = NULL;
10055 STAILQ_INIT(&commits);
10056 TAILQ_INIT(&merged_paths);
10057 memset(&upa, 0, sizeof(upa));
10059 while ((ch = getopt(argc, argv, "aclX")) != -1) {
10065 continue_rebase = 1;
10071 delete_backups = 1;
10083 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10084 "unveil", NULL) == -1)
10087 if (list_backups) {
10089 option_conflict('l', 'a');
10090 if (continue_rebase)
10091 option_conflict('l', 'c');
10092 if (delete_backups)
10093 option_conflict('l', 'X');
10094 if (argc != 0 && argc != 1)
10096 } else if (delete_backups) {
10098 option_conflict('X', 'a');
10099 if (continue_rebase)
10100 option_conflict('X', 'c');
10102 option_conflict('l', 'X');
10103 if (argc != 0 && argc != 1)
10106 if (abort_rebase && continue_rebase)
10108 else if (abort_rebase || continue_rebase) {
10111 } else if (argc != 1)
10115 cwd = getcwd(NULL, 0);
10117 error = got_error_from_errno("getcwd");
10121 error = got_repo_pack_fds_open(&pack_fds);
10125 error = got_worktree_open(&worktree, cwd);
10127 if (list_backups || delete_backups) {
10128 if (error->code != GOT_ERR_NOT_WORKTREE)
10131 if (error->code == GOT_ERR_NOT_WORKTREE)
10132 error = wrap_not_worktree_error(error,
10138 error = get_gitconfig_path(&gitconfig_path);
10141 error = got_repo_open(&repo,
10142 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10143 gitconfig_path, pack_fds);
10147 error = get_author(&committer, repo, worktree);
10148 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
10151 error = apply_unveil(got_repo_get_path(repo), 0,
10152 worktree ? got_worktree_get_root_path(worktree) : NULL);
10156 if (list_backups || delete_backups) {
10157 error = process_backup_refs(
10158 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
10159 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10160 goto done; /* nothing else to do */
10163 error = got_worktree_histedit_in_progress(&histedit_in_progress,
10167 if (histedit_in_progress) {
10168 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10172 error = got_worktree_merge_in_progress(&merge_in_progress,
10176 if (merge_in_progress) {
10177 error = got_error(GOT_ERR_MERGE_BUSY);
10181 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10185 if (abort_rebase) {
10186 if (!rebase_in_progress) {
10187 error = got_error(GOT_ERR_NOT_REBASING);
10190 error = got_worktree_rebase_continue(&resume_commit_id,
10191 &new_base_branch, &tmp_branch, &branch, &fileindex,
10195 printf("Switching work tree to %s\n",
10196 got_ref_get_symref_target(new_base_branch));
10197 error = got_worktree_rebase_abort(worktree, fileindex, repo,
10198 new_base_branch, abort_progress, &upa);
10201 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
10202 print_merge_progress_stats(&upa);
10203 goto done; /* nothing else to do */
10206 if (continue_rebase) {
10207 if (!rebase_in_progress) {
10208 error = got_error(GOT_ERR_NOT_REBASING);
10211 error = got_worktree_rebase_continue(&resume_commit_id,
10212 &new_base_branch, &tmp_branch, &branch, &fileindex,
10217 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
10218 committer, resume_commit_id, repo);
10222 yca_id = got_object_id_dup(resume_commit_id);
10223 if (yca_id == NULL) {
10224 error = got_error_from_errno("got_object_id_dup");
10228 error = got_ref_open(&branch, repo, argv[0], 0);
10231 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10232 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10233 "will not rebase a branch which lives outside "
10234 "the \"refs/heads/\" reference namespace");
10239 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
10243 if (!continue_rebase) {
10244 struct got_object_id *base_commit_id;
10246 base_commit_id = got_worktree_get_base_commit_id(worktree);
10247 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10248 base_commit_id, branch_head_commit_id, 1, repo,
10249 check_cancelled, NULL);
10252 if (yca_id == NULL) {
10253 error = got_error_msg(GOT_ERR_ANCESTRY,
10254 "specified branch shares no common ancestry "
10255 "with work tree's branch");
10259 error = check_same_branch(base_commit_id, branch, yca_id, repo);
10261 if (error->code != GOT_ERR_ANCESTRY)
10265 struct got_pathlist_head paths;
10266 printf("%s is already based on %s\n",
10267 got_ref_get_name(branch),
10268 got_worktree_get_head_ref_name(worktree));
10269 error = switch_head_ref(branch, branch_head_commit_id,
10273 error = got_worktree_set_base_commit_id(worktree, repo,
10274 branch_head_commit_id);
10277 TAILQ_INIT(&paths);
10278 error = got_pathlist_append(&paths, "", NULL);
10281 error = got_worktree_checkout_files(worktree,
10282 &paths, repo, update_progress, &upa,
10283 check_cancelled, NULL);
10284 got_pathlist_free(&paths);
10287 if (upa.did_something) {
10289 error = got_object_id_str(&id_str,
10290 branch_head_commit_id);
10293 printf("Updated to %s: %s\n",
10294 got_worktree_get_head_ref_name(worktree),
10298 printf("Already up-to-date\n");
10299 print_update_progress_stats(&upa);
10304 commit_id = branch_head_commit_id;
10305 error = got_object_open_as_commit(&commit, repo, commit_id);
10309 parent_ids = got_object_commit_get_parent_ids(commit);
10310 pid = STAILQ_FIRST(parent_ids);
10312 error = got_error(GOT_ERR_EMPTY_REBASE);
10315 error = collect_commits(&commits, commit_id, &pid->id,
10316 yca_id, got_worktree_get_path_prefix(worktree),
10317 GOT_ERR_REBASE_PATH, repo);
10318 got_object_commit_close(commit);
10323 if (!continue_rebase) {
10324 error = got_worktree_rebase_prepare(&new_base_branch,
10325 &tmp_branch, &fileindex, worktree, branch, repo);
10330 if (STAILQ_EMPTY(&commits)) {
10331 if (continue_rebase) {
10332 error = rebase_complete(worktree, fileindex,
10333 branch, new_base_branch, tmp_branch, repo,
10337 /* Fast-forward the reference of the branch. */
10338 struct got_object_id *new_head_commit_id;
10340 error = got_ref_resolve(&new_head_commit_id, repo,
10344 error = got_object_id_str(&id_str, new_head_commit_id);
10347 printf("Forwarding %s to commit %s\n",
10348 got_ref_get_name(branch), id_str);
10350 error = got_ref_change_ref(branch,
10351 new_head_commit_id);
10354 /* No backup needed since objects did not change. */
10360 STAILQ_FOREACH(qid, &commits, entry) {
10362 commit_id = &qid->id;
10363 parent_id = pid ? &pid->id : yca_id;
10366 memset(&upa, 0, sizeof(upa));
10367 error = got_worktree_rebase_merge_files(&merged_paths,
10368 worktree, fileindex, parent_id, commit_id, repo,
10369 update_progress, &upa, check_cancelled, NULL);
10373 print_merge_progress_stats(&upa);
10374 if (upa.conflicts > 0 || upa.missing > 0 ||
10375 upa.not_deleted > 0 || upa.unversioned > 0) {
10376 if (upa.conflicts > 0) {
10377 error = show_rebase_merge_conflict(&qid->id,
10382 got_worktree_rebase_pathlist_free(&merged_paths);
10386 error = rebase_commit(&merged_paths, worktree, fileindex,
10387 tmp_branch, committer, commit_id, repo);
10388 got_worktree_rebase_pathlist_free(&merged_paths);
10393 if (upa.conflicts > 0 || upa.missing > 0 ||
10394 upa.not_deleted > 0 || upa.unversioned > 0) {
10395 error = got_worktree_rebase_postpone(worktree, fileindex);
10398 if (upa.conflicts > 0 && upa.missing == 0 &&
10399 upa.not_deleted == 0 && upa.unversioned == 0) {
10400 error = got_error_msg(GOT_ERR_CONFLICTS,
10401 "conflicts must be resolved before rebasing "
10403 } else if (upa.conflicts > 0) {
10404 error = got_error_msg(GOT_ERR_CONFLICTS,
10405 "conflicts must be resolved before rebasing "
10406 "can continue; changes destined for some "
10407 "files were not yet merged and should be "
10408 "merged manually if required before the "
10409 "rebase operation is continued");
10411 error = got_error_msg(GOT_ERR_CONFLICTS,
10412 "changes destined for some files were not "
10413 "yet merged and should be merged manually "
10414 "if required before the rebase operation "
10418 error = rebase_complete(worktree, fileindex, branch,
10419 new_base_branch, tmp_branch, repo, create_backup);
10423 free(gitconfig_path);
10424 got_object_id_queue_free(&commits);
10425 free(branch_head_commit_id);
10426 free(resume_commit_id);
10429 got_object_commit_close(commit);
10431 got_ref_close(branch);
10432 if (new_base_branch)
10433 got_ref_close(new_base_branch);
10435 got_ref_close(tmp_branch);
10437 got_worktree_close(worktree);
10439 const struct got_error *close_err = got_repo_close(repo);
10444 const struct got_error *pack_err =
10445 got_repo_pack_fds_close(pack_fds);
10453 usage_histedit(void)
10455 fprintf(stderr, "usage: %s histedit [-aceflmX] [-F histedit-script] "
10456 "[branch]\n", getprogname());
10460 #define GOT_HISTEDIT_PICK 'p'
10461 #define GOT_HISTEDIT_EDIT 'e'
10462 #define GOT_HISTEDIT_FOLD 'f'
10463 #define GOT_HISTEDIT_DROP 'd'
10464 #define GOT_HISTEDIT_MESG 'm'
10466 static const struct got_histedit_cmd {
10467 unsigned char code;
10470 } got_histedit_cmds[] = {
10471 { GOT_HISTEDIT_PICK, "pick", "use commit" },
10472 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
10473 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
10475 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
10476 { GOT_HISTEDIT_MESG, "mesg",
10477 "single-line log message for commit above (open editor if empty)" },
10480 struct got_histedit_list_entry {
10481 TAILQ_ENTRY(got_histedit_list_entry) entry;
10482 struct got_object_id *commit_id;
10483 const struct got_histedit_cmd *cmd;
10486 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
10488 static const struct got_error *
10489 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
10490 FILE *f, struct got_repository *repo)
10492 const struct got_error *err = NULL;
10493 char *logmsg = NULL, *id_str = NULL;
10494 struct got_commit_object *commit = NULL;
10497 err = got_object_open_as_commit(&commit, repo, commit_id);
10501 err = get_short_logmsg(&logmsg, 34, commit);
10505 err = got_object_id_str(&id_str, commit_id);
10509 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
10511 err = got_ferror(f, GOT_ERR_IO);
10514 got_object_commit_close(commit);
10520 static const struct got_error *
10521 histedit_write_commit_list(struct got_object_id_queue *commits,
10522 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
10523 struct got_repository *repo)
10525 const struct got_error *err = NULL;
10526 struct got_object_qid *qid;
10527 const char *histedit_cmd = NULL;
10529 if (STAILQ_EMPTY(commits))
10530 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10532 STAILQ_FOREACH(qid, commits, entry) {
10533 histedit_cmd = got_histedit_cmds[0].name;
10535 histedit_cmd = "edit";
10536 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
10537 histedit_cmd = "fold";
10538 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
10541 if (edit_logmsg_only) {
10542 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
10544 err = got_ferror(f, GOT_ERR_IO);
10553 static const struct got_error *
10554 write_cmd_list(FILE *f, const char *branch_name,
10555 struct got_object_id_queue *commits)
10557 const struct got_error *err = NULL;
10561 struct got_object_qid *qid;
10563 qid = STAILQ_FIRST(commits);
10564 err = got_object_id_str(&id_str, &qid->id);
10569 "# Editing the history of branch '%s' starting at\n"
10571 "# Commits will be processed in order from top to "
10572 "bottom of this file.\n", branch_name, id_str);
10574 err = got_ferror(f, GOT_ERR_IO);
10578 n = fprintf(f, "# Available histedit commands:\n");
10580 err = got_ferror(f, GOT_ERR_IO);
10584 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10585 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
10586 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
10589 err = got_ferror(f, GOT_ERR_IO);
10598 static const struct got_error *
10599 histedit_syntax_error(int lineno)
10601 static char msg[42];
10604 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
10606 if (ret < 0 || (size_t)ret >= sizeof(msg))
10607 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
10609 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
10612 static const struct got_error *
10613 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
10614 char *logmsg, struct got_repository *repo)
10616 const struct got_error *err;
10617 struct got_commit_object *folded_commit = NULL;
10618 char *id_str, *folded_logmsg = NULL;
10620 err = got_object_id_str(&id_str, hle->commit_id);
10624 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
10628 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
10631 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
10632 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
10633 folded_logmsg) == -1) {
10634 err = got_error_from_errno("asprintf");
10638 got_object_commit_close(folded_commit);
10640 free(folded_logmsg);
10644 static struct got_histedit_list_entry *
10645 get_folded_commits(struct got_histedit_list_entry *hle)
10647 struct got_histedit_list_entry *prev, *folded = NULL;
10649 prev = TAILQ_PREV(hle, got_histedit_list, entry);
10650 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
10651 prev->cmd->code == GOT_HISTEDIT_DROP)) {
10652 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
10654 prev = TAILQ_PREV(prev, got_histedit_list, entry);
10660 static const struct got_error *
10661 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
10662 struct got_repository *repo)
10664 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
10665 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
10666 const struct got_error *err = NULL;
10667 struct got_commit_object *commit = NULL;
10670 struct got_histedit_list_entry *folded = NULL;
10672 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10676 folded = get_folded_commits(hle);
10678 while (folded != hle) {
10679 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
10680 folded = TAILQ_NEXT(folded, entry);
10683 err = append_folded_commit_msg(&new_msg, folded,
10689 folded = TAILQ_NEXT(folded, entry);
10693 err = got_object_id_str(&id_str, hle->commit_id);
10696 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
10699 logmsg_len = asprintf(&new_msg,
10700 "%s\n# original log message of commit %s: %s",
10701 logmsg ? logmsg : "", id_str, orig_logmsg);
10702 if (logmsg_len == -1) {
10703 err = got_error_from_errno("asprintf");
10709 err = got_object_id_str(&id_str, hle->commit_id);
10713 err = got_opentemp_named_fd(&logmsg_path, &fd,
10714 GOT_TMPDIR_STR "/got-logmsg");
10718 write(fd, logmsg, logmsg_len);
10721 err = get_editor(&editor);
10725 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
10728 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
10731 hle->logmsg = strdup(new_msg);
10732 if (hle->logmsg == NULL)
10733 err = got_error_from_errno("strdup");
10736 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
10737 err = got_error_from_errno2("unlink", logmsg_path);
10743 got_object_commit_close(commit);
10747 static const struct got_error *
10748 histedit_parse_list(struct got_histedit_list *histedit_cmds,
10749 FILE *f, struct got_repository *repo)
10751 const struct got_error *err = NULL;
10752 char *line = NULL, *p, *end;
10755 int lineno = 0, lastcmd = -1;
10756 const struct got_histedit_cmd *cmd;
10757 struct got_object_id *commit_id = NULL;
10758 struct got_histedit_list_entry *hle = NULL;
10761 len = getline(&line, &size, f);
10763 const struct got_error *getline_err;
10766 getline_err = got_error_from_errno("getline");
10767 err = got_ferror(f, getline_err->code);
10772 while (isspace((unsigned char)p[0]))
10774 if (p[0] == '#' || p[0] == '\0') {
10780 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10781 cmd = &got_histedit_cmds[i];
10782 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10783 isspace((unsigned char)p[strlen(cmd->name)])) {
10784 p += strlen(cmd->name);
10787 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
10792 if (i == nitems(got_histedit_cmds)) {
10793 err = histedit_syntax_error(lineno);
10796 while (isspace((unsigned char)p[0]))
10798 if (cmd->code == GOT_HISTEDIT_MESG) {
10799 if (lastcmd != GOT_HISTEDIT_PICK &&
10800 lastcmd != GOT_HISTEDIT_EDIT) {
10801 err = got_error(GOT_ERR_HISTEDIT_CMD);
10804 if (p[0] == '\0') {
10805 err = histedit_edit_logmsg(hle, repo);
10809 hle->logmsg = strdup(p);
10810 if (hle->logmsg == NULL) {
10811 err = got_error_from_errno("strdup");
10817 lastcmd = cmd->code;
10821 while (end[0] && !isspace((unsigned char)end[0]))
10825 err = got_object_resolve_id_str(&commit_id, repo, p);
10827 /* override error code */
10828 err = histedit_syntax_error(lineno);
10832 hle = malloc(sizeof(*hle));
10834 err = got_error_from_errno("malloc");
10838 hle->commit_id = commit_id;
10839 hle->logmsg = NULL;
10843 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10844 lastcmd = cmd->code;
10852 static const struct got_error *
10853 histedit_check_script(struct got_histedit_list *histedit_cmds,
10854 struct got_object_id_queue *commits, struct got_repository *repo)
10856 const struct got_error *err = NULL;
10857 struct got_object_qid *qid;
10858 struct got_histedit_list_entry *hle;
10859 static char msg[92];
10862 if (TAILQ_EMPTY(histedit_cmds))
10863 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10864 "histedit script contains no commands");
10865 if (STAILQ_EMPTY(commits))
10866 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10868 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10869 struct got_histedit_list_entry *hle2;
10870 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10873 if (got_object_id_cmp(hle->commit_id,
10874 hle2->commit_id) != 0)
10876 err = got_object_id_str(&id_str, hle->commit_id);
10879 snprintf(msg, sizeof(msg), "commit %s is listed "
10880 "more than once in histedit script", id_str);
10882 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10886 STAILQ_FOREACH(qid, commits, entry) {
10887 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10888 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
10892 err = got_object_id_str(&id_str, &qid->id);
10895 snprintf(msg, sizeof(msg),
10896 "commit %s missing from histedit script", id_str);
10898 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10902 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10903 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10904 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10905 "last commit in histedit script cannot be folded");
10910 static const struct got_error *
10911 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10912 const char *path, struct got_object_id_queue *commits,
10913 struct got_repository *repo)
10915 const struct got_error *err = NULL;
10919 err = get_editor(&editor);
10923 if (spawn_editor(editor, path) == -1) {
10924 err = got_error_from_errno("failed spawning editor");
10928 f = fopen(path, "re");
10930 err = got_error_from_errno("fopen");
10933 err = histedit_parse_list(histedit_cmds, f, repo);
10937 err = histedit_check_script(histedit_cmds, commits, repo);
10939 if (f && fclose(f) == EOF && err == NULL)
10940 err = got_error_from_errno("fclose");
10945 static const struct got_error *
10946 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10947 struct got_object_id_queue *, const char *, const char *,
10948 struct got_repository *);
10950 static const struct got_error *
10951 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10952 struct got_object_id_queue *commits, const char *branch_name,
10953 int edit_logmsg_only, int fold_only, int edit_only,
10954 struct got_repository *repo)
10956 const struct got_error *err;
10960 err = got_opentemp_named(&path, &f, "got-histedit");
10964 err = write_cmd_list(f, branch_name, commits);
10968 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10969 fold_only, edit_only, repo);
10973 if (edit_logmsg_only || fold_only || edit_only) {
10975 err = histedit_parse_list(histedit_cmds, f, repo);
10977 if (fclose(f) == EOF) {
10978 err = got_error_from_errno("fclose");
10982 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10984 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10985 err->code != GOT_ERR_HISTEDIT_CMD)
10987 err = histedit_edit_list_retry(histedit_cmds, err,
10988 commits, path, branch_name, repo);
10992 if (f && fclose(f) == EOF && err == NULL)
10993 err = got_error_from_errno("fclose");
10994 if (path && unlink(path) != 0 && err == NULL)
10995 err = got_error_from_errno2("unlink", path);
11000 static const struct got_error *
11001 histedit_save_list(struct got_histedit_list *histedit_cmds,
11002 struct got_worktree *worktree, struct got_repository *repo)
11004 const struct got_error *err = NULL;
11007 struct got_histedit_list_entry *hle;
11008 struct got_commit_object *commit = NULL;
11010 err = got_worktree_get_histedit_script_path(&path, worktree);
11014 f = fopen(path, "we");
11016 err = got_error_from_errno2("fopen", path);
11019 TAILQ_FOREACH(hle, histedit_cmds, entry) {
11020 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
11026 int n = fprintf(f, "%c %s\n",
11027 GOT_HISTEDIT_MESG, hle->logmsg);
11029 err = got_ferror(f, GOT_ERR_IO);
11035 if (f && fclose(f) == EOF && err == NULL)
11036 err = got_error_from_errno("fclose");
11039 got_object_commit_close(commit);
11044 histedit_free_list(struct got_histedit_list *histedit_cmds)
11046 struct got_histedit_list_entry *hle;
11048 while ((hle = TAILQ_FIRST(histedit_cmds))) {
11049 TAILQ_REMOVE(histedit_cmds, hle, entry);
11054 static const struct got_error *
11055 histedit_load_list(struct got_histedit_list *histedit_cmds,
11056 const char *path, struct got_repository *repo)
11058 const struct got_error *err = NULL;
11061 f = fopen(path, "re");
11063 err = got_error_from_errno2("fopen", path);
11067 err = histedit_parse_list(histedit_cmds, f, repo);
11069 if (f && fclose(f) == EOF && err == NULL)
11070 err = got_error_from_errno("fclose");
11074 static const struct got_error *
11075 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
11076 const struct got_error *edit_err, struct got_object_id_queue *commits,
11077 const char *path, const char *branch_name, struct got_repository *repo)
11079 const struct got_error *err = NULL, *prev_err = edit_err;
11082 while (resp != 'c' && resp != 'r' && resp != 'a') {
11083 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
11084 "or (a)bort: ", getprogname(), prev_err->msg);
11089 histedit_free_list(histedit_cmds);
11090 err = histedit_run_editor(histedit_cmds, path, commits,
11093 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11094 err->code != GOT_ERR_HISTEDIT_CMD)
11101 } else if (resp == 'r') {
11102 histedit_free_list(histedit_cmds);
11103 err = histedit_edit_script(histedit_cmds,
11104 commits, branch_name, 0, 0, 0, repo);
11106 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
11107 err->code != GOT_ERR_HISTEDIT_CMD)
11114 } else if (resp == 'a') {
11115 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
11118 printf("invalid response '%c'\n", resp);
11124 static const struct got_error *
11125 histedit_complete(struct got_worktree *worktree,
11126 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
11127 struct got_reference *branch, struct got_repository *repo)
11129 printf("Switching work tree to %s\n",
11130 got_ref_get_symref_target(branch));
11131 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
11135 static const struct got_error *
11136 show_histedit_progress(struct got_commit_object *commit,
11137 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
11139 const struct got_error *err;
11140 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
11142 err = got_object_id_str(&old_id_str, hle->commit_id);
11147 err = got_object_id_str(&new_id_str, new_id);
11152 old_id_str[12] = '\0';
11154 new_id_str[12] = '\0';
11157 logmsg = strdup(hle->logmsg);
11158 if (logmsg == NULL) {
11159 err = got_error_from_errno("strdup");
11162 trim_logmsg(logmsg, 42);
11164 err = get_short_logmsg(&logmsg, 42, commit);
11169 switch (hle->cmd->code) {
11170 case GOT_HISTEDIT_PICK:
11171 case GOT_HISTEDIT_EDIT:
11172 printf("%s -> %s: %s\n", old_id_str,
11173 new_id_str ? new_id_str : "no-op change", logmsg);
11175 case GOT_HISTEDIT_DROP:
11176 case GOT_HISTEDIT_FOLD:
11177 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
11189 static const struct got_error *
11190 histedit_commit(struct got_pathlist_head *merged_paths,
11191 struct got_worktree *worktree, struct got_fileindex *fileindex,
11192 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
11193 const char *committer, struct got_repository *repo)
11195 const struct got_error *err;
11196 struct got_commit_object *commit;
11197 struct got_object_id *new_commit_id;
11199 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
11200 && hle->logmsg == NULL) {
11201 err = histedit_edit_logmsg(hle, repo);
11206 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
11210 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
11211 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
11212 hle->logmsg, repo);
11214 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
11216 err = show_histedit_progress(commit, hle, NULL);
11218 err = show_histedit_progress(commit, hle, new_commit_id);
11219 free(new_commit_id);
11222 got_object_commit_close(commit);
11226 static const struct got_error *
11227 histedit_skip_commit(struct got_histedit_list_entry *hle,
11228 struct got_worktree *worktree, struct got_repository *repo)
11230 const struct got_error *error;
11231 struct got_commit_object *commit;
11233 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
11238 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
11242 error = show_histedit_progress(commit, hle, NULL);
11243 got_object_commit_close(commit);
11247 static const struct got_error *
11248 check_local_changes(void *arg, unsigned char status,
11249 unsigned char staged_status, const char *path,
11250 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11251 struct got_object_id *commit_id, int dirfd, const char *de_name)
11253 int *have_local_changes = arg;
11256 case GOT_STATUS_ADD:
11257 case GOT_STATUS_DELETE:
11258 case GOT_STATUS_MODIFY:
11259 case GOT_STATUS_CONFLICT:
11260 *have_local_changes = 1;
11261 return got_error(GOT_ERR_CANCELLED);
11266 switch (staged_status) {
11267 case GOT_STATUS_ADD:
11268 case GOT_STATUS_DELETE:
11269 case GOT_STATUS_MODIFY:
11270 *have_local_changes = 1;
11271 return got_error(GOT_ERR_CANCELLED);
11279 static const struct got_error *
11280 cmd_histedit(int argc, char *argv[])
11282 const struct got_error *error = NULL;
11283 struct got_worktree *worktree = NULL;
11284 struct got_fileindex *fileindex = NULL;
11285 struct got_repository *repo = NULL;
11286 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11287 struct got_reference *branch = NULL;
11288 struct got_reference *tmp_branch = NULL;
11289 struct got_object_id *resume_commit_id = NULL;
11290 struct got_object_id *base_commit_id = NULL;
11291 struct got_object_id *head_commit_id = NULL;
11292 struct got_commit_object *commit = NULL;
11293 int ch, rebase_in_progress = 0, merge_in_progress = 0;
11294 struct got_update_progress_arg upa;
11295 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
11296 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
11297 int list_backups = 0, delete_backups = 0;
11298 const char *edit_script_path = NULL;
11299 struct got_object_id_queue commits;
11300 struct got_pathlist_head merged_paths;
11301 const struct got_object_id_queue *parent_ids;
11302 struct got_object_qid *pid;
11303 struct got_histedit_list histedit_cmds;
11304 struct got_histedit_list_entry *hle;
11305 int *pack_fds = NULL;
11307 STAILQ_INIT(&commits);
11308 TAILQ_INIT(&histedit_cmds);
11309 TAILQ_INIT(&merged_paths);
11310 memset(&upa, 0, sizeof(upa));
11312 while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
11327 edit_script_path = optarg;
11330 edit_logmsg_only = 1;
11336 delete_backups = 1;
11348 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11349 "unveil", NULL) == -1)
11352 if (abort_edit && continue_edit)
11353 option_conflict('a', 'c');
11354 if (edit_script_path && edit_logmsg_only)
11355 option_conflict('F', 'm');
11356 if (abort_edit && edit_logmsg_only)
11357 option_conflict('a', 'm');
11358 if (continue_edit && edit_logmsg_only)
11359 option_conflict('c', 'm');
11360 if (abort_edit && fold_only)
11361 option_conflict('a', 'f');
11362 if (continue_edit && fold_only)
11363 option_conflict('c', 'f');
11364 if (fold_only && edit_logmsg_only)
11365 option_conflict('f', 'm');
11366 if (edit_script_path && fold_only)
11367 option_conflict('F', 'f');
11368 if (abort_edit && edit_only)
11369 option_conflict('a', 'e');
11370 if (continue_edit && edit_only)
11371 option_conflict('c', 'e');
11372 if (edit_only && edit_logmsg_only)
11373 option_conflict('e', 'm');
11374 if (edit_script_path && edit_only)
11375 option_conflict('F', 'e');
11376 if (list_backups) {
11378 option_conflict('l', 'a');
11380 option_conflict('l', 'c');
11381 if (edit_script_path)
11382 option_conflict('l', 'F');
11383 if (edit_logmsg_only)
11384 option_conflict('l', 'm');
11386 option_conflict('l', 'f');
11388 option_conflict('l', 'e');
11389 if (delete_backups)
11390 option_conflict('l', 'X');
11391 if (argc != 0 && argc != 1)
11393 } else if (delete_backups) {
11395 option_conflict('X', 'a');
11397 option_conflict('X', 'c');
11398 if (edit_script_path)
11399 option_conflict('X', 'F');
11400 if (edit_logmsg_only)
11401 option_conflict('X', 'm');
11403 option_conflict('X', 'f');
11405 option_conflict('X', 'e');
11407 option_conflict('X', 'l');
11408 if (argc != 0 && argc != 1)
11410 } else if (argc != 0)
11414 * This command cannot apply unveil(2) in all cases because the
11415 * user may choose to run an editor to edit the histedit script
11416 * and to edit individual commit log messages.
11417 * unveil(2) traverses exec(2); if an editor is used we have to
11418 * apply unveil after edit script and log messages have been written.
11419 * XXX TODO: Make use of unveil(2) where possible.
11422 cwd = getcwd(NULL, 0);
11424 error = got_error_from_errno("getcwd");
11428 error = got_repo_pack_fds_open(&pack_fds);
11432 error = got_worktree_open(&worktree, cwd);
11434 if (list_backups || delete_backups) {
11435 if (error->code != GOT_ERR_NOT_WORKTREE)
11438 if (error->code == GOT_ERR_NOT_WORKTREE)
11439 error = wrap_not_worktree_error(error,
11445 if (list_backups || delete_backups) {
11446 error = got_repo_open(&repo,
11447 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11451 error = apply_unveil(got_repo_get_path(repo), 0,
11452 worktree ? got_worktree_get_root_path(worktree) : NULL);
11455 error = process_backup_refs(
11456 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
11457 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11458 goto done; /* nothing else to do */
11461 error = get_gitconfig_path(&gitconfig_path);
11464 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11465 gitconfig_path, pack_fds);
11469 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11472 if (rebase_in_progress) {
11473 error = got_error(GOT_ERR_REBASING);
11477 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11481 if (merge_in_progress) {
11482 error = got_error(GOT_ERR_MERGE_BUSY);
11486 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
11490 if (edit_in_progress && edit_logmsg_only) {
11491 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11492 "histedit operation is in progress in this "
11493 "work tree and must be continued or aborted "
11494 "before the -m option can be used");
11497 if (edit_in_progress && fold_only) {
11498 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11499 "histedit operation is in progress in this "
11500 "work tree and must be continued or aborted "
11501 "before the -f option can be used");
11504 if (edit_in_progress && edit_only) {
11505 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11506 "histedit operation is in progress in this "
11507 "work tree and must be continued or aborted "
11508 "before the -e option can be used");
11512 if (edit_in_progress && abort_edit) {
11513 error = got_worktree_histedit_continue(&resume_commit_id,
11514 &tmp_branch, &branch, &base_commit_id, &fileindex,
11518 printf("Switching work tree to %s\n",
11519 got_ref_get_symref_target(branch));
11520 error = got_worktree_histedit_abort(worktree, fileindex, repo,
11521 branch, base_commit_id, abort_progress, &upa);
11524 printf("Histedit of %s aborted\n",
11525 got_ref_get_symref_target(branch));
11526 print_merge_progress_stats(&upa);
11527 goto done; /* nothing else to do */
11528 } else if (abort_edit) {
11529 error = got_error(GOT_ERR_NOT_HISTEDIT);
11533 error = get_author(&committer, repo, worktree);
11537 if (continue_edit) {
11540 if (!edit_in_progress) {
11541 error = got_error(GOT_ERR_NOT_HISTEDIT);
11545 error = got_worktree_get_histedit_script_path(&path, worktree);
11549 error = histedit_load_list(&histedit_cmds, path, repo);
11554 error = got_worktree_histedit_continue(&resume_commit_id,
11555 &tmp_branch, &branch, &base_commit_id, &fileindex,
11560 error = got_ref_resolve(&head_commit_id, repo, branch);
11564 error = got_object_open_as_commit(&commit, repo,
11568 parent_ids = got_object_commit_get_parent_ids(commit);
11569 pid = STAILQ_FIRST(parent_ids);
11571 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11574 error = collect_commits(&commits, head_commit_id, &pid->id,
11575 base_commit_id, got_worktree_get_path_prefix(worktree),
11576 GOT_ERR_HISTEDIT_PATH, repo);
11577 got_object_commit_close(commit);
11582 if (edit_in_progress) {
11583 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11587 error = got_ref_open(&branch, repo,
11588 got_worktree_get_head_ref_name(worktree), 0);
11592 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11593 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11594 "will not edit commit history of a branch outside "
11595 "the \"refs/heads/\" reference namespace");
11599 error = got_ref_resolve(&head_commit_id, repo, branch);
11600 got_ref_close(branch);
11605 error = got_object_open_as_commit(&commit, repo,
11609 parent_ids = got_object_commit_get_parent_ids(commit);
11610 pid = STAILQ_FIRST(parent_ids);
11612 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11615 error = collect_commits(&commits, head_commit_id, &pid->id,
11616 got_worktree_get_base_commit_id(worktree),
11617 got_worktree_get_path_prefix(worktree),
11618 GOT_ERR_HISTEDIT_PATH, repo);
11619 got_object_commit_close(commit);
11624 if (STAILQ_EMPTY(&commits)) {
11625 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11629 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
11630 &base_commit_id, &fileindex, worktree, repo);
11634 if (edit_script_path) {
11635 error = histedit_load_list(&histedit_cmds,
11636 edit_script_path, repo);
11638 got_worktree_histedit_abort(worktree, fileindex,
11639 repo, branch, base_commit_id,
11640 abort_progress, &upa);
11641 print_merge_progress_stats(&upa);
11645 const char *branch_name;
11646 branch_name = got_ref_get_symref_target(branch);
11647 if (strncmp(branch_name, "refs/heads/", 11) == 0)
11649 error = histedit_edit_script(&histedit_cmds, &commits,
11650 branch_name, edit_logmsg_only, fold_only,
11653 got_worktree_histedit_abort(worktree, fileindex,
11654 repo, branch, base_commit_id,
11655 abort_progress, &upa);
11656 print_merge_progress_stats(&upa);
11662 error = histedit_save_list(&histedit_cmds, worktree,
11665 got_worktree_histedit_abort(worktree, fileindex,
11666 repo, branch, base_commit_id,
11667 abort_progress, &upa);
11668 print_merge_progress_stats(&upa);
11674 error = histedit_check_script(&histedit_cmds, &commits, repo);
11678 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
11679 if (resume_commit_id) {
11680 if (got_object_id_cmp(hle->commit_id,
11681 resume_commit_id) != 0)
11684 resume_commit_id = NULL;
11685 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
11686 hle->cmd->code == GOT_HISTEDIT_FOLD) {
11687 error = histedit_skip_commit(hle, worktree,
11692 struct got_pathlist_head paths;
11693 int have_changes = 0;
11695 TAILQ_INIT(&paths);
11696 error = got_pathlist_append(&paths, "", NULL);
11699 error = got_worktree_status(worktree, &paths,
11700 repo, 0, check_local_changes, &have_changes,
11701 check_cancelled, NULL);
11702 got_pathlist_free(&paths);
11704 if (error->code != GOT_ERR_CANCELLED)
11706 if (sigint_received || sigpipe_received)
11709 if (have_changes) {
11710 error = histedit_commit(NULL, worktree,
11711 fileindex, tmp_branch, hle,
11716 error = got_object_open_as_commit(
11717 &commit, repo, hle->commit_id);
11720 error = show_histedit_progress(commit,
11722 got_object_commit_close(commit);
11731 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
11732 error = histedit_skip_commit(hle, worktree, repo);
11738 error = got_object_open_as_commit(&commit, repo,
11742 parent_ids = got_object_commit_get_parent_ids(commit);
11743 pid = STAILQ_FIRST(parent_ids);
11745 error = got_worktree_histedit_merge_files(&merged_paths,
11746 worktree, fileindex, &pid->id, hle->commit_id, repo,
11747 update_progress, &upa, check_cancelled, NULL);
11750 got_object_commit_close(commit);
11753 print_merge_progress_stats(&upa);
11754 if (upa.conflicts > 0 || upa.missing > 0 ||
11755 upa.not_deleted > 0 || upa.unversioned > 0) {
11756 if (upa.conflicts > 0) {
11757 error = show_rebase_merge_conflict(
11758 hle->commit_id, repo);
11762 got_worktree_rebase_pathlist_free(&merged_paths);
11766 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
11768 error = got_object_id_str(&id_str, hle->commit_id);
11771 printf("Stopping histedit for amending commit %s\n",
11774 got_worktree_rebase_pathlist_free(&merged_paths);
11775 error = got_worktree_histedit_postpone(worktree,
11780 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11781 error = histedit_skip_commit(hle, worktree, repo);
11787 error = histedit_commit(&merged_paths, worktree, fileindex,
11788 tmp_branch, hle, committer, repo);
11789 got_worktree_rebase_pathlist_free(&merged_paths);
11794 if (upa.conflicts > 0 || upa.missing > 0 ||
11795 upa.not_deleted > 0 || upa.unversioned > 0) {
11796 error = got_worktree_histedit_postpone(worktree, fileindex);
11799 if (upa.conflicts > 0 && upa.missing == 0 &&
11800 upa.not_deleted == 0 && upa.unversioned == 0) {
11801 error = got_error_msg(GOT_ERR_CONFLICTS,
11802 "conflicts must be resolved before histedit "
11804 } else if (upa.conflicts > 0) {
11805 error = got_error_msg(GOT_ERR_CONFLICTS,
11806 "conflicts must be resolved before histedit "
11807 "can continue; changes destined for some "
11808 "files were not yet merged and should be "
11809 "merged manually if required before the "
11810 "histedit operation is continued");
11812 error = got_error_msg(GOT_ERR_CONFLICTS,
11813 "changes destined for some files were not "
11814 "yet merged and should be merged manually "
11815 "if required before the histedit operation "
11819 error = histedit_complete(worktree, fileindex, tmp_branch,
11824 free(gitconfig_path);
11825 got_object_id_queue_free(&commits);
11826 histedit_free_list(&histedit_cmds);
11827 free(head_commit_id);
11828 free(base_commit_id);
11829 free(resume_commit_id);
11831 got_object_commit_close(commit);
11833 got_ref_close(branch);
11835 got_ref_close(tmp_branch);
11837 got_worktree_close(worktree);
11839 const struct got_error *close_err = got_repo_close(repo);
11844 const struct got_error *pack_err =
11845 got_repo_pack_fds_close(pack_fds);
11853 usage_integrate(void)
11855 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
11859 static const struct got_error *
11860 cmd_integrate(int argc, char *argv[])
11862 const struct got_error *error = NULL;
11863 struct got_repository *repo = NULL;
11864 struct got_worktree *worktree = NULL;
11865 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
11866 const char *branch_arg = NULL;
11867 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11868 struct got_fileindex *fileindex = NULL;
11869 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11871 struct got_update_progress_arg upa;
11872 int *pack_fds = NULL;
11874 while ((ch = getopt(argc, argv, "")) != -1) {
11887 branch_arg = argv[0];
11889 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11890 "unveil", NULL) == -1)
11893 cwd = getcwd(NULL, 0);
11895 error = got_error_from_errno("getcwd");
11899 error = got_repo_pack_fds_open(&pack_fds);
11903 error = got_worktree_open(&worktree, cwd);
11905 if (error->code == GOT_ERR_NOT_WORKTREE)
11906 error = wrap_not_worktree_error(error, "integrate",
11911 error = check_rebase_or_histedit_in_progress(worktree);
11915 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11920 error = apply_unveil(got_repo_get_path(repo), 0,
11921 got_worktree_get_root_path(worktree));
11925 error = check_merge_in_progress(worktree, repo);
11929 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11930 error = got_error_from_errno("asprintf");
11934 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11935 &base_branch_ref, worktree, refname, repo);
11939 refname = strdup(got_ref_get_name(branch_ref));
11940 if (refname == NULL) {
11941 error = got_error_from_errno("strdup");
11942 got_worktree_integrate_abort(worktree, fileindex, repo,
11943 branch_ref, base_branch_ref);
11946 base_refname = strdup(got_ref_get_name(base_branch_ref));
11947 if (base_refname == NULL) {
11948 error = got_error_from_errno("strdup");
11949 got_worktree_integrate_abort(worktree, fileindex, repo,
11950 branch_ref, base_branch_ref);
11954 error = got_ref_resolve(&commit_id, repo, branch_ref);
11958 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11962 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11963 error = got_error_msg(GOT_ERR_SAME_BRANCH,
11964 "specified branch has already been integrated");
11965 got_worktree_integrate_abort(worktree, fileindex, repo,
11966 branch_ref, base_branch_ref);
11970 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11972 if (error->code == GOT_ERR_ANCESTRY)
11973 error = got_error(GOT_ERR_REBASE_REQUIRED);
11974 got_worktree_integrate_abort(worktree, fileindex, repo,
11975 branch_ref, base_branch_ref);
11979 memset(&upa, 0, sizeof(upa));
11980 error = got_worktree_integrate_continue(worktree, fileindex, repo,
11981 branch_ref, base_branch_ref, update_progress, &upa,
11982 check_cancelled, NULL);
11986 printf("Integrated %s into %s\n", refname, base_refname);
11987 print_update_progress_stats(&upa);
11990 const struct got_error *close_err = got_repo_close(repo);
11995 got_worktree_close(worktree);
11997 const struct got_error *pack_err =
11998 got_repo_pack_fds_close(pack_fds);
12003 free(base_commit_id);
12006 free(base_refname);
12013 fprintf(stderr, "usage: %s merge [-acn] [branch]\n", getprogname());
12017 static const struct got_error *
12018 cmd_merge(int argc, char *argv[])
12020 const struct got_error *error = NULL;
12021 struct got_worktree *worktree = NULL;
12022 struct got_repository *repo = NULL;
12023 struct got_fileindex *fileindex = NULL;
12024 char *cwd = NULL, *id_str = NULL, *author = NULL;
12025 struct got_reference *branch = NULL, *wt_branch = NULL;
12026 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
12027 struct got_object_id *wt_branch_tip = NULL;
12028 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
12029 int interrupt_merge = 0;
12030 struct got_update_progress_arg upa;
12031 struct got_object_id *merge_commit_id = NULL;
12032 char *branch_name = NULL;
12033 int *pack_fds = NULL;
12035 memset(&upa, 0, sizeof(upa));
12037 while ((ch = getopt(argc, argv, "acn")) != -1) {
12043 continue_merge = 1;
12046 interrupt_merge = 1;
12058 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12059 "unveil", NULL) == -1)
12063 if (abort_merge && continue_merge)
12064 option_conflict('a', 'c');
12065 if (abort_merge || continue_merge) {
12068 } else if (argc != 1)
12071 cwd = getcwd(NULL, 0);
12073 error = got_error_from_errno("getcwd");
12077 error = got_repo_pack_fds_open(&pack_fds);
12081 error = got_worktree_open(&worktree, cwd);
12083 if (error->code == GOT_ERR_NOT_WORKTREE)
12084 error = wrap_not_worktree_error(error,
12089 error = got_repo_open(&repo,
12090 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
12095 error = apply_unveil(got_repo_get_path(repo), 0,
12096 worktree ? got_worktree_get_root_path(worktree) : NULL);
12100 error = check_rebase_or_histedit_in_progress(worktree);
12104 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12110 if (!merge_in_progress) {
12111 error = got_error(GOT_ERR_NOT_MERGING);
12114 error = got_worktree_merge_continue(&branch_name,
12115 &branch_tip, &fileindex, worktree, repo);
12118 error = got_worktree_merge_abort(worktree, fileindex, repo,
12119 abort_progress, &upa);
12122 printf("Merge of %s aborted\n", branch_name);
12123 goto done; /* nothing else to do */
12126 error = get_author(&author, repo, worktree);
12130 if (continue_merge) {
12131 if (!merge_in_progress) {
12132 error = got_error(GOT_ERR_NOT_MERGING);
12135 error = got_worktree_merge_continue(&branch_name,
12136 &branch_tip, &fileindex, worktree, repo);
12140 error = got_ref_open(&branch, repo, argv[0], 0);
12143 branch_name = strdup(got_ref_get_name(branch));
12144 if (branch_name == NULL) {
12145 error = got_error_from_errno("strdup");
12148 error = got_ref_resolve(&branch_tip, repo, branch);
12153 error = got_ref_open(&wt_branch, repo,
12154 got_worktree_get_head_ref_name(worktree), 0);
12157 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
12160 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
12161 wt_branch_tip, branch_tip, 0, repo,
12162 check_cancelled, NULL);
12163 if (error && error->code != GOT_ERR_ANCESTRY)
12166 if (!continue_merge) {
12167 error = check_path_prefix(wt_branch_tip, branch_tip,
12168 got_worktree_get_path_prefix(worktree),
12169 GOT_ERR_MERGE_PATH, repo);
12173 error = check_same_branch(wt_branch_tip, branch,
12176 if (error->code != GOT_ERR_ANCESTRY)
12180 static char msg[512];
12181 snprintf(msg, sizeof(msg),
12182 "cannot create a merge commit because "
12183 "%s is based on %s; %s can be integrated "
12184 "with 'got integrate' instead", branch_name,
12185 got_worktree_get_head_ref_name(worktree),
12187 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
12191 error = got_worktree_merge_prepare(&fileindex, worktree,
12196 error = got_worktree_merge_branch(worktree, fileindex,
12197 yca_id, branch_tip, repo, update_progress, &upa,
12198 check_cancelled, NULL);
12201 print_merge_progress_stats(&upa);
12202 if (!upa.did_something) {
12203 error = got_worktree_merge_abort(worktree, fileindex,
12204 repo, abort_progress, &upa);
12207 printf("Already up-to-date\n");
12212 if (interrupt_merge) {
12213 error = got_worktree_merge_postpone(worktree, fileindex);
12216 printf("Merge of %s interrupted on request\n", branch_name);
12217 } else if (upa.conflicts > 0 || upa.missing > 0 ||
12218 upa.not_deleted > 0 || upa.unversioned > 0) {
12219 error = got_worktree_merge_postpone(worktree, fileindex);
12222 if (upa.conflicts > 0 && upa.missing == 0 &&
12223 upa.not_deleted == 0 && upa.unversioned == 0) {
12224 error = got_error_msg(GOT_ERR_CONFLICTS,
12225 "conflicts must be resolved before merging "
12227 } else if (upa.conflicts > 0) {
12228 error = got_error_msg(GOT_ERR_CONFLICTS,
12229 "conflicts must be resolved before merging "
12230 "can continue; changes destined for some "
12231 "files were not yet merged and "
12232 "should be merged manually if required before the "
12233 "merge operation is continued");
12235 error = got_error_msg(GOT_ERR_CONFLICTS,
12236 "changes destined for some "
12237 "files were not yet merged and should be "
12238 "merged manually if required before the "
12239 "merge operation is continued");
12243 error = got_worktree_merge_commit(&merge_commit_id, worktree,
12244 fileindex, author, NULL, 1, branch_tip, branch_name,
12245 repo, continue_merge ? print_status : NULL, NULL);
12248 error = got_worktree_merge_complete(worktree, fileindex, repo);
12251 error = got_object_id_str(&id_str, merge_commit_id);
12254 printf("Merged %s into %s: %s\n", branch_name,
12255 got_worktree_get_head_ref_name(worktree),
12261 free(merge_commit_id);
12267 got_ref_close(branch);
12269 got_ref_close(wt_branch);
12271 got_worktree_close(worktree);
12273 const struct got_error *close_err = got_repo_close(repo);
12278 const struct got_error *pack_err =
12279 got_repo_pack_fds_close(pack_fds);
12289 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
12290 "[path ...]\n", getprogname());
12294 static const struct got_error *
12295 print_stage(void *arg, unsigned char status, unsigned char staged_status,
12296 const char *path, struct got_object_id *blob_id,
12297 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
12298 int dirfd, const char *de_name)
12300 const struct got_error *err = NULL;
12301 char *id_str = NULL;
12303 if (staged_status != GOT_STATUS_ADD &&
12304 staged_status != GOT_STATUS_MODIFY &&
12305 staged_status != GOT_STATUS_DELETE)
12308 if (staged_status == GOT_STATUS_ADD ||
12309 staged_status == GOT_STATUS_MODIFY)
12310 err = got_object_id_str(&id_str, staged_blob_id);
12312 err = got_object_id_str(&id_str, blob_id);
12316 printf("%s %c %s\n", id_str, staged_status, path);
12321 static const struct got_error *
12322 cmd_stage(int argc, char *argv[])
12324 const struct got_error *error = NULL;
12325 struct got_repository *repo = NULL;
12326 struct got_worktree *worktree = NULL;
12328 struct got_pathlist_head paths;
12329 struct got_pathlist_entry *pe;
12330 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
12331 FILE *patch_script_file = NULL;
12332 const char *patch_script_path = NULL;
12333 struct choose_patch_arg cpa;
12334 int *pack_fds = NULL;
12336 TAILQ_INIT(&paths);
12338 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
12347 patch_script_path = optarg;
12350 allow_bad_symlinks = 1;
12362 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12363 "unveil", NULL) == -1)
12366 if (list_stage && (pflag || patch_script_path))
12367 errx(1, "-l option cannot be used with other options");
12368 if (patch_script_path && !pflag)
12369 errx(1, "-F option can only be used together with -p option");
12371 cwd = getcwd(NULL, 0);
12373 error = got_error_from_errno("getcwd");
12377 error = got_repo_pack_fds_open(&pack_fds);
12381 error = got_worktree_open(&worktree, cwd);
12383 if (error->code == GOT_ERR_NOT_WORKTREE)
12384 error = wrap_not_worktree_error(error, "stage", cwd);
12388 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12393 if (patch_script_path) {
12394 patch_script_file = fopen(patch_script_path, "re");
12395 if (patch_script_file == NULL) {
12396 error = got_error_from_errno2("fopen",
12397 patch_script_path);
12401 error = apply_unveil(got_repo_get_path(repo), 0,
12402 got_worktree_get_root_path(worktree));
12406 error = check_merge_in_progress(worktree, repo);
12410 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12415 error = got_worktree_status(worktree, &paths, repo, 0,
12416 print_stage, NULL, check_cancelled, NULL);
12418 cpa.patch_script_file = patch_script_file;
12419 cpa.action = "stage";
12420 error = got_worktree_stage(worktree, &paths,
12421 pflag ? NULL : print_status, NULL,
12422 pflag ? choose_patch : NULL, &cpa,
12423 allow_bad_symlinks, repo);
12426 if (patch_script_file && fclose(patch_script_file) == EOF &&
12428 error = got_error_from_errno2("fclose", patch_script_path);
12430 const struct got_error *close_err = got_repo_close(repo);
12435 got_worktree_close(worktree);
12437 const struct got_error *pack_err =
12438 got_repo_pack_fds_close(pack_fds);
12442 TAILQ_FOREACH(pe, &paths, entry)
12443 free((char *)pe->path);
12444 got_pathlist_free(&paths);
12450 usage_unstage(void)
12452 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
12453 "[path ...]\n", getprogname());
12458 static const struct got_error *
12459 cmd_unstage(int argc, char *argv[])
12461 const struct got_error *error = NULL;
12462 struct got_repository *repo = NULL;
12463 struct got_worktree *worktree = NULL;
12465 struct got_pathlist_head paths;
12466 struct got_pathlist_entry *pe;
12468 struct got_update_progress_arg upa;
12469 FILE *patch_script_file = NULL;
12470 const char *patch_script_path = NULL;
12471 struct choose_patch_arg cpa;
12472 int *pack_fds = NULL;
12474 TAILQ_INIT(&paths);
12476 while ((ch = getopt(argc, argv, "pF:")) != -1) {
12482 patch_script_path = optarg;
12494 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12495 "unveil", NULL) == -1)
12498 if (patch_script_path && !pflag)
12499 errx(1, "-F option can only be used together with -p option");
12501 cwd = getcwd(NULL, 0);
12503 error = got_error_from_errno("getcwd");
12507 error = got_repo_pack_fds_open(&pack_fds);
12511 error = got_worktree_open(&worktree, cwd);
12513 if (error->code == GOT_ERR_NOT_WORKTREE)
12514 error = wrap_not_worktree_error(error, "unstage", cwd);
12518 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12523 if (patch_script_path) {
12524 patch_script_file = fopen(patch_script_path, "re");
12525 if (patch_script_file == NULL) {
12526 error = got_error_from_errno2("fopen",
12527 patch_script_path);
12532 error = apply_unveil(got_repo_get_path(repo), 0,
12533 got_worktree_get_root_path(worktree));
12537 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12541 cpa.patch_script_file = patch_script_file;
12542 cpa.action = "unstage";
12543 memset(&upa, 0, sizeof(upa));
12544 error = got_worktree_unstage(worktree, &paths, update_progress,
12545 &upa, pflag ? choose_patch : NULL, &cpa, repo);
12547 print_merge_progress_stats(&upa);
12549 if (patch_script_file && fclose(patch_script_file) == EOF &&
12551 error = got_error_from_errno2("fclose", patch_script_path);
12553 const struct got_error *close_err = got_repo_close(repo);
12558 got_worktree_close(worktree);
12560 const struct got_error *pack_err =
12561 got_repo_pack_fds_close(pack_fds);
12565 TAILQ_FOREACH(pe, &paths, entry)
12566 free((char *)pe->path);
12567 got_pathlist_free(&paths);
12575 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
12576 "arg ...\n", getprogname());
12580 static const struct got_error *
12581 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12583 const struct got_error *err;
12584 struct got_blob_object *blob;
12587 fd = got_opentempfd();
12589 return got_error_from_errno("got_opentempfd");
12591 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
12595 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
12597 if (fd != -1 && close(fd) == -1 && err == NULL)
12598 err = got_error_from_errno("close");
12600 got_object_blob_close(blob);
12604 static const struct got_error *
12605 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12607 const struct got_error *err;
12608 struct got_tree_object *tree;
12611 err = got_object_open_as_tree(&tree, repo, id);
12615 nentries = got_object_tree_get_nentries(tree);
12616 for (i = 0; i < nentries; i++) {
12617 struct got_tree_entry *te;
12619 if (sigint_received || sigpipe_received)
12621 te = got_object_tree_get_entry(tree, i);
12622 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
12625 fprintf(outfile, "%s %.7o %s\n", id_str,
12626 got_tree_entry_get_mode(te),
12627 got_tree_entry_get_name(te));
12631 got_object_tree_close(tree);
12635 static const struct got_error *
12636 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12638 const struct got_error *err;
12639 struct got_commit_object *commit;
12640 const struct got_object_id_queue *parent_ids;
12641 struct got_object_qid *pid;
12642 char *id_str = NULL;
12643 const char *logmsg = NULL;
12646 err = got_object_open_as_commit(&commit, repo, id);
12650 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
12654 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
12655 parent_ids = got_object_commit_get_parent_ids(commit);
12656 fprintf(outfile, "numparents %d\n",
12657 got_object_commit_get_nparents(commit));
12658 STAILQ_FOREACH(pid, parent_ids, entry) {
12660 err = got_object_id_str(&pid_str, &pid->id);
12663 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
12666 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12667 got_object_commit_get_author_gmtoff(commit));
12668 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
12669 got_object_commit_get_author(commit),
12670 (long long)got_object_commit_get_author_time(commit),
12673 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12674 got_object_commit_get_committer_gmtoff(commit));
12675 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
12676 got_object_commit_get_committer(commit),
12677 (long long)got_object_commit_get_committer_time(commit),
12680 logmsg = got_object_commit_get_logmsg_raw(commit);
12681 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
12682 fprintf(outfile, "%s", logmsg);
12685 got_object_commit_close(commit);
12689 static const struct got_error *
12690 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12692 const struct got_error *err;
12693 struct got_tag_object *tag;
12694 char *id_str = NULL;
12695 const char *tagmsg = NULL;
12698 err = got_object_open_as_tag(&tag, repo, id);
12702 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
12706 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
12708 switch (got_object_tag_get_object_type(tag)) {
12709 case GOT_OBJ_TYPE_BLOB:
12710 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12711 GOT_OBJ_LABEL_BLOB);
12713 case GOT_OBJ_TYPE_TREE:
12714 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12715 GOT_OBJ_LABEL_TREE);
12717 case GOT_OBJ_TYPE_COMMIT:
12718 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12719 GOT_OBJ_LABEL_COMMIT);
12721 case GOT_OBJ_TYPE_TAG:
12722 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12723 GOT_OBJ_LABEL_TAG);
12729 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
12730 got_object_tag_get_name(tag));
12732 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
12733 got_object_tag_get_tagger_gmtoff(tag));
12734 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
12735 got_object_tag_get_tagger(tag),
12736 (long long)got_object_tag_get_tagger_time(tag),
12739 tagmsg = got_object_tag_get_message(tag);
12740 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
12741 fprintf(outfile, "%s", tagmsg);
12744 got_object_tag_close(tag);
12748 static const struct got_error *
12749 cmd_cat(int argc, char *argv[])
12751 const struct got_error *error;
12752 struct got_repository *repo = NULL;
12753 struct got_worktree *worktree = NULL;
12754 char *cwd = NULL, *repo_path = NULL, *label = NULL;
12755 const char *commit_id_str = NULL;
12756 struct got_object_id *id = NULL, *commit_id = NULL;
12757 struct got_commit_object *commit = NULL;
12758 int ch, obj_type, i, force_path = 0;
12759 struct got_reflist_head refs;
12760 int *pack_fds = NULL;
12765 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12770 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
12773 commit_id_str = optarg;
12776 repo_path = realpath(optarg, NULL);
12777 if (repo_path == NULL)
12778 return got_error_from_errno2("realpath",
12780 got_path_strip_trailing_slashes(repo_path);
12794 cwd = getcwd(NULL, 0);
12796 error = got_error_from_errno("getcwd");
12800 error = got_repo_pack_fds_open(&pack_fds);
12804 if (repo_path == NULL) {
12805 error = got_worktree_open(&worktree, cwd);
12806 if (error && error->code != GOT_ERR_NOT_WORKTREE)
12809 repo_path = strdup(
12810 got_worktree_get_repo_path(worktree));
12811 if (repo_path == NULL) {
12812 error = got_error_from_errno("strdup");
12816 /* Release work tree lock. */
12817 got_worktree_close(worktree);
12822 if (repo_path == NULL) {
12823 repo_path = strdup(cwd);
12824 if (repo_path == NULL)
12825 return got_error_from_errno("strdup");
12828 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
12833 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
12837 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
12841 if (commit_id_str == NULL)
12842 commit_id_str = GOT_REF_HEAD;
12843 error = got_repo_match_object_id(&commit_id, NULL,
12844 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
12848 error = got_object_open_as_commit(&commit, repo, commit_id);
12852 for (i = 0; i < argc; i++) {
12854 error = got_object_id_by_path(&id, repo, commit,
12859 error = got_repo_match_object_id(&id, &label, argv[i],
12860 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
12863 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
12864 error->code != GOT_ERR_NOT_REF)
12866 error = got_object_id_by_path(&id, repo,
12873 error = got_object_get_type(&obj_type, repo, id);
12877 switch (obj_type) {
12878 case GOT_OBJ_TYPE_BLOB:
12879 error = cat_blob(id, repo, stdout);
12881 case GOT_OBJ_TYPE_TREE:
12882 error = cat_tree(id, repo, stdout);
12884 case GOT_OBJ_TYPE_COMMIT:
12885 error = cat_commit(id, repo, stdout);
12887 case GOT_OBJ_TYPE_TAG:
12888 error = cat_tag(id, repo, stdout);
12891 error = got_error(GOT_ERR_OBJ_TYPE);
12906 got_object_commit_close(commit);
12908 got_worktree_close(worktree);
12910 const struct got_error *close_err = got_repo_close(repo);
12915 const struct got_error *pack_err =
12916 got_repo_pack_fds_close(pack_fds);
12921 got_ref_list_free(&refs);
12928 fprintf(stderr, "usage: %s info [path ...]\n",
12933 static const struct got_error *
12934 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12935 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12936 struct got_object_id *commit_id)
12938 const struct got_error *err = NULL;
12939 char *id_str = NULL;
12941 struct tm mytm, *tm;
12942 struct got_pathlist_head *paths = arg;
12943 struct got_pathlist_entry *pe;
12946 * Clear error indication from any of the path arguments which
12947 * would cause this file index entry to be displayed.
12949 TAILQ_FOREACH(pe, paths, entry) {
12950 if (got_path_cmp(path, pe->path, strlen(path),
12951 pe->path_len) == 0 ||
12952 got_path_is_child(path, pe->path, pe->path_len))
12953 pe->data = NULL; /* no error */
12956 printf(GOT_COMMIT_SEP_STR);
12958 printf("symlink: %s\n", path);
12959 else if (S_ISREG(mode)) {
12960 printf("file: %s\n", path);
12961 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12962 } else if (S_ISDIR(mode))
12963 printf("directory: %s\n", path);
12965 printf("something: %s\n", path);
12967 tm = localtime_r(&mtime, &mytm);
12970 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12971 return got_error(GOT_ERR_NO_SPACE);
12972 printf("timestamp: %s\n", datebuf);
12975 err = got_object_id_str(&id_str, blob_id);
12978 printf("based on blob: %s\n", id_str);
12982 if (staged_blob_id) {
12983 err = got_object_id_str(&id_str, staged_blob_id);
12986 printf("based on staged blob: %s\n", id_str);
12991 err = got_object_id_str(&id_str, commit_id);
12994 printf("based on commit: %s\n", id_str);
13001 static const struct got_error *
13002 cmd_info(int argc, char *argv[])
13004 const struct got_error *error = NULL;
13005 struct got_worktree *worktree = NULL;
13006 char *cwd = NULL, *id_str = NULL;
13007 struct got_pathlist_head paths;
13008 struct got_pathlist_entry *pe;
13009 char *uuidstr = NULL;
13010 int ch, show_files = 0;
13012 TAILQ_INIT(&paths);
13014 while ((ch = getopt(argc, argv, "")) != -1) {
13026 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
13030 cwd = getcwd(NULL, 0);
13032 error = got_error_from_errno("getcwd");
13036 error = got_worktree_open(&worktree, cwd);
13038 if (error->code == GOT_ERR_NOT_WORKTREE)
13039 error = wrap_not_worktree_error(error, "info", cwd);
13044 /* Remove "wpath cpath proc exec sendfd" promises. */
13045 if (pledge("stdio rpath flock unveil", NULL) == -1)
13048 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
13053 error = get_worktree_paths_from_argv(&paths, argc, argv,
13060 error = got_object_id_str(&id_str,
13061 got_worktree_get_base_commit_id(worktree));
13065 error = got_worktree_get_uuid(&uuidstr, worktree);
13069 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
13070 printf("work tree base commit: %s\n", id_str);
13071 printf("work tree path prefix: %s\n",
13072 got_worktree_get_path_prefix(worktree));
13073 printf("work tree branch reference: %s\n",
13074 got_worktree_get_head_ref_name(worktree));
13075 printf("work tree UUID: %s\n", uuidstr);
13076 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
13079 struct got_pathlist_entry *pe;
13080 TAILQ_FOREACH(pe, &paths, entry) {
13081 if (pe->path_len == 0)
13084 * Assume this path will fail. This will be corrected
13085 * in print_path_info() in case the path does suceeed.
13087 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
13089 error = got_worktree_path_info(worktree, &paths,
13090 print_path_info, &paths, check_cancelled, NULL);
13093 TAILQ_FOREACH(pe, &paths, entry) {
13094 if (pe->data != NULL) {
13095 const struct got_error *perr;
13098 error = got_error_fmt(perr->code, "%s",
13106 got_worktree_close(worktree);
13107 TAILQ_FOREACH(pe, &paths, entry)
13108 free((char *)pe->path);
13109 got_pathlist_free(&paths);