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>
5 * Copyright (C) 2023 Josh Rickmar <jrick@zettaport.com>
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 #include <sys/queue.h>
22 #include <sys/types.h>
46 #include "got_version.h"
47 #include "got_error.h"
48 #include "got_object.h"
49 #include "got_reference.h"
50 #include "got_repository.h"
52 #include "got_cancel.h"
53 #include "got_worktree.h"
54 #include "got_worktree_cvg.h"
56 #include "got_commit_graph.h"
57 #include "got_fetch.h"
59 #include "got_blame.h"
60 #include "got_privsep.h"
61 #include "got_opentemp.h"
62 #include "got_gotconfig.h"
64 #include "got_patch.h"
69 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
72 static volatile sig_atomic_t sigint_received;
73 static volatile sig_atomic_t sigpipe_received;
76 catch_sigint(int signo)
82 catch_sigpipe(int signo)
90 const struct got_error *(*cmd_main)(int, char *[]);
91 void (*cmd_usage)(void);
92 const char *cmd_alias;
95 __dead static void usage(int, int);
96 __dead static void usage_import(void);
97 __dead static void usage_clone(void);
98 __dead static void usage_checkout(void);
99 __dead static void usage_update(void);
100 __dead static void usage_log(void);
101 __dead static void usage_diff(void);
102 __dead static void usage_blame(void);
103 __dead static void usage_tree(void);
104 __dead static void usage_status(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_cherrypick(void);
112 __dead static void usage_backout(void);
113 __dead static void usage_cat(void);
114 __dead static void usage_info(void);
116 static const struct got_error* cmd_import(int, char *[]);
117 static const struct got_error* cmd_clone(int, char *[]);
118 static const struct got_error* cmd_checkout(int, char *[]);
119 static const struct got_error* cmd_update(int, char *[]);
120 static const struct got_error* cmd_log(int, char *[]);
121 static const struct got_error* cmd_diff(int, char *[]);
122 static const struct got_error* cmd_blame(int, char *[]);
123 static const struct got_error* cmd_tree(int, char *[]);
124 static const struct got_error* cmd_status(int, char *[]);
125 static const struct got_error* cmd_tag(int, char *[]);
126 static const struct got_error* cmd_add(int, char *[]);
127 static const struct got_error* cmd_remove(int, char *[]);
128 static const struct got_error* cmd_patch(int, char *[]);
129 static const struct got_error* cmd_revert(int, char *[]);
130 static const struct got_error* cmd_commit(int, char *[]);
131 static const struct got_error* cmd_cherrypick(int, char *[]);
132 static const struct got_error* cmd_backout(int, char *[]);
133 static const struct got_error* cmd_cat(int, char *[]);
134 static const struct got_error* cmd_info(int, char *[]);
136 static const struct got_cmd got_commands[] = {
137 { "import", cmd_import, usage_import, "im" },
138 { "clone", cmd_clone, usage_clone, "cl" },
139 { "checkout", cmd_checkout, usage_checkout, "co" },
140 { "update", cmd_update, usage_update, "up" },
141 { "log", cmd_log, usage_log, "" },
142 { "diff", cmd_diff, usage_diff, "di" },
143 { "blame", cmd_blame, usage_blame, "bl" },
144 { "tree", cmd_tree, usage_tree, "tr" },
145 { "status", cmd_status, usage_status, "st" },
146 { "tag", cmd_tag, usage_tag, "" },
147 { "add", cmd_add, usage_add, "" },
148 { "remove", cmd_remove, usage_remove, "rm" },
149 { "patch", cmd_patch, usage_patch, "pa" },
150 { "revert", cmd_revert, usage_revert, "rv" },
151 { "commit", cmd_commit, usage_commit, "ci" },
152 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
153 { "backout", cmd_backout, usage_backout, "bo" },
154 { "cat", cmd_cat, usage_cat, "" },
155 { "info", cmd_info, usage_info, "" },
159 list_commands(FILE *fp)
163 fprintf(fp, "commands:");
164 for (i = 0; i < nitems(got_commands); i++) {
165 const struct got_cmd *cmd = &got_commands[i];
166 fprintf(fp, " %s", cmd->cmd_name);
172 option_conflict(char a, char b)
174 errx(1, "-%c and -%c options are mutually exclusive", a, b);
178 main(int argc, char *argv[])
180 const struct got_cmd *cmd;
183 int hflag = 0, Vflag = 0;
184 static const struct option longopts[] = {
185 { "version", no_argument, NULL, 'V' },
189 setlocale(LC_CTYPE, "");
191 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
211 got_version_print_str();
216 usage(hflag, hflag ? 0 : 1);
218 signal(SIGINT, catch_sigint);
219 signal(SIGPIPE, catch_sigpipe);
221 for (i = 0; i < nitems(got_commands); i++) {
222 const struct got_error *error;
224 cmd = &got_commands[i];
226 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
227 strcmp(cmd->cmd_alias, argv[0]) != 0)
233 error = cmd->cmd_main(argc, argv);
234 if (error && error->code != GOT_ERR_CANCELLED &&
235 error->code != GOT_ERR_PRIVSEP_EXIT &&
236 !(sigpipe_received &&
237 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
239 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
241 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
248 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
249 list_commands(stderr);
254 usage(int hflag, int status)
256 FILE *fp = (status == 0) ? stdout : stderr;
258 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
265 static const struct got_error *
266 get_editor(char **abspath)
268 const struct got_error *err = NULL;
273 editor = getenv("VISUAL");
275 editor = getenv("EDITOR");
278 err = got_path_find_prog(abspath, editor);
283 if (*abspath == NULL) {
284 *abspath = strdup("/usr/bin/vi");
285 if (*abspath == NULL)
286 return got_error_from_errno("strdup");
292 static const struct got_error *
293 apply_unveil(const char *repo_path, int repo_read_only,
294 const char *worktree_path)
296 const struct got_error *err;
299 if (unveil("gmon.out", "rwc") != 0)
300 return got_error_from_errno2("unveil", "gmon.out");
302 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
303 return got_error_from_errno2("unveil", repo_path);
305 if (worktree_path && unveil(worktree_path, "rwc") != 0)
306 return got_error_from_errno2("unveil", worktree_path);
308 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
309 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
311 err = got_privsep_unveil_exec_helpers();
315 if (unveil(NULL, NULL) != 0)
316 return got_error_from_errno("unveil");
324 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
325 "[-r repository-path] directory\n", getprogname());
330 spawn_editor(const char *editor, const char *file)
333 sig_t sighup, sigint, sigquit;
336 sighup = signal(SIGHUP, SIG_IGN);
337 sigint = signal(SIGINT, SIG_IGN);
338 sigquit = signal(SIGQUIT, SIG_IGN);
340 switch (pid = fork()) {
344 execl(editor, editor, file, (char *)NULL);
348 while (waitpid(pid, &st, 0) == -1)
353 (void)signal(SIGHUP, sighup);
354 (void)signal(SIGINT, sigint);
355 (void)signal(SIGQUIT, sigquit);
357 if (!WIFEXITED(st)) {
362 return WEXITSTATUS(st);
365 static const struct got_error *
366 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
368 const struct got_error *err = NULL;
375 if (fseeko(fp, 0L, SEEK_SET) == -1)
376 return got_error_from_errno("fseeko");
378 *logmsg = malloc(filesize + 1);
380 return got_error_from_errno("malloc");
383 while (getline(&line, &linesize, fp) != -1) {
384 if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
385 continue; /* remove comments and leading empty lines */
386 *len = strlcat(*logmsg, line, filesize + 1);
387 if (*len >= filesize + 1) {
388 err = got_error(GOT_ERR_NO_SPACE);
393 err = got_ferror(fp, GOT_ERR_IO);
397 while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
398 (*logmsg)[*len - 1] = '\0';
411 static const struct got_error *
412 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
413 const char *initial_content, size_t initial_content_len,
414 int require_modification)
416 const struct got_error *err = NULL;
423 if (stat(logmsg_path, &st) == -1)
424 return got_error_from_errno2("stat", logmsg_path);
426 if (spawn_editor(editor, logmsg_path) == -1)
427 return got_error_from_errno("failed spawning editor");
429 if (require_modification) {
430 struct timespec timeout;
434 nanosleep(&timeout, NULL);
437 if (stat(logmsg_path, &st2) == -1)
438 return got_error_from_errno2("stat", logmsg_path);
440 if (require_modification && st.st_size == st2.st_size &&
441 timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
442 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
443 "no changes made to commit message, aborting");
445 fp = fopen(logmsg_path, "re");
447 err = got_error_from_errno("fopen");
451 /* strip comments and leading/trailing newlines */
452 err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
455 if (logmsg_len == 0) {
456 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
457 "commit message cannot be empty, aborting");
461 if (fp && fclose(fp) == EOF && err == NULL)
462 err = got_error_from_errno("fclose");
470 static const struct got_error *
471 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
472 const char *path_dir, const char *branch_name)
474 char *initial_content = NULL;
475 const struct got_error *err = NULL;
476 int initial_content_len;
479 initial_content_len = asprintf(&initial_content,
480 "\n# %s to be imported to branch %s\n", path_dir,
482 if (initial_content_len == -1)
483 return got_error_from_errno("asprintf");
485 err = got_opentemp_named_fd(logmsg_path, &fd,
486 GOT_TMPDIR_STR "/got-importmsg", "");
490 if (write(fd, initial_content, initial_content_len) == -1) {
491 err = got_error_from_errno2("write", *logmsg_path);
494 if (close(fd) == -1) {
495 err = got_error_from_errno2("close", *logmsg_path);
500 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
501 initial_content_len, 1);
503 if (fd != -1 && close(fd) == -1 && err == NULL)
504 err = got_error_from_errno2("close", *logmsg_path);
505 free(initial_content);
513 static const struct got_error *
514 import_progress(void *arg, const char *path)
516 printf("A %s\n", path);
520 static const struct got_error *
521 valid_author(const char *author)
523 const char *email = author;
526 * Git' expects the author (or committer) to be in the form
527 * "name <email>", which are mostly free form (see the
528 * "committer" description in git-fast-import(1)). We're only
529 * doing this to avoid git's object parser breaking on commits
533 while (*author && *author != '\n' && *author != '<' && *author != '>')
535 if (author != email && *author == '<' && *(author - 1) != ' ')
536 return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
537 "between author name and email required", email);
538 if (*author++ != '<')
539 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
540 while (*author && *author != '\n' && *author != '<' && *author != '>')
542 if (strcmp(author, ">") != 0)
543 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
547 static const struct got_error *
548 get_author(char **author, struct got_repository *repo,
549 struct got_worktree *worktree)
551 const struct got_error *err = NULL;
552 const char *got_author = NULL, *name, *email;
553 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
558 worktree_conf = got_worktree_get_gotconfig(worktree);
559 repo_conf = got_repo_get_gotconfig(repo);
562 * Priority of potential author information sources, from most
563 * significant to least significant:
564 * 1) work tree's .got/got.conf file
565 * 2) repository's got.conf file
566 * 3) repository's git config file
567 * 4) environment variables
568 * 5) global git config files (in user's home directory or /etc)
572 got_author = got_gotconfig_get_author(worktree_conf);
573 if (got_author == NULL)
574 got_author = got_gotconfig_get_author(repo_conf);
575 if (got_author == NULL) {
576 name = got_repo_get_gitconfig_author_name(repo);
577 email = got_repo_get_gitconfig_author_email(repo);
579 if (asprintf(author, "%s <%s>", name, email) == -1)
580 return got_error_from_errno("asprintf");
584 got_author = getenv("GOT_AUTHOR");
585 if (got_author == NULL) {
586 name = got_repo_get_global_gitconfig_author_name(repo);
587 email = got_repo_get_global_gitconfig_author_email(
590 if (asprintf(author, "%s <%s>", name, email)
592 return got_error_from_errno("asprintf");
595 /* TODO: Look up user in password database? */
596 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
600 *author = strdup(got_author);
602 return got_error_from_errno("strdup");
604 err = valid_author(*author);
612 static const struct got_error *
613 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
614 struct got_worktree *worktree)
616 const char *got_allowed_signers = NULL;
617 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
619 *allowed_signers = NULL;
622 worktree_conf = got_worktree_get_gotconfig(worktree);
623 repo_conf = got_repo_get_gotconfig(repo);
626 * Priority of potential author information sources, from most
627 * significant to least significant:
628 * 1) work tree's .got/got.conf file
629 * 2) repository's got.conf file
633 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
635 if (got_allowed_signers == NULL)
636 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
639 if (got_allowed_signers) {
640 *allowed_signers = strdup(got_allowed_signers);
641 if (*allowed_signers == NULL)
642 return got_error_from_errno("strdup");
647 static const struct got_error *
648 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
649 struct got_worktree *worktree)
651 const char *got_revoked_signers = NULL;
652 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
654 *revoked_signers = NULL;
657 worktree_conf = got_worktree_get_gotconfig(worktree);
658 repo_conf = got_repo_get_gotconfig(repo);
661 * Priority of potential author information sources, from most
662 * significant to least significant:
663 * 1) work tree's .got/got.conf file
664 * 2) repository's got.conf file
668 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
670 if (got_revoked_signers == NULL)
671 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
674 if (got_revoked_signers) {
675 *revoked_signers = strdup(got_revoked_signers);
676 if (*revoked_signers == NULL)
677 return got_error_from_errno("strdup");
683 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
685 const char *got_signer_id = NULL;
686 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
689 worktree_conf = got_worktree_get_gotconfig(worktree);
690 repo_conf = got_repo_get_gotconfig(repo);
693 * Priority of potential author information sources, from most
694 * significant to least significant:
695 * 1) work tree's .got/got.conf file
696 * 2) repository's got.conf file
700 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
701 if (got_signer_id == NULL)
702 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
704 return got_signer_id;
707 static const struct got_error *
708 get_gitconfig_path(char **gitconfig_path)
710 const char *homedir = getenv("HOME");
712 *gitconfig_path = NULL;
714 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
715 return got_error_from_errno("asprintf");
721 static const struct got_error *
722 cmd_import(int argc, char *argv[])
724 const struct got_error *error = NULL;
725 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
726 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
727 const char *branch_name = NULL;
728 char *id_str = NULL, *logmsg_path = NULL;
729 char refname[PATH_MAX] = "refs/heads/";
730 struct got_repository *repo = NULL;
731 struct got_reference *branch_ref = NULL, *head_ref = NULL;
732 struct got_object_id *new_commit_id = NULL;
734 struct got_pathlist_head ignores;
735 struct got_pathlist_entry *pe;
736 int preserve_logmsg = 0;
737 int *pack_fds = NULL;
739 TAILQ_INIT(&ignores);
742 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
748 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
751 branch_name = optarg;
754 if (optarg[0] == '\0')
756 error = got_pathlist_insert(&pe, &ignores, optarg,
762 logmsg = strdup(optarg);
763 if (logmsg == NULL) {
764 error = got_error_from_errno("strdup");
769 repo_path = realpath(optarg, NULL);
770 if (repo_path == NULL) {
771 error = got_error_from_errno2("realpath",
788 if (repo_path == NULL) {
789 repo_path = getcwd(NULL, 0);
790 if (repo_path == NULL)
791 return got_error_from_errno("getcwd");
793 got_path_strip_trailing_slashes(repo_path);
794 error = get_gitconfig_path(&gitconfig_path);
797 error = got_repo_pack_fds_open(&pack_fds);
800 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
804 error = get_author(&author, repo, NULL);
809 * Don't let the user create a branch name with a leading '-'.
810 * While technically a valid reference name, this case is usually
811 * an unintended typo.
813 if (branch_name && branch_name[0] == '-')
814 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
816 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
817 if (error && error->code != GOT_ERR_NOT_REF)
821 n = strlcat(refname, branch_name, sizeof(refname));
822 else if (head_ref && got_ref_is_symbolic(head_ref))
823 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
826 n = strlcat(refname, "main", sizeof(refname));
827 if (n >= sizeof(refname)) {
828 error = got_error(GOT_ERR_NO_SPACE);
832 error = got_ref_open(&branch_ref, repo, refname, 0);
834 if (error->code != GOT_ERR_NOT_REF)
837 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
838 "import target branch already exists");
842 path_dir = realpath(argv[0], NULL);
843 if (path_dir == NULL) {
844 error = got_error_from_errno2("realpath", argv[0]);
847 got_path_strip_trailing_slashes(path_dir);
850 * unveil(2) traverses exec(2); if an editor is used we have
851 * to apply unveil after the log message has been written.
853 if (logmsg == NULL || *logmsg == '\0') {
854 error = get_editor(&editor);
858 error = collect_import_msg(&logmsg, &logmsg_path, editor,
861 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
868 if (unveil(path_dir, "r") != 0) {
869 error = got_error_from_errno2("unveil", path_dir);
875 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
882 error = got_repo_import(&new_commit_id, path_dir, logmsg,
883 author, &ignores, repo, import_progress, NULL);
890 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
897 error = got_ref_write(branch_ref, repo);
904 error = got_object_id_str(&id_str, new_commit_id);
911 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
913 if (error->code != GOT_ERR_NOT_REF) {
919 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
927 error = got_ref_write(head_ref, repo);
935 printf("Created branch %s with commit %s\n",
936 got_ref_get_name(branch_ref), id_str);
939 const struct got_error *pack_err =
940 got_repo_pack_fds_close(pack_fds);
945 const struct got_error *close_err = got_repo_close(repo);
949 if (preserve_logmsg) {
950 fprintf(stderr, "%s: log message preserved in %s\n",
951 getprogname(), logmsg_path);
952 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
953 error = got_error_from_errno2("unlink", logmsg_path);
961 free(gitconfig_path);
963 got_ref_close(branch_ref);
965 got_ref_close(head_ref);
972 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
973 "repository-URL [directory]\n", getprogname());
977 struct got_fetch_progress_arg {
978 char last_scaled_size[FMT_SCALED_STRSIZE];
983 struct got_repository *repo;
988 struct got_pathlist_head *symrefs;
989 struct got_pathlist_head *wanted_branches;
990 struct got_pathlist_head *wanted_refs;
994 const char *remote_repo_path;
996 int fetch_all_branches;
997 int mirror_references;
1001 /* XXX forward declaration */
1002 static const struct got_error *
1003 create_config_files(const char *proto, const char *host, const char *port,
1004 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1005 int mirror_references, struct got_pathlist_head *symrefs,
1006 struct got_pathlist_head *wanted_branches,
1007 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1009 static const struct got_error *
1010 fetch_progress(void *arg, const char *message, off_t packfile_size,
1011 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1013 const struct got_error *err = NULL;
1014 struct got_fetch_progress_arg *a = arg;
1015 char scaled_size[FMT_SCALED_STRSIZE];
1016 int p_indexed, p_resolved;
1017 int print_size = 0, print_indexed = 0, print_resolved = 0;
1020 * In order to allow a failed clone to be resumed with 'got fetch'
1021 * we try to create configuration files as soon as possible.
1022 * Once the server has sent information about its default branch
1023 * we have all required information.
1025 if (a->create_configs && !a->configs_created &&
1026 !TAILQ_EMPTY(a->config_info.symrefs)) {
1027 err = create_config_files(a->config_info.proto,
1028 a->config_info.host, a->config_info.port,
1029 a->config_info.remote_repo_path,
1030 a->config_info.git_url,
1031 a->config_info.fetch_all_branches,
1032 a->config_info.mirror_references,
1033 a->config_info.symrefs,
1034 a->config_info.wanted_branches,
1035 a->config_info.wanted_refs, a->repo);
1038 a->configs_created = 1;
1041 if (a->verbosity < 0)
1044 if (message && message[0] != '\0') {
1045 printf("\rserver: %s", message);
1050 if (packfile_size > 0 || nobj_indexed > 0) {
1051 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1052 (a->last_scaled_size[0] == '\0' ||
1053 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1055 if (strlcpy(a->last_scaled_size, scaled_size,
1056 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1057 return got_error(GOT_ERR_NO_SPACE);
1059 if (nobj_indexed > 0) {
1060 p_indexed = (nobj_indexed * 100) / nobj_total;
1061 if (p_indexed != a->last_p_indexed) {
1062 a->last_p_indexed = p_indexed;
1067 if (nobj_resolved > 0) {
1068 p_resolved = (nobj_resolved * 100) /
1069 (nobj_total - nobj_loose);
1070 if (p_resolved != a->last_p_resolved) {
1071 a->last_p_resolved = p_resolved;
1079 if (print_size || print_indexed || print_resolved)
1082 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1084 printf("; indexing %d%%", p_indexed);
1086 printf("; resolving deltas %d%%", p_resolved);
1087 if (print_size || print_indexed || print_resolved)
1093 static const struct got_error *
1094 create_symref(const char *refname, struct got_reference *target_ref,
1095 int verbosity, struct got_repository *repo)
1097 const struct got_error *err;
1098 struct got_reference *head_symref;
1100 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1104 err = got_ref_write(head_symref, repo);
1105 if (err == NULL && verbosity > 0) {
1106 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1107 got_ref_get_name(target_ref));
1109 got_ref_close(head_symref);
1113 static const struct got_error *
1114 list_remote_refs(struct got_pathlist_head *symrefs,
1115 struct got_pathlist_head *refs)
1117 const struct got_error *err;
1118 struct got_pathlist_entry *pe;
1120 TAILQ_FOREACH(pe, symrefs, entry) {
1121 const char *refname = pe->path;
1122 const char *targetref = pe->data;
1124 printf("%s: %s\n", refname, targetref);
1127 TAILQ_FOREACH(pe, refs, entry) {
1128 const char *refname = pe->path;
1129 struct got_object_id *id = pe->data;
1132 err = got_object_id_str(&id_str, id);
1135 printf("%s: %s\n", refname, id_str);
1142 static const struct got_error *
1143 create_ref(const char *refname, struct got_object_id *id,
1144 int verbosity, struct got_repository *repo)
1146 const struct got_error *err = NULL;
1147 struct got_reference *ref;
1150 err = got_object_id_str(&id_str, id);
1154 err = got_ref_alloc(&ref, refname, id);
1158 err = got_ref_write(ref, repo);
1161 if (err == NULL && verbosity >= 0)
1162 printf("Created reference %s: %s\n", refname, id_str);
1169 match_wanted_ref(const char *refname, const char *wanted_ref)
1171 if (strncmp(refname, "refs/", 5) != 0)
1176 * Prevent fetching of references that won't make any
1177 * sense outside of the remote repository's context.
1179 if (strncmp(refname, "got/", 4) == 0)
1181 if (strncmp(refname, "remotes/", 8) == 0)
1184 if (strncmp(wanted_ref, "refs/", 5) == 0)
1187 /* Allow prefix match. */
1188 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1191 /* Allow exact match. */
1192 return (strcmp(refname, wanted_ref) == 0);
1196 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1198 struct got_pathlist_entry *pe;
1200 TAILQ_FOREACH(pe, wanted_refs, entry) {
1201 if (match_wanted_ref(refname, pe->path))
1208 static const struct got_error *
1209 create_wanted_ref(const char *refname, struct got_object_id *id,
1210 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1212 const struct got_error *err;
1213 char *remote_refname;
1215 if (strncmp("refs/", refname, 5) == 0)
1218 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1219 remote_repo_name, refname) == -1)
1220 return got_error_from_errno("asprintf");
1222 err = create_ref(remote_refname, id, verbosity, repo);
1223 free(remote_refname);
1227 static const struct got_error *
1228 create_gotconfig(const char *proto, const char *host, const char *port,
1229 const char *remote_repo_path, const char *default_branch,
1230 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1231 struct got_pathlist_head *wanted_refs, int mirror_references,
1232 struct got_repository *repo)
1234 const struct got_error *err = NULL;
1235 char *gotconfig_path = NULL;
1236 char *gotconfig = NULL;
1237 FILE *gotconfig_file = NULL;
1238 const char *branchname = NULL;
1239 char *branches = NULL, *refs = NULL;
1242 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1243 struct got_pathlist_entry *pe;
1244 TAILQ_FOREACH(pe, wanted_branches, entry) {
1246 branchname = pe->path;
1247 if (strncmp(branchname, "refs/heads/", 11) == 0)
1249 if (asprintf(&s, "%s\"%s\" ",
1250 branches ? branches : "", branchname) == -1) {
1251 err = got_error_from_errno("asprintf");
1257 } else if (!fetch_all_branches && default_branch) {
1258 branchname = default_branch;
1259 if (strncmp(branchname, "refs/heads/", 11) == 0)
1261 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1262 err = got_error_from_errno("asprintf");
1266 if (!TAILQ_EMPTY(wanted_refs)) {
1267 struct got_pathlist_entry *pe;
1268 TAILQ_FOREACH(pe, wanted_refs, entry) {
1270 const char *refname = pe->path;
1271 if (strncmp(refname, "refs/", 5) == 0)
1273 if (asprintf(&s, "%s\"%s\" ",
1274 refs ? refs : "", refname) == -1) {
1275 err = got_error_from_errno("asprintf");
1283 /* Create got.conf(5). */
1284 gotconfig_path = got_repo_get_path_gotconfig(repo);
1285 if (gotconfig_path == NULL) {
1286 err = got_error_from_errno("got_repo_get_path_gotconfig");
1289 gotconfig_file = fopen(gotconfig_path, "ae");
1290 if (gotconfig_file == NULL) {
1291 err = got_error_from_errno2("fopen", gotconfig_path);
1294 if (asprintf(&gotconfig,
1299 "\trepository \"%s\"\n"
1305 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1306 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1307 remote_repo_path, branches ? "\tbranch { " : "",
1308 branches ? branches : "", branches ? "}\n" : "",
1309 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1310 mirror_references ? "\tmirror_references yes\n" : "",
1311 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1312 err = got_error_from_errno("asprintf");
1315 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1316 if (n != strlen(gotconfig)) {
1317 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1322 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1323 err = got_error_from_errno2("fclose", gotconfig_path);
1324 free(gotconfig_path);
1329 static const struct got_error *
1330 create_gitconfig(const char *git_url, const char *default_branch,
1331 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1332 struct got_pathlist_head *wanted_refs, int mirror_references,
1333 struct got_repository *repo)
1335 const struct got_error *err = NULL;
1336 char *gitconfig_path = NULL;
1337 char *gitconfig = NULL;
1338 FILE *gitconfig_file = NULL;
1339 char *branches = NULL, *refs = NULL;
1340 const char *branchname;
1343 /* Create a config file Git can understand. */
1344 gitconfig_path = got_repo_get_path_gitconfig(repo);
1345 if (gitconfig_path == NULL) {
1346 err = got_error_from_errno("got_repo_get_path_gitconfig");
1349 gitconfig_file = fopen(gitconfig_path, "ae");
1350 if (gitconfig_file == NULL) {
1351 err = got_error_from_errno2("fopen", gitconfig_path);
1354 if (fetch_all_branches) {
1355 if (mirror_references) {
1356 if (asprintf(&branches,
1357 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1358 err = got_error_from_errno("asprintf");
1361 } else if (asprintf(&branches,
1362 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1363 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1364 err = got_error_from_errno("asprintf");
1367 } else if (!TAILQ_EMPTY(wanted_branches)) {
1368 struct got_pathlist_entry *pe;
1369 TAILQ_FOREACH(pe, wanted_branches, entry) {
1371 branchname = pe->path;
1372 if (strncmp(branchname, "refs/heads/", 11) == 0)
1374 if (mirror_references) {
1376 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1377 branches ? branches : "",
1378 branchname, branchname) == -1) {
1379 err = got_error_from_errno("asprintf");
1382 } else if (asprintf(&s,
1383 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1384 branches ? branches : "",
1385 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1386 branchname) == -1) {
1387 err = got_error_from_errno("asprintf");
1395 * If the server specified a default branch, use just that one.
1396 * Otherwise fall back to fetching all branches on next fetch.
1398 if (default_branch) {
1399 branchname = default_branch;
1400 if (strncmp(branchname, "refs/heads/", 11) == 0)
1403 branchname = "*"; /* fall back to all branches */
1404 if (mirror_references) {
1405 if (asprintf(&branches,
1406 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1407 branchname, branchname) == -1) {
1408 err = got_error_from_errno("asprintf");
1411 } else if (asprintf(&branches,
1412 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1413 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1414 branchname) == -1) {
1415 err = got_error_from_errno("asprintf");
1419 if (!TAILQ_EMPTY(wanted_refs)) {
1420 struct got_pathlist_entry *pe;
1421 TAILQ_FOREACH(pe, wanted_refs, entry) {
1423 const char *refname = pe->path;
1424 if (strncmp(refname, "refs/", 5) == 0)
1426 if (mirror_references) {
1428 "%s\tfetch = refs/%s:refs/%s\n",
1429 refs ? refs : "", refname, refname) == -1) {
1430 err = got_error_from_errno("asprintf");
1433 } else if (asprintf(&s,
1434 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1436 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1438 err = got_error_from_errno("asprintf");
1446 if (asprintf(&gitconfig,
1451 "\tfetch = refs/tags/*:refs/tags/*\n",
1452 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1453 refs ? refs : "") == -1) {
1454 err = got_error_from_errno("asprintf");
1457 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1458 if (n != strlen(gitconfig)) {
1459 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1463 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1464 err = got_error_from_errno2("fclose", gitconfig_path);
1465 free(gitconfig_path);
1470 static const struct got_error *
1471 create_config_files(const char *proto, const char *host, const char *port,
1472 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1473 int mirror_references, struct got_pathlist_head *symrefs,
1474 struct got_pathlist_head *wanted_branches,
1475 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1477 const struct got_error *err = NULL;
1478 const char *default_branch = NULL;
1479 struct got_pathlist_entry *pe;
1482 * If we asked for a set of wanted branches then use the first
1485 if (!TAILQ_EMPTY(wanted_branches)) {
1486 pe = TAILQ_FIRST(wanted_branches);
1487 default_branch = pe->path;
1489 /* First HEAD ref listed by server is the default branch. */
1490 TAILQ_FOREACH(pe, symrefs, entry) {
1491 const char *refname = pe->path;
1492 const char *target = pe->data;
1494 if (strcmp(refname, GOT_REF_HEAD) != 0)
1497 default_branch = target;
1502 /* Create got.conf(5). */
1503 err = create_gotconfig(proto, host, port, remote_repo_path,
1504 default_branch, fetch_all_branches, wanted_branches,
1505 wanted_refs, mirror_references, repo);
1509 /* Create a config file Git can understand. */
1510 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1511 wanted_branches, wanted_refs, mirror_references, repo);
1514 static const struct got_error *
1515 cmd_clone(int argc, char *argv[])
1517 const struct got_error *error = NULL;
1518 const char *uri, *dirname;
1519 char *proto, *host, *port, *repo_name, *server_path;
1520 char *default_destdir = NULL, *id_str = NULL;
1521 const char *repo_path;
1522 struct got_repository *repo = NULL;
1523 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1524 struct got_pathlist_entry *pe;
1525 struct got_object_id *pack_hash = NULL;
1526 int ch, fetchfd = -1, fetchstatus;
1527 pid_t fetchpid = -1;
1528 struct got_fetch_progress_arg fpa;
1529 char *git_url = NULL;
1530 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1531 int bflag = 0, list_refs_only = 0;
1532 int *pack_fds = NULL;
1535 TAILQ_INIT(&symrefs);
1536 TAILQ_INIT(&wanted_branches);
1537 TAILQ_INIT(&wanted_refs);
1539 while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1542 fetch_all_branches = 1;
1545 error = got_pathlist_append(&wanted_branches,
1555 mirror_references = 1;
1561 error = got_pathlist_append(&wanted_refs,
1569 else if (verbosity < 3)
1580 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1581 option_conflict('a', 'b');
1582 if (list_refs_only) {
1583 if (!TAILQ_EMPTY(&wanted_branches))
1584 option_conflict('l', 'b');
1585 if (fetch_all_branches)
1586 option_conflict('l', 'a');
1587 if (mirror_references)
1588 option_conflict('l', 'm');
1589 if (!TAILQ_EMPTY(&wanted_refs))
1590 option_conflict('l', 'R');
1602 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1607 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1608 host, port ? ":" : "", port ? port : "",
1609 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1610 error = got_error_from_errno("asprintf");
1614 if (strcmp(proto, "git") == 0) {
1616 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1617 "sendfd dns inet unveil", NULL) == -1)
1620 } else if (strcmp(proto, "git+ssh") == 0 ||
1621 strcmp(proto, "ssh") == 0) {
1623 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1624 "sendfd unveil", NULL) == -1)
1627 } else if (strcmp(proto, "http") == 0 ||
1628 strcmp(proto, "git+http") == 0) {
1629 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1632 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1635 if (dirname == NULL) {
1636 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1637 error = got_error_from_errno("asprintf");
1640 repo_path = default_destdir;
1642 repo_path = dirname;
1644 if (!list_refs_only) {
1645 error = got_path_mkdir(repo_path);
1647 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1648 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1650 if (!got_path_dir_is_empty(repo_path)) {
1651 error = got_error_path(repo_path,
1652 GOT_ERR_DIR_NOT_EMPTY);
1657 error = got_dial_apply_unveil(proto);
1661 error = apply_unveil(repo_path, 0, NULL);
1666 printf("Connecting to %s\n", git_url);
1668 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1669 server_path, verbosity);
1673 if (!list_refs_only) {
1674 error = got_repo_init(repo_path, NULL);
1677 error = got_repo_pack_fds_open(&pack_fds);
1680 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1685 fpa.last_scaled_size[0] = '\0';
1686 fpa.last_p_indexed = -1;
1687 fpa.last_p_resolved = -1;
1688 fpa.verbosity = verbosity;
1689 fpa.create_configs = 1;
1690 fpa.configs_created = 0;
1692 fpa.config_info.symrefs = &symrefs;
1693 fpa.config_info.wanted_branches = &wanted_branches;
1694 fpa.config_info.wanted_refs = &wanted_refs;
1695 fpa.config_info.proto = proto;
1696 fpa.config_info.host = host;
1697 fpa.config_info.port = port;
1698 fpa.config_info.remote_repo_path = server_path;
1699 fpa.config_info.git_url = git_url;
1700 fpa.config_info.fetch_all_branches = fetch_all_branches;
1701 fpa.config_info.mirror_references = mirror_references;
1702 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1703 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1704 fetch_all_branches, &wanted_branches, &wanted_refs,
1705 list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1706 fetch_progress, &fpa);
1710 if (list_refs_only) {
1711 error = list_remote_refs(&symrefs, &refs);
1715 if (pack_hash == NULL) {
1716 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1717 "server sent an empty pack file");
1720 error = got_object_id_str(&id_str, pack_hash);
1724 printf("\nFetched %s.pack\n", id_str);
1727 /* Set up references provided with the pack file. */
1728 TAILQ_FOREACH(pe, &refs, entry) {
1729 const char *refname = pe->path;
1730 struct got_object_id *id = pe->data;
1731 char *remote_refname;
1733 if (is_wanted_ref(&wanted_refs, refname) &&
1734 !mirror_references) {
1735 error = create_wanted_ref(refname, id,
1736 GOT_FETCH_DEFAULT_REMOTE_NAME,
1737 verbosity - 1, repo);
1743 error = create_ref(refname, id, verbosity - 1, repo);
1747 if (mirror_references)
1750 if (strncmp("refs/heads/", refname, 11) != 0)
1753 if (asprintf(&remote_refname,
1754 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1755 refname + 11) == -1) {
1756 error = got_error_from_errno("asprintf");
1759 error = create_ref(remote_refname, id, verbosity - 1, repo);
1760 free(remote_refname);
1765 /* Set the HEAD reference if the server provided one. */
1766 TAILQ_FOREACH(pe, &symrefs, entry) {
1767 struct got_reference *target_ref;
1768 const char *refname = pe->path;
1769 const char *target = pe->data;
1770 char *remote_refname = NULL, *remote_target = NULL;
1772 if (strcmp(refname, GOT_REF_HEAD) != 0)
1775 error = got_ref_open(&target_ref, repo, target, 0);
1777 if (error->code == GOT_ERR_NOT_REF) {
1784 error = create_symref(refname, target_ref, verbosity, repo);
1785 got_ref_close(target_ref);
1789 if (mirror_references)
1792 if (strncmp("refs/heads/", target, 11) != 0)
1795 if (asprintf(&remote_refname,
1796 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1798 error = got_error_from_errno("asprintf");
1801 if (asprintf(&remote_target,
1802 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1803 target + 11) == -1) {
1804 error = got_error_from_errno("asprintf");
1805 free(remote_refname);
1808 error = got_ref_open(&target_ref, repo, remote_target, 0);
1810 free(remote_refname);
1811 free(remote_target);
1812 if (error->code == GOT_ERR_NOT_REF) {
1818 error = create_symref(remote_refname, target_ref,
1819 verbosity - 1, repo);
1820 free(remote_refname);
1821 free(remote_target);
1822 got_ref_close(target_ref);
1828 * We failed to set the HEAD reference. If we asked for
1829 * a set of wanted branches use the first of one of those
1830 * which could be fetched instead.
1832 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1833 const char *target = pe->path;
1834 struct got_reference *target_ref;
1836 error = got_ref_open(&target_ref, repo, target, 0);
1838 if (error->code == GOT_ERR_NOT_REF) {
1845 error = create_symref(GOT_REF_HEAD, target_ref,
1847 got_ref_close(target_ref);
1853 if (!fpa.configs_created && pe != NULL) {
1854 error = create_config_files(fpa.config_info.proto,
1855 fpa.config_info.host, fpa.config_info.port,
1856 fpa.config_info.remote_repo_path,
1857 fpa.config_info.git_url,
1858 fpa.config_info.fetch_all_branches,
1859 fpa.config_info.mirror_references,
1860 fpa.config_info.symrefs,
1861 fpa.config_info.wanted_branches,
1862 fpa.config_info.wanted_refs, fpa.repo);
1869 printf("Created %s repository '%s'\n",
1870 mirror_references ? "mirrored" : "cloned", repo_path);
1873 const struct got_error *pack_err =
1874 got_repo_pack_fds_close(pack_fds);
1879 if (kill(fetchpid, SIGTERM) == -1)
1880 error = got_error_from_errno("kill");
1881 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1882 error = got_error_from_errno("waitpid");
1884 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1885 error = got_error_from_errno("close");
1887 const struct got_error *close_err = got_repo_close(repo);
1891 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1892 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1893 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1894 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1901 free(default_destdir);
1906 static const struct got_error *
1907 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1908 int replace_tags, int verbosity, struct got_repository *repo)
1910 const struct got_error *err = NULL;
1911 char *new_id_str = NULL;
1912 struct got_object_id *old_id = NULL;
1914 err = got_object_id_str(&new_id_str, new_id);
1918 if (!replace_tags &&
1919 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1920 err = got_ref_resolve(&old_id, repo, ref);
1923 if (got_object_id_cmp(old_id, new_id) == 0)
1925 if (verbosity >= 0) {
1926 printf("Rejecting update of existing tag %s: %s\n",
1927 got_ref_get_name(ref), new_id_str);
1932 if (got_ref_is_symbolic(ref)) {
1933 if (verbosity >= 0) {
1934 printf("Replacing reference %s: %s\n",
1935 got_ref_get_name(ref),
1936 got_ref_get_symref_target(ref));
1938 err = got_ref_change_symref_to_ref(ref, new_id);
1941 err = got_ref_write(ref, repo);
1945 err = got_ref_resolve(&old_id, repo, ref);
1948 if (got_object_id_cmp(old_id, new_id) == 0)
1951 err = got_ref_change_ref(ref, new_id);
1954 err = got_ref_write(ref, repo);
1960 printf("Updated %s: %s\n", got_ref_get_name(ref),
1968 static const struct got_error *
1969 update_wanted_ref(const char *refname, struct got_object_id *id,
1970 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1972 const struct got_error *err, *unlock_err;
1973 char *remote_refname;
1974 struct got_reference *ref;
1976 if (strncmp("refs/", refname, 5) == 0)
1979 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1980 remote_repo_name, refname) == -1)
1981 return got_error_from_errno("asprintf");
1983 err = got_ref_open(&ref, repo, remote_refname, 1);
1985 if (err->code != GOT_ERR_NOT_REF)
1987 err = create_ref(remote_refname, id, verbosity, repo);
1989 err = update_ref(ref, id, 0, verbosity, repo);
1990 unlock_err = got_ref_unlock(ref);
1991 if (unlock_err && err == NULL)
1996 free(remote_refname);
2001 usage_checkout(void)
2003 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2004 "[-p path-prefix] repository-path [work-tree-path]\n",
2010 show_worktree_base_ref_warning(void)
2012 fprintf(stderr, "%s: warning: could not create a reference "
2013 "to the work tree's base commit; the commit could be "
2014 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2015 "repository writable and running 'got update' will prevent this\n",
2019 struct got_checkout_progress_arg {
2020 const char *worktree_path;
2021 int had_base_commit_ref_error;
2025 static const struct got_error *
2026 checkout_progress(void *arg, unsigned char status, const char *path)
2028 struct got_checkout_progress_arg *a = arg;
2030 /* Base commit bump happens silently. */
2031 if (status == GOT_STATUS_BUMP_BASE)
2034 if (status == GOT_STATUS_BASE_REF_ERR) {
2035 a->had_base_commit_ref_error = 1;
2039 while (path[0] == '/')
2042 if (a->verbosity >= 0)
2043 printf("%c %s/%s\n", status, a->worktree_path, path);
2048 static const struct got_error *
2049 check_cancelled(void *arg)
2051 if (sigint_received || sigpipe_received)
2052 return got_error(GOT_ERR_CANCELLED);
2056 static const struct got_error *
2057 check_linear_ancestry(struct got_object_id *commit_id,
2058 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2059 struct got_repository *repo)
2061 const struct got_error *err = NULL;
2062 struct got_object_id *yca_id;
2064 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2065 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2070 return got_error(GOT_ERR_ANCESTRY);
2073 * Require a straight line of history between the target commit
2074 * and the work tree's base commit.
2076 * Non-linear situations such as this require a rebase:
2078 * (commit) D F (base_commit)
2086 * 'got update' only handles linear cases:
2087 * Update forwards in time: A (base/yca) - B - C - D (commit)
2088 * Update backwards in time: D (base) - C - B - A (commit/yca)
2090 if (allow_forwards_in_time_only) {
2091 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2092 return got_error(GOT_ERR_ANCESTRY);
2093 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2094 got_object_id_cmp(base_commit_id, yca_id) != 0)
2095 return got_error(GOT_ERR_ANCESTRY);
2101 static const struct got_error *
2102 check_same_branch(struct got_object_id *commit_id,
2103 struct got_reference *head_ref, struct got_repository *repo)
2105 const struct got_error *err = NULL;
2106 struct got_commit_graph *graph = NULL;
2107 struct got_object_id *head_commit_id = NULL;
2109 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2113 if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2116 err = got_commit_graph_open(&graph, "/", 1);
2120 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2121 check_cancelled, NULL);
2126 struct got_object_id id;
2128 err = got_commit_graph_iter_next(&id, graph, repo,
2129 check_cancelled, NULL);
2131 if (err->code == GOT_ERR_ITER_COMPLETED)
2132 err = got_error(GOT_ERR_ANCESTRY);
2136 if (got_object_id_cmp(&id, commit_id) == 0)
2141 got_commit_graph_close(graph);
2142 free(head_commit_id);
2146 static const struct got_error *
2147 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2149 static char msg[512];
2150 const char *branch_name;
2152 if (got_ref_is_symbolic(ref))
2153 branch_name = got_ref_get_symref_target(ref);
2155 branch_name = got_ref_get_name(ref);
2157 if (strncmp("refs/heads/", branch_name, 11) == 0)
2160 snprintf(msg, sizeof(msg),
2161 "target commit is not contained in branch '%s'; "
2162 "the branch to use must be specified with -b; "
2163 "if necessary a new branch can be created for "
2164 "this commit with 'got branch -c %s BRANCH_NAME'",
2165 branch_name, commit_id_str);
2167 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2170 static const struct got_error *
2171 cmd_checkout(int argc, char *argv[])
2173 const struct got_error *error = NULL;
2174 struct got_repository *repo = NULL;
2175 struct got_reference *head_ref = NULL, *ref = NULL;
2176 struct got_worktree *worktree = NULL;
2177 char *repo_path = NULL;
2178 char *worktree_path = NULL;
2179 const char *path_prefix = "";
2180 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2181 char *commit_id_str = NULL;
2182 struct got_object_id *commit_id = NULL;
2184 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2185 struct got_pathlist_head paths;
2186 struct got_checkout_progress_arg cpa;
2187 int *pack_fds = NULL;
2192 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2193 "unveil", NULL) == -1)
2197 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2200 branch_name = optarg;
2203 commit_id_str = strdup(optarg);
2204 if (commit_id_str == NULL)
2205 return got_error_from_errno("strdup");
2211 path_prefix = optarg;
2226 char *base, *dotgit;
2228 repo_path = realpath(argv[0], NULL);
2229 if (repo_path == NULL)
2230 return got_error_from_errno2("realpath", argv[0]);
2231 cwd = getcwd(NULL, 0);
2233 error = got_error_from_errno("getcwd");
2240 error = got_path_basename(&base, path);
2243 dotgit = strstr(base, ".git");
2246 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2247 error = got_error_from_errno("asprintf");
2252 } else if (argc == 2) {
2253 repo_path = realpath(argv[0], NULL);
2254 if (repo_path == NULL) {
2255 error = got_error_from_errno2("realpath", argv[0]);
2258 worktree_path = realpath(argv[1], NULL);
2259 if (worktree_path == NULL) {
2260 if (errno != ENOENT) {
2261 error = got_error_from_errno2("realpath",
2265 worktree_path = strdup(argv[1]);
2266 if (worktree_path == NULL) {
2267 error = got_error_from_errno("strdup");
2274 got_path_strip_trailing_slashes(repo_path);
2275 got_path_strip_trailing_slashes(worktree_path);
2277 error = got_repo_pack_fds_open(&pack_fds);
2281 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2285 /* Pre-create work tree path for unveil(2) */
2286 error = got_path_mkdir(worktree_path);
2288 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2289 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2291 if (!allow_nonempty &&
2292 !got_path_dir_is_empty(worktree_path)) {
2293 error = got_error_path(worktree_path,
2294 GOT_ERR_DIR_NOT_EMPTY);
2299 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2303 error = got_ref_open(&head_ref, repo, branch_name, 0);
2307 error = got_worktree_init(worktree_path, head_ref, path_prefix,
2308 GOT_WORKTREE_CVG_DIR, repo);
2309 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2312 error = got_worktree_open(&worktree, worktree_path, GOT_WORKTREE_CVG_DIR);
2316 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2320 if (!same_path_prefix) {
2321 error = got_error(GOT_ERR_PATH_PREFIX);
2325 if (commit_id_str) {
2326 struct got_reflist_head refs;
2328 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2332 error = got_repo_match_object_id(&commit_id, NULL,
2333 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2334 got_ref_list_free(&refs);
2337 error = check_linear_ancestry(commit_id,
2338 got_worktree_get_base_commit_id(worktree), 0, repo);
2339 if (error != NULL) {
2340 if (error->code == GOT_ERR_ANCESTRY) {
2341 error = checkout_ancestry_error(
2342 head_ref, commit_id_str);
2346 error = check_same_branch(commit_id, head_ref, repo);
2348 if (error->code == GOT_ERR_ANCESTRY) {
2349 error = checkout_ancestry_error(
2350 head_ref, commit_id_str);
2354 error = got_worktree_set_base_commit_id(worktree, repo,
2358 /* Expand potentially abbreviated commit ID string. */
2359 free(commit_id_str);
2360 error = got_object_id_str(&commit_id_str, commit_id);
2364 commit_id = got_object_id_dup(
2365 got_worktree_get_base_commit_id(worktree));
2366 if (commit_id == NULL) {
2367 error = got_error_from_errno("got_object_id_dup");
2370 error = got_object_id_str(&commit_id_str, commit_id);
2375 error = got_pathlist_append(&paths, "", NULL);
2378 cpa.worktree_path = worktree_path;
2379 cpa.had_base_commit_ref_error = 0;
2380 cpa.verbosity = verbosity;
2381 error = got_worktree_checkout_files(worktree, &paths, repo,
2382 checkout_progress, &cpa, check_cancelled, NULL);
2386 if (got_ref_is_symbolic(head_ref)) {
2387 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
2390 refname = got_ref_get_name(ref);
2392 refname = got_ref_get_name(head_ref);
2393 printf("Checked out %s: %s\n", refname, commit_id_str);
2394 printf("Now shut up and hack\n");
2395 if (cpa.had_base_commit_ref_error)
2396 show_worktree_base_ref_warning();
2399 const struct got_error *pack_err =
2400 got_repo_pack_fds_close(pack_fds);
2405 got_ref_close(head_ref);
2409 const struct got_error *close_err = got_repo_close(repo);
2413 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2414 free(commit_id_str);
2417 free(worktree_path);
2422 struct got_update_progress_arg {
2434 print_update_progress_stats(struct got_update_progress_arg *upa)
2436 if (!upa->did_something)
2439 if (upa->conflicts > 0)
2440 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2441 if (upa->obstructed > 0)
2442 printf("File paths obstructed by a non-regular file: %d\n",
2444 if (upa->not_updated > 0)
2445 printf("Files not updated because of existing merge "
2446 "conflicts: %d\n", upa->not_updated);
2450 * The meaning of some status codes differs between merge-style operations and
2451 * update operations. For example, the ! status code means "file was missing"
2452 * if changes were merged into the work tree, and "missing file was restored"
2453 * if the work tree was updated. This function should be used by any operation
2454 * which merges changes into the work tree without updating the work tree.
2457 print_merge_progress_stats(struct got_update_progress_arg *upa)
2459 if (!upa->did_something)
2462 if (upa->conflicts > 0)
2463 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2464 if (upa->obstructed > 0)
2465 printf("File paths obstructed by a non-regular file: %d\n",
2467 if (upa->missing > 0)
2468 printf("Files which had incoming changes but could not be "
2469 "found in the work tree: %d\n", upa->missing);
2470 if (upa->not_deleted > 0)
2471 printf("Files not deleted due to differences in deleted "
2472 "content: %d\n", upa->not_deleted);
2473 if (upa->unversioned > 0)
2474 printf("Files not merged because an unversioned file was "
2475 "found in the work tree: %d\n", upa->unversioned);
2481 fprintf(stderr, "usage: %s update [-qtvX] [-c commit] [-r remote] "
2482 "[path ...]\n", getprogname());
2486 static const struct got_error *
2487 update_progress(void *arg, unsigned char status, const char *path)
2489 struct got_update_progress_arg *upa = arg;
2491 if (status == GOT_STATUS_EXISTS ||
2492 status == GOT_STATUS_BASE_REF_ERR)
2495 upa->did_something = 1;
2497 /* Base commit bump happens silently. */
2498 if (status == GOT_STATUS_BUMP_BASE)
2501 if (status == GOT_STATUS_CONFLICT)
2503 if (status == GOT_STATUS_OBSTRUCTED)
2505 if (status == GOT_STATUS_CANNOT_UPDATE)
2507 if (status == GOT_STATUS_MISSING)
2509 if (status == GOT_STATUS_CANNOT_DELETE)
2511 if (status == GOT_STATUS_UNVERSIONED)
2514 while (path[0] == '/')
2516 if (upa->verbosity >= 0)
2517 printf("%c %s\n", status, path);
2522 static const struct got_error *
2523 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2525 const struct got_error *err;
2528 err = got_worktree_rebase_in_progress(&in_progress, worktree);
2532 return got_error(GOT_ERR_REBASING);
2534 err = got_worktree_histedit_in_progress(&in_progress, worktree);
2538 return got_error(GOT_ERR_HISTEDIT_BUSY);
2543 static const struct got_error *
2544 check_merge_in_progress(struct got_worktree *worktree,
2545 struct got_repository *repo)
2547 const struct got_error *err;
2550 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
2554 return got_error(GOT_ERR_MERGE_BUSY);
2559 static const struct got_error *
2560 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2561 char *argv[], struct got_worktree *worktree)
2563 const struct got_error *err = NULL;
2565 struct got_pathlist_entry *new;
2571 return got_error_from_errno("strdup");
2572 return got_pathlist_append(paths, path, NULL);
2575 for (i = 0; i < argc; i++) {
2576 err = got_worktree_resolve_path(&path, worktree, argv[i]);
2579 err = got_pathlist_insert(&new, paths, path, NULL);
2580 if (err || new == NULL /* duplicate */) {
2590 static const struct got_error *
2591 wrap_not_worktree_error(const struct got_error *orig_err,
2592 const char *cmdname, const char *path)
2594 const struct got_error *err;
2595 struct got_repository *repo;
2596 static char msg[512];
2597 int *pack_fds = NULL;
2599 err = got_repo_pack_fds_open(&pack_fds);
2603 err = got_repo_open(&repo, path, NULL, pack_fds);
2607 snprintf(msg, sizeof(msg),
2608 "'got %s' needs a work tree in addition to a git repository\n"
2609 "Work trees can be checked out from this Git repository with "
2611 "The got(1) manual page contains more information.", cmdname);
2612 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2614 const struct got_error *close_err = got_repo_close(repo);
2619 const struct got_error *pack_err =
2620 got_repo_pack_fds_close(pack_fds);
2627 static const struct got_error *
2628 cmd_update(int argc, char *argv[])
2630 const struct got_error *error = NULL, *unlock_err;
2631 char *worktree_path = NULL;
2632 const char *repo_path = NULL;
2633 const char *remote_name = NULL;
2634 char *proto = NULL, *host = NULL, *port = NULL;
2635 char *repo_name = NULL, *server_path = NULL;
2636 const struct got_remote_repo *remotes, *remote = NULL;
2638 char *id_str = NULL;
2639 struct got_repository *repo = NULL;
2640 struct got_worktree *worktree = NULL;
2641 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2642 struct got_pathlist_head paths, refs, symrefs;
2643 struct got_pathlist_head wanted_branches, wanted_refs;
2644 struct got_pathlist_entry *pe;
2645 struct got_reflist_head remote_refs;
2646 struct got_reflist_entry *re;
2647 struct got_object_id *pack_hash = NULL;
2648 int i, ch, fetchfd = -1, fetchstatus;
2649 pid_t fetchpid = -1;
2650 struct got_fetch_progress_arg fpa;
2651 struct got_update_progress_arg upa;
2653 int delete_remote = 0;
2654 int replace_tags = 0;
2655 int *pack_fds = NULL;
2656 const char *remote_head = NULL, *worktree_branch = NULL;
2657 struct got_object_id *commit_id = NULL;
2658 char *commit_id_str = NULL;
2659 const char *refname;
2660 struct got_reference *head_ref = NULL;
2664 TAILQ_INIT(&symrefs);
2665 TAILQ_INIT(&remote_refs);
2666 TAILQ_INIT(&wanted_branches);
2667 TAILQ_INIT(&wanted_refs);
2669 while ((ch = getopt(argc, argv, "c:qr:vX")) != -1) {
2672 commit_id_str = strdup(optarg);
2673 if (commit_id_str == NULL)
2674 return got_error_from_errno("strdup");
2683 remote_name = optarg;
2688 else if (verbosity < 3)
2702 if (delete_remote) {
2704 option_conflict('X', 't');
2705 if (remote_name == NULL)
2706 errx(1, "-X option requires a remote name");
2708 if (remote_name == NULL)
2709 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2711 worktree_path = getcwd(NULL, 0);
2712 if (worktree_path == NULL) {
2713 error = got_error_from_errno("getcwd");
2716 error = got_worktree_open(&worktree, worktree_path, GOT_WORKTREE_CVG_DIR);
2718 if (error->code == GOT_ERR_NOT_WORKTREE)
2719 error = wrap_not_worktree_error(error, "update",
2723 repo_path = got_worktree_get_repo_path(worktree);
2725 error = got_repo_pack_fds_open(&pack_fds);
2729 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2733 error = check_rebase_or_histedit_in_progress(worktree);
2736 error = check_merge_in_progress(worktree, repo);
2740 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2744 worktree_conf = got_worktree_get_gotconfig(worktree);
2745 if (worktree_conf) {
2746 got_gotconfig_get_remotes(&nremotes, &remotes,
2748 for (i = 0; i < nremotes; i++) {
2749 if (strcmp(remotes[i].name, remote_name) == 0) {
2750 remote = &remotes[i];
2756 if (remote == NULL) {
2757 repo_conf = got_repo_get_gotconfig(repo);
2759 got_gotconfig_get_remotes(&nremotes, &remotes,
2761 for (i = 0; i < nremotes; i++) {
2762 if (strcmp(remotes[i].name, remote_name) == 0) {
2763 remote = &remotes[i];
2769 if (remote == NULL) {
2770 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2771 for (i = 0; i < nremotes; i++) {
2772 if (strcmp(remotes[i].name, remote_name) == 0) {
2773 remote = &remotes[i];
2778 if (remote == NULL) {
2779 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2783 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2784 &repo_name, remote->fetch_url);
2788 if (strcmp(proto, "git") == 0) {
2790 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2791 "sendfd dns inet unveil", NULL) == -1)
2794 } else if (strcmp(proto, "git+ssh") == 0 ||
2795 strcmp(proto, "ssh") == 0) {
2797 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2798 "sendfd unveil", NULL) == -1)
2801 } else if (strcmp(proto, "http") == 0 ||
2802 strcmp(proto, "git+http") == 0) {
2803 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2806 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2810 error = got_dial_apply_unveil(proto);
2814 error = apply_unveil(got_repo_get_path(repo), 0,
2815 got_worktree_get_root_path(worktree));
2819 if (verbosity >= 0) {
2820 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2821 remote->name, proto, host,
2822 port ? ":" : "", port ? port : "",
2823 *server_path == '/' ? "" : "/", server_path);
2826 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2827 server_path, verbosity);
2832 * If set, get this remote's HEAD ref target so
2833 * if it has changed on the server we can fetch it.
2835 error = got_ref_list(&remote_refs, repo, "refs/remotes",
2836 got_ref_cmp_by_name, repo);
2840 TAILQ_FOREACH(re, &remote_refs, entry) {
2841 const char *remote_refname, *remote_target;
2842 size_t remote_name_len;
2844 if (!got_ref_is_symbolic(re->ref))
2847 remote_name_len = strlen(remote->name);
2848 remote_refname = got_ref_get_name(re->ref);
2850 /* we only want refs/remotes/$remote->name/HEAD */
2851 if (strncmp(remote_refname + 13, remote->name,
2852 remote_name_len) != 0)
2855 if (strcmp(remote_refname + remote_name_len + 14,
2860 * Take the name itself because we already
2861 * only match with refs/heads/ in fetch_pack().
2863 remote_target = got_ref_get_symref_target(re->ref);
2864 remote_head = remote_target + remote_name_len + 14;
2868 refname = got_worktree_get_head_ref_name(worktree);
2869 if (strncmp(refname, "refs/heads/", 11) == 0)
2870 worktree_branch = refname;
2872 fpa.last_scaled_size[0] = '\0';
2873 fpa.last_p_indexed = -1;
2874 fpa.last_p_resolved = -1;
2875 fpa.verbosity = verbosity;
2877 fpa.create_configs = 0;
2878 fpa.configs_created = 0;
2879 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2881 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2882 remote->mirror_references, 0, &wanted_branches, &wanted_refs,
2883 0, verbosity, fetchfd, repo, worktree_branch, remote_head,
2884 0, fetch_progress, &fpa);
2888 if (pack_hash != NULL && verbosity >= 0) {
2889 error = got_object_id_str(&id_str, pack_hash);
2892 printf("\nFetched %s.pack\n", id_str);
2897 /* Update references provided with the pack file. */
2898 TAILQ_FOREACH(pe, &refs, entry) {
2899 const char *refname = pe->path;
2900 struct got_object_id *id = pe->data;
2901 struct got_reference *ref;
2903 if (is_wanted_ref(&wanted_refs, refname)) {
2904 error = update_wanted_ref(refname, id,
2905 remote->name, verbosity, repo);
2911 error = got_ref_open(&ref, repo, refname, 1);
2913 if (error->code != GOT_ERR_NOT_REF)
2915 error = create_ref(refname, id, verbosity,
2920 error = update_ref(ref, id, replace_tags,
2922 unlock_err = got_ref_unlock(ref);
2923 if (unlock_err && error == NULL)
2931 /* Update worktree */
2932 error = got_ref_open(&head_ref, repo,
2933 got_worktree_get_head_ref_name(worktree), 0);
2936 if (commit_id_str == NULL) {
2937 error = got_ref_resolve(&commit_id, repo, head_ref);
2940 error = got_object_id_str(&commit_id_str, commit_id);
2944 struct got_reflist_head refs;
2946 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2950 error = got_repo_match_object_id(&commit_id, NULL,
2951 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2952 got_ref_list_free(&refs);
2953 free(commit_id_str);
2954 commit_id_str = NULL;
2957 error = got_object_id_str(&commit_id_str, commit_id);
2963 error = check_linear_ancestry(commit_id,
2964 got_worktree_get_base_commit_id(worktree), 0, repo);
2965 if (error != NULL) {
2966 if (error->code == GOT_ERR_ANCESTRY)
2967 error = got_error(GOT_ERR_BRANCH_MOVED);
2970 error = check_same_branch(commit_id, head_ref, repo);
2974 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2976 error = got_worktree_set_base_commit_id(worktree, repo,
2982 memset(&upa, 0, sizeof(upa));
2983 upa.verbosity = verbosity;
2984 error = got_worktree_checkout_files(worktree, &paths, repo,
2985 update_progress, &upa, check_cancelled, NULL);
2989 if (upa.did_something) {
2990 printf("Updated to %s: %s\n",
2991 got_worktree_get_head_ref_name(worktree), commit_id_str);
2993 printf("Already up-to-date\n");
2995 print_update_progress_stats(&upa);
2998 if (kill(fetchpid, SIGTERM) == -1)
2999 error = got_error_from_errno("kill");
3000 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
3001 error = got_error_from_errno("waitpid");
3003 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
3004 error = got_error_from_errno("close");
3006 const struct got_error *close_err = got_repo_close(repo);
3011 got_worktree_close(worktree);
3013 const struct got_error *pack_err =
3014 got_repo_pack_fds_close(pack_fds);
3018 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3019 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
3020 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
3021 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
3022 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
3023 got_ref_list_free(&remote_refs);
3025 free(worktree_path);
3033 free(commit_id_str);
3037 static const struct got_error *
3038 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3039 const char *path, int diff_context, int ignore_whitespace,
3040 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3041 struct got_repository *repo, FILE *outfile)
3043 const struct got_error *err = NULL;
3044 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3045 FILE *f1 = NULL, *f2 = NULL;
3046 int fd1 = -1, fd2 = -1;
3048 fd1 = got_opentempfd();
3050 return got_error_from_errno("got_opentempfd");
3051 fd2 = got_opentempfd();
3053 err = got_error_from_errno("got_opentempfd");
3058 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3064 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3068 f1 = got_opentemp();
3070 err = got_error_from_errno("got_opentemp");
3073 f2 = got_opentemp();
3075 err = got_error_from_errno("got_opentemp");
3079 while (path[0] == '/')
3081 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3082 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3083 force_text_diff, dsa, outfile);
3085 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3086 err = got_error_from_errno("close");
3088 got_object_blob_close(blob1);
3089 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3090 err = got_error_from_errno("close");
3092 got_object_blob_close(blob2);
3093 if (f1 && fclose(f1) == EOF && err == NULL)
3094 err = got_error_from_errno("fclose");
3095 if (f2 && fclose(f2) == EOF && err == NULL)
3096 err = got_error_from_errno("fclose");
3100 static const struct got_error *
3101 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3102 const char *path, int diff_context, int ignore_whitespace,
3103 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3104 struct got_repository *repo, FILE *outfile)
3106 const struct got_error *err = NULL;
3107 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3108 struct got_diff_blob_output_unidiff_arg arg;
3109 FILE *f1 = NULL, *f2 = NULL;
3110 int fd1 = -1, fd2 = -1;
3113 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3116 fd1 = got_opentempfd();
3118 err = got_error_from_errno("got_opentempfd");
3123 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3127 f1 = got_opentemp();
3129 err = got_error_from_errno("got_opentemp");
3133 f2 = got_opentemp();
3135 err = got_error_from_errno("got_opentemp");
3138 fd2 = got_opentempfd();
3140 err = got_error_from_errno("got_opentempfd");
3143 arg.diff_context = diff_context;
3144 arg.ignore_whitespace = ignore_whitespace;
3145 arg.force_text_diff = force_text_diff;
3147 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3148 arg.outfile = outfile;
3151 while (path[0] == '/')
3153 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3154 got_diff_blob_output_unidiff, &arg, 1);
3157 got_object_tree_close(tree1);
3159 got_object_tree_close(tree2);
3160 if (f1 && fclose(f1) == EOF && err == NULL)
3161 err = got_error_from_errno("fclose");
3162 if (f2 && fclose(f2) == EOF && err == NULL)
3163 err = got_error_from_errno("fclose");
3164 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3165 err = got_error_from_errno("close");
3166 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3167 err = got_error_from_errno("close");
3171 static const struct got_error *
3172 get_changed_paths(struct got_pathlist_head *paths,
3173 struct got_commit_object *commit, struct got_repository *repo,
3174 struct got_diffstat_cb_arg *dsa)
3176 const struct got_error *err = NULL;
3177 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3178 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3179 struct got_object_qid *qid;
3180 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3181 FILE *f1 = NULL, *f2 = NULL;
3182 int fd1 = -1, fd2 = -1;
3185 cb = got_diff_tree_compute_diffstat;
3187 f1 = got_opentemp();
3189 err = got_error_from_errno("got_opentemp");
3192 f2 = got_opentemp();
3194 err = got_error_from_errno("got_opentemp");
3197 fd1 = got_opentempfd();
3199 err = got_error_from_errno("got_opentempfd");
3202 fd2 = got_opentempfd();
3204 err = got_error_from_errno("got_opentempfd");
3209 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3211 struct got_commit_object *pcommit;
3212 err = got_object_open_as_commit(&pcommit, repo,
3217 tree_id1 = got_object_id_dup(
3218 got_object_commit_get_tree_id(pcommit));
3219 if (tree_id1 == NULL) {
3220 got_object_commit_close(pcommit);
3221 return got_error_from_errno("got_object_id_dup");
3223 got_object_commit_close(pcommit);
3228 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3233 tree_id2 = got_object_commit_get_tree_id(commit);
3234 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3238 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3239 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3242 got_object_tree_close(tree1);
3244 got_object_tree_close(tree2);
3245 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3246 err = got_error_from_errno("close");
3247 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3248 err = got_error_from_errno("close");
3249 if (f1 && fclose(f1) == EOF && err == NULL)
3250 err = got_error_from_errno("fclose");
3251 if (f2 && fclose(f2) == EOF && err == NULL)
3252 err = got_error_from_errno("fclose");
3257 static const struct got_error *
3258 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3259 const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3260 struct got_repository *repo, FILE *outfile)
3262 const struct got_error *err = NULL;
3263 struct got_commit_object *pcommit = NULL;
3264 char *id_str1 = NULL, *id_str2 = NULL;
3265 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3266 struct got_object_qid *qid;
3268 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3270 err = got_object_open_as_commit(&pcommit, repo,
3274 err = got_object_id_str(&id_str1, &qid->id);
3279 err = got_object_id_str(&id_str2, id);
3283 if (path && path[0] != '\0') {
3285 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3289 err = got_object_id_by_path(&obj_id1, repo,
3292 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3298 err = got_object_get_type(&obj_type, repo, obj_id2);
3304 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3305 fprintf(outfile, "commit - %s\n",
3306 id_str1 ? id_str1 : "/dev/null");
3307 fprintf(outfile, "commit + %s\n", id_str2);
3309 case GOT_OBJ_TYPE_BLOB:
3310 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3311 0, 0, dsa, repo, outfile);
3313 case GOT_OBJ_TYPE_TREE:
3314 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3315 0, 0, dsa, repo, outfile);
3318 err = got_error(GOT_ERR_OBJ_TYPE);
3324 obj_id2 = got_object_commit_get_tree_id(commit);
3326 obj_id1 = got_object_commit_get_tree_id(pcommit);
3328 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3329 fprintf(outfile, "commit - %s\n",
3330 id_str1 ? id_str1 : "/dev/null");
3331 fprintf(outfile, "commit + %s\n", id_str2);
3332 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3333 dsa, repo, outfile);
3339 got_object_commit_close(pcommit);
3344 get_datestr(time_t *time, char *datebuf)
3346 struct tm mytm, *tm;
3349 tm = gmtime_r(time, &mytm);
3352 s = asctime_r(tm, datebuf);
3355 p = strchr(s, '\n');
3361 static const struct got_error *
3362 match_commit(int *have_match, struct got_object_id *id,
3363 struct got_commit_object *commit, regex_t *regex)
3365 const struct got_error *err = NULL;
3366 regmatch_t regmatch;
3367 char *id_str = NULL, *logmsg = NULL;
3371 err = got_object_id_str(&id_str, id);
3375 err = got_object_commit_get_logmsg(&logmsg, commit);
3379 if (regexec(regex, got_object_commit_get_author(commit), 1,
3380 ®match, 0) == 0 ||
3381 regexec(regex, got_object_commit_get_committer(commit), 1,
3382 ®match, 0) == 0 ||
3383 regexec(regex, id_str, 1, ®match, 0) == 0 ||
3384 regexec(regex, logmsg, 1, ®match, 0) == 0)
3393 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3396 regmatch_t regmatch;
3397 struct got_pathlist_entry *pe;
3401 TAILQ_FOREACH(pe, changed_paths, entry) {
3402 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3409 static const struct got_error *
3410 match_patch(int *have_match, struct got_commit_object *commit,
3411 struct got_object_id *id, const char *path, int diff_context,
3412 struct got_repository *repo, regex_t *regex, FILE *f)
3414 const struct got_error *err = NULL;
3416 size_t linesize = 0;
3417 regmatch_t regmatch;
3421 err = got_opentemp_truncate(f);
3425 err = print_patch(commit, id, path, diff_context, NULL, repo, f);
3429 if (fseeko(f, 0L, SEEK_SET) == -1) {
3430 err = got_error_from_errno("fseeko");
3434 while (getline(&line, &linesize, f) != -1) {
3435 if (regexec(regex, line, 1, ®match, 0) == 0) {
3445 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3447 static const struct got_error*
3448 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3449 struct got_object_id *id, struct got_repository *repo,
3452 static const struct got_error *err = NULL;
3453 struct got_reflist_entry *re;
3459 TAILQ_FOREACH(re, refs, entry) {
3460 struct got_tag_object *tag = NULL;
3461 struct got_object_id *ref_id;
3464 name = got_ref_get_name(re->ref);
3465 if (strcmp(name, GOT_REF_HEAD) == 0)
3467 if (strncmp(name, "refs/", 5) == 0)
3469 if (strncmp(name, "got/", 4) == 0)
3471 if (strncmp(name, "heads/", 6) == 0)
3473 if (strncmp(name, "remotes/", 8) == 0) {
3477 s = strstr(name, "/" GOT_REF_HEAD);
3478 if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
3481 err = got_ref_resolve(&ref_id, repo, re->ref);
3484 if (strncmp(name, "tags/", 5) == 0) {
3485 err = got_object_open_as_tag(&tag, repo, ref_id);
3487 if (err->code != GOT_ERR_OBJ_TYPE) {
3491 /* Ref points at something other than a tag. */
3496 cmp = got_object_id_cmp(tag ?
3497 got_object_tag_get_object_id(tag) : ref_id, id);
3500 got_object_tag_close(tag);
3504 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3505 s ? ", " : "", name) == -1) {
3506 err = got_error_from_errno("asprintf");
3517 static const struct got_error *
3518 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3519 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3521 const struct got_error *err = NULL;
3522 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3523 char *comma, *s, *nl;
3524 struct got_reflist_head *refs;
3525 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3527 time_t committer_time;
3529 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3531 err = build_refs_str(&ref_str, refs, id, repo, 1);
3535 /* Display the first matching ref only. */
3536 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3540 if (ref_str == NULL) {
3541 err = got_object_id_str(&id_str, id);
3546 committer_time = got_object_commit_get_committer_time(commit);
3547 if (gmtime_r(&committer_time, &tm) == NULL) {
3548 err = got_error_from_errno("gmtime_r");
3551 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3552 err = got_error(GOT_ERR_NO_SPACE);
3556 err = got_object_commit_get_logmsg(&logmsg0, commit);
3561 while (isspace((unsigned char)s[0]))
3564 nl = strchr(s, '\n');
3570 printf("%s%-7s %s\n", datebuf, ref_str, s);
3572 printf("%s%.7s %s\n", datebuf, id_str, s);
3574 if (fflush(stdout) != 0 && err == NULL)
3575 err = got_error_from_errno("fflush");
3583 static const struct got_error *
3584 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
3586 struct got_pathlist_entry *pe;
3589 printf("%s\n", header);
3591 TAILQ_FOREACH(pe, dsa->paths, entry) {
3592 struct got_diff_changed_path *cp = pe->data;
3593 int pad = dsa->max_path_len - pe->path_len + 1;
3595 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
3596 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
3598 printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
3599 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
3600 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
3602 if (fflush(stdout) != 0)
3603 return got_error_from_errno("fflush");
3608 static const struct got_error *
3614 if (fseeko(f, 0L, SEEK_SET) == -1)
3615 return got_error_from_errno("fseek");
3618 r = fread(buf, 1, sizeof(buf), f);
3621 return got_error_from_errno("fread");
3625 if (fwrite(buf, 1, r, stdout) != r)
3626 return got_ferror(stdout, GOT_ERR_IO);
3632 static const struct got_error *
3633 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3634 struct got_repository *repo, const char *path,
3635 struct got_pathlist_head *changed_paths,
3636 struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
3637 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
3640 const struct got_error *err = NULL;
3642 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3644 time_t committer_time;
3645 const char *author, *committer;
3646 char *refs_str = NULL;
3648 err = got_object_id_str(&id_str, id);
3652 if (custom_refs_str == NULL) {
3653 struct got_reflist_head *refs;
3654 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3656 err = build_refs_str(&refs_str, refs, id, repo, 0);
3662 printf(GOT_COMMIT_SEP_STR);
3663 if (custom_refs_str)
3664 printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
3667 printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
3668 refs_str ? " (" : "", refs_str ? refs_str : "",
3669 refs_str ? ")" : "");
3674 printf("from: %s\n", got_object_commit_get_author(commit));
3675 author = got_object_commit_get_author(commit);
3676 committer = got_object_commit_get_committer(commit);
3677 if (strcmp(author, committer) != 0)
3678 printf("via: %s\n", committer);
3679 committer_time = got_object_commit_get_committer_time(commit);
3680 datestr = get_datestr(&committer_time, datebuf);
3682 printf("date: %s UTC\n", datestr);
3683 if (got_object_commit_get_nparents(commit) > 1) {
3684 const struct got_object_id_queue *parent_ids;
3685 struct got_object_qid *qid;
3687 parent_ids = got_object_commit_get_parent_ids(commit);
3688 STAILQ_FOREACH(qid, parent_ids, entry) {
3689 err = got_object_id_str(&id_str, &qid->id);
3692 printf("parent %d: %s\n", n++, id_str);
3698 err = got_object_commit_get_logmsg(&logmsg0, commit);
3704 line = strsep(&logmsg, "\n");
3706 printf(" %s\n", line);
3710 if (changed_paths && diffstat == NULL) {
3711 struct got_pathlist_entry *pe;
3713 TAILQ_FOREACH(pe, changed_paths, entry) {
3714 struct got_diff_changed_path *cp = pe->data;
3716 printf(" %c %s\n", cp->status, pe->path);
3724 err = got_error_from_errno("got_opentemp");
3729 err = print_patch(commit, id, path, diff_context, diffstat,
3730 repo, diffstat == NULL ? stdout : f);
3735 err = print_diffstat(diffstat, NULL);
3747 if (fflush(stdout) != 0 && err == NULL)
3748 err = got_error_from_errno("fflush");
3750 if (f && fclose(f) == EOF && err == NULL)
3751 err = got_error_from_errno("fclose");
3757 static const struct got_error *
3758 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3759 struct got_repository *repo, const char *path, int show_changed_paths,
3760 int show_diffstat, int show_patch, const char *search_pattern,
3761 int diff_context, int limit, int log_branches, int reverse_display_order,
3762 struct got_reflist_object_id_map *refs_idmap, int one_line,
3765 const struct got_error *err;
3766 struct got_commit_graph *graph;
3769 struct got_object_id_queue reversed_commits;
3770 struct got_object_qid *qid;
3771 struct got_commit_object *commit;
3772 struct got_pathlist_head changed_paths;
3774 STAILQ_INIT(&reversed_commits);
3775 TAILQ_INIT(&changed_paths);
3777 if (search_pattern && regcomp(®ex, search_pattern,
3778 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3779 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3781 err = got_commit_graph_open(&graph, path, !log_branches);
3784 err = got_commit_graph_iter_start(graph, root_id, repo,
3785 check_cancelled, NULL);
3789 struct got_object_id id;
3790 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3791 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3793 if (sigint_received || sigpipe_received)
3796 err = got_commit_graph_iter_next(&id, graph, repo,
3797 check_cancelled, NULL);
3799 if (err->code == GOT_ERR_ITER_COMPLETED)
3804 err = got_object_open_as_commit(&commit, repo, &id);
3808 if ((show_changed_paths || (show_diffstat && !show_patch))
3809 && !reverse_display_order) {
3810 err = get_changed_paths(&changed_paths, commit, repo,
3811 show_diffstat ? &dsa : NULL);
3816 if (search_pattern) {
3817 err = match_commit(&have_match, &id, commit, ®ex);
3819 got_object_commit_close(commit);
3822 if (have_match == 0 && show_changed_paths)
3823 match_changed_paths(&have_match,
3824 &changed_paths, ®ex);
3825 if (have_match == 0 && show_patch) {
3826 err = match_patch(&have_match, commit, &id,
3827 path, diff_context, repo, ®ex, tmpfile);
3831 if (have_match == 0) {
3832 got_object_commit_close(commit);
3833 got_pathlist_free(&changed_paths,
3834 GOT_PATHLIST_FREE_ALL);
3839 if (reverse_display_order) {
3840 err = got_object_qid_alloc(&qid, &id);
3843 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3844 got_object_commit_close(commit);
3847 err = print_commit_oneline(commit, &id,
3850 err = print_commit(commit, &id, repo, path,
3851 (show_changed_paths || show_diffstat) ?
3852 &changed_paths : NULL,
3853 show_diffstat ? &dsa : NULL, show_patch,
3854 diff_context, refs_idmap, NULL, NULL);
3855 got_object_commit_close(commit);
3859 if ((limit && --limit == 0) ||
3860 (end_id && got_object_id_cmp(&id, end_id) == 0))
3863 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3865 if (reverse_display_order) {
3866 STAILQ_FOREACH(qid, &reversed_commits, entry) {
3867 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3868 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3870 err = got_object_open_as_commit(&commit, repo,
3874 if (show_changed_paths ||
3875 (show_diffstat && !show_patch)) {
3876 err = get_changed_paths(&changed_paths, commit,
3877 repo, show_diffstat ? &dsa : NULL);
3882 err = print_commit_oneline(commit, &qid->id,
3885 err = print_commit(commit, &qid->id, repo, path,
3886 (show_changed_paths || show_diffstat) ?
3887 &changed_paths : NULL,
3888 show_diffstat ? &dsa : NULL, show_patch,
3889 diff_context, refs_idmap, NULL, NULL);
3890 got_object_commit_close(commit);
3893 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3897 while (!STAILQ_EMPTY(&reversed_commits)) {
3898 qid = STAILQ_FIRST(&reversed_commits);
3899 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
3900 got_object_qid_free(qid);
3902 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3905 got_commit_graph_close(graph);
3912 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
3913 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
3914 "[path]\n", getprogname());
3919 get_default_log_limit(void)
3921 const char *got_default_log_limit;
3925 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3926 if (got_default_log_limit == NULL)
3928 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3934 static const struct got_error *
3935 cmd_log(int argc, char *argv[])
3937 const struct got_error *error;
3938 struct got_repository *repo = NULL;
3939 struct got_worktree *worktree = NULL;
3940 struct got_object_id *start_id = NULL, *end_id = NULL;
3941 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3942 const char *start_commit = NULL, *end_commit = NULL;
3943 const char *search_pattern = NULL;
3944 int diff_context = -1, ch;
3945 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3946 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
3948 struct got_reflist_head refs;
3949 struct got_reflist_object_id_map *refs_idmap = NULL;
3950 FILE *tmpfile = NULL;
3951 int *pack_fds = NULL;
3956 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3962 limit = get_default_log_limit();
3964 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
3970 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3973 errx(1, "number of context lines is %s: %s",
3977 start_commit = optarg;
3983 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3985 errx(1, "number of commits is %s: %s",
3989 show_changed_paths = 1;
3995 reverse_display_order = 1;
3998 repo_path = realpath(optarg, NULL);
3999 if (repo_path == NULL)
4000 return got_error_from_errno2("realpath",
4002 got_path_strip_trailing_slashes(repo_path);
4005 search_pattern = optarg;
4011 end_commit = optarg;
4022 if (diff_context == -1)
4024 else if (!show_patch)
4025 errx(1, "-C requires -p");
4027 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4028 errx(1, "cannot use -s with -d, -p or -P");
4030 cwd = getcwd(NULL, 0);
4032 error = got_error_from_errno("getcwd");
4036 error = got_repo_pack_fds_open(&pack_fds);
4040 if (repo_path == NULL) {
4041 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
4042 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4049 error = got_worktree_resolve_path(&path, worktree,
4054 path = strdup(argv[0]);
4056 error = got_error_from_errno("strdup");
4060 } else if (argc != 0)
4063 if (repo_path == NULL) {
4064 repo_path = worktree ?
4065 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4067 if (repo_path == NULL) {
4068 error = got_error_from_errno("strdup");
4072 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4076 error = apply_unveil(got_repo_get_path(repo), 1,
4077 worktree ? got_worktree_get_root_path(worktree) : NULL);
4081 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4085 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4089 if (start_commit == NULL) {
4090 struct got_reference *head_ref;
4091 struct got_commit_object *commit = NULL;
4092 error = got_ref_open(&head_ref, repo,
4093 worktree ? got_worktree_get_head_ref_name(worktree)
4097 error = got_ref_resolve(&start_id, repo, head_ref);
4098 got_ref_close(head_ref);
4101 error = got_object_open_as_commit(&commit, repo,
4105 got_object_commit_close(commit);
4107 error = got_repo_match_object_id(&start_id, NULL,
4108 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4112 if (end_commit != NULL) {
4113 error = got_repo_match_object_id(&end_id, NULL,
4114 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4121 * If a path was specified on the command line it was resolved
4122 * to a path in the work tree above. Prepend the work tree's
4123 * path prefix to obtain the corresponding in-repository path.
4127 prefix = got_worktree_get_path_prefix(worktree);
4128 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4129 (path[0] != '\0') ? "/" : "", path) == -1) {
4130 error = got_error_from_errno("asprintf");
4135 error = got_repo_map_path(&in_repo_path, repo,
4141 path = in_repo_path;
4145 /* Release work tree lock. */
4146 got_worktree_close(worktree);
4150 if (search_pattern && show_patch) {
4151 tmpfile = got_opentemp();
4152 if (tmpfile == NULL) {
4153 error = got_error_from_errno("got_opentemp");
4158 error = print_commits(start_id, end_id, repo, path ? path : "",
4159 show_changed_paths, show_diffstat, show_patch, search_pattern,
4160 diff_context, limit, log_branches, reverse_display_order,
4161 refs_idmap, one_line, tmpfile);
4169 got_worktree_close(worktree);
4171 const struct got_error *close_err = got_repo_close(repo);
4176 const struct got_error *pack_err =
4177 got_repo_pack_fds_close(pack_fds);
4182 got_reflist_object_id_map_free(refs_idmap);
4183 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4184 error = got_error_from_errno("fclose");
4185 got_ref_list_free(&refs);
4192 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4193 "[-r repository-path] [object1 object2 | path ...]\n",
4198 struct print_diff_arg {
4199 struct got_repository *repo;
4200 struct got_worktree *worktree;
4201 struct got_diffstat_cb_arg *diffstat;
4206 enum got_diff_algorithm diff_algo;
4207 int ignore_whitespace;
4208 int force_text_diff;
4215 * Create a file which contains the target path of a symlink so we can feed
4216 * it as content to the diff engine.
4218 static const struct got_error *
4219 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4220 const char *abspath)
4222 const struct got_error *err = NULL;
4223 char target_path[PATH_MAX];
4224 ssize_t target_len, outlen;
4229 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4230 if (target_len == -1)
4231 return got_error_from_errno2("readlinkat", abspath);
4233 target_len = readlink(abspath, target_path, PATH_MAX);
4234 if (target_len == -1)
4235 return got_error_from_errno2("readlink", abspath);
4238 *fd = got_opentempfd();
4240 return got_error_from_errno("got_opentempfd");
4242 outlen = write(*fd, target_path, target_len);
4244 err = got_error_from_errno("got_opentempfd");
4248 if (lseek(*fd, 0, SEEK_SET) == -1) {
4249 err = got_error_from_errno2("lseek", abspath);
4260 static const struct got_error *
4261 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4262 const char *path, struct got_object_id *blob_id,
4263 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4264 int dirfd, const char *de_name)
4266 struct print_diff_arg *a = arg;
4267 const struct got_error *err = NULL;
4268 struct got_blob_object *blob1 = NULL;
4269 int fd = -1, fd1 = -1, fd2 = -1;
4271 char *abspath = NULL, *label1 = NULL;
4276 memset(&sb, 0, sizeof(sb));
4278 if (a->diff_staged) {
4279 if (staged_status != GOT_STATUS_MODIFY &&
4280 staged_status != GOT_STATUS_ADD &&
4281 staged_status != GOT_STATUS_DELETE)
4284 if (staged_status == GOT_STATUS_DELETE)
4286 if (status == GOT_STATUS_NONEXISTENT)
4287 return got_error_set_errno(ENOENT, path);
4288 if (status != GOT_STATUS_MODIFY &&
4289 status != GOT_STATUS_ADD &&
4290 status != GOT_STATUS_DELETE &&
4291 status != GOT_STATUS_CONFLICT)
4295 err = got_opentemp_truncate(a->f1);
4297 return got_error_from_errno("got_opentemp_truncate");
4298 err = got_opentemp_truncate(a->f2);
4300 return got_error_from_errno("got_opentemp_truncate");
4302 if (!a->header_shown) {
4303 if (fprintf(a->outfile, "diff %s%s\n",
4304 a->diff_staged ? "-s " : "",
4305 got_worktree_get_root_path(a->worktree)) < 0) {
4306 err = got_error_from_errno("fprintf");
4309 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4310 err = got_error_from_errno("fprintf");
4313 if (fprintf(a->outfile, "path + %s%s\n",
4314 got_worktree_get_root_path(a->worktree),
4315 a->diff_staged ? " (staged changes)" : "") < 0) {
4316 err = got_error_from_errno("fprintf");
4319 a->header_shown = 1;
4322 if (a->diff_staged) {
4323 const char *label1 = NULL, *label2 = NULL;
4324 switch (staged_status) {
4325 case GOT_STATUS_MODIFY:
4329 case GOT_STATUS_ADD:
4332 case GOT_STATUS_DELETE:
4336 return got_error(GOT_ERR_FILE_STATUS);
4338 fd1 = got_opentempfd();
4340 err = got_error_from_errno("got_opentempfd");
4343 fd2 = got_opentempfd();
4345 err = got_error_from_errno("got_opentempfd");
4348 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4349 fd1, fd2, blob_id, staged_blob_id, label1, label2,
4350 a->diff_algo, a->diff_context, a->ignore_whitespace,
4351 a->force_text_diff, a->diffstat, a->repo, a->outfile);
4355 fd1 = got_opentempfd();
4357 err = got_error_from_errno("got_opentempfd");
4361 if (staged_status == GOT_STATUS_ADD ||
4362 staged_status == GOT_STATUS_MODIFY) {
4364 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4368 err = got_object_id_str(&id_str, staged_blob_id);
4371 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4372 err = got_error_from_errno("asprintf");
4377 } else if (status != GOT_STATUS_ADD) {
4378 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4384 if (status != GOT_STATUS_DELETE) {
4385 if (asprintf(&abspath, "%s/%s",
4386 got_worktree_get_root_path(a->worktree), path) == -1) {
4387 err = got_error_from_errno("asprintf");
4392 fd = openat(dirfd, de_name,
4393 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4395 if (!got_err_open_nofollow_on_symlink()) {
4396 err = got_error_from_errno2("openat",
4400 err = get_symlink_target_file(&fd, dirfd,
4406 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4408 if (!got_err_open_nofollow_on_symlink()) {
4409 err = got_error_from_errno2("open",
4413 err = get_symlink_target_file(&fd, dirfd,
4419 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4420 err = got_error_from_errno2("fstatat", abspath);
4423 f2 = fdopen(fd, "r");
4425 err = got_error_from_errno2("fdopen", abspath);
4433 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4439 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4440 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4441 a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
4443 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4444 err = got_error_from_errno("close");
4445 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4446 err = got_error_from_errno("close");
4448 got_object_blob_close(blob1);
4449 if (fd != -1 && close(fd) == -1 && err == NULL)
4450 err = got_error_from_errno("close");
4451 if (f2 && fclose(f2) == EOF && err == NULL)
4452 err = got_error_from_errno("fclose");
4457 static const struct got_error *
4458 cmd_diff(int argc, char *argv[])
4460 const struct got_error *error;
4461 struct got_repository *repo = NULL;
4462 struct got_worktree *worktree = NULL;
4463 char *cwd = NULL, *repo_path = NULL;
4464 const char *commit_args[2] = { NULL, NULL };
4465 int ncommit_args = 0;
4466 struct got_object_id *ids[2] = { NULL, NULL };
4467 char *labels[2] = { NULL, NULL };
4468 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4469 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4470 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
4472 struct got_reflist_head refs;
4473 struct got_pathlist_head diffstat_paths, paths;
4474 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4475 int fd1 = -1, fd2 = -1;
4476 int *pack_fds = NULL;
4477 struct got_diffstat_cb_arg dsa;
4479 memset(&dsa, 0, sizeof(dsa));
4483 TAILQ_INIT(&diffstat_paths);
4486 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4491 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
4494 force_text_diff = 1;
4497 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4500 errx(1, "number of context lines is %s: %s",
4504 if (ncommit_args >= 2)
4505 errx(1, "too many -c options used");
4506 commit_args[ncommit_args++] = optarg;
4515 repo_path = realpath(optarg, NULL);
4516 if (repo_path == NULL)
4517 return got_error_from_errno2("realpath",
4519 got_path_strip_trailing_slashes(repo_path);
4526 ignore_whitespace = 1;
4537 cwd = getcwd(NULL, 0);
4539 error = got_error_from_errno("getcwd");
4543 error = got_repo_pack_fds_open(&pack_fds);
4547 if (repo_path == NULL) {
4548 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
4549 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4555 strdup(got_worktree_get_repo_path(worktree));
4556 if (repo_path == NULL) {
4557 error = got_error_from_errno("strdup");
4561 repo_path = strdup(cwd);
4562 if (repo_path == NULL) {
4563 error = got_error_from_errno("strdup");
4569 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4574 if (show_diffstat) {
4575 dsa.paths = &diffstat_paths;
4576 dsa.force_text = force_text_diff;
4577 dsa.ignore_ws = ignore_whitespace;
4578 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4581 if (rflag || worktree == NULL || ncommit_args > 0) {
4583 error = got_error_msg(GOT_ERR_NOT_IMPL,
4584 "-P option can only be used when diffing "
4589 error = got_error_msg(GOT_ERR_NOT_IMPL,
4590 "-s option can only be used when diffing "
4596 error = apply_unveil(got_repo_get_path(repo), 1,
4597 worktree ? got_worktree_get_root_path(worktree) : NULL);
4601 if ((!force_path && argc == 2) || ncommit_args > 0) {
4602 int obj_type = (ncommit_args > 0 ?
4603 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4604 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4608 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4610 if (ncommit_args > 0)
4611 arg = commit_args[i];
4614 error = got_repo_match_object_id(&ids[i], &labels[i],
4615 arg, obj_type, &refs, repo);
4617 if (error->code != GOT_ERR_NOT_REF &&
4618 error->code != GOT_ERR_NO_OBJ)
4620 if (ncommit_args > 0)
4628 f1 = got_opentemp();
4630 error = got_error_from_errno("got_opentemp");
4634 f2 = got_opentemp();
4636 error = got_error_from_errno("got_opentemp");
4640 outfile = got_opentemp();
4641 if (outfile == NULL) {
4642 error = got_error_from_errno("got_opentemp");
4646 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4647 struct print_diff_arg arg;
4650 if (worktree == NULL) {
4651 if (argc == 2 && ids[0] == NULL) {
4652 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4654 } else if (argc == 2 && ids[1] == NULL) {
4655 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4657 } else if (argc > 0) {
4658 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4659 "%s", "specified paths cannot be resolved");
4662 error = got_error(GOT_ERR_NOT_WORKTREE);
4667 error = get_worktree_paths_from_argv(&paths, argc, argv,
4672 error = got_object_id_str(&id_str,
4673 got_worktree_get_base_commit_id(worktree));
4677 arg.worktree = worktree;
4678 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4679 arg.diff_context = diff_context;
4680 arg.id_str = id_str;
4681 arg.header_shown = 0;
4682 arg.diff_staged = diff_staged;
4683 arg.ignore_whitespace = ignore_whitespace;
4684 arg.force_text_diff = force_text_diff;
4685 arg.diffstat = show_diffstat ? &dsa : NULL;
4688 arg.outfile = outfile;
4690 error = got_worktree_status(worktree, &paths, repo, 0,
4691 print_diff, &arg, check_cancelled, NULL);
4696 if (show_diffstat && dsa.nfiles > 0) {
4699 if (asprintf(&header, "diffstat %s%s",
4700 diff_staged ? "-s " : "",
4701 got_worktree_get_root_path(worktree)) == -1) {
4702 error = got_error_from_errno("asprintf");
4706 error = print_diffstat(&dsa, header);
4712 error = printfile(outfile);
4716 if (ncommit_args == 1) {
4717 struct got_commit_object *commit;
4718 error = got_object_open_as_commit(&commit, repo, ids[0]);
4722 labels[1] = labels[0];
4724 if (got_object_commit_get_nparents(commit) > 0) {
4725 const struct got_object_id_queue *pids;
4726 struct got_object_qid *pid;
4727 pids = got_object_commit_get_parent_ids(commit);
4728 pid = STAILQ_FIRST(pids);
4729 ids[0] = got_object_id_dup(&pid->id);
4730 if (ids[0] == NULL) {
4731 error = got_error_from_errno(
4732 "got_object_id_dup");
4733 got_object_commit_close(commit);
4736 error = got_object_id_str(&labels[0], ids[0]);
4738 got_object_commit_close(commit);
4743 labels[0] = strdup("/dev/null");
4744 if (labels[0] == NULL) {
4745 error = got_error_from_errno("strdup");
4746 got_object_commit_close(commit);
4751 got_object_commit_close(commit);
4754 if (ncommit_args == 0 && argc > 2) {
4755 error = got_error_msg(GOT_ERR_BAD_PATH,
4756 "path arguments cannot be used when diffing two objects");
4761 error = got_object_get_type(&type1, repo, ids[0]);
4766 error = got_object_get_type(&type2, repo, ids[1]);
4769 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4770 error = got_error(GOT_ERR_OBJ_TYPE);
4773 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
4774 error = got_error_msg(GOT_ERR_OBJ_TYPE,
4775 "path arguments cannot be used when diffing blobs");
4779 for (i = 0; ncommit_args > 0 && i < argc; i++) {
4781 struct got_pathlist_entry *new;
4785 error = got_worktree_resolve_path(&p, worktree,
4789 prefix = got_worktree_get_path_prefix(worktree);
4790 while (prefix[0] == '/')
4792 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4793 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4795 error = got_error_from_errno("asprintf");
4801 char *mapped_path, *s;
4802 error = got_repo_map_path(&mapped_path, repo, argv[i]);
4808 in_repo_path = strdup(s);
4809 if (in_repo_path == NULL) {
4810 error = got_error_from_errno("asprintf");
4817 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4818 if (error || new == NULL /* duplicate */)
4825 /* Release work tree lock. */
4826 got_worktree_close(worktree);
4830 fd1 = got_opentempfd();
4832 error = got_error_from_errno("got_opentempfd");
4836 fd2 = got_opentempfd();
4838 error = got_error_from_errno("got_opentempfd");
4842 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4843 case GOT_OBJ_TYPE_BLOB:
4844 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4845 fd1, fd2, ids[0], ids[1], NULL, NULL,
4846 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4847 ignore_whitespace, force_text_diff,
4848 show_diffstat ? &dsa : NULL, repo, outfile);
4850 case GOT_OBJ_TYPE_TREE:
4851 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
4852 ids[0], ids[1], &paths, "", "",
4853 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4854 ignore_whitespace, force_text_diff,
4855 show_diffstat ? &dsa : NULL, repo, outfile);
4857 case GOT_OBJ_TYPE_COMMIT:
4858 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
4859 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4860 fd1, fd2, ids[0], ids[1], &paths,
4861 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4862 ignore_whitespace, force_text_diff,
4863 show_diffstat ? &dsa : NULL, repo, outfile);
4866 error = got_error(GOT_ERR_OBJ_TYPE);
4871 if (show_diffstat && dsa.nfiles > 0) {
4872 char *header = NULL;
4874 if (asprintf(&header, "diffstat %s %s",
4875 labels[0], labels[1]) == -1) {
4876 error = got_error_from_errno("asprintf");
4880 error = print_diffstat(&dsa, header);
4886 error = printfile(outfile);
4894 got_worktree_close(worktree);
4896 const struct got_error *close_err = got_repo_close(repo);
4901 const struct got_error *pack_err =
4902 got_repo_pack_fds_close(pack_fds);
4906 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
4907 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
4908 got_ref_list_free(&refs);
4909 if (outfile && fclose(outfile) == EOF && error == NULL)
4910 error = got_error_from_errno("fclose");
4911 if (f1 && fclose(f1) == EOF && error == NULL)
4912 error = got_error_from_errno("fclose");
4913 if (f2 && fclose(f2) == EOF && error == NULL)
4914 error = got_error_from_errno("fclose");
4915 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
4916 error = got_error_from_errno("close");
4917 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
4918 error = got_error_from_errno("close");
4926 "usage: %s blame [-c commit] [-r repository-path] path\n",
4935 char datebuf[11]; /* YYYY-MM-DD + NUL */
4938 struct blame_cb_args {
4939 struct blame_line *lines;
4943 off_t *line_offsets;
4945 struct got_repository *repo;
4948 static const struct got_error *
4949 blame_cb(void *arg, int nlines, int lineno,
4950 struct got_commit_object *commit, struct got_object_id *id)
4952 const struct got_error *err = NULL;
4953 struct blame_cb_args *a = arg;
4954 struct blame_line *bline;
4956 size_t linesize = 0;
4959 time_t committer_time;
4961 if (nlines != a->nlines ||
4962 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4963 return got_error(GOT_ERR_RANGE);
4965 if (sigint_received)
4966 return got_error(GOT_ERR_ITER_COMPLETED);
4969 return NULL; /* no change in this commit */
4971 /* Annotate this line. */
4972 bline = &a->lines[lineno - 1];
4973 if (bline->annotated)
4975 err = got_object_id_str(&bline->id_str, id);
4979 bline->committer = strdup(got_object_commit_get_committer(commit));
4980 if (bline->committer == NULL) {
4981 err = got_error_from_errno("strdup");
4985 committer_time = got_object_commit_get_committer_time(commit);
4986 if (gmtime_r(&committer_time, &tm) == NULL)
4987 return got_error_from_errno("gmtime_r");
4988 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4990 err = got_error(GOT_ERR_NO_SPACE);
4993 bline->annotated = 1;
4995 /* Print lines annotated so far. */
4996 bline = &a->lines[a->lineno_cur - 1];
4997 if (!bline->annotated)
5000 offset = a->line_offsets[a->lineno_cur - 1];
5001 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5002 err = got_error_from_errno("fseeko");
5006 while (a->lineno_cur <= a->nlines && bline->annotated) {
5007 char *smallerthan, *at, *nl, *committer;
5010 if (getline(&line, &linesize, a->f) == -1) {
5012 err = got_error_from_errno("getline");
5016 committer = bline->committer;
5017 smallerthan = strchr(committer, '<');
5018 if (smallerthan && smallerthan[1] != '\0')
5019 committer = smallerthan + 1;
5020 at = strchr(committer, '@');
5023 len = strlen(committer);
5025 committer[8] = '\0';
5027 nl = strchr(line, '\n');
5030 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5031 bline->id_str, bline->datebuf, committer, line);
5034 bline = &a->lines[a->lineno_cur - 1];
5041 static const struct got_error *
5042 cmd_blame(int argc, char *argv[])
5044 const struct got_error *error;
5045 struct got_repository *repo = NULL;
5046 struct got_worktree *worktree = NULL;
5047 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5048 char *link_target = NULL;
5049 struct got_object_id *obj_id = NULL;
5050 struct got_object_id *commit_id = NULL;
5051 struct got_commit_object *commit = NULL;
5052 struct got_blob_object *blob = NULL;
5053 char *commit_id_str = NULL;
5054 struct blame_cb_args bca;
5055 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5057 int *pack_fds = NULL;
5058 FILE *f1 = NULL, *f2 = NULL;
5060 fd1 = got_opentempfd();
5062 return got_error_from_errno("got_opentempfd");
5064 memset(&bca, 0, sizeof(bca));
5067 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5072 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5075 commit_id_str = optarg;
5078 repo_path = realpath(optarg, NULL);
5079 if (repo_path == NULL)
5080 return got_error_from_errno2("realpath",
5082 got_path_strip_trailing_slashes(repo_path);
5098 cwd = getcwd(NULL, 0);
5100 error = got_error_from_errno("getcwd");
5104 error = got_repo_pack_fds_open(&pack_fds);
5108 if (repo_path == NULL) {
5109 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5110 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5116 strdup(got_worktree_get_repo_path(worktree));
5117 if (repo_path == NULL) {
5118 error = got_error_from_errno("strdup");
5123 repo_path = strdup(cwd);
5124 if (repo_path == NULL) {
5125 error = got_error_from_errno("strdup");
5131 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5136 const char *prefix = got_worktree_get_path_prefix(worktree);
5139 error = got_worktree_resolve_path(&p, worktree, path);
5142 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5143 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5145 error = got_error_from_errno("asprintf");
5150 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5152 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5155 error = got_repo_map_path(&in_repo_path, repo, path);
5160 if (commit_id_str == NULL) {
5161 struct got_reference *head_ref;
5162 error = got_ref_open(&head_ref, repo, worktree ?
5163 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5166 error = got_ref_resolve(&commit_id, repo, head_ref);
5167 got_ref_close(head_ref);
5171 struct got_reflist_head refs;
5173 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5177 error = got_repo_match_object_id(&commit_id, NULL,
5178 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5179 got_ref_list_free(&refs);
5185 /* Release work tree lock. */
5186 got_worktree_close(worktree);
5190 error = got_object_open_as_commit(&commit, repo, commit_id);
5194 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5199 error = got_object_id_by_path(&obj_id, repo, commit,
5200 link_target ? link_target : in_repo_path);
5204 error = got_object_get_type(&obj_type, repo, obj_id);
5208 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5209 error = got_error_path(link_target ? link_target : in_repo_path,
5214 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5217 bca.f = got_opentemp();
5218 if (bca.f == NULL) {
5219 error = got_error_from_errno("got_opentemp");
5222 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5223 &bca.line_offsets, bca.f, blob);
5224 if (error || bca.nlines == 0)
5227 /* Don't include \n at EOF in the blame line count. */
5228 if (bca.line_offsets[bca.nlines - 1] == filesize)
5231 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5232 if (bca.lines == NULL) {
5233 error = got_error_from_errno("calloc");
5237 bca.nlines_prec = 0;
5245 fd2 = got_opentempfd();
5247 error = got_error_from_errno("got_opentempfd");
5250 fd3 = got_opentempfd();
5252 error = got_error_from_errno("got_opentempfd");
5255 f1 = got_opentemp();
5257 error = got_error_from_errno("got_opentemp");
5260 f2 = got_opentemp();
5262 error = got_error_from_errno("got_opentemp");
5265 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5266 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5267 check_cancelled, NULL, fd2, fd3, f1, f2);
5276 got_object_commit_close(commit);
5278 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5279 error = got_error_from_errno("close");
5280 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5281 error = got_error_from_errno("close");
5282 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5283 error = got_error_from_errno("close");
5284 if (f1 && fclose(f1) == EOF && error == NULL)
5285 error = got_error_from_errno("fclose");
5286 if (f2 && fclose(f2) == EOF && error == NULL)
5287 error = got_error_from_errno("fclose");
5290 got_object_blob_close(blob);
5292 got_worktree_close(worktree);
5294 const struct got_error *close_err = got_repo_close(repo);
5299 const struct got_error *pack_err =
5300 got_repo_pack_fds_close(pack_fds);
5305 for (i = 0; i < bca.nlines; i++) {
5306 struct blame_line *bline = &bca.lines[i];
5307 free(bline->id_str);
5308 free(bline->committer);
5312 free(bca.line_offsets);
5313 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5314 error = got_error_from_errno("fclose");
5321 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5322 "[path]\n", getprogname());
5326 static const struct got_error *
5327 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5328 const char *root_path, struct got_repository *repo)
5330 const struct got_error *err = NULL;
5331 int is_root_path = (strcmp(path, root_path) == 0);
5332 const char *modestr = "";
5333 mode_t mode = got_tree_entry_get_mode(te);
5334 char *link_target = NULL;
5336 path += strlen(root_path);
5337 while (path[0] == '/')
5340 if (got_object_tree_entry_is_submodule(te))
5342 else if (S_ISLNK(mode)) {
5345 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5348 for (i = 0; link_target[i] != '\0'; i++) {
5349 if (!isprint((unsigned char)link_target[i]))
5350 link_target[i] = '?';
5355 else if (S_ISDIR(mode))
5357 else if (mode & S_IXUSR)
5360 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5361 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5362 link_target ? " -> ": "", link_target ? link_target : "");
5368 static const struct got_error *
5369 print_tree(const char *path, struct got_commit_object *commit,
5370 int show_ids, int recurse, const char *root_path,
5371 struct got_repository *repo)
5373 const struct got_error *err = NULL;
5374 struct got_object_id *tree_id = NULL;
5375 struct got_tree_object *tree = NULL;
5378 err = got_object_id_by_path(&tree_id, repo, commit, path);
5382 err = got_object_open_as_tree(&tree, repo, tree_id);
5385 nentries = got_object_tree_get_nentries(tree);
5386 for (i = 0; i < nentries; i++) {
5387 struct got_tree_entry *te;
5390 if (sigint_received || sigpipe_received)
5393 te = got_object_tree_get_entry(tree, i);
5396 err = got_object_id_str(&id_str,
5397 got_tree_entry_get_id(te));
5400 if (asprintf(&id, "%s ", id_str) == -1) {
5401 err = got_error_from_errno("asprintf");
5407 err = print_entry(te, id, path, root_path, repo);
5412 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5414 if (asprintf(&child_path, "%s%s%s", path,
5415 path[0] == '/' && path[1] == '\0' ? "" : "/",
5416 got_tree_entry_get_name(te)) == -1) {
5417 err = got_error_from_errno("asprintf");
5420 err = print_tree(child_path, commit, show_ids, 1,
5429 got_object_tree_close(tree);
5434 static const struct got_error *
5435 cmd_tree(int argc, char *argv[])
5437 const struct got_error *error;
5438 struct got_repository *repo = NULL;
5439 struct got_worktree *worktree = NULL;
5440 const char *path, *refname = NULL;
5441 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5442 struct got_object_id *commit_id = NULL;
5443 struct got_commit_object *commit = NULL;
5444 char *commit_id_str = NULL;
5445 int show_ids = 0, recurse = 0;
5447 int *pack_fds = NULL;
5450 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5455 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
5458 commit_id_str = optarg;
5467 repo_path = realpath(optarg, NULL);
5468 if (repo_path == NULL)
5469 return got_error_from_errno2("realpath",
5471 got_path_strip_trailing_slashes(repo_path);
5489 cwd = getcwd(NULL, 0);
5491 error = got_error_from_errno("getcwd");
5495 error = got_repo_pack_fds_open(&pack_fds);
5499 if (repo_path == NULL) {
5500 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5501 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5507 strdup(got_worktree_get_repo_path(worktree));
5508 if (repo_path == NULL)
5509 error = got_error_from_errno("strdup");
5513 repo_path = strdup(cwd);
5514 if (repo_path == NULL) {
5515 error = got_error_from_errno("strdup");
5521 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5526 const char *prefix = got_worktree_get_path_prefix(worktree);
5529 if (path == NULL || got_path_is_root_dir(path))
5531 error = got_worktree_resolve_path(&p, worktree, path);
5534 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5535 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5537 error = got_error_from_errno("asprintf");
5542 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5546 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5551 error = got_repo_map_path(&in_repo_path, repo, path);
5556 if (commit_id_str == NULL) {
5557 struct got_reference *head_ref;
5559 refname = got_worktree_get_head_ref_name(worktree);
5561 refname = GOT_REF_HEAD;
5562 error = got_ref_open(&head_ref, repo, refname, 0);
5565 error = got_ref_resolve(&commit_id, repo, head_ref);
5566 got_ref_close(head_ref);
5570 struct got_reflist_head refs;
5572 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5576 error = got_repo_match_object_id(&commit_id, NULL,
5577 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5578 got_ref_list_free(&refs);
5584 /* Release work tree lock. */
5585 got_worktree_close(worktree);
5589 error = got_object_open_as_commit(&commit, repo, commit_id);
5593 error = print_tree(in_repo_path, commit, show_ids, recurse,
5594 in_repo_path, repo);
5601 got_object_commit_close(commit);
5603 got_worktree_close(worktree);
5605 const struct got_error *close_err = got_repo_close(repo);
5610 const struct got_error *pack_err =
5611 got_repo_pack_fds_close(pack_fds);
5621 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5622 "[-s status-codes] [path ...]\n", getprogname());
5626 struct got_status_arg {
5631 static const struct got_error *
5632 print_status(void *arg, unsigned char status, unsigned char staged_status,
5633 const char *path, struct got_object_id *blob_id,
5634 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5635 int dirfd, const char *de_name)
5637 struct got_status_arg *st = arg;
5639 if (status == staged_status && (status == GOT_STATUS_DELETE))
5640 status = GOT_STATUS_NO_CHANGE;
5641 if (st != NULL && st->status_codes) {
5642 size_t ncodes = strlen(st->status_codes);
5645 for (i = 0; i < ncodes ; i++) {
5647 if (status == st->status_codes[i] ||
5648 staged_status == st->status_codes[i]) {
5653 if (status == st->status_codes[i] ||
5654 staged_status == st->status_codes[i])
5659 if (st->suppress && j == 0)
5666 printf("%c%c %s\n", status, staged_status, path);
5670 static const struct got_error *
5671 cmd_status(int argc, char *argv[])
5673 const struct got_error *error = NULL;
5674 struct got_repository *repo = NULL;
5675 struct got_worktree *worktree = NULL;
5676 struct got_status_arg st;
5678 struct got_pathlist_head paths;
5679 int ch, i, no_ignores = 0;
5680 int *pack_fds = NULL;
5684 memset(&st, 0, sizeof(st));
5685 st.status_codes = NULL;
5689 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5694 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
5700 if (st.status_codes != NULL && st.suppress == 0)
5701 option_conflict('S', 's');
5705 for (i = 0; optarg[i] != '\0'; i++) {
5706 switch (optarg[i]) {
5707 case GOT_STATUS_MODIFY:
5708 case GOT_STATUS_ADD:
5709 case GOT_STATUS_DELETE:
5710 case GOT_STATUS_CONFLICT:
5711 case GOT_STATUS_MISSING:
5712 case GOT_STATUS_OBSTRUCTED:
5713 case GOT_STATUS_UNVERSIONED:
5714 case GOT_STATUS_MODE_CHANGE:
5715 case GOT_STATUS_NONEXISTENT:
5718 errx(1, "invalid status code '%c'",
5722 if (ch == 's' && st.suppress)
5723 option_conflict('s', 'S');
5724 st.status_codes = optarg;
5735 cwd = getcwd(NULL, 0);
5737 error = got_error_from_errno("getcwd");
5741 error = got_repo_pack_fds_open(&pack_fds);
5745 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
5747 if (error->code == GOT_ERR_NOT_WORKTREE)
5748 error = wrap_not_worktree_error(error, "status", cwd);
5752 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5757 error = apply_unveil(got_repo_get_path(repo), 1,
5758 got_worktree_get_root_path(worktree));
5762 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5766 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5767 print_status, &st, check_cancelled, NULL);
5770 const struct got_error *pack_err =
5771 got_repo_pack_fds_close(pack_fds);
5776 const struct got_error *close_err = got_repo_close(repo);
5781 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5789 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
5790 "[-r repository-path] [-s signer-id] name\n", getprogname());
5795 static const struct got_error *
5796 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5798 const struct got_error *err = NULL;
5799 struct got_reflist_entry *re, *se, *new;
5800 struct got_object_id *re_id, *se_id;
5801 struct got_tag_object *re_tag, *se_tag;
5802 time_t re_time, se_time;
5804 STAILQ_FOREACH(re, tags, entry) {
5805 se = STAILQ_FIRST(sorted);
5807 err = got_reflist_entry_dup(&new, re);
5810 STAILQ_INSERT_HEAD(sorted, new, entry);
5813 err = got_ref_resolve(&re_id, repo, re->ref);
5816 err = got_object_open_as_tag(&re_tag, repo, re_id);
5820 re_time = got_object_tag_get_tagger_time(re_tag);
5821 got_object_tag_close(re_tag);
5825 err = got_ref_resolve(&se_id, repo, re->ref);
5828 err = got_object_open_as_tag(&se_tag, repo, se_id);
5832 se_time = got_object_tag_get_tagger_time(se_tag);
5833 got_object_tag_close(se_tag);
5835 if (se_time > re_time) {
5836 err = got_reflist_entry_dup(&new, re);
5839 STAILQ_INSERT_AFTER(sorted, se, new, entry);
5842 se = STAILQ_NEXT(se, entry);
5851 static const struct got_error *
5852 get_tag_refname(char **refname, const char *tag_name)
5854 const struct got_error *err;
5856 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5857 *refname = strdup(tag_name);
5858 if (*refname == NULL)
5859 return got_error_from_errno("strdup");
5860 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
5861 err = got_error_from_errno("asprintf");
5869 static const struct got_error *
5870 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
5871 const char *allowed_signers, const char *revoked_signers, int verbosity)
5873 static const struct got_error *err = NULL;
5874 struct got_reflist_head refs;
5875 struct got_reflist_entry *re;
5876 char *wanted_refname = NULL;
5881 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5886 struct got_reference *ref;
5887 err = get_tag_refname(&wanted_refname, tag_name);
5890 /* Wanted tag reference should exist. */
5891 err = got_ref_open(&ref, repo, wanted_refname, 0);
5897 TAILQ_FOREACH(re, &refs, entry) {
5898 const char *refname;
5899 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5901 const char *tagger, *ssh_sig = NULL;
5902 char *sig_msg = NULL;
5904 struct got_object_id *id;
5905 struct got_tag_object *tag;
5906 struct got_commit_object *commit = NULL;
5908 refname = got_ref_get_name(re->ref);
5909 if (strncmp(refname, "refs/tags/", 10) != 0 ||
5910 (wanted_refname && strcmp(refname, wanted_refname) != 0))
5913 refstr = got_ref_to_str(re->ref);
5914 if (refstr == NULL) {
5915 err = got_error_from_errno("got_ref_to_str");
5919 err = got_ref_resolve(&id, repo, re->ref);
5922 err = got_object_open_as_tag(&tag, repo, id);
5924 if (err->code != GOT_ERR_OBJ_TYPE) {
5928 /* "lightweight" tag */
5929 err = got_object_open_as_commit(&commit, repo, id);
5934 tagger = got_object_commit_get_committer(commit);
5936 got_object_commit_get_committer_time(commit);
5937 err = got_object_id_str(&id_str, id);
5943 tagger = got_object_tag_get_tagger(tag);
5944 tagger_time = got_object_tag_get_tagger_time(tag);
5945 err = got_object_id_str(&id_str,
5946 got_object_tag_get_object_id(tag));
5951 if (tag && verify_tags) {
5952 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
5953 got_object_tag_get_message(tag));
5954 if (ssh_sig && allowed_signers == NULL) {
5955 err = got_error_msg(
5956 GOT_ERR_VERIFY_TAG_SIGNATURE,
5957 "SSH signature verification requires "
5958 "setting allowed_signers in "
5964 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5966 printf("from: %s\n", tagger);
5967 datestr = get_datestr(&tagger_time, datebuf);
5969 printf("date: %s UTC\n", datestr);
5971 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5973 switch (got_object_tag_get_object_type(tag)) {
5974 case GOT_OBJ_TYPE_BLOB:
5975 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5978 case GOT_OBJ_TYPE_TREE:
5979 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5982 case GOT_OBJ_TYPE_COMMIT:
5983 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5986 case GOT_OBJ_TYPE_TAG:
5987 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5997 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
5998 allowed_signers, revoked_signers, verbosity);
5999 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
6003 printf("signature: %s", sig_msg);
6009 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6012 got_object_commit_close(commit);
6014 tagmsg0 = strdup(got_object_tag_get_message(tag));
6015 got_object_tag_close(tag);
6016 if (tagmsg0 == NULL) {
6017 err = got_error_from_errno("strdup");
6024 line = strsep(&tagmsg, "\n");
6026 printf(" %s\n", line);
6031 got_ref_list_free(&refs);
6032 free(wanted_refname);
6034 if (err == NULL && bad_sigs)
6035 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
6039 static const struct got_error *
6040 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6041 const char *tag_name, const char *repo_path)
6043 const struct got_error *err = NULL;
6044 char *template = NULL, *initial_content = NULL;
6045 char *editor = NULL;
6046 int initial_content_len;
6049 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6050 err = got_error_from_errno("asprintf");
6054 initial_content_len = asprintf(&initial_content,
6055 "\n# tagging commit %s as %s\n",
6056 commit_id_str, tag_name);
6057 if (initial_content_len == -1) {
6058 err = got_error_from_errno("asprintf");
6062 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
6066 if (write(fd, initial_content, initial_content_len) == -1) {
6067 err = got_error_from_errno2("write", *tagmsg_path);
6070 if (close(fd) == -1) {
6071 err = got_error_from_errno2("close", *tagmsg_path);
6076 err = get_editor(&editor);
6079 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6080 initial_content_len, 1);
6082 free(initial_content);
6086 if (fd != -1 && close(fd) == -1 && err == NULL)
6087 err = got_error_from_errno2("close", *tagmsg_path);
6096 static const struct got_error *
6097 add_tag(struct got_repository *repo, const char *tagger,
6098 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
6099 const char *signer_id, int verbosity)
6101 const struct got_error *err = NULL;
6102 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6103 char *label = NULL, *commit_id_str = NULL;
6104 struct got_reference *ref = NULL;
6105 char *refname = NULL, *tagmsg = NULL;
6106 char *tagmsg_path = NULL, *tag_id_str = NULL;
6107 int preserve_tagmsg = 0;
6108 struct got_reflist_head refs;
6113 * Don't let the user create a tag name with a leading '-'.
6114 * While technically a valid reference name, this case is usually
6115 * an unintended typo.
6117 if (tag_name[0] == '-')
6118 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6120 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6124 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6125 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6129 err = got_object_id_str(&commit_id_str, commit_id);
6133 err = get_tag_refname(&refname, tag_name);
6136 if (strncmp("refs/tags/", tag_name, 10) == 0)
6139 err = got_ref_open(&ref, repo, refname, 0);
6141 err = got_error(GOT_ERR_TAG_EXISTS);
6143 } else if (err->code != GOT_ERR_NOT_REF)
6146 if (tagmsg_arg == NULL) {
6147 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6148 tag_name, got_repo_get_path(repo));
6150 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6151 tagmsg_path != NULL)
6152 preserve_tagmsg = 1;
6155 /* Editor is done; we can now apply unveil(2) */
6156 err = got_sigs_apply_unveil();
6159 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
6164 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6165 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
6169 preserve_tagmsg = 1;
6173 err = got_ref_alloc(&ref, refname, tag_id);
6176 preserve_tagmsg = 1;
6180 err = got_ref_write(ref, repo);
6183 preserve_tagmsg = 1;
6187 err = got_object_id_str(&tag_id_str, tag_id);
6190 preserve_tagmsg = 1;
6193 printf("Created tag %s\n", tag_id_str);
6195 if (preserve_tagmsg) {
6196 fprintf(stderr, "%s: tag message preserved in %s\n",
6197 getprogname(), tagmsg_path);
6198 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6199 err = got_error_from_errno2("unlink", tagmsg_path);
6204 free(commit_id_str);
6208 got_ref_list_free(&refs);
6212 static const struct got_error *
6213 cmd_tag(int argc, char *argv[])
6215 const struct got_error *error = NULL;
6216 struct got_repository *repo = NULL;
6217 struct got_worktree *worktree = NULL;
6218 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6219 char *gitconfig_path = NULL, *tagger = NULL;
6220 char *allowed_signers = NULL, *revoked_signers = NULL;
6221 const char *signer_id = NULL;
6222 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
6223 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
6224 int *pack_fds = NULL;
6227 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6228 "sendfd unveil", NULL) == -1)
6232 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
6235 commit_id_arg = optarg;
6244 repo_path = realpath(optarg, NULL);
6245 if (repo_path == NULL) {
6246 error = got_error_from_errno2("realpath",
6250 got_path_strip_trailing_slashes(repo_path);
6261 else if (verbosity < 3)
6273 if (do_list || verify_tags) {
6274 if (commit_id_arg != NULL)
6276 "-c option can only be used when creating a tag");
6279 option_conflict('l', 'm');
6281 option_conflict('V', 'm');
6285 option_conflict('l', 's');
6287 option_conflict('V', 's');
6291 } else if (argc != 1)
6297 cwd = getcwd(NULL, 0);
6299 error = got_error_from_errno("getcwd");
6303 error = got_repo_pack_fds_open(&pack_fds);
6307 if (repo_path == NULL) {
6308 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6309 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6315 strdup(got_worktree_get_repo_path(worktree));
6316 if (repo_path == NULL)
6317 error = got_error_from_errno("strdup");
6321 repo_path = strdup(cwd);
6322 if (repo_path == NULL) {
6323 error = got_error_from_errno("strdup");
6329 if (do_list || verify_tags) {
6330 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6333 error = get_allowed_signers(&allowed_signers, repo, worktree);
6336 error = get_revoked_signers(&revoked_signers, repo, worktree);
6340 /* Release work tree lock. */
6341 got_worktree_close(worktree);
6346 * Remove "cpath" promise unless needed for signature tmpfile
6350 got_sigs_apply_unveil();
6353 if (pledge("stdio rpath wpath flock proc exec sendfd "
6354 "unveil", NULL) == -1)
6358 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6361 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
6362 revoked_signers, verbosity);
6364 error = get_gitconfig_path(&gitconfig_path);
6367 error = got_repo_open(&repo, repo_path, gitconfig_path,
6372 error = get_author(&tagger, repo, worktree);
6375 if (signer_id == NULL)
6376 signer_id = get_signer_id(repo, worktree);
6380 error = got_sigs_apply_unveil();
6384 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6389 if (commit_id_arg == NULL) {
6390 struct got_reference *head_ref;
6391 struct got_object_id *commit_id;
6392 error = got_ref_open(&head_ref, repo,
6393 worktree ? got_worktree_get_head_ref_name(worktree)
6397 error = got_ref_resolve(&commit_id, repo, head_ref);
6398 got_ref_close(head_ref);
6401 error = got_object_id_str(&commit_id_str, commit_id);
6408 /* Release work tree lock. */
6409 got_worktree_close(worktree);
6413 error = add_tag(repo, tagger, tag_name,
6414 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
6415 signer_id, verbosity);
6419 const struct got_error *close_err = got_repo_close(repo);
6424 got_worktree_close(worktree);
6426 const struct got_error *pack_err =
6427 got_repo_pack_fds_close(pack_fds);
6433 free(gitconfig_path);
6434 free(commit_id_str);
6436 free(allowed_signers);
6437 free(revoked_signers);
6444 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
6448 static const struct got_error *
6449 add_progress(void *arg, unsigned char status, const char *path)
6451 while (path[0] == '/')
6453 printf("%c %s\n", status, path);
6457 static const struct got_error *
6458 cmd_add(int argc, char *argv[])
6460 const struct got_error *error = NULL;
6461 struct got_repository *repo = NULL;
6462 struct got_worktree *worktree = NULL;
6464 struct got_pathlist_head paths;
6465 struct got_pathlist_entry *pe;
6466 int ch, can_recurse = 0, no_ignores = 0;
6467 int *pack_fds = NULL;
6472 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6477 while ((ch = getopt(argc, argv, "IR")) != -1) {
6497 cwd = getcwd(NULL, 0);
6499 error = got_error_from_errno("getcwd");
6503 error = got_repo_pack_fds_open(&pack_fds);
6507 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6509 if (error->code == GOT_ERR_NOT_WORKTREE)
6510 error = wrap_not_worktree_error(error, "add", cwd);
6514 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6519 error = apply_unveil(got_repo_get_path(repo), 1,
6520 got_worktree_get_root_path(worktree));
6524 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6531 TAILQ_FOREACH(pe, &paths, entry) {
6532 if (asprintf(&ondisk_path, "%s/%s",
6533 got_worktree_get_root_path(worktree),
6535 error = got_error_from_errno("asprintf");
6538 if (lstat(ondisk_path, &sb) == -1) {
6539 if (errno == ENOENT) {
6543 error = got_error_from_errno2("lstat",
6549 if (S_ISDIR(sb.st_mode)) {
6550 error = got_error_msg(GOT_ERR_BAD_PATH,
6551 "adding directories requires -R option");
6557 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6558 NULL, repo, no_ignores);
6561 const struct got_error *close_err = got_repo_close(repo);
6566 got_worktree_close(worktree);
6568 const struct got_error *pack_err =
6569 got_repo_pack_fds_close(pack_fds);
6573 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6581 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
6586 static const struct got_error *
6587 print_remove_status(void *arg, unsigned char status,
6588 unsigned char staged_status, const char *path)
6590 while (path[0] == '/')
6592 if (status == GOT_STATUS_NONEXISTENT)
6594 if (status == staged_status && (status == GOT_STATUS_DELETE))
6595 status = GOT_STATUS_NO_CHANGE;
6596 printf("%c%c %s\n", status, staged_status, path);
6600 static const struct got_error *
6601 cmd_remove(int argc, char *argv[])
6603 const struct got_error *error = NULL;
6604 struct got_worktree *worktree = NULL;
6605 struct got_repository *repo = NULL;
6606 const char *status_codes = NULL;
6608 struct got_pathlist_head paths;
6609 struct got_pathlist_entry *pe;
6610 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6611 int ignore_missing_paths = 0;
6612 int *pack_fds = NULL;
6617 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6622 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6625 delete_local_mods = 1;
6626 ignore_missing_paths = 1;
6635 for (i = 0; optarg[i] != '\0'; i++) {
6636 switch (optarg[i]) {
6637 case GOT_STATUS_MODIFY:
6638 delete_local_mods = 1;
6640 case GOT_STATUS_MISSING:
6641 ignore_missing_paths = 1;
6644 errx(1, "invalid status code '%c'",
6648 status_codes = optarg;
6662 cwd = getcwd(NULL, 0);
6664 error = got_error_from_errno("getcwd");
6668 error = got_repo_pack_fds_open(&pack_fds);
6672 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6674 if (error->code == GOT_ERR_NOT_WORKTREE)
6675 error = wrap_not_worktree_error(error, "remove", cwd);
6679 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6684 error = apply_unveil(got_repo_get_path(repo), 1,
6685 got_worktree_get_root_path(worktree));
6689 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6696 TAILQ_FOREACH(pe, &paths, entry) {
6697 if (asprintf(&ondisk_path, "%s/%s",
6698 got_worktree_get_root_path(worktree),
6700 error = got_error_from_errno("asprintf");
6703 if (lstat(ondisk_path, &sb) == -1) {
6704 if (errno == ENOENT) {
6708 error = got_error_from_errno2("lstat",
6714 if (S_ISDIR(sb.st_mode)) {
6715 error = got_error_msg(GOT_ERR_BAD_PATH,
6716 "removing directories requires -R option");
6722 error = got_worktree_schedule_delete(worktree, &paths,
6723 delete_local_mods, status_codes, print_remove_status, NULL,
6724 repo, keep_on_disk, ignore_missing_paths);
6727 const struct got_error *close_err = got_repo_close(repo);
6732 got_worktree_close(worktree);
6734 const struct got_error *pack_err =
6735 got_repo_pack_fds_close(pack_fds);
6739 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6747 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
6748 "[patchfile]\n", getprogname());
6752 static const struct got_error *
6753 patch_from_stdin(int *patchfd)
6755 const struct got_error *err = NULL;
6758 sig_t sighup, sigint, sigquit;
6760 *patchfd = got_opentempfd();
6762 return got_error_from_errno("got_opentempfd");
6764 sighup = signal(SIGHUP, SIG_DFL);
6765 sigint = signal(SIGINT, SIG_DFL);
6766 sigquit = signal(SIGQUIT, SIG_DFL);
6769 r = read(0, buf, sizeof(buf));
6771 err = got_error_from_errno("read");
6776 if (write(*patchfd, buf, r) == -1) {
6777 err = got_error_from_errno("write");
6782 signal(SIGHUP, sighup);
6783 signal(SIGINT, sigint);
6784 signal(SIGQUIT, sigquit);
6786 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
6787 err = got_error_from_errno("lseek");
6797 struct got_patch_progress_arg {
6803 static const struct got_error *
6804 patch_progress(void *arg, const char *old, const char *new,
6805 unsigned char status, const struct got_error *error, int old_from,
6806 int old_lines, int new_from, int new_lines, int offset,
6807 int ws_mangled, const struct got_error *hunk_err)
6809 const char *path = new == NULL ? old : new;
6810 struct got_patch_progress_arg *a = arg;
6812 while (*path == '/')
6815 if (status != GOT_STATUS_NO_CHANGE &&
6816 status != 0 /* per-hunk progress */) {
6817 printf("%c %s\n", status, path);
6818 a->did_something = 1;
6821 if (hunk_err == NULL) {
6822 if (status == GOT_STATUS_CANNOT_UPDATE)
6824 else if (status == GOT_STATUS_CONFLICT)
6829 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
6831 if (offset != 0 || hunk_err != NULL || ws_mangled) {
6832 printf("@@ -%d,%d +%d,%d @@ ", old_from,
6833 old_lines, new_from, new_lines);
6834 if (hunk_err != NULL)
6835 printf("%s\n", hunk_err->msg);
6836 else if (offset != 0)
6837 printf("applied with offset %d\n", offset);
6839 printf("hunk contains mangled whitespace\n");
6846 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
6848 if (!ppa->did_something)
6851 if (ppa->conflicts > 0)
6852 printf("Files with merge conflicts: %d\n", ppa->conflicts);
6854 if (ppa->rejects > 0) {
6855 printf("Files where patch failed to apply: %d\n",
6860 static const struct got_error *
6861 cmd_patch(int argc, char *argv[])
6863 const struct got_error *error = NULL, *close_error = NULL;
6864 struct got_worktree *worktree = NULL;
6865 struct got_repository *repo = NULL;
6866 struct got_reflist_head refs;
6867 struct got_object_id *commit_id = NULL;
6868 const char *commit_id_str = NULL;
6872 int ch, nop = 0, strip = -1, reverse = 0;
6874 int *pack_fds = NULL;
6875 struct got_patch_progress_arg ppa;
6880 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
6881 "unveil", NULL) == -1)
6885 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
6888 commit_id_str = optarg;
6894 strip = strtonum(optarg, 0, INT_MAX, &errstr);
6896 errx(1, "pathname strip count is %s: %s",
6912 error = patch_from_stdin(&patchfd);
6915 } else if (argc == 1) {
6916 patchfd = open(argv[0], O_RDONLY);
6917 if (patchfd == -1) {
6918 error = got_error_from_errno2("open", argv[0]);
6921 if (fstat(patchfd, &sb) == -1) {
6922 error = got_error_from_errno2("fstat", argv[0]);
6925 if (!S_ISREG(sb.st_mode)) {
6926 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
6932 if ((cwd = getcwd(NULL, 0)) == NULL) {
6933 error = got_error_from_errno("getcwd");
6937 error = got_repo_pack_fds_open(&pack_fds);
6941 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
6945 const char *repo_path = got_worktree_get_repo_path(worktree);
6946 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6950 error = apply_unveil(got_repo_get_path(repo), 0,
6951 got_worktree_get_root_path(worktree));
6955 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6959 if (commit_id_str != NULL) {
6960 error = got_repo_match_object_id(&commit_id, NULL,
6961 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6966 memset(&ppa, 0, sizeof(ppa));
6967 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
6968 commit_id, patch_progress, &ppa, check_cancelled, NULL);
6969 print_patch_progress_stats(&ppa);
6971 got_ref_list_free(&refs);
6974 close_error = got_repo_close(repo);
6976 error = close_error;
6978 if (worktree != NULL) {
6979 close_error = got_worktree_close(worktree);
6981 error = close_error;
6984 const struct got_error *pack_err =
6985 got_repo_pack_fds_close(pack_fds);
6996 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
7001 static const struct got_error *
7002 revert_progress(void *arg, unsigned char status, const char *path)
7004 if (status == GOT_STATUS_UNVERSIONED)
7007 while (path[0] == '/')
7009 printf("%c %s\n", status, path);
7013 struct choose_patch_arg {
7014 FILE *patch_script_file;
7018 static const struct got_error *
7019 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7020 int nchanges, const char *action)
7022 const struct got_error *err;
7024 size_t linesize = 0;
7028 case GOT_STATUS_ADD:
7029 printf("A %s\n%s this addition? [y/n] ", path, action);
7031 case GOT_STATUS_DELETE:
7032 printf("D %s\n%s this deletion? [y/n] ", path, action);
7034 case GOT_STATUS_MODIFY:
7035 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7036 return got_error_from_errno("fseek");
7037 printf(GOT_COMMIT_SEP_STR);
7038 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7040 if (linelen == -1 && ferror(patch_file)) {
7041 err = got_error_from_errno("getline");
7046 printf(GOT_COMMIT_SEP_STR);
7047 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7048 path, n, nchanges, action);
7051 return got_error_path(path, GOT_ERR_FILE_STATUS);
7058 static const struct got_error *
7059 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7060 FILE *patch_file, int n, int nchanges)
7062 const struct got_error *err = NULL;
7064 size_t linesize = 0;
7067 struct choose_patch_arg *a = arg;
7069 *choice = GOT_PATCH_CHOICE_NONE;
7071 if (a->patch_script_file) {
7073 err = show_change(status, path, patch_file, n, nchanges,
7077 linelen = getline(&line, &linesize, a->patch_script_file);
7078 if (linelen == -1) {
7079 if (ferror(a->patch_script_file))
7080 return got_error_from_errno("getline");
7083 nl = strchr(line, '\n');
7086 if (strcmp(line, "y") == 0) {
7087 *choice = GOT_PATCH_CHOICE_YES;
7089 } else if (strcmp(line, "n") == 0) {
7090 *choice = GOT_PATCH_CHOICE_NO;
7092 } else if (strcmp(line, "q") == 0 &&
7093 status == GOT_STATUS_MODIFY) {
7094 *choice = GOT_PATCH_CHOICE_QUIT;
7097 printf("invalid response '%s'\n", line);
7102 while (resp != 'y' && resp != 'n' && resp != 'q') {
7103 err = show_change(status, path, patch_file, n, nchanges,
7110 if (status == GOT_STATUS_MODIFY) {
7111 if (resp != 'y' && resp != 'n' && resp != 'q') {
7112 printf("invalid response '%c'\n", resp);
7115 } else if (resp != 'y' && resp != 'n') {
7116 printf("invalid response '%c'\n", resp);
7122 *choice = GOT_PATCH_CHOICE_YES;
7123 else if (resp == 'n')
7124 *choice = GOT_PATCH_CHOICE_NO;
7125 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7126 *choice = GOT_PATCH_CHOICE_QUIT;
7131 struct wt_commitable_path_arg {
7132 struct got_pathlist_head *commit_paths;
7137 * Shortcut work tree status callback to determine if the set of paths scanned
7138 * has at least one versioned path that is being modified and, if not NULL, is
7139 * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
7140 * soon as a path is passed with a status that satisfies this criteria.
7142 static const struct got_error *
7143 worktree_has_commitable_path(void *arg, unsigned char status,
7144 unsigned char staged_status, const char *path,
7145 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7146 struct got_object_id *commit_id, int dirfd, const char *de_name)
7148 struct wt_commitable_path_arg *a = arg;
7150 if (status == staged_status && (status == GOT_STATUS_DELETE))
7151 status = GOT_STATUS_NO_CHANGE;
7153 if (!(status == GOT_STATUS_NO_CHANGE ||
7154 status == GOT_STATUS_UNVERSIONED) ||
7155 staged_status != GOT_STATUS_NO_CHANGE) {
7156 if (a->commit_paths != NULL) {
7157 struct got_pathlist_entry *pe;
7159 TAILQ_FOREACH(pe, a->commit_paths, entry) {
7160 if (strncmp(path, pe->path,
7161 pe->path_len) == 0) {
7162 *a->has_changes = 1;
7167 *a->has_changes = 1;
7169 if (*a->has_changes)
7170 return got_error(GOT_ERR_FILE_MODIFIED);
7177 * Check that the changeset of the commit identified by id is
7178 * comprised of at least one modified path that is being committed.
7180 static const struct got_error *
7181 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
7182 struct got_object_id *id, struct got_worktree *worktree,
7183 struct got_repository *repo)
7185 const struct got_error *err;
7186 struct got_pathlist_head paths;
7187 struct got_commit_object *commit = NULL, *pcommit = NULL;
7188 struct got_tree_object *tree = NULL, *ptree = NULL;
7189 struct got_object_qid *pid;
7193 err = got_object_open_as_commit(&commit, repo, id);
7197 err = got_object_open_as_tree(&tree, repo,
7198 got_object_commit_get_tree_id(commit));
7202 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7204 err = got_object_open_as_commit(&pcommit, repo, &pid->id);
7208 err = got_object_open_as_tree(&ptree, repo,
7209 got_object_commit_get_tree_id(pcommit));
7214 err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
7215 got_diff_tree_collect_changed_paths, &paths, 0);
7219 err = got_worktree_status(worktree, &paths, repo, 0,
7220 worktree_has_commitable_path, wcpa, check_cancelled, NULL);
7221 if (err && err->code == GOT_ERR_FILE_MODIFIED) {
7223 * At least one changed path in the referenced commit is
7224 * modified in the work tree, that's all we need to know!
7230 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
7232 got_object_commit_close(commit);
7234 got_object_commit_close(pcommit);
7236 got_object_tree_close(tree);
7238 got_object_tree_close(ptree);
7243 * Remove any "logmsg" reference comprised entirely of paths that have
7244 * been reverted in this work tree. If any path in the logmsg ref changeset
7245 * remains in a changed state in the worktree, do not remove the reference.
7247 static const struct got_error *
7248 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
7250 const struct got_error *err;
7251 struct got_reflist_head refs;
7252 struct got_reflist_entry *re;
7253 struct got_commit_object *commit = NULL;
7254 struct got_object_id *commit_id = NULL;
7255 struct wt_commitable_path_arg wcpa;
7256 char *uuidstr = NULL;
7260 err = got_worktree_get_uuid(&uuidstr, worktree);
7264 err = got_ref_list(&refs, repo, "refs/got/worktree",
7265 got_ref_cmp_by_name, repo);
7269 TAILQ_FOREACH(re, &refs, entry) {
7270 const char *refname;
7271 int has_changes = 0;
7273 refname = got_ref_get_name(re->ref);
7275 if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7276 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
7277 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7278 else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7279 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
7280 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7284 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7285 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7289 err = got_repo_match_object_id(&commit_id, NULL, refname,
7290 GOT_OBJ_TYPE_COMMIT, NULL, repo);
7294 err = got_object_open_as_commit(&commit, repo, commit_id);
7298 wcpa.commit_paths = NULL;
7299 wcpa.has_changes = &has_changes;
7301 err = commit_path_changed_in_worktree(&wcpa, commit_id,
7307 err = got_ref_delete(re->ref, repo);
7312 got_object_commit_close(commit);
7321 got_ref_list_free(&refs);
7323 got_object_commit_close(commit);
7327 static const struct got_error *
7328 cmd_revert(int argc, char *argv[])
7330 const struct got_error *error = NULL;
7331 struct got_worktree *worktree = NULL;
7332 struct got_repository *repo = NULL;
7333 char *cwd = NULL, *path = NULL;
7334 struct got_pathlist_head paths;
7335 struct got_pathlist_entry *pe;
7336 int ch, can_recurse = 0, pflag = 0;
7337 FILE *patch_script_file = NULL;
7338 const char *patch_script_path = NULL;
7339 struct choose_patch_arg cpa;
7340 int *pack_fds = NULL;
7345 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7346 "unveil", NULL) == -1)
7350 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
7353 patch_script_path = optarg;
7372 if (patch_script_path && !pflag)
7373 errx(1, "-F option can only be used together with -p option");
7375 cwd = getcwd(NULL, 0);
7377 error = got_error_from_errno("getcwd");
7381 error = got_repo_pack_fds_open(&pack_fds);
7385 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
7387 if (error->code == GOT_ERR_NOT_WORKTREE)
7388 error = wrap_not_worktree_error(error, "revert", cwd);
7392 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7397 if (patch_script_path) {
7398 patch_script_file = fopen(patch_script_path, "re");
7399 if (patch_script_file == NULL) {
7400 error = got_error_from_errno2("fopen",
7407 * XXX "c" perm needed on repo dir to delete merge references.
7409 error = apply_unveil(got_repo_get_path(repo), 0,
7410 got_worktree_get_root_path(worktree));
7414 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7421 TAILQ_FOREACH(pe, &paths, entry) {
7422 if (asprintf(&ondisk_path, "%s/%s",
7423 got_worktree_get_root_path(worktree),
7425 error = got_error_from_errno("asprintf");
7428 if (lstat(ondisk_path, &sb) == -1) {
7429 if (errno == ENOENT) {
7433 error = got_error_from_errno2("lstat",
7439 if (S_ISDIR(sb.st_mode)) {
7440 error = got_error_msg(GOT_ERR_BAD_PATH,
7441 "reverting directories requires -R option");
7447 cpa.patch_script_file = patch_script_file;
7448 cpa.action = "revert";
7449 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7450 pflag ? choose_patch : NULL, &cpa, repo);
7452 error = rm_logmsg_ref(worktree, repo);
7454 if (patch_script_file && fclose(patch_script_file) == EOF &&
7456 error = got_error_from_errno2("fclose", patch_script_path);
7458 const struct got_error *close_err = got_repo_close(repo);
7463 got_worktree_close(worktree);
7465 const struct got_error *pack_err =
7466 got_repo_pack_fds_close(pack_fds);
7470 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7479 fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
7480 "[-m message] [path ...]\n", getprogname());
7484 struct collect_commit_logmsg_arg {
7485 const char *cmdline_log;
7486 const char *prepared_log;
7487 const char *merged_log;
7488 int non_interactive;
7490 const char *worktree_path;
7491 const char *repo_path;
7492 const char *dial_proto;
7496 static const struct got_error *
7497 read_prepared_logmsg(char **logmsg, const char *path)
7499 const struct got_error *err = NULL;
7505 memset(&sb, 0, sizeof(sb));
7507 f = fopen(path, "re");
7509 return got_error_from_errno2("fopen", path);
7511 if (fstat(fileno(f), &sb) == -1) {
7512 err = got_error_from_errno2("fstat", path);
7515 if (sb.st_size == 0) {
7516 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7520 *logmsg = malloc(sb.st_size + 1);
7521 if (*logmsg == NULL) {
7522 err = got_error_from_errno("malloc");
7526 r = fread(*logmsg, 1, sb.st_size, f);
7527 if (r != sb.st_size) {
7529 err = got_error_from_errno2("fread", path);
7531 err = got_error(GOT_ERR_IO);
7534 (*logmsg)[sb.st_size] = '\0';
7536 if (fclose(f) == EOF && err == NULL)
7537 err = got_error_from_errno2("fclose", path);
7545 static const struct got_error *
7546 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
7547 const char *diff_path, char **logmsg, void *arg)
7549 char *initial_content = NULL;
7550 struct got_pathlist_entry *pe;
7551 const struct got_error *err = NULL;
7552 char *template = NULL;
7553 char *prepared_msg = NULL, *merged_msg = NULL;
7554 struct collect_commit_logmsg_arg *a = arg;
7555 int initial_content_len;
7559 /* if a message was specified on the command line, just use it */
7560 if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
7561 len = strlen(a->cmdline_log) + 1;
7562 *logmsg = malloc(len + 1);
7563 if (*logmsg == NULL)
7564 return got_error_from_errno("malloc");
7565 strlcpy(*logmsg, a->cmdline_log, len);
7567 } else if (a->prepared_log != NULL && a->non_interactive)
7568 return read_prepared_logmsg(logmsg, a->prepared_log);
7570 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7571 return got_error_from_errno("asprintf");
7573 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
7577 if (a->prepared_log) {
7578 err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
7581 } else if (a->merged_log) {
7582 err = read_prepared_logmsg(&merged_msg, a->merged_log);
7587 initial_content_len = asprintf(&initial_content,
7588 "%s%s\n# changes to be committed:\n",
7589 prepared_msg ? prepared_msg : "",
7590 merged_msg ? merged_msg : "");
7591 if (initial_content_len == -1) {
7592 err = got_error_from_errno("asprintf");
7596 if (write(fd, initial_content, initial_content_len) == -1) {
7597 err = got_error_from_errno2("write", a->logmsg_path);
7601 TAILQ_FOREACH(pe, commitable_paths, entry) {
7602 struct got_commitable *ct = pe->data;
7603 dprintf(fd, "# %c %s\n",
7604 got_commitable_get_status(ct),
7605 got_commitable_get_path(ct));
7609 dprintf(fd, "# detailed changes can be viewed in %s\n",
7613 if (close(fd) == -1) {
7614 err = got_error_from_errno2("close", a->logmsg_path);
7619 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7620 initial_content_len, a->prepared_log ? 0 : 1);
7622 free(initial_content);
7627 if (fd != -1 && close(fd) == -1 && err == NULL)
7628 err = got_error_from_errno2("close", a->logmsg_path);
7630 /* Editor is done; we can now apply unveil(2) */
7632 err = got_dial_apply_unveil(a->dial_proto);
7634 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7642 static const struct got_error *
7643 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
7644 const char *type, int has_content)
7646 const struct got_error *err = NULL;
7647 char *logmsg = NULL;
7649 err = got_object_commit_get_logmsg(&logmsg, commit);
7653 if (fprintf(f, "%s# log message of %s commit %s:%s",
7654 has_content ? "\n" : "", type, idstr, logmsg) < 0)
7655 err = got_ferror(f, GOT_ERR_IO);
7662 * Lookup "logmsg" references of backed-out and cherrypicked commits
7663 * belonging to the current work tree. If found, and the worktree has
7664 * at least one modified file that was changed in the referenced commit,
7665 * add its log message to a new temporary file at *logmsg_path.
7666 * Add all refs found to matched_refs to be scheduled for removal on
7667 * successful commit.
7669 static const struct got_error *
7670 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
7671 struct got_reflist_head *matched_refs, struct got_worktree *worktree,
7672 struct got_repository *repo)
7674 const struct got_error *err;
7675 struct got_commit_object *commit = NULL;
7676 struct got_object_id *id = NULL;
7677 struct got_reflist_head refs;
7678 struct got_reflist_entry *re, *re_match;
7680 char *uuidstr = NULL;
7681 int added_logmsg = 0;
7685 *logmsg_path = NULL;
7687 err = got_worktree_get_uuid(&uuidstr, worktree);
7691 err = got_ref_list(&refs, repo, "refs/got/worktree",
7692 got_ref_cmp_by_name, repo);
7696 TAILQ_FOREACH(re, &refs, entry) {
7697 const char *refname, *type;
7698 struct wt_commitable_path_arg wcpa;
7701 refname = got_ref_get_name(re->ref);
7703 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7704 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
7705 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7706 type = "cherrypicked";
7707 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7708 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
7709 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7710 type = "backed-out";
7714 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7715 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7719 err = got_repo_match_object_id(&id, NULL, refname,
7720 GOT_OBJ_TYPE_COMMIT, NULL, repo);
7724 err = got_object_open_as_commit(&commit, repo, id);
7728 wcpa.commit_paths = paths;
7729 wcpa.has_changes = &add_logmsg;
7731 err = commit_path_changed_in_worktree(&wcpa, id,
7738 err = got_opentemp_named(logmsg_path, &f,
7739 "got-commit-logmsg", "");
7743 err = cat_logmsg(f, commit, refname, type,
7750 err = got_reflist_entry_dup(&re_match, re);
7753 TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
7756 got_object_commit_close(commit);
7765 got_ref_list_free(&refs);
7767 got_object_commit_close(commit);
7768 if (f && fclose(f) == EOF && err == NULL)
7769 err = got_error_from_errno("fclose");
7770 if (!added_logmsg) {
7771 if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
7772 err = got_error_from_errno2("unlink", *logmsg_path);
7773 *logmsg_path = NULL;
7778 static const struct got_error *
7779 cmd_commit(int argc, char *argv[])
7781 const struct got_error *error = NULL;
7782 struct got_worktree *worktree = NULL;
7783 struct got_repository *repo = NULL;
7784 char *cwd = NULL, *id_str = NULL;
7785 struct got_object_id *id = NULL;
7786 const char *logmsg = NULL;
7787 char *prepared_logmsg = NULL, *merged_logmsg = NULL;
7788 struct collect_commit_logmsg_arg cl_arg;
7789 const char *author = NULL;
7790 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
7791 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7792 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7793 int show_diff = 1, commit_conflicts = 0;
7794 struct got_pathlist_head paths;
7795 struct got_reflist_head refs;
7796 struct got_reflist_entry *re;
7797 int *pack_fds = NULL;
7798 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
7799 const struct got_remote_repo *remotes, *remote = NULL;
7801 char *proto = NULL, *host = NULL, *port = NULL;
7802 char *repo_name = NULL, *server_path = NULL;
7803 const char *remote_name;
7809 cl_arg.logmsg_path = NULL;
7812 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7813 "unveil", NULL) == -1)
7817 while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
7821 error = valid_author(author);
7826 commit_conflicts = 1;
7830 option_conflict('F', 'm');
7831 prepared_logmsg = realpath(optarg, NULL);
7832 if (prepared_logmsg == NULL)
7833 return got_error_from_errno2("realpath",
7837 if (prepared_logmsg)
7838 option_conflict('m', 'F');
7842 non_interactive = 1;
7848 allow_bad_symlinks = 1;
7859 cwd = getcwd(NULL, 0);
7861 error = got_error_from_errno("getcwd");
7865 error = got_repo_pack_fds_open(&pack_fds);
7869 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
7871 if (error->code == GOT_ERR_NOT_WORKTREE)
7872 error = wrap_not_worktree_error(error, "commit", cwd);
7876 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7879 if (rebase_in_progress) {
7880 error = got_error(GOT_ERR_REBASING);
7884 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7889 error = get_gitconfig_path(&gitconfig_path);
7892 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7893 gitconfig_path, pack_fds);
7897 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7900 if (merge_in_progress) {
7901 error = got_error(GOT_ERR_MERGE_BUSY);
7905 error = get_author(&committer, repo, worktree);
7912 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
7913 worktree_conf = got_worktree_get_gotconfig(worktree);
7914 if (worktree_conf) {
7915 got_gotconfig_get_remotes(&nremotes, &remotes,
7917 for (i = 0; i < nremotes; i++) {
7918 if (strcmp(remotes[i].name, remote_name) == 0) {
7919 remote = &remotes[i];
7924 if (remote == NULL) {
7925 repo_conf = got_repo_get_gotconfig(repo);
7927 got_gotconfig_get_remotes(&nremotes, &remotes,
7929 for (i = 0; i < nremotes; i++) {
7930 if (strcmp(remotes[i].name, remote_name) == 0) {
7931 remote = &remotes[i];
7937 if (remote == NULL) {
7938 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
7939 for (i = 0; i < nremotes; i++) {
7940 if (strcmp(remotes[i].name, remote_name) == 0) {
7941 remote = &remotes[i];
7946 if (remote == NULL) {
7947 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
7951 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
7952 &repo_name, remote->fetch_url);
7956 if (strcmp(proto, "git") == 0) {
7958 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7959 "sendfd dns inet unveil", NULL) == -1)
7962 } else if (strcmp(proto, "git+ssh") == 0 ||
7963 strcmp(proto, "ssh") == 0) {
7965 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7966 "sendfd unveil", NULL) == -1)
7969 } else if (strcmp(proto, "http") == 0 ||
7970 strcmp(proto, "git+http") == 0) {
7971 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
7974 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
7979 /*if (verbosity >= 0) {
7980 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
7981 remote->name, proto, host,
7982 port ? ":" : "", port ? port : "",
7983 *server_path == '/' ? "" : "/", server_path);
7987 * unveil(2) traverses exec(2); if an editor is used we have
7988 * to apply unveil after the log message has been written during
7991 if (logmsg == NULL || strlen(logmsg) == 0)
7992 error = get_editor(&editor);
7994 error = got_dial_apply_unveil(proto);
7997 error = apply_unveil(got_repo_get_path(repo), 0,
7998 got_worktree_get_root_path(worktree));
8003 if (prepared_logmsg == NULL) {
8004 error = lookup_logmsg_ref(&merged_logmsg,
8005 argc > 0 ? &paths : NULL, &refs, worktree, repo);
8010 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8014 cl_arg.editor = editor;
8015 cl_arg.cmdline_log = logmsg;
8016 cl_arg.prepared_log = prepared_logmsg;
8017 cl_arg.merged_log = merged_logmsg;
8018 cl_arg.non_interactive = non_interactive;
8019 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8020 cl_arg.repo_path = got_repo_get_path(repo);
8021 cl_arg.dial_proto = proto;
8022 error = got_worktree_cvg_commit(&id, worktree, &paths, author,
8023 committer, allow_bad_symlinks, show_diff, commit_conflicts,
8024 collect_commit_logmsg, &cl_arg, print_status, NULL, proto, host,
8025 port, server_path, verbosity, remote, check_cancelled, repo);
8027 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8028 cl_arg.logmsg_path != NULL)
8029 preserve_logmsg = 1;
8033 error = got_object_id_str(&id_str, id);
8036 printf("Created commit %s\n", id_str);
8038 TAILQ_FOREACH(re, &refs, entry) {
8039 error = got_ref_delete(re->ref, repo);
8045 if (preserve_logmsg) {
8046 fprintf(stderr, "%s: log message preserved in %s\n",
8047 getprogname(), cl_arg.logmsg_path);
8048 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8050 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8051 free(cl_arg.logmsg_path);
8052 if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
8053 error = got_error_from_errno2("unlink", merged_logmsg);
8054 free(merged_logmsg);
8056 const struct got_error *close_err = got_repo_close(repo);
8061 got_worktree_close(worktree);
8063 const struct got_error *pack_err =
8064 got_repo_pack_fds_close(pack_fds);
8068 got_ref_list_free(&refs);
8069 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8072 free(gitconfig_path);
8075 free(prepared_logmsg);
8080 * Print and if delete is set delete all ref_prefix references.
8081 * If wanted_ref is not NULL, only print or delete this reference.
8083 static const struct got_error *
8084 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
8085 const char *wanted_ref, int delete, struct got_worktree *worktree,
8086 struct got_repository *repo)
8088 const struct got_error *err;
8089 struct got_pathlist_head paths;
8090 struct got_reflist_head refs;
8091 struct got_reflist_entry *re;
8092 struct got_reflist_object_id_map *refs_idmap = NULL;
8093 struct got_commit_object *commit = NULL;
8094 struct got_object_id *id = NULL;
8095 const char *header_prefix;
8096 char *uuidstr = NULL;
8102 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
8106 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8110 if (worktree != NULL) {
8111 err = got_worktree_get_uuid(&uuidstr, worktree);
8117 if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
8121 if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
8122 header_prefix = "backout";
8124 header_prefix = "cherrypick";
8126 TAILQ_FOREACH(re, &refs, entry) {
8127 const char *refname, *wt;
8129 refname = got_ref_get_name(re->ref);
8131 err = check_cancelled(NULL);
8135 if (strncmp(refname, ref_prefix, prefix_len) == 0)
8136 refname += prefix_len + 1; /* skip '-' delimiter */
8142 if (worktree == NULL || strncmp(refname, uuidstr,
8143 GOT_WORKTREE_UUID_STRLEN) == 0)
8144 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8148 err = got_repo_match_object_id(&id, NULL, refname,
8149 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8153 err = got_object_open_as_commit(&commit, repo, id);
8158 found = strncmp(wanted_ref, refname,
8159 strlen(wanted_ref)) == 0;
8160 if (wanted_ref && !found) {
8161 struct got_reflist_head *ci_refs;
8163 ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
8167 char *refs_str = NULL;
8168 char const *r = NULL;
8170 err = build_refs_str(&refs_str, ci_refs, id,
8177 if (strncmp(r, wanted_ref,
8178 strlen(wanted_ref)) == 0) {
8190 if (wanted_ref == NULL || found) {
8192 err = got_ref_delete(re->ref, repo);
8195 printf("Deleted: ");
8196 err = print_commit_oneline(commit, id, repo,
8200 * Print paths modified by commit to help
8201 * associate commits with worktree changes.
8203 err = get_changed_paths(&paths, commit,
8208 err = print_commit(commit, id, repo, NULL,
8209 &paths, NULL, 0, 0, refs_idmap, NULL,
8211 got_pathlist_free(&paths,
8212 GOT_PATHLIST_FREE_ALL);
8214 if (worktree == NULL)
8215 printf("work tree: %.*s\n\n",
8216 GOT_WORKTREE_UUID_STRLEN, wt);
8222 got_object_commit_close(commit);
8228 if (wanted_ref != NULL && !found)
8229 err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
8234 got_ref_list_free(&refs);
8235 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8237 got_reflist_object_id_map_free(refs_idmap);
8239 got_object_commit_close(commit);
8244 * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
8245 * identified by id for log messages to prepopulate the editor on commit.
8247 static const struct got_error *
8248 logmsg_ref(struct got_object_id *id, const char *prefix,
8249 struct got_worktree *worktree, struct got_repository *repo)
8251 const struct got_error *err = NULL;
8252 char *idstr, *ref = NULL, *refname = NULL;
8253 int histedit_in_progress;
8254 int rebase_in_progress, merge_in_progress;
8257 * Silenty refuse to create merge reference if any histedit, merge,
8258 * or rebase operation is in progress.
8260 err = got_worktree_histedit_in_progress(&histedit_in_progress,
8264 if (histedit_in_progress)
8267 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8270 if (rebase_in_progress)
8273 err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
8277 if (merge_in_progress)
8280 err = got_object_id_str(&idstr, id);
8284 err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
8288 if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
8289 err = got_error_from_errno("asprintf");
8293 err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
8303 usage_cherrypick(void)
8305 fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
8310 static const struct got_error *
8311 cmd_cherrypick(int argc, char *argv[])
8313 const struct got_error *error = NULL;
8314 struct got_worktree *worktree = NULL;
8315 struct got_repository *repo = NULL;
8316 char *cwd = NULL, *commit_id_str = NULL;
8317 struct got_object_id *commit_id = NULL;
8318 struct got_commit_object *commit = NULL;
8319 struct got_object_qid *pid;
8320 int ch, list_refs = 0, remove_refs = 0;
8321 struct got_update_progress_arg upa;
8322 int *pack_fds = NULL;
8325 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8326 "unveil", NULL) == -1)
8330 while ((ch = getopt(argc, argv, "lX")) != -1) {
8347 if (list_refs || remove_refs) {
8348 if (argc != 0 && argc != 1)
8350 } else if (argc != 1)
8352 if (list_refs && remove_refs)
8353 option_conflict('l', 'X');
8355 cwd = getcwd(NULL, 0);
8357 error = got_error_from_errno("getcwd");
8361 error = got_repo_pack_fds_open(&pack_fds);
8365 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8367 if (list_refs || remove_refs) {
8368 if (error->code != GOT_ERR_NOT_WORKTREE)
8371 if (error->code == GOT_ERR_NOT_WORKTREE)
8372 error = wrap_not_worktree_error(error,
8378 error = got_repo_open(&repo,
8379 worktree ? got_worktree_get_repo_path(worktree) : cwd,
8384 error = apply_unveil(got_repo_get_path(repo), 0,
8385 worktree ? got_worktree_get_root_path(worktree) : NULL);
8389 if (list_refs || remove_refs) {
8390 error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8391 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
8392 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8396 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8397 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8400 error = got_object_id_str(&commit_id_str, commit_id);
8404 error = got_object_open_as_commit(&commit, repo, commit_id);
8407 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8408 memset(&upa, 0, sizeof(upa));
8409 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8410 commit_id, repo, update_progress, &upa, check_cancelled,
8415 if (upa.did_something) {
8416 error = logmsg_ref(commit_id,
8417 GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
8420 printf("Merged commit %s\n", commit_id_str);
8422 print_merge_progress_stats(&upa);
8426 got_object_commit_close(commit);
8427 free(commit_id_str);
8429 got_worktree_close(worktree);
8431 const struct got_error *close_err = got_repo_close(repo);
8436 const struct got_error *pack_err =
8437 got_repo_pack_fds_close(pack_fds);
8448 fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
8452 static const struct got_error *
8453 cmd_backout(int argc, char *argv[])
8455 const struct got_error *error = NULL;
8456 struct got_worktree *worktree = NULL;
8457 struct got_repository *repo = NULL;
8458 char *cwd = NULL, *commit_id_str = NULL;
8459 struct got_object_id *commit_id = NULL;
8460 struct got_commit_object *commit = NULL;
8461 struct got_object_qid *pid;
8462 int ch, list_refs = 0, remove_refs = 0;
8463 struct got_update_progress_arg upa;
8464 int *pack_fds = NULL;
8467 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8468 "unveil", NULL) == -1)
8472 while ((ch = getopt(argc, argv, "lX")) != -1) {
8489 if (list_refs || remove_refs) {
8490 if (argc != 0 && argc != 1)
8492 } else if (argc != 1)
8494 if (list_refs && remove_refs)
8495 option_conflict('l', 'X');
8497 cwd = getcwd(NULL, 0);
8499 error = got_error_from_errno("getcwd");
8503 error = got_repo_pack_fds_open(&pack_fds);
8507 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8509 if (list_refs || remove_refs) {
8510 if (error->code != GOT_ERR_NOT_WORKTREE)
8513 if (error->code == GOT_ERR_NOT_WORKTREE)
8514 error = wrap_not_worktree_error(error,
8520 error = got_repo_open(&repo,
8521 worktree ? got_worktree_get_repo_path(worktree) : cwd,
8526 error = apply_unveil(got_repo_get_path(repo), 0,
8527 worktree ? got_worktree_get_root_path(worktree) : NULL);
8531 if (list_refs || remove_refs) {
8532 error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
8533 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
8534 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8538 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8539 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8542 error = got_object_id_str(&commit_id_str, commit_id);
8546 error = got_object_open_as_commit(&commit, repo, commit_id);
8549 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8551 error = got_error(GOT_ERR_ROOT_COMMIT);
8555 memset(&upa, 0, sizeof(upa));
8556 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8557 repo, update_progress, &upa, check_cancelled, NULL);
8561 if (upa.did_something) {
8562 error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8566 printf("Backed out commit %s\n", commit_id_str);
8568 print_merge_progress_stats(&upa);
8572 got_object_commit_close(commit);
8573 free(commit_id_str);
8575 got_worktree_close(worktree);
8577 const struct got_error *close_err = got_repo_close(repo);
8582 const struct got_error *pack_err =
8583 got_repo_pack_fds_close(pack_fds);
8593 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
8594 "arg ...\n", getprogname());
8598 static const struct got_error *
8599 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8601 const struct got_error *err;
8602 struct got_blob_object *blob;
8605 fd = got_opentempfd();
8607 return got_error_from_errno("got_opentempfd");
8609 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
8613 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8615 if (fd != -1 && close(fd) == -1 && err == NULL)
8616 err = got_error_from_errno("close");
8618 got_object_blob_close(blob);
8622 static const struct got_error *
8623 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8625 const struct got_error *err;
8626 struct got_tree_object *tree;
8629 err = got_object_open_as_tree(&tree, repo, id);
8633 nentries = got_object_tree_get_nentries(tree);
8634 for (i = 0; i < nentries; i++) {
8635 struct got_tree_entry *te;
8637 if (sigint_received || sigpipe_received)
8639 te = got_object_tree_get_entry(tree, i);
8640 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8643 fprintf(outfile, "%s %.7o %s\n", id_str,
8644 got_tree_entry_get_mode(te),
8645 got_tree_entry_get_name(te));
8649 got_object_tree_close(tree);
8653 static const struct got_error *
8654 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8656 const struct got_error *err;
8657 struct got_commit_object *commit;
8658 const struct got_object_id_queue *parent_ids;
8659 struct got_object_qid *pid;
8660 char *id_str = NULL;
8661 const char *logmsg = NULL;
8664 err = got_object_open_as_commit(&commit, repo, id);
8668 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8672 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8673 parent_ids = got_object_commit_get_parent_ids(commit);
8674 fprintf(outfile, "numparents %d\n",
8675 got_object_commit_get_nparents(commit));
8676 STAILQ_FOREACH(pid, parent_ids, entry) {
8678 err = got_object_id_str(&pid_str, &pid->id);
8681 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8684 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8685 got_object_commit_get_author_gmtoff(commit));
8686 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
8687 got_object_commit_get_author(commit),
8688 (long long)got_object_commit_get_author_time(commit),
8691 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8692 got_object_commit_get_committer_gmtoff(commit));
8693 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
8694 got_object_commit_get_committer(commit),
8695 (long long)got_object_commit_get_committer_time(commit),
8698 logmsg = got_object_commit_get_logmsg_raw(commit);
8699 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8700 fprintf(outfile, "%s", logmsg);
8703 got_object_commit_close(commit);
8707 static const struct got_error *
8708 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8710 const struct got_error *err;
8711 struct got_tag_object *tag;
8712 char *id_str = NULL;
8713 const char *tagmsg = NULL;
8716 err = got_object_open_as_tag(&tag, repo, id);
8720 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8724 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8726 switch (got_object_tag_get_object_type(tag)) {
8727 case GOT_OBJ_TYPE_BLOB:
8728 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8729 GOT_OBJ_LABEL_BLOB);
8731 case GOT_OBJ_TYPE_TREE:
8732 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8733 GOT_OBJ_LABEL_TREE);
8735 case GOT_OBJ_TYPE_COMMIT:
8736 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8737 GOT_OBJ_LABEL_COMMIT);
8739 case GOT_OBJ_TYPE_TAG:
8740 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8747 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8748 got_object_tag_get_name(tag));
8750 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8751 got_object_tag_get_tagger_gmtoff(tag));
8752 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
8753 got_object_tag_get_tagger(tag),
8754 (long long)got_object_tag_get_tagger_time(tag),
8757 tagmsg = got_object_tag_get_message(tag);
8758 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8759 fprintf(outfile, "%s", tagmsg);
8762 got_object_tag_close(tag);
8766 static const struct got_error *
8767 cmd_cat(int argc, char *argv[])
8769 const struct got_error *error;
8770 struct got_repository *repo = NULL;
8771 struct got_worktree *worktree = NULL;
8772 char *cwd = NULL, *repo_path = NULL, *label = NULL;
8773 const char *commit_id_str = NULL;
8774 struct got_object_id *id = NULL, *commit_id = NULL;
8775 struct got_commit_object *commit = NULL;
8776 int ch, obj_type, i, force_path = 0;
8777 struct got_reflist_head refs;
8778 int *pack_fds = NULL;
8783 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8788 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
8791 commit_id_str = optarg;
8797 repo_path = realpath(optarg, NULL);
8798 if (repo_path == NULL)
8799 return got_error_from_errno2("realpath",
8801 got_path_strip_trailing_slashes(repo_path);
8812 cwd = getcwd(NULL, 0);
8814 error = got_error_from_errno("getcwd");
8818 error = got_repo_pack_fds_open(&pack_fds);
8822 if (repo_path == NULL) {
8823 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
8824 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8828 got_worktree_get_repo_path(worktree));
8829 if (repo_path == NULL) {
8830 error = got_error_from_errno("strdup");
8834 /* Release work tree lock. */
8835 got_worktree_close(worktree);
8840 if (repo_path == NULL) {
8841 repo_path = strdup(cwd);
8842 if (repo_path == NULL)
8843 return got_error_from_errno("strdup");
8846 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8851 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8855 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8859 if (commit_id_str == NULL)
8860 commit_id_str = GOT_REF_HEAD;
8861 error = got_repo_match_object_id(&commit_id, NULL,
8862 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8866 error = got_object_open_as_commit(&commit, repo, commit_id);
8870 for (i = 0; i < argc; i++) {
8872 error = got_object_id_by_path(&id, repo, commit,
8877 error = got_repo_match_object_id(&id, &label, argv[i],
8878 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
8881 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8882 error->code != GOT_ERR_NOT_REF)
8884 error = got_object_id_by_path(&id, repo,
8891 error = got_object_get_type(&obj_type, repo, id);
8896 case GOT_OBJ_TYPE_BLOB:
8897 error = cat_blob(id, repo, stdout);
8899 case GOT_OBJ_TYPE_TREE:
8900 error = cat_tree(id, repo, stdout);
8902 case GOT_OBJ_TYPE_COMMIT:
8903 error = cat_commit(id, repo, stdout);
8905 case GOT_OBJ_TYPE_TAG:
8906 error = cat_tag(id, repo, stdout);
8909 error = got_error(GOT_ERR_OBJ_TYPE);
8924 got_object_commit_close(commit);
8926 got_worktree_close(worktree);
8928 const struct got_error *close_err = got_repo_close(repo);
8933 const struct got_error *pack_err =
8934 got_repo_pack_fds_close(pack_fds);
8939 got_ref_list_free(&refs);
8946 fprintf(stderr, "usage: %s info [path ...]\n",
8951 static const struct got_error *
8952 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
8953 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8954 struct got_object_id *commit_id)
8956 const struct got_error *err = NULL;
8957 char *id_str = NULL;
8959 struct tm mytm, *tm;
8960 struct got_pathlist_head *paths = arg;
8961 struct got_pathlist_entry *pe;
8964 * Clear error indication from any of the path arguments which
8965 * would cause this file index entry to be displayed.
8967 TAILQ_FOREACH(pe, paths, entry) {
8968 if (got_path_cmp(path, pe->path, strlen(path),
8969 pe->path_len) == 0 ||
8970 got_path_is_child(path, pe->path, pe->path_len))
8971 pe->data = NULL; /* no error */
8974 printf(GOT_COMMIT_SEP_STR);
8976 printf("symlink: %s\n", path);
8977 else if (S_ISREG(mode)) {
8978 printf("file: %s\n", path);
8979 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
8980 } else if (S_ISDIR(mode))
8981 printf("directory: %s\n", path);
8983 printf("something: %s\n", path);
8985 tm = localtime_r(&mtime, &mytm);
8988 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
8989 return got_error(GOT_ERR_NO_SPACE);
8990 printf("timestamp: %s\n", datebuf);
8993 err = got_object_id_str(&id_str, blob_id);
8996 printf("based on blob: %s\n", id_str);
9000 if (staged_blob_id) {
9001 err = got_object_id_str(&id_str, staged_blob_id);
9004 printf("based on staged blob: %s\n", id_str);
9009 err = got_object_id_str(&id_str, commit_id);
9012 printf("based on commit: %s\n", id_str);
9019 static const struct got_error *
9020 cmd_info(int argc, char *argv[])
9022 const struct got_error *error = NULL;
9023 struct got_worktree *worktree = NULL;
9024 char *cwd = NULL, *id_str = NULL;
9025 struct got_pathlist_head paths;
9026 char *uuidstr = NULL;
9027 int ch, show_files = 0;
9032 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9037 while ((ch = getopt(argc, argv, "")) != -1) {
9048 cwd = getcwd(NULL, 0);
9050 error = got_error_from_errno("getcwd");
9054 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_CVG_DIR);
9056 if (error->code == GOT_ERR_NOT_WORKTREE)
9057 error = wrap_not_worktree_error(error, "info", cwd);
9062 /* Remove "wpath cpath proc exec sendfd" promises. */
9063 if (pledge("stdio rpath flock unveil", NULL) == -1)
9066 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9071 error = get_worktree_paths_from_argv(&paths, argc, argv,
9078 error = got_object_id_str(&id_str,
9079 got_worktree_get_base_commit_id(worktree));
9083 error = got_worktree_get_uuid(&uuidstr, worktree);
9087 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9088 printf("work tree base commit: %s\n", id_str);
9089 printf("work tree path prefix: %s\n",
9090 got_worktree_get_path_prefix(worktree));
9091 printf("work tree branch reference: %s\n",
9092 got_worktree_get_head_ref_name(worktree));
9093 printf("work tree UUID: %s\n", uuidstr);
9094 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9097 struct got_pathlist_entry *pe;
9098 TAILQ_FOREACH(pe, &paths, entry) {
9099 if (pe->path_len == 0)
9102 * Assume this path will fail. This will be corrected
9103 * in print_path_info() in case the path does suceeed.
9105 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
9107 error = got_worktree_path_info(worktree, &paths,
9108 print_path_info, &paths, check_cancelled, NULL);
9111 TAILQ_FOREACH(pe, &paths, entry) {
9112 if (pe->data != NULL) {
9113 const struct got_error *perr;
9116 error = got_error_fmt(perr->code, "%s",
9124 got_worktree_close(worktree);
9125 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);