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, repo);
2308 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2311 error = got_worktree_open(&worktree, worktree_path);
2315 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2319 if (!same_path_prefix) {
2320 error = got_error(GOT_ERR_PATH_PREFIX);
2324 if (commit_id_str) {
2325 struct got_reflist_head refs;
2327 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2331 error = got_repo_match_object_id(&commit_id, NULL,
2332 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2333 got_ref_list_free(&refs);
2336 error = check_linear_ancestry(commit_id,
2337 got_worktree_get_base_commit_id(worktree), 0, repo);
2338 if (error != NULL) {
2339 if (error->code == GOT_ERR_ANCESTRY) {
2340 error = checkout_ancestry_error(
2341 head_ref, commit_id_str);
2345 error = check_same_branch(commit_id, head_ref, repo);
2347 if (error->code == GOT_ERR_ANCESTRY) {
2348 error = checkout_ancestry_error(
2349 head_ref, commit_id_str);
2353 error = got_worktree_set_base_commit_id(worktree, repo,
2357 /* Expand potentially abbreviated commit ID string. */
2358 free(commit_id_str);
2359 error = got_object_id_str(&commit_id_str, commit_id);
2363 commit_id = got_object_id_dup(
2364 got_worktree_get_base_commit_id(worktree));
2365 if (commit_id == NULL) {
2366 error = got_error_from_errno("got_object_id_dup");
2369 error = got_object_id_str(&commit_id_str, commit_id);
2374 error = got_pathlist_append(&paths, "", NULL);
2377 cpa.worktree_path = worktree_path;
2378 cpa.had_base_commit_ref_error = 0;
2379 cpa.verbosity = verbosity;
2380 error = got_worktree_checkout_files(worktree, &paths, repo,
2381 checkout_progress, &cpa, check_cancelled, NULL);
2385 if (got_ref_is_symbolic(head_ref)) {
2386 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
2389 refname = got_ref_get_name(ref);
2391 refname = got_ref_get_name(head_ref);
2392 printf("Checked out %s: %s\n", refname, commit_id_str);
2393 printf("Now shut up and hack\n");
2394 if (cpa.had_base_commit_ref_error)
2395 show_worktree_base_ref_warning();
2398 const struct got_error *pack_err =
2399 got_repo_pack_fds_close(pack_fds);
2404 got_ref_close(head_ref);
2408 const struct got_error *close_err = got_repo_close(repo);
2412 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2413 free(commit_id_str);
2416 free(worktree_path);
2421 struct got_update_progress_arg {
2433 print_update_progress_stats(struct got_update_progress_arg *upa)
2435 if (!upa->did_something)
2438 if (upa->conflicts > 0)
2439 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2440 if (upa->obstructed > 0)
2441 printf("File paths obstructed by a non-regular file: %d\n",
2443 if (upa->not_updated > 0)
2444 printf("Files not updated because of existing merge "
2445 "conflicts: %d\n", upa->not_updated);
2449 * The meaning of some status codes differs between merge-style operations and
2450 * update operations. For example, the ! status code means "file was missing"
2451 * if changes were merged into the work tree, and "missing file was restored"
2452 * if the work tree was updated. This function should be used by any operation
2453 * which merges changes into the work tree without updating the work tree.
2456 print_merge_progress_stats(struct got_update_progress_arg *upa)
2458 if (!upa->did_something)
2461 if (upa->conflicts > 0)
2462 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2463 if (upa->obstructed > 0)
2464 printf("File paths obstructed by a non-regular file: %d\n",
2466 if (upa->missing > 0)
2467 printf("Files which had incoming changes but could not be "
2468 "found in the work tree: %d\n", upa->missing);
2469 if (upa->not_deleted > 0)
2470 printf("Files not deleted due to differences in deleted "
2471 "content: %d\n", upa->not_deleted);
2472 if (upa->unversioned > 0)
2473 printf("Files not merged because an unversioned file was "
2474 "found in the work tree: %d\n", upa->unversioned);
2480 fprintf(stderr, "usage: %s update [-qtvX] [-c commit] [-r remote] "
2481 "[path ...]\n", getprogname());
2485 static const struct got_error *
2486 update_progress(void *arg, unsigned char status, const char *path)
2488 struct got_update_progress_arg *upa = arg;
2490 if (status == GOT_STATUS_EXISTS ||
2491 status == GOT_STATUS_BASE_REF_ERR)
2494 upa->did_something = 1;
2496 /* Base commit bump happens silently. */
2497 if (status == GOT_STATUS_BUMP_BASE)
2500 if (status == GOT_STATUS_CONFLICT)
2502 if (status == GOT_STATUS_OBSTRUCTED)
2504 if (status == GOT_STATUS_CANNOT_UPDATE)
2506 if (status == GOT_STATUS_MISSING)
2508 if (status == GOT_STATUS_CANNOT_DELETE)
2510 if (status == GOT_STATUS_UNVERSIONED)
2513 while (path[0] == '/')
2515 if (upa->verbosity >= 0)
2516 printf("%c %s\n", status, path);
2521 static const struct got_error *
2522 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2524 const struct got_error *err;
2527 err = got_worktree_rebase_in_progress(&in_progress, worktree);
2531 return got_error(GOT_ERR_REBASING);
2533 err = got_worktree_histedit_in_progress(&in_progress, worktree);
2537 return got_error(GOT_ERR_HISTEDIT_BUSY);
2542 static const struct got_error *
2543 check_merge_in_progress(struct got_worktree *worktree,
2544 struct got_repository *repo)
2546 const struct got_error *err;
2549 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
2553 return got_error(GOT_ERR_MERGE_BUSY);
2558 static const struct got_error *
2559 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2560 char *argv[], struct got_worktree *worktree)
2562 const struct got_error *err = NULL;
2564 struct got_pathlist_entry *new;
2570 return got_error_from_errno("strdup");
2571 return got_pathlist_append(paths, path, NULL);
2574 for (i = 0; i < argc; i++) {
2575 err = got_worktree_resolve_path(&path, worktree, argv[i]);
2578 err = got_pathlist_insert(&new, paths, path, NULL);
2579 if (err || new == NULL /* duplicate */) {
2589 static const struct got_error *
2590 wrap_not_worktree_error(const struct got_error *orig_err,
2591 const char *cmdname, const char *path)
2593 const struct got_error *err;
2594 struct got_repository *repo;
2595 static char msg[512];
2596 int *pack_fds = NULL;
2598 err = got_repo_pack_fds_open(&pack_fds);
2602 err = got_repo_open(&repo, path, NULL, pack_fds);
2606 snprintf(msg, sizeof(msg),
2607 "'got %s' needs a work tree in addition to a git repository\n"
2608 "Work trees can be checked out from this Git repository with "
2610 "The got(1) manual page contains more information.", cmdname);
2611 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2613 const struct got_error *close_err = got_repo_close(repo);
2618 const struct got_error *pack_err =
2619 got_repo_pack_fds_close(pack_fds);
2626 static const struct got_error *
2627 cmd_update(int argc, char *argv[])
2629 const struct got_error *error = NULL, *unlock_err;
2630 char *worktree_path = NULL;
2631 const char *repo_path = NULL;
2632 const char *remote_name = NULL;
2633 char *proto = NULL, *host = NULL, *port = NULL;
2634 char *repo_name = NULL, *server_path = NULL;
2635 const struct got_remote_repo *remotes, *remote = NULL;
2637 char *id_str = NULL;
2638 struct got_repository *repo = NULL;
2639 struct got_worktree *worktree = NULL;
2640 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2641 struct got_pathlist_head paths, refs, symrefs;
2642 struct got_pathlist_head wanted_branches, wanted_refs;
2643 struct got_pathlist_entry *pe;
2644 struct got_reflist_head remote_refs;
2645 struct got_reflist_entry *re;
2646 struct got_object_id *pack_hash = NULL;
2647 int i, ch, fetchfd = -1, fetchstatus;
2648 pid_t fetchpid = -1;
2649 struct got_fetch_progress_arg fpa;
2650 struct got_update_progress_arg upa;
2652 int delete_remote = 0;
2653 int replace_tags = 0;
2654 int *pack_fds = NULL;
2655 const char *remote_head = NULL, *worktree_branch = NULL;
2656 struct got_object_id *commit_id = NULL;
2657 char *commit_id_str = NULL;
2658 const char *refname;
2659 struct got_reference *head_ref = NULL;
2663 TAILQ_INIT(&symrefs);
2664 TAILQ_INIT(&remote_refs);
2665 TAILQ_INIT(&wanted_branches);
2666 TAILQ_INIT(&wanted_refs);
2668 while ((ch = getopt(argc, argv, "c:qr:vX")) != -1) {
2671 commit_id_str = strdup(optarg);
2672 if (commit_id_str == NULL)
2673 return got_error_from_errno("strdup");
2682 remote_name = optarg;
2687 else if (verbosity < 3)
2701 if (delete_remote) {
2703 option_conflict('X', 't');
2704 if (remote_name == NULL)
2705 errx(1, "-X option requires a remote name");
2707 if (remote_name == NULL)
2708 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2710 worktree_path = getcwd(NULL, 0);
2711 if (worktree_path == NULL) {
2712 error = got_error_from_errno("getcwd");
2715 error = got_worktree_open(&worktree, worktree_path);
2717 if (error->code == GOT_ERR_NOT_WORKTREE)
2718 error = wrap_not_worktree_error(error, "update",
2722 repo_path = got_worktree_get_repo_path(worktree);
2724 error = got_repo_pack_fds_open(&pack_fds);
2728 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2732 error = check_rebase_or_histedit_in_progress(worktree);
2735 error = check_merge_in_progress(worktree, repo);
2739 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2743 worktree_conf = got_worktree_get_gotconfig(worktree);
2744 if (worktree_conf) {
2745 got_gotconfig_get_remotes(&nremotes, &remotes,
2747 for (i = 0; i < nremotes; i++) {
2748 if (strcmp(remotes[i].name, remote_name) == 0) {
2749 remote = &remotes[i];
2755 if (remote == NULL) {
2756 repo_conf = got_repo_get_gotconfig(repo);
2758 got_gotconfig_get_remotes(&nremotes, &remotes,
2760 for (i = 0; i < nremotes; i++) {
2761 if (strcmp(remotes[i].name, remote_name) == 0) {
2762 remote = &remotes[i];
2768 if (remote == NULL) {
2769 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2770 for (i = 0; i < nremotes; i++) {
2771 if (strcmp(remotes[i].name, remote_name) == 0) {
2772 remote = &remotes[i];
2777 if (remote == NULL) {
2778 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2782 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2783 &repo_name, remote->fetch_url);
2787 if (strcmp(proto, "git") == 0) {
2789 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2790 "sendfd dns inet unveil", NULL) == -1)
2793 } else if (strcmp(proto, "git+ssh") == 0 ||
2794 strcmp(proto, "ssh") == 0) {
2796 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2797 "sendfd unveil", NULL) == -1)
2800 } else if (strcmp(proto, "http") == 0 ||
2801 strcmp(proto, "git+http") == 0) {
2802 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2805 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2809 error = got_dial_apply_unveil(proto);
2813 error = apply_unveil(got_repo_get_path(repo), 0,
2814 got_worktree_get_root_path(worktree));
2818 if (verbosity >= 0) {
2819 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2820 remote->name, proto, host,
2821 port ? ":" : "", port ? port : "",
2822 *server_path == '/' ? "" : "/", server_path);
2825 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2826 server_path, verbosity);
2831 * If set, get this remote's HEAD ref target so
2832 * if it has changed on the server we can fetch it.
2834 error = got_ref_list(&remote_refs, repo, "refs/remotes",
2835 got_ref_cmp_by_name, repo);
2839 TAILQ_FOREACH(re, &remote_refs, entry) {
2840 const char *remote_refname, *remote_target;
2841 size_t remote_name_len;
2843 if (!got_ref_is_symbolic(re->ref))
2846 remote_name_len = strlen(remote->name);
2847 remote_refname = got_ref_get_name(re->ref);
2849 /* we only want refs/remotes/$remote->name/HEAD */
2850 if (strncmp(remote_refname + 13, remote->name,
2851 remote_name_len) != 0)
2854 if (strcmp(remote_refname + remote_name_len + 14,
2859 * Take the name itself because we already
2860 * only match with refs/heads/ in fetch_pack().
2862 remote_target = got_ref_get_symref_target(re->ref);
2863 remote_head = remote_target + remote_name_len + 14;
2867 refname = got_worktree_get_head_ref_name(worktree);
2868 if (strncmp(refname, "refs/heads/", 11) == 0)
2869 worktree_branch = refname;
2871 fpa.last_scaled_size[0] = '\0';
2872 fpa.last_p_indexed = -1;
2873 fpa.last_p_resolved = -1;
2874 fpa.verbosity = verbosity;
2876 fpa.create_configs = 0;
2877 fpa.configs_created = 0;
2878 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2880 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2881 remote->mirror_references, 0, &wanted_branches, &wanted_refs,
2882 0, verbosity, fetchfd, repo, worktree_branch, remote_head,
2883 0, fetch_progress, &fpa);
2887 if (pack_hash != NULL && verbosity >= 0) {
2888 error = got_object_id_str(&id_str, pack_hash);
2891 printf("\nFetched %s.pack\n", id_str);
2896 /* Update references provided with the pack file. */
2897 TAILQ_FOREACH(pe, &refs, entry) {
2898 const char *refname = pe->path;
2899 struct got_object_id *id = pe->data;
2900 struct got_reference *ref;
2902 if (is_wanted_ref(&wanted_refs, refname)) {
2903 error = update_wanted_ref(refname, id,
2904 remote->name, verbosity, repo);
2910 error = got_ref_open(&ref, repo, refname, 1);
2912 if (error->code != GOT_ERR_NOT_REF)
2914 error = create_ref(refname, id, verbosity,
2919 error = update_ref(ref, id, replace_tags,
2921 unlock_err = got_ref_unlock(ref);
2922 if (unlock_err && error == NULL)
2930 /* Update worktree */
2931 error = got_ref_open(&head_ref, repo,
2932 got_worktree_get_head_ref_name(worktree), 0);
2935 if (commit_id_str == NULL) {
2936 error = got_ref_resolve(&commit_id, repo, head_ref);
2939 error = got_object_id_str(&commit_id_str, commit_id);
2943 struct got_reflist_head refs;
2945 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2949 error = got_repo_match_object_id(&commit_id, NULL,
2950 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2951 got_ref_list_free(&refs);
2952 free(commit_id_str);
2953 commit_id_str = NULL;
2956 error = got_object_id_str(&commit_id_str, commit_id);
2962 error = check_linear_ancestry(commit_id,
2963 got_worktree_get_base_commit_id(worktree), 0, repo);
2964 if (error != NULL) {
2965 if (error->code == GOT_ERR_ANCESTRY)
2966 error = got_error(GOT_ERR_BRANCH_MOVED);
2969 error = check_same_branch(commit_id, head_ref, repo);
2973 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2975 error = got_worktree_set_base_commit_id(worktree, repo,
2981 memset(&upa, 0, sizeof(upa));
2982 upa.verbosity = verbosity;
2983 error = got_worktree_checkout_files(worktree, &paths, repo,
2984 update_progress, &upa, check_cancelled, NULL);
2988 if (upa.did_something) {
2989 printf("Updated to %s: %s\n",
2990 got_worktree_get_head_ref_name(worktree), commit_id_str);
2992 printf("Already up-to-date\n");
2994 print_update_progress_stats(&upa);
2997 if (kill(fetchpid, SIGTERM) == -1)
2998 error = got_error_from_errno("kill");
2999 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
3000 error = got_error_from_errno("waitpid");
3002 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
3003 error = got_error_from_errno("close");
3005 const struct got_error *close_err = got_repo_close(repo);
3010 got_worktree_close(worktree);
3012 const struct got_error *pack_err =
3013 got_repo_pack_fds_close(pack_fds);
3017 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3018 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
3019 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
3020 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
3021 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
3022 got_ref_list_free(&remote_refs);
3024 free(worktree_path);
3032 free(commit_id_str);
3036 static const struct got_error *
3037 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3038 const char *path, int diff_context, int ignore_whitespace,
3039 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3040 struct got_repository *repo, FILE *outfile)
3042 const struct got_error *err = NULL;
3043 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3044 FILE *f1 = NULL, *f2 = NULL;
3045 int fd1 = -1, fd2 = -1;
3047 fd1 = got_opentempfd();
3049 return got_error_from_errno("got_opentempfd");
3050 fd2 = got_opentempfd();
3052 err = got_error_from_errno("got_opentempfd");
3057 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3063 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3067 f1 = got_opentemp();
3069 err = got_error_from_errno("got_opentemp");
3072 f2 = got_opentemp();
3074 err = got_error_from_errno("got_opentemp");
3078 while (path[0] == '/')
3080 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3081 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3082 force_text_diff, dsa, outfile);
3084 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3085 err = got_error_from_errno("close");
3087 got_object_blob_close(blob1);
3088 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3089 err = got_error_from_errno("close");
3091 got_object_blob_close(blob2);
3092 if (f1 && fclose(f1) == EOF && err == NULL)
3093 err = got_error_from_errno("fclose");
3094 if (f2 && fclose(f2) == EOF && err == NULL)
3095 err = got_error_from_errno("fclose");
3099 static const struct got_error *
3100 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3101 const char *path, int diff_context, int ignore_whitespace,
3102 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3103 struct got_repository *repo, FILE *outfile)
3105 const struct got_error *err = NULL;
3106 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3107 struct got_diff_blob_output_unidiff_arg arg;
3108 FILE *f1 = NULL, *f2 = NULL;
3109 int fd1 = -1, fd2 = -1;
3112 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3115 fd1 = got_opentempfd();
3117 err = got_error_from_errno("got_opentempfd");
3122 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3126 f1 = got_opentemp();
3128 err = got_error_from_errno("got_opentemp");
3132 f2 = got_opentemp();
3134 err = got_error_from_errno("got_opentemp");
3137 fd2 = got_opentempfd();
3139 err = got_error_from_errno("got_opentempfd");
3142 arg.diff_context = diff_context;
3143 arg.ignore_whitespace = ignore_whitespace;
3144 arg.force_text_diff = force_text_diff;
3146 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3147 arg.outfile = outfile;
3150 while (path[0] == '/')
3152 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3153 got_diff_blob_output_unidiff, &arg, 1);
3156 got_object_tree_close(tree1);
3158 got_object_tree_close(tree2);
3159 if (f1 && fclose(f1) == EOF && err == NULL)
3160 err = got_error_from_errno("fclose");
3161 if (f2 && fclose(f2) == EOF && err == NULL)
3162 err = got_error_from_errno("fclose");
3163 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3164 err = got_error_from_errno("close");
3165 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3166 err = got_error_from_errno("close");
3170 static const struct got_error *
3171 get_changed_paths(struct got_pathlist_head *paths,
3172 struct got_commit_object *commit, struct got_repository *repo,
3173 struct got_diffstat_cb_arg *dsa)
3175 const struct got_error *err = NULL;
3176 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3177 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3178 struct got_object_qid *qid;
3179 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3180 FILE *f1 = NULL, *f2 = NULL;
3181 int fd1 = -1, fd2 = -1;
3184 cb = got_diff_tree_compute_diffstat;
3186 f1 = got_opentemp();
3188 err = got_error_from_errno("got_opentemp");
3191 f2 = got_opentemp();
3193 err = got_error_from_errno("got_opentemp");
3196 fd1 = got_opentempfd();
3198 err = got_error_from_errno("got_opentempfd");
3201 fd2 = got_opentempfd();
3203 err = got_error_from_errno("got_opentempfd");
3208 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3210 struct got_commit_object *pcommit;
3211 err = got_object_open_as_commit(&pcommit, repo,
3216 tree_id1 = got_object_id_dup(
3217 got_object_commit_get_tree_id(pcommit));
3218 if (tree_id1 == NULL) {
3219 got_object_commit_close(pcommit);
3220 return got_error_from_errno("got_object_id_dup");
3222 got_object_commit_close(pcommit);
3227 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3232 tree_id2 = got_object_commit_get_tree_id(commit);
3233 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3237 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3238 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3241 got_object_tree_close(tree1);
3243 got_object_tree_close(tree2);
3244 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3245 err = got_error_from_errno("close");
3246 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3247 err = got_error_from_errno("close");
3248 if (f1 && fclose(f1) == EOF && err == NULL)
3249 err = got_error_from_errno("fclose");
3250 if (f2 && fclose(f2) == EOF && err == NULL)
3251 err = got_error_from_errno("fclose");
3256 static const struct got_error *
3257 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3258 const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3259 struct got_repository *repo, FILE *outfile)
3261 const struct got_error *err = NULL;
3262 struct got_commit_object *pcommit = NULL;
3263 char *id_str1 = NULL, *id_str2 = NULL;
3264 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3265 struct got_object_qid *qid;
3267 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3269 err = got_object_open_as_commit(&pcommit, repo,
3273 err = got_object_id_str(&id_str1, &qid->id);
3278 err = got_object_id_str(&id_str2, id);
3282 if (path && path[0] != '\0') {
3284 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3288 err = got_object_id_by_path(&obj_id1, repo,
3291 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3297 err = got_object_get_type(&obj_type, repo, obj_id2);
3303 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3304 fprintf(outfile, "commit - %s\n",
3305 id_str1 ? id_str1 : "/dev/null");
3306 fprintf(outfile, "commit + %s\n", id_str2);
3308 case GOT_OBJ_TYPE_BLOB:
3309 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3310 0, 0, dsa, repo, outfile);
3312 case GOT_OBJ_TYPE_TREE:
3313 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3314 0, 0, dsa, repo, outfile);
3317 err = got_error(GOT_ERR_OBJ_TYPE);
3323 obj_id2 = got_object_commit_get_tree_id(commit);
3325 obj_id1 = got_object_commit_get_tree_id(pcommit);
3327 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3328 fprintf(outfile, "commit - %s\n",
3329 id_str1 ? id_str1 : "/dev/null");
3330 fprintf(outfile, "commit + %s\n", id_str2);
3331 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3332 dsa, repo, outfile);
3338 got_object_commit_close(pcommit);
3343 get_datestr(time_t *time, char *datebuf)
3345 struct tm mytm, *tm;
3348 tm = gmtime_r(time, &mytm);
3351 s = asctime_r(tm, datebuf);
3354 p = strchr(s, '\n');
3360 static const struct got_error *
3361 match_commit(int *have_match, struct got_object_id *id,
3362 struct got_commit_object *commit, regex_t *regex)
3364 const struct got_error *err = NULL;
3365 regmatch_t regmatch;
3366 char *id_str = NULL, *logmsg = NULL;
3370 err = got_object_id_str(&id_str, id);
3374 err = got_object_commit_get_logmsg(&logmsg, commit);
3378 if (regexec(regex, got_object_commit_get_author(commit), 1,
3379 ®match, 0) == 0 ||
3380 regexec(regex, got_object_commit_get_committer(commit), 1,
3381 ®match, 0) == 0 ||
3382 regexec(regex, id_str, 1, ®match, 0) == 0 ||
3383 regexec(regex, logmsg, 1, ®match, 0) == 0)
3392 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3395 regmatch_t regmatch;
3396 struct got_pathlist_entry *pe;
3400 TAILQ_FOREACH(pe, changed_paths, entry) {
3401 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3408 static const struct got_error *
3409 match_patch(int *have_match, struct got_commit_object *commit,
3410 struct got_object_id *id, const char *path, int diff_context,
3411 struct got_repository *repo, regex_t *regex, FILE *f)
3413 const struct got_error *err = NULL;
3415 size_t linesize = 0;
3416 regmatch_t regmatch;
3420 err = got_opentemp_truncate(f);
3424 err = print_patch(commit, id, path, diff_context, NULL, repo, f);
3428 if (fseeko(f, 0L, SEEK_SET) == -1) {
3429 err = got_error_from_errno("fseeko");
3433 while (getline(&line, &linesize, f) != -1) {
3434 if (regexec(regex, line, 1, ®match, 0) == 0) {
3444 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3446 static const struct got_error*
3447 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3448 struct got_object_id *id, struct got_repository *repo,
3451 static const struct got_error *err = NULL;
3452 struct got_reflist_entry *re;
3458 TAILQ_FOREACH(re, refs, entry) {
3459 struct got_tag_object *tag = NULL;
3460 struct got_object_id *ref_id;
3463 name = got_ref_get_name(re->ref);
3464 if (strcmp(name, GOT_REF_HEAD) == 0)
3466 if (strncmp(name, "refs/", 5) == 0)
3468 if (strncmp(name, "got/", 4) == 0)
3470 if (strncmp(name, "heads/", 6) == 0)
3472 if (strncmp(name, "remotes/", 8) == 0) {
3476 s = strstr(name, "/" GOT_REF_HEAD);
3477 if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
3480 err = got_ref_resolve(&ref_id, repo, re->ref);
3483 if (strncmp(name, "tags/", 5) == 0) {
3484 err = got_object_open_as_tag(&tag, repo, ref_id);
3486 if (err->code != GOT_ERR_OBJ_TYPE) {
3490 /* Ref points at something other than a tag. */
3495 cmp = got_object_id_cmp(tag ?
3496 got_object_tag_get_object_id(tag) : ref_id, id);
3499 got_object_tag_close(tag);
3503 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3504 s ? ", " : "", name) == -1) {
3505 err = got_error_from_errno("asprintf");
3516 static const struct got_error *
3517 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3518 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3520 const struct got_error *err = NULL;
3521 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3522 char *comma, *s, *nl;
3523 struct got_reflist_head *refs;
3524 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3526 time_t committer_time;
3528 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3530 err = build_refs_str(&ref_str, refs, id, repo, 1);
3534 /* Display the first matching ref only. */
3535 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3539 if (ref_str == NULL) {
3540 err = got_object_id_str(&id_str, id);
3545 committer_time = got_object_commit_get_committer_time(commit);
3546 if (gmtime_r(&committer_time, &tm) == NULL) {
3547 err = got_error_from_errno("gmtime_r");
3550 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3551 err = got_error(GOT_ERR_NO_SPACE);
3555 err = got_object_commit_get_logmsg(&logmsg0, commit);
3560 while (isspace((unsigned char)s[0]))
3563 nl = strchr(s, '\n');
3569 printf("%s%-7s %s\n", datebuf, ref_str, s);
3571 printf("%s%.7s %s\n", datebuf, id_str, s);
3573 if (fflush(stdout) != 0 && err == NULL)
3574 err = got_error_from_errno("fflush");
3582 static const struct got_error *
3583 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
3585 struct got_pathlist_entry *pe;
3588 printf("%s\n", header);
3590 TAILQ_FOREACH(pe, dsa->paths, entry) {
3591 struct got_diff_changed_path *cp = pe->data;
3592 int pad = dsa->max_path_len - pe->path_len + 1;
3594 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
3595 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
3597 printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
3598 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
3599 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
3601 if (fflush(stdout) != 0)
3602 return got_error_from_errno("fflush");
3607 static const struct got_error *
3613 if (fseeko(f, 0L, SEEK_SET) == -1)
3614 return got_error_from_errno("fseek");
3617 r = fread(buf, 1, sizeof(buf), f);
3620 return got_error_from_errno("fread");
3624 if (fwrite(buf, 1, r, stdout) != r)
3625 return got_ferror(stdout, GOT_ERR_IO);
3631 static const struct got_error *
3632 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3633 struct got_repository *repo, const char *path,
3634 struct got_pathlist_head *changed_paths,
3635 struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
3636 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
3639 const struct got_error *err = NULL;
3641 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3643 time_t committer_time;
3644 const char *author, *committer;
3645 char *refs_str = NULL;
3647 err = got_object_id_str(&id_str, id);
3651 if (custom_refs_str == NULL) {
3652 struct got_reflist_head *refs;
3653 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3655 err = build_refs_str(&refs_str, refs, id, repo, 0);
3661 printf(GOT_COMMIT_SEP_STR);
3662 if (custom_refs_str)
3663 printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
3666 printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
3667 refs_str ? " (" : "", refs_str ? refs_str : "",
3668 refs_str ? ")" : "");
3673 printf("from: %s\n", got_object_commit_get_author(commit));
3674 author = got_object_commit_get_author(commit);
3675 committer = got_object_commit_get_committer(commit);
3676 if (strcmp(author, committer) != 0)
3677 printf("via: %s\n", committer);
3678 committer_time = got_object_commit_get_committer_time(commit);
3679 datestr = get_datestr(&committer_time, datebuf);
3681 printf("date: %s UTC\n", datestr);
3682 if (got_object_commit_get_nparents(commit) > 1) {
3683 const struct got_object_id_queue *parent_ids;
3684 struct got_object_qid *qid;
3686 parent_ids = got_object_commit_get_parent_ids(commit);
3687 STAILQ_FOREACH(qid, parent_ids, entry) {
3688 err = got_object_id_str(&id_str, &qid->id);
3691 printf("parent %d: %s\n", n++, id_str);
3697 err = got_object_commit_get_logmsg(&logmsg0, commit);
3703 line = strsep(&logmsg, "\n");
3705 printf(" %s\n", line);
3709 if (changed_paths && diffstat == NULL) {
3710 struct got_pathlist_entry *pe;
3712 TAILQ_FOREACH(pe, changed_paths, entry) {
3713 struct got_diff_changed_path *cp = pe->data;
3715 printf(" %c %s\n", cp->status, pe->path);
3723 err = got_error_from_errno("got_opentemp");
3728 err = print_patch(commit, id, path, diff_context, diffstat,
3729 repo, diffstat == NULL ? stdout : f);
3734 err = print_diffstat(diffstat, NULL);
3746 if (fflush(stdout) != 0 && err == NULL)
3747 err = got_error_from_errno("fflush");
3749 if (f && fclose(f) == EOF && err == NULL)
3750 err = got_error_from_errno("fclose");
3756 static const struct got_error *
3757 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3758 struct got_repository *repo, const char *path, int show_changed_paths,
3759 int show_diffstat, int show_patch, const char *search_pattern,
3760 int diff_context, int limit, int log_branches, int reverse_display_order,
3761 struct got_reflist_object_id_map *refs_idmap, int one_line,
3764 const struct got_error *err;
3765 struct got_commit_graph *graph;
3768 struct got_object_id_queue reversed_commits;
3769 struct got_object_qid *qid;
3770 struct got_commit_object *commit;
3771 struct got_pathlist_head changed_paths;
3773 STAILQ_INIT(&reversed_commits);
3774 TAILQ_INIT(&changed_paths);
3776 if (search_pattern && regcomp(®ex, search_pattern,
3777 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3778 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3780 err = got_commit_graph_open(&graph, path, !log_branches);
3783 err = got_commit_graph_iter_start(graph, root_id, repo,
3784 check_cancelled, NULL);
3788 struct got_object_id id;
3789 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3790 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3792 if (sigint_received || sigpipe_received)
3795 err = got_commit_graph_iter_next(&id, graph, repo,
3796 check_cancelled, NULL);
3798 if (err->code == GOT_ERR_ITER_COMPLETED)
3803 err = got_object_open_as_commit(&commit, repo, &id);
3807 if ((show_changed_paths || (show_diffstat && !show_patch))
3808 && !reverse_display_order) {
3809 err = get_changed_paths(&changed_paths, commit, repo,
3810 show_diffstat ? &dsa : NULL);
3815 if (search_pattern) {
3816 err = match_commit(&have_match, &id, commit, ®ex);
3818 got_object_commit_close(commit);
3821 if (have_match == 0 && show_changed_paths)
3822 match_changed_paths(&have_match,
3823 &changed_paths, ®ex);
3824 if (have_match == 0 && show_patch) {
3825 err = match_patch(&have_match, commit, &id,
3826 path, diff_context, repo, ®ex, tmpfile);
3830 if (have_match == 0) {
3831 got_object_commit_close(commit);
3832 got_pathlist_free(&changed_paths,
3833 GOT_PATHLIST_FREE_ALL);
3838 if (reverse_display_order) {
3839 err = got_object_qid_alloc(&qid, &id);
3842 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3843 got_object_commit_close(commit);
3846 err = print_commit_oneline(commit, &id,
3849 err = print_commit(commit, &id, repo, path,
3850 (show_changed_paths || show_diffstat) ?
3851 &changed_paths : NULL,
3852 show_diffstat ? &dsa : NULL, show_patch,
3853 diff_context, refs_idmap, NULL, NULL);
3854 got_object_commit_close(commit);
3858 if ((limit && --limit == 0) ||
3859 (end_id && got_object_id_cmp(&id, end_id) == 0))
3862 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3864 if (reverse_display_order) {
3865 STAILQ_FOREACH(qid, &reversed_commits, entry) {
3866 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3867 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3869 err = got_object_open_as_commit(&commit, repo,
3873 if (show_changed_paths ||
3874 (show_diffstat && !show_patch)) {
3875 err = get_changed_paths(&changed_paths, commit,
3876 repo, show_diffstat ? &dsa : NULL);
3881 err = print_commit_oneline(commit, &qid->id,
3884 err = print_commit(commit, &qid->id, repo, path,
3885 (show_changed_paths || show_diffstat) ?
3886 &changed_paths : NULL,
3887 show_diffstat ? &dsa : NULL, show_patch,
3888 diff_context, refs_idmap, NULL, NULL);
3889 got_object_commit_close(commit);
3892 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3896 while (!STAILQ_EMPTY(&reversed_commits)) {
3897 qid = STAILQ_FIRST(&reversed_commits);
3898 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
3899 got_object_qid_free(qid);
3901 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3904 got_commit_graph_close(graph);
3911 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
3912 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
3913 "[path]\n", getprogname());
3918 get_default_log_limit(void)
3920 const char *got_default_log_limit;
3924 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3925 if (got_default_log_limit == NULL)
3927 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3933 static const struct got_error *
3934 cmd_log(int argc, char *argv[])
3936 const struct got_error *error;
3937 struct got_repository *repo = NULL;
3938 struct got_worktree *worktree = NULL;
3939 struct got_object_id *start_id = NULL, *end_id = NULL;
3940 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3941 const char *start_commit = NULL, *end_commit = NULL;
3942 const char *search_pattern = NULL;
3943 int diff_context = -1, ch;
3944 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3945 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
3947 struct got_reflist_head refs;
3948 struct got_reflist_object_id_map *refs_idmap = NULL;
3949 FILE *tmpfile = NULL;
3950 int *pack_fds = NULL;
3955 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3961 limit = get_default_log_limit();
3963 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
3969 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3972 errx(1, "number of context lines is %s: %s",
3976 start_commit = optarg;
3982 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3984 errx(1, "number of commits is %s: %s",
3988 show_changed_paths = 1;
3994 reverse_display_order = 1;
3997 repo_path = realpath(optarg, NULL);
3998 if (repo_path == NULL)
3999 return got_error_from_errno2("realpath",
4001 got_path_strip_trailing_slashes(repo_path);
4004 search_pattern = optarg;
4010 end_commit = optarg;
4021 if (diff_context == -1)
4023 else if (!show_patch)
4024 errx(1, "-C requires -p");
4026 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4027 errx(1, "cannot use -s with -d, -p or -P");
4029 cwd = getcwd(NULL, 0);
4031 error = got_error_from_errno("getcwd");
4035 error = got_repo_pack_fds_open(&pack_fds);
4039 if (repo_path == NULL) {
4040 error = got_worktree_open(&worktree, cwd);
4041 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4048 error = got_worktree_resolve_path(&path, worktree,
4053 path = strdup(argv[0]);
4055 error = got_error_from_errno("strdup");
4059 } else if (argc != 0)
4062 if (repo_path == NULL) {
4063 repo_path = worktree ?
4064 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4066 if (repo_path == NULL) {
4067 error = got_error_from_errno("strdup");
4071 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4075 error = apply_unveil(got_repo_get_path(repo), 1,
4076 worktree ? got_worktree_get_root_path(worktree) : NULL);
4080 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4084 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4088 if (start_commit == NULL) {
4089 struct got_reference *head_ref;
4090 struct got_commit_object *commit = NULL;
4091 error = got_ref_open(&head_ref, repo,
4092 worktree ? got_worktree_get_head_ref_name(worktree)
4096 error = got_ref_resolve(&start_id, repo, head_ref);
4097 got_ref_close(head_ref);
4100 error = got_object_open_as_commit(&commit, repo,
4104 got_object_commit_close(commit);
4106 error = got_repo_match_object_id(&start_id, NULL,
4107 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4111 if (end_commit != NULL) {
4112 error = got_repo_match_object_id(&end_id, NULL,
4113 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4120 * If a path was specified on the command line it was resolved
4121 * to a path in the work tree above. Prepend the work tree's
4122 * path prefix to obtain the corresponding in-repository path.
4126 prefix = got_worktree_get_path_prefix(worktree);
4127 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4128 (path[0] != '\0') ? "/" : "", path) == -1) {
4129 error = got_error_from_errno("asprintf");
4134 error = got_repo_map_path(&in_repo_path, repo,
4140 path = in_repo_path;
4144 /* Release work tree lock. */
4145 got_worktree_close(worktree);
4149 if (search_pattern && show_patch) {
4150 tmpfile = got_opentemp();
4151 if (tmpfile == NULL) {
4152 error = got_error_from_errno("got_opentemp");
4157 error = print_commits(start_id, end_id, repo, path ? path : "",
4158 show_changed_paths, show_diffstat, show_patch, search_pattern,
4159 diff_context, limit, log_branches, reverse_display_order,
4160 refs_idmap, one_line, tmpfile);
4168 got_worktree_close(worktree);
4170 const struct got_error *close_err = got_repo_close(repo);
4175 const struct got_error *pack_err =
4176 got_repo_pack_fds_close(pack_fds);
4181 got_reflist_object_id_map_free(refs_idmap);
4182 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4183 error = got_error_from_errno("fclose");
4184 got_ref_list_free(&refs);
4191 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4192 "[-r repository-path] [object1 object2 | path ...]\n",
4197 struct print_diff_arg {
4198 struct got_repository *repo;
4199 struct got_worktree *worktree;
4200 struct got_diffstat_cb_arg *diffstat;
4205 enum got_diff_algorithm diff_algo;
4206 int ignore_whitespace;
4207 int force_text_diff;
4214 * Create a file which contains the target path of a symlink so we can feed
4215 * it as content to the diff engine.
4217 static const struct got_error *
4218 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4219 const char *abspath)
4221 const struct got_error *err = NULL;
4222 char target_path[PATH_MAX];
4223 ssize_t target_len, outlen;
4228 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4229 if (target_len == -1)
4230 return got_error_from_errno2("readlinkat", abspath);
4232 target_len = readlink(abspath, target_path, PATH_MAX);
4233 if (target_len == -1)
4234 return got_error_from_errno2("readlink", abspath);
4237 *fd = got_opentempfd();
4239 return got_error_from_errno("got_opentempfd");
4241 outlen = write(*fd, target_path, target_len);
4243 err = got_error_from_errno("got_opentempfd");
4247 if (lseek(*fd, 0, SEEK_SET) == -1) {
4248 err = got_error_from_errno2("lseek", abspath);
4259 static const struct got_error *
4260 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4261 const char *path, struct got_object_id *blob_id,
4262 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4263 int dirfd, const char *de_name)
4265 struct print_diff_arg *a = arg;
4266 const struct got_error *err = NULL;
4267 struct got_blob_object *blob1 = NULL;
4268 int fd = -1, fd1 = -1, fd2 = -1;
4270 char *abspath = NULL, *label1 = NULL;
4275 memset(&sb, 0, sizeof(sb));
4277 if (a->diff_staged) {
4278 if (staged_status != GOT_STATUS_MODIFY &&
4279 staged_status != GOT_STATUS_ADD &&
4280 staged_status != GOT_STATUS_DELETE)
4283 if (staged_status == GOT_STATUS_DELETE)
4285 if (status == GOT_STATUS_NONEXISTENT)
4286 return got_error_set_errno(ENOENT, path);
4287 if (status != GOT_STATUS_MODIFY &&
4288 status != GOT_STATUS_ADD &&
4289 status != GOT_STATUS_DELETE &&
4290 status != GOT_STATUS_CONFLICT)
4294 err = got_opentemp_truncate(a->f1);
4296 return got_error_from_errno("got_opentemp_truncate");
4297 err = got_opentemp_truncate(a->f2);
4299 return got_error_from_errno("got_opentemp_truncate");
4301 if (!a->header_shown) {
4302 if (fprintf(a->outfile, "diff %s%s\n",
4303 a->diff_staged ? "-s " : "",
4304 got_worktree_get_root_path(a->worktree)) < 0) {
4305 err = got_error_from_errno("fprintf");
4308 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4309 err = got_error_from_errno("fprintf");
4312 if (fprintf(a->outfile, "path + %s%s\n",
4313 got_worktree_get_root_path(a->worktree),
4314 a->diff_staged ? " (staged changes)" : "") < 0) {
4315 err = got_error_from_errno("fprintf");
4318 a->header_shown = 1;
4321 if (a->diff_staged) {
4322 const char *label1 = NULL, *label2 = NULL;
4323 switch (staged_status) {
4324 case GOT_STATUS_MODIFY:
4328 case GOT_STATUS_ADD:
4331 case GOT_STATUS_DELETE:
4335 return got_error(GOT_ERR_FILE_STATUS);
4337 fd1 = got_opentempfd();
4339 err = got_error_from_errno("got_opentempfd");
4342 fd2 = got_opentempfd();
4344 err = got_error_from_errno("got_opentempfd");
4347 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4348 fd1, fd2, blob_id, staged_blob_id, label1, label2,
4349 a->diff_algo, a->diff_context, a->ignore_whitespace,
4350 a->force_text_diff, a->diffstat, a->repo, a->outfile);
4354 fd1 = got_opentempfd();
4356 err = got_error_from_errno("got_opentempfd");
4360 if (staged_status == GOT_STATUS_ADD ||
4361 staged_status == GOT_STATUS_MODIFY) {
4363 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4367 err = got_object_id_str(&id_str, staged_blob_id);
4370 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4371 err = got_error_from_errno("asprintf");
4376 } else if (status != GOT_STATUS_ADD) {
4377 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4383 if (status != GOT_STATUS_DELETE) {
4384 if (asprintf(&abspath, "%s/%s",
4385 got_worktree_get_root_path(a->worktree), path) == -1) {
4386 err = got_error_from_errno("asprintf");
4391 fd = openat(dirfd, de_name,
4392 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4394 if (!got_err_open_nofollow_on_symlink()) {
4395 err = got_error_from_errno2("openat",
4399 err = get_symlink_target_file(&fd, dirfd,
4405 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4407 if (!got_err_open_nofollow_on_symlink()) {
4408 err = got_error_from_errno2("open",
4412 err = get_symlink_target_file(&fd, dirfd,
4418 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4419 err = got_error_from_errno2("fstatat", abspath);
4422 f2 = fdopen(fd, "r");
4424 err = got_error_from_errno2("fdopen", abspath);
4432 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4438 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4439 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4440 a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
4442 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4443 err = got_error_from_errno("close");
4444 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4445 err = got_error_from_errno("close");
4447 got_object_blob_close(blob1);
4448 if (fd != -1 && close(fd) == -1 && err == NULL)
4449 err = got_error_from_errno("close");
4450 if (f2 && fclose(f2) == EOF && err == NULL)
4451 err = got_error_from_errno("fclose");
4456 static const struct got_error *
4457 cmd_diff(int argc, char *argv[])
4459 const struct got_error *error;
4460 struct got_repository *repo = NULL;
4461 struct got_worktree *worktree = NULL;
4462 char *cwd = NULL, *repo_path = NULL;
4463 const char *commit_args[2] = { NULL, NULL };
4464 int ncommit_args = 0;
4465 struct got_object_id *ids[2] = { NULL, NULL };
4466 char *labels[2] = { NULL, NULL };
4467 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4468 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4469 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
4471 struct got_reflist_head refs;
4472 struct got_pathlist_head diffstat_paths, paths;
4473 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4474 int fd1 = -1, fd2 = -1;
4475 int *pack_fds = NULL;
4476 struct got_diffstat_cb_arg dsa;
4478 memset(&dsa, 0, sizeof(dsa));
4482 TAILQ_INIT(&diffstat_paths);
4485 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4490 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
4493 force_text_diff = 1;
4496 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4499 errx(1, "number of context lines is %s: %s",
4503 if (ncommit_args >= 2)
4504 errx(1, "too many -c options used");
4505 commit_args[ncommit_args++] = optarg;
4514 repo_path = realpath(optarg, NULL);
4515 if (repo_path == NULL)
4516 return got_error_from_errno2("realpath",
4518 got_path_strip_trailing_slashes(repo_path);
4525 ignore_whitespace = 1;
4536 cwd = getcwd(NULL, 0);
4538 error = got_error_from_errno("getcwd");
4542 error = got_repo_pack_fds_open(&pack_fds);
4546 if (repo_path == NULL) {
4547 error = got_worktree_open(&worktree, cwd);
4548 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4554 strdup(got_worktree_get_repo_path(worktree));
4555 if (repo_path == NULL) {
4556 error = got_error_from_errno("strdup");
4560 repo_path = strdup(cwd);
4561 if (repo_path == NULL) {
4562 error = got_error_from_errno("strdup");
4568 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4573 if (show_diffstat) {
4574 dsa.paths = &diffstat_paths;
4575 dsa.force_text = force_text_diff;
4576 dsa.ignore_ws = ignore_whitespace;
4577 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4580 if (rflag || worktree == NULL || ncommit_args > 0) {
4582 error = got_error_msg(GOT_ERR_NOT_IMPL,
4583 "-P option can only be used when diffing "
4588 error = got_error_msg(GOT_ERR_NOT_IMPL,
4589 "-s option can only be used when diffing "
4595 error = apply_unveil(got_repo_get_path(repo), 1,
4596 worktree ? got_worktree_get_root_path(worktree) : NULL);
4600 if ((!force_path && argc == 2) || ncommit_args > 0) {
4601 int obj_type = (ncommit_args > 0 ?
4602 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4603 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4607 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4609 if (ncommit_args > 0)
4610 arg = commit_args[i];
4613 error = got_repo_match_object_id(&ids[i], &labels[i],
4614 arg, obj_type, &refs, repo);
4616 if (error->code != GOT_ERR_NOT_REF &&
4617 error->code != GOT_ERR_NO_OBJ)
4619 if (ncommit_args > 0)
4627 f1 = got_opentemp();
4629 error = got_error_from_errno("got_opentemp");
4633 f2 = got_opentemp();
4635 error = got_error_from_errno("got_opentemp");
4639 outfile = got_opentemp();
4640 if (outfile == NULL) {
4641 error = got_error_from_errno("got_opentemp");
4645 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4646 struct print_diff_arg arg;
4649 if (worktree == NULL) {
4650 if (argc == 2 && ids[0] == NULL) {
4651 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4653 } else if (argc == 2 && ids[1] == NULL) {
4654 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4656 } else if (argc > 0) {
4657 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4658 "%s", "specified paths cannot be resolved");
4661 error = got_error(GOT_ERR_NOT_WORKTREE);
4666 error = get_worktree_paths_from_argv(&paths, argc, argv,
4671 error = got_object_id_str(&id_str,
4672 got_worktree_get_base_commit_id(worktree));
4676 arg.worktree = worktree;
4677 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4678 arg.diff_context = diff_context;
4679 arg.id_str = id_str;
4680 arg.header_shown = 0;
4681 arg.diff_staged = diff_staged;
4682 arg.ignore_whitespace = ignore_whitespace;
4683 arg.force_text_diff = force_text_diff;
4684 arg.diffstat = show_diffstat ? &dsa : NULL;
4687 arg.outfile = outfile;
4689 error = got_worktree_status(worktree, &paths, repo, 0,
4690 print_diff, &arg, check_cancelled, NULL);
4695 if (show_diffstat && dsa.nfiles > 0) {
4698 if (asprintf(&header, "diffstat %s%s",
4699 diff_staged ? "-s " : "",
4700 got_worktree_get_root_path(worktree)) == -1) {
4701 error = got_error_from_errno("asprintf");
4705 error = print_diffstat(&dsa, header);
4711 error = printfile(outfile);
4715 if (ncommit_args == 1) {
4716 struct got_commit_object *commit;
4717 error = got_object_open_as_commit(&commit, repo, ids[0]);
4721 labels[1] = labels[0];
4723 if (got_object_commit_get_nparents(commit) > 0) {
4724 const struct got_object_id_queue *pids;
4725 struct got_object_qid *pid;
4726 pids = got_object_commit_get_parent_ids(commit);
4727 pid = STAILQ_FIRST(pids);
4728 ids[0] = got_object_id_dup(&pid->id);
4729 if (ids[0] == NULL) {
4730 error = got_error_from_errno(
4731 "got_object_id_dup");
4732 got_object_commit_close(commit);
4735 error = got_object_id_str(&labels[0], ids[0]);
4737 got_object_commit_close(commit);
4742 labels[0] = strdup("/dev/null");
4743 if (labels[0] == NULL) {
4744 error = got_error_from_errno("strdup");
4745 got_object_commit_close(commit);
4750 got_object_commit_close(commit);
4753 if (ncommit_args == 0 && argc > 2) {
4754 error = got_error_msg(GOT_ERR_BAD_PATH,
4755 "path arguments cannot be used when diffing two objects");
4760 error = got_object_get_type(&type1, repo, ids[0]);
4765 error = got_object_get_type(&type2, repo, ids[1]);
4768 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4769 error = got_error(GOT_ERR_OBJ_TYPE);
4772 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
4773 error = got_error_msg(GOT_ERR_OBJ_TYPE,
4774 "path arguments cannot be used when diffing blobs");
4778 for (i = 0; ncommit_args > 0 && i < argc; i++) {
4780 struct got_pathlist_entry *new;
4784 error = got_worktree_resolve_path(&p, worktree,
4788 prefix = got_worktree_get_path_prefix(worktree);
4789 while (prefix[0] == '/')
4791 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4792 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4794 error = got_error_from_errno("asprintf");
4800 char *mapped_path, *s;
4801 error = got_repo_map_path(&mapped_path, repo, argv[i]);
4807 in_repo_path = strdup(s);
4808 if (in_repo_path == NULL) {
4809 error = got_error_from_errno("asprintf");
4816 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4817 if (error || new == NULL /* duplicate */)
4824 /* Release work tree lock. */
4825 got_worktree_close(worktree);
4829 fd1 = got_opentempfd();
4831 error = got_error_from_errno("got_opentempfd");
4835 fd2 = got_opentempfd();
4837 error = got_error_from_errno("got_opentempfd");
4841 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4842 case GOT_OBJ_TYPE_BLOB:
4843 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4844 fd1, fd2, ids[0], ids[1], NULL, NULL,
4845 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4846 ignore_whitespace, force_text_diff,
4847 show_diffstat ? &dsa : NULL, repo, outfile);
4849 case GOT_OBJ_TYPE_TREE:
4850 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
4851 ids[0], ids[1], &paths, "", "",
4852 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4853 ignore_whitespace, force_text_diff,
4854 show_diffstat ? &dsa : NULL, repo, outfile);
4856 case GOT_OBJ_TYPE_COMMIT:
4857 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
4858 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4859 fd1, fd2, ids[0], ids[1], &paths,
4860 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4861 ignore_whitespace, force_text_diff,
4862 show_diffstat ? &dsa : NULL, repo, outfile);
4865 error = got_error(GOT_ERR_OBJ_TYPE);
4870 if (show_diffstat && dsa.nfiles > 0) {
4871 char *header = NULL;
4873 if (asprintf(&header, "diffstat %s %s",
4874 labels[0], labels[1]) == -1) {
4875 error = got_error_from_errno("asprintf");
4879 error = print_diffstat(&dsa, header);
4885 error = printfile(outfile);
4893 got_worktree_close(worktree);
4895 const struct got_error *close_err = got_repo_close(repo);
4900 const struct got_error *pack_err =
4901 got_repo_pack_fds_close(pack_fds);
4905 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
4906 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
4907 got_ref_list_free(&refs);
4908 if (outfile && fclose(outfile) == EOF && error == NULL)
4909 error = got_error_from_errno("fclose");
4910 if (f1 && fclose(f1) == EOF && error == NULL)
4911 error = got_error_from_errno("fclose");
4912 if (f2 && fclose(f2) == EOF && error == NULL)
4913 error = got_error_from_errno("fclose");
4914 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
4915 error = got_error_from_errno("close");
4916 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
4917 error = got_error_from_errno("close");
4925 "usage: %s blame [-c commit] [-r repository-path] path\n",
4934 char datebuf[11]; /* YYYY-MM-DD + NUL */
4937 struct blame_cb_args {
4938 struct blame_line *lines;
4942 off_t *line_offsets;
4944 struct got_repository *repo;
4947 static const struct got_error *
4948 blame_cb(void *arg, int nlines, int lineno,
4949 struct got_commit_object *commit, struct got_object_id *id)
4951 const struct got_error *err = NULL;
4952 struct blame_cb_args *a = arg;
4953 struct blame_line *bline;
4955 size_t linesize = 0;
4958 time_t committer_time;
4960 if (nlines != a->nlines ||
4961 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4962 return got_error(GOT_ERR_RANGE);
4964 if (sigint_received)
4965 return got_error(GOT_ERR_ITER_COMPLETED);
4968 return NULL; /* no change in this commit */
4970 /* Annotate this line. */
4971 bline = &a->lines[lineno - 1];
4972 if (bline->annotated)
4974 err = got_object_id_str(&bline->id_str, id);
4978 bline->committer = strdup(got_object_commit_get_committer(commit));
4979 if (bline->committer == NULL) {
4980 err = got_error_from_errno("strdup");
4984 committer_time = got_object_commit_get_committer_time(commit);
4985 if (gmtime_r(&committer_time, &tm) == NULL)
4986 return got_error_from_errno("gmtime_r");
4987 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4989 err = got_error(GOT_ERR_NO_SPACE);
4992 bline->annotated = 1;
4994 /* Print lines annotated so far. */
4995 bline = &a->lines[a->lineno_cur - 1];
4996 if (!bline->annotated)
4999 offset = a->line_offsets[a->lineno_cur - 1];
5000 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5001 err = got_error_from_errno("fseeko");
5005 while (a->lineno_cur <= a->nlines && bline->annotated) {
5006 char *smallerthan, *at, *nl, *committer;
5009 if (getline(&line, &linesize, a->f) == -1) {
5011 err = got_error_from_errno("getline");
5015 committer = bline->committer;
5016 smallerthan = strchr(committer, '<');
5017 if (smallerthan && smallerthan[1] != '\0')
5018 committer = smallerthan + 1;
5019 at = strchr(committer, '@');
5022 len = strlen(committer);
5024 committer[8] = '\0';
5026 nl = strchr(line, '\n');
5029 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5030 bline->id_str, bline->datebuf, committer, line);
5033 bline = &a->lines[a->lineno_cur - 1];
5040 static const struct got_error *
5041 cmd_blame(int argc, char *argv[])
5043 const struct got_error *error;
5044 struct got_repository *repo = NULL;
5045 struct got_worktree *worktree = NULL;
5046 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5047 char *link_target = NULL;
5048 struct got_object_id *obj_id = NULL;
5049 struct got_object_id *commit_id = NULL;
5050 struct got_commit_object *commit = NULL;
5051 struct got_blob_object *blob = NULL;
5052 char *commit_id_str = NULL;
5053 struct blame_cb_args bca;
5054 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5056 int *pack_fds = NULL;
5057 FILE *f1 = NULL, *f2 = NULL;
5059 fd1 = got_opentempfd();
5061 return got_error_from_errno("got_opentempfd");
5063 memset(&bca, 0, sizeof(bca));
5066 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5071 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5074 commit_id_str = optarg;
5077 repo_path = realpath(optarg, NULL);
5078 if (repo_path == NULL)
5079 return got_error_from_errno2("realpath",
5081 got_path_strip_trailing_slashes(repo_path);
5097 cwd = getcwd(NULL, 0);
5099 error = got_error_from_errno("getcwd");
5103 error = got_repo_pack_fds_open(&pack_fds);
5107 if (repo_path == NULL) {
5108 error = got_worktree_open(&worktree, cwd);
5109 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5115 strdup(got_worktree_get_repo_path(worktree));
5116 if (repo_path == NULL) {
5117 error = got_error_from_errno("strdup");
5122 repo_path = strdup(cwd);
5123 if (repo_path == NULL) {
5124 error = got_error_from_errno("strdup");
5130 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5135 const char *prefix = got_worktree_get_path_prefix(worktree);
5138 error = got_worktree_resolve_path(&p, worktree, path);
5141 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5142 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5144 error = got_error_from_errno("asprintf");
5149 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5151 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5154 error = got_repo_map_path(&in_repo_path, repo, path);
5159 if (commit_id_str == NULL) {
5160 struct got_reference *head_ref;
5161 error = got_ref_open(&head_ref, repo, worktree ?
5162 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5165 error = got_ref_resolve(&commit_id, repo, head_ref);
5166 got_ref_close(head_ref);
5170 struct got_reflist_head refs;
5172 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5176 error = got_repo_match_object_id(&commit_id, NULL,
5177 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5178 got_ref_list_free(&refs);
5184 /* Release work tree lock. */
5185 got_worktree_close(worktree);
5189 error = got_object_open_as_commit(&commit, repo, commit_id);
5193 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5198 error = got_object_id_by_path(&obj_id, repo, commit,
5199 link_target ? link_target : in_repo_path);
5203 error = got_object_get_type(&obj_type, repo, obj_id);
5207 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5208 error = got_error_path(link_target ? link_target : in_repo_path,
5213 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5216 bca.f = got_opentemp();
5217 if (bca.f == NULL) {
5218 error = got_error_from_errno("got_opentemp");
5221 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5222 &bca.line_offsets, bca.f, blob);
5223 if (error || bca.nlines == 0)
5226 /* Don't include \n at EOF in the blame line count. */
5227 if (bca.line_offsets[bca.nlines - 1] == filesize)
5230 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5231 if (bca.lines == NULL) {
5232 error = got_error_from_errno("calloc");
5236 bca.nlines_prec = 0;
5244 fd2 = got_opentempfd();
5246 error = got_error_from_errno("got_opentempfd");
5249 fd3 = got_opentempfd();
5251 error = got_error_from_errno("got_opentempfd");
5254 f1 = got_opentemp();
5256 error = got_error_from_errno("got_opentemp");
5259 f2 = got_opentemp();
5261 error = got_error_from_errno("got_opentemp");
5264 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5265 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5266 check_cancelled, NULL, fd2, fd3, f1, f2);
5275 got_object_commit_close(commit);
5277 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5278 error = got_error_from_errno("close");
5279 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5280 error = got_error_from_errno("close");
5281 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5282 error = got_error_from_errno("close");
5283 if (f1 && fclose(f1) == EOF && error == NULL)
5284 error = got_error_from_errno("fclose");
5285 if (f2 && fclose(f2) == EOF && error == NULL)
5286 error = got_error_from_errno("fclose");
5289 got_object_blob_close(blob);
5291 got_worktree_close(worktree);
5293 const struct got_error *close_err = got_repo_close(repo);
5298 const struct got_error *pack_err =
5299 got_repo_pack_fds_close(pack_fds);
5304 for (i = 0; i < bca.nlines; i++) {
5305 struct blame_line *bline = &bca.lines[i];
5306 free(bline->id_str);
5307 free(bline->committer);
5311 free(bca.line_offsets);
5312 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5313 error = got_error_from_errno("fclose");
5320 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5321 "[path]\n", getprogname());
5325 static const struct got_error *
5326 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5327 const char *root_path, struct got_repository *repo)
5329 const struct got_error *err = NULL;
5330 int is_root_path = (strcmp(path, root_path) == 0);
5331 const char *modestr = "";
5332 mode_t mode = got_tree_entry_get_mode(te);
5333 char *link_target = NULL;
5335 path += strlen(root_path);
5336 while (path[0] == '/')
5339 if (got_object_tree_entry_is_submodule(te))
5341 else if (S_ISLNK(mode)) {
5344 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5347 for (i = 0; link_target[i] != '\0'; i++) {
5348 if (!isprint((unsigned char)link_target[i]))
5349 link_target[i] = '?';
5354 else if (S_ISDIR(mode))
5356 else if (mode & S_IXUSR)
5359 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5360 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5361 link_target ? " -> ": "", link_target ? link_target : "");
5367 static const struct got_error *
5368 print_tree(const char *path, struct got_commit_object *commit,
5369 int show_ids, int recurse, const char *root_path,
5370 struct got_repository *repo)
5372 const struct got_error *err = NULL;
5373 struct got_object_id *tree_id = NULL;
5374 struct got_tree_object *tree = NULL;
5377 err = got_object_id_by_path(&tree_id, repo, commit, path);
5381 err = got_object_open_as_tree(&tree, repo, tree_id);
5384 nentries = got_object_tree_get_nentries(tree);
5385 for (i = 0; i < nentries; i++) {
5386 struct got_tree_entry *te;
5389 if (sigint_received || sigpipe_received)
5392 te = got_object_tree_get_entry(tree, i);
5395 err = got_object_id_str(&id_str,
5396 got_tree_entry_get_id(te));
5399 if (asprintf(&id, "%s ", id_str) == -1) {
5400 err = got_error_from_errno("asprintf");
5406 err = print_entry(te, id, path, root_path, repo);
5411 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5413 if (asprintf(&child_path, "%s%s%s", path,
5414 path[0] == '/' && path[1] == '\0' ? "" : "/",
5415 got_tree_entry_get_name(te)) == -1) {
5416 err = got_error_from_errno("asprintf");
5419 err = print_tree(child_path, commit, show_ids, 1,
5428 got_object_tree_close(tree);
5433 static const struct got_error *
5434 cmd_tree(int argc, char *argv[])
5436 const struct got_error *error;
5437 struct got_repository *repo = NULL;
5438 struct got_worktree *worktree = NULL;
5439 const char *path, *refname = NULL;
5440 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5441 struct got_object_id *commit_id = NULL;
5442 struct got_commit_object *commit = NULL;
5443 char *commit_id_str = NULL;
5444 int show_ids = 0, recurse = 0;
5446 int *pack_fds = NULL;
5449 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5454 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
5457 commit_id_str = optarg;
5466 repo_path = realpath(optarg, NULL);
5467 if (repo_path == NULL)
5468 return got_error_from_errno2("realpath",
5470 got_path_strip_trailing_slashes(repo_path);
5488 cwd = getcwd(NULL, 0);
5490 error = got_error_from_errno("getcwd");
5494 error = got_repo_pack_fds_open(&pack_fds);
5498 if (repo_path == NULL) {
5499 error = got_worktree_open(&worktree, cwd);
5500 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5506 strdup(got_worktree_get_repo_path(worktree));
5507 if (repo_path == NULL)
5508 error = got_error_from_errno("strdup");
5512 repo_path = strdup(cwd);
5513 if (repo_path == NULL) {
5514 error = got_error_from_errno("strdup");
5520 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5525 const char *prefix = got_worktree_get_path_prefix(worktree);
5528 if (path == NULL || got_path_is_root_dir(path))
5530 error = got_worktree_resolve_path(&p, worktree, path);
5533 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5534 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5536 error = got_error_from_errno("asprintf");
5541 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5545 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5550 error = got_repo_map_path(&in_repo_path, repo, path);
5555 if (commit_id_str == NULL) {
5556 struct got_reference *head_ref;
5558 refname = got_worktree_get_head_ref_name(worktree);
5560 refname = GOT_REF_HEAD;
5561 error = got_ref_open(&head_ref, repo, refname, 0);
5564 error = got_ref_resolve(&commit_id, repo, head_ref);
5565 got_ref_close(head_ref);
5569 struct got_reflist_head refs;
5571 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5575 error = got_repo_match_object_id(&commit_id, NULL,
5576 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5577 got_ref_list_free(&refs);
5583 /* Release work tree lock. */
5584 got_worktree_close(worktree);
5588 error = got_object_open_as_commit(&commit, repo, commit_id);
5592 error = print_tree(in_repo_path, commit, show_ids, recurse,
5593 in_repo_path, repo);
5600 got_object_commit_close(commit);
5602 got_worktree_close(worktree);
5604 const struct got_error *close_err = got_repo_close(repo);
5609 const struct got_error *pack_err =
5610 got_repo_pack_fds_close(pack_fds);
5620 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5621 "[-s status-codes] [path ...]\n", getprogname());
5625 struct got_status_arg {
5630 static const struct got_error *
5631 print_status(void *arg, unsigned char status, unsigned char staged_status,
5632 const char *path, struct got_object_id *blob_id,
5633 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5634 int dirfd, const char *de_name)
5636 struct got_status_arg *st = arg;
5638 if (status == staged_status && (status == GOT_STATUS_DELETE))
5639 status = GOT_STATUS_NO_CHANGE;
5640 if (st != NULL && st->status_codes) {
5641 size_t ncodes = strlen(st->status_codes);
5644 for (i = 0; i < ncodes ; i++) {
5646 if (status == st->status_codes[i] ||
5647 staged_status == st->status_codes[i]) {
5652 if (status == st->status_codes[i] ||
5653 staged_status == st->status_codes[i])
5658 if (st->suppress && j == 0)
5665 printf("%c%c %s\n", status, staged_status, path);
5669 static const struct got_error *
5670 cmd_status(int argc, char *argv[])
5672 const struct got_error *error = NULL;
5673 struct got_repository *repo = NULL;
5674 struct got_worktree *worktree = NULL;
5675 struct got_status_arg st;
5677 struct got_pathlist_head paths;
5678 int ch, i, no_ignores = 0;
5679 int *pack_fds = NULL;
5683 memset(&st, 0, sizeof(st));
5684 st.status_codes = NULL;
5688 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5693 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
5699 if (st.status_codes != NULL && st.suppress == 0)
5700 option_conflict('S', 's');
5704 for (i = 0; optarg[i] != '\0'; i++) {
5705 switch (optarg[i]) {
5706 case GOT_STATUS_MODIFY:
5707 case GOT_STATUS_ADD:
5708 case GOT_STATUS_DELETE:
5709 case GOT_STATUS_CONFLICT:
5710 case GOT_STATUS_MISSING:
5711 case GOT_STATUS_OBSTRUCTED:
5712 case GOT_STATUS_UNVERSIONED:
5713 case GOT_STATUS_MODE_CHANGE:
5714 case GOT_STATUS_NONEXISTENT:
5717 errx(1, "invalid status code '%c'",
5721 if (ch == 's' && st.suppress)
5722 option_conflict('s', 'S');
5723 st.status_codes = optarg;
5734 cwd = getcwd(NULL, 0);
5736 error = got_error_from_errno("getcwd");
5740 error = got_repo_pack_fds_open(&pack_fds);
5744 error = got_worktree_open(&worktree, cwd);
5746 if (error->code == GOT_ERR_NOT_WORKTREE)
5747 error = wrap_not_worktree_error(error, "status", cwd);
5751 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5756 error = apply_unveil(got_repo_get_path(repo), 1,
5757 got_worktree_get_root_path(worktree));
5761 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5765 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5766 print_status, &st, check_cancelled, NULL);
5769 const struct got_error *pack_err =
5770 got_repo_pack_fds_close(pack_fds);
5775 const struct got_error *close_err = got_repo_close(repo);
5780 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5788 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
5789 "[-r repository-path] [-s signer-id] name\n", getprogname());
5794 static const struct got_error *
5795 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5797 const struct got_error *err = NULL;
5798 struct got_reflist_entry *re, *se, *new;
5799 struct got_object_id *re_id, *se_id;
5800 struct got_tag_object *re_tag, *se_tag;
5801 time_t re_time, se_time;
5803 STAILQ_FOREACH(re, tags, entry) {
5804 se = STAILQ_FIRST(sorted);
5806 err = got_reflist_entry_dup(&new, re);
5809 STAILQ_INSERT_HEAD(sorted, new, entry);
5812 err = got_ref_resolve(&re_id, repo, re->ref);
5815 err = got_object_open_as_tag(&re_tag, repo, re_id);
5819 re_time = got_object_tag_get_tagger_time(re_tag);
5820 got_object_tag_close(re_tag);
5824 err = got_ref_resolve(&se_id, repo, re->ref);
5827 err = got_object_open_as_tag(&se_tag, repo, se_id);
5831 se_time = got_object_tag_get_tagger_time(se_tag);
5832 got_object_tag_close(se_tag);
5834 if (se_time > re_time) {
5835 err = got_reflist_entry_dup(&new, re);
5838 STAILQ_INSERT_AFTER(sorted, se, new, entry);
5841 se = STAILQ_NEXT(se, entry);
5850 static const struct got_error *
5851 get_tag_refname(char **refname, const char *tag_name)
5853 const struct got_error *err;
5855 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5856 *refname = strdup(tag_name);
5857 if (*refname == NULL)
5858 return got_error_from_errno("strdup");
5859 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
5860 err = got_error_from_errno("asprintf");
5868 static const struct got_error *
5869 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
5870 const char *allowed_signers, const char *revoked_signers, int verbosity)
5872 static const struct got_error *err = NULL;
5873 struct got_reflist_head refs;
5874 struct got_reflist_entry *re;
5875 char *wanted_refname = NULL;
5880 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5885 struct got_reference *ref;
5886 err = get_tag_refname(&wanted_refname, tag_name);
5889 /* Wanted tag reference should exist. */
5890 err = got_ref_open(&ref, repo, wanted_refname, 0);
5896 TAILQ_FOREACH(re, &refs, entry) {
5897 const char *refname;
5898 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5900 const char *tagger, *ssh_sig = NULL;
5901 char *sig_msg = NULL;
5903 struct got_object_id *id;
5904 struct got_tag_object *tag;
5905 struct got_commit_object *commit = NULL;
5907 refname = got_ref_get_name(re->ref);
5908 if (strncmp(refname, "refs/tags/", 10) != 0 ||
5909 (wanted_refname && strcmp(refname, wanted_refname) != 0))
5912 refstr = got_ref_to_str(re->ref);
5913 if (refstr == NULL) {
5914 err = got_error_from_errno("got_ref_to_str");
5918 err = got_ref_resolve(&id, repo, re->ref);
5921 err = got_object_open_as_tag(&tag, repo, id);
5923 if (err->code != GOT_ERR_OBJ_TYPE) {
5927 /* "lightweight" tag */
5928 err = got_object_open_as_commit(&commit, repo, id);
5933 tagger = got_object_commit_get_committer(commit);
5935 got_object_commit_get_committer_time(commit);
5936 err = got_object_id_str(&id_str, id);
5942 tagger = got_object_tag_get_tagger(tag);
5943 tagger_time = got_object_tag_get_tagger_time(tag);
5944 err = got_object_id_str(&id_str,
5945 got_object_tag_get_object_id(tag));
5950 if (tag && verify_tags) {
5951 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
5952 got_object_tag_get_message(tag));
5953 if (ssh_sig && allowed_signers == NULL) {
5954 err = got_error_msg(
5955 GOT_ERR_VERIFY_TAG_SIGNATURE,
5956 "SSH signature verification requires "
5957 "setting allowed_signers in "
5963 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5965 printf("from: %s\n", tagger);
5966 datestr = get_datestr(&tagger_time, datebuf);
5968 printf("date: %s UTC\n", datestr);
5970 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5972 switch (got_object_tag_get_object_type(tag)) {
5973 case GOT_OBJ_TYPE_BLOB:
5974 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5977 case GOT_OBJ_TYPE_TREE:
5978 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5981 case GOT_OBJ_TYPE_COMMIT:
5982 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5985 case GOT_OBJ_TYPE_TAG:
5986 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5996 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
5997 allowed_signers, revoked_signers, verbosity);
5998 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
6002 printf("signature: %s", sig_msg);
6008 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6011 got_object_commit_close(commit);
6013 tagmsg0 = strdup(got_object_tag_get_message(tag));
6014 got_object_tag_close(tag);
6015 if (tagmsg0 == NULL) {
6016 err = got_error_from_errno("strdup");
6023 line = strsep(&tagmsg, "\n");
6025 printf(" %s\n", line);
6030 got_ref_list_free(&refs);
6031 free(wanted_refname);
6033 if (err == NULL && bad_sigs)
6034 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
6038 static const struct got_error *
6039 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6040 const char *tag_name, const char *repo_path)
6042 const struct got_error *err = NULL;
6043 char *template = NULL, *initial_content = NULL;
6044 char *editor = NULL;
6045 int initial_content_len;
6048 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6049 err = got_error_from_errno("asprintf");
6053 initial_content_len = asprintf(&initial_content,
6054 "\n# tagging commit %s as %s\n",
6055 commit_id_str, tag_name);
6056 if (initial_content_len == -1) {
6057 err = got_error_from_errno("asprintf");
6061 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
6065 if (write(fd, initial_content, initial_content_len) == -1) {
6066 err = got_error_from_errno2("write", *tagmsg_path);
6069 if (close(fd) == -1) {
6070 err = got_error_from_errno2("close", *tagmsg_path);
6075 err = get_editor(&editor);
6078 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6079 initial_content_len, 1);
6081 free(initial_content);
6085 if (fd != -1 && close(fd) == -1 && err == NULL)
6086 err = got_error_from_errno2("close", *tagmsg_path);
6095 static const struct got_error *
6096 add_tag(struct got_repository *repo, const char *tagger,
6097 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
6098 const char *signer_id, int verbosity)
6100 const struct got_error *err = NULL;
6101 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6102 char *label = NULL, *commit_id_str = NULL;
6103 struct got_reference *ref = NULL;
6104 char *refname = NULL, *tagmsg = NULL;
6105 char *tagmsg_path = NULL, *tag_id_str = NULL;
6106 int preserve_tagmsg = 0;
6107 struct got_reflist_head refs;
6112 * Don't let the user create a tag name with a leading '-'.
6113 * While technically a valid reference name, this case is usually
6114 * an unintended typo.
6116 if (tag_name[0] == '-')
6117 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6119 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6123 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6124 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6128 err = got_object_id_str(&commit_id_str, commit_id);
6132 err = get_tag_refname(&refname, tag_name);
6135 if (strncmp("refs/tags/", tag_name, 10) == 0)
6138 err = got_ref_open(&ref, repo, refname, 0);
6140 err = got_error(GOT_ERR_TAG_EXISTS);
6142 } else if (err->code != GOT_ERR_NOT_REF)
6145 if (tagmsg_arg == NULL) {
6146 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6147 tag_name, got_repo_get_path(repo));
6149 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6150 tagmsg_path != NULL)
6151 preserve_tagmsg = 1;
6154 /* Editor is done; we can now apply unveil(2) */
6155 err = got_sigs_apply_unveil();
6158 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
6163 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6164 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
6168 preserve_tagmsg = 1;
6172 err = got_ref_alloc(&ref, refname, tag_id);
6175 preserve_tagmsg = 1;
6179 err = got_ref_write(ref, repo);
6182 preserve_tagmsg = 1;
6186 err = got_object_id_str(&tag_id_str, tag_id);
6189 preserve_tagmsg = 1;
6192 printf("Created tag %s\n", tag_id_str);
6194 if (preserve_tagmsg) {
6195 fprintf(stderr, "%s: tag message preserved in %s\n",
6196 getprogname(), tagmsg_path);
6197 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6198 err = got_error_from_errno2("unlink", tagmsg_path);
6203 free(commit_id_str);
6207 got_ref_list_free(&refs);
6211 static const struct got_error *
6212 cmd_tag(int argc, char *argv[])
6214 const struct got_error *error = NULL;
6215 struct got_repository *repo = NULL;
6216 struct got_worktree *worktree = NULL;
6217 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6218 char *gitconfig_path = NULL, *tagger = NULL;
6219 char *allowed_signers = NULL, *revoked_signers = NULL;
6220 const char *signer_id = NULL;
6221 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
6222 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
6223 int *pack_fds = NULL;
6226 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6227 "sendfd unveil", NULL) == -1)
6231 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
6234 commit_id_arg = optarg;
6243 repo_path = realpath(optarg, NULL);
6244 if (repo_path == NULL) {
6245 error = got_error_from_errno2("realpath",
6249 got_path_strip_trailing_slashes(repo_path);
6260 else if (verbosity < 3)
6272 if (do_list || verify_tags) {
6273 if (commit_id_arg != NULL)
6275 "-c option can only be used when creating a tag");
6278 option_conflict('l', 'm');
6280 option_conflict('V', 'm');
6284 option_conflict('l', 's');
6286 option_conflict('V', 's');
6290 } else if (argc != 1)
6296 cwd = getcwd(NULL, 0);
6298 error = got_error_from_errno("getcwd");
6302 error = got_repo_pack_fds_open(&pack_fds);
6306 if (repo_path == NULL) {
6307 error = got_worktree_open(&worktree, cwd);
6308 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6314 strdup(got_worktree_get_repo_path(worktree));
6315 if (repo_path == NULL)
6316 error = got_error_from_errno("strdup");
6320 repo_path = strdup(cwd);
6321 if (repo_path == NULL) {
6322 error = got_error_from_errno("strdup");
6328 if (do_list || verify_tags) {
6329 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6332 error = get_allowed_signers(&allowed_signers, repo, worktree);
6335 error = get_revoked_signers(&revoked_signers, repo, worktree);
6339 /* Release work tree lock. */
6340 got_worktree_close(worktree);
6345 * Remove "cpath" promise unless needed for signature tmpfile
6349 got_sigs_apply_unveil();
6352 if (pledge("stdio rpath wpath flock proc exec sendfd "
6353 "unveil", NULL) == -1)
6357 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6360 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
6361 revoked_signers, verbosity);
6363 error = get_gitconfig_path(&gitconfig_path);
6366 error = got_repo_open(&repo, repo_path, gitconfig_path,
6371 error = get_author(&tagger, repo, worktree);
6374 if (signer_id == NULL)
6375 signer_id = get_signer_id(repo, worktree);
6379 error = got_sigs_apply_unveil();
6383 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6388 if (commit_id_arg == NULL) {
6389 struct got_reference *head_ref;
6390 struct got_object_id *commit_id;
6391 error = got_ref_open(&head_ref, repo,
6392 worktree ? got_worktree_get_head_ref_name(worktree)
6396 error = got_ref_resolve(&commit_id, repo, head_ref);
6397 got_ref_close(head_ref);
6400 error = got_object_id_str(&commit_id_str, commit_id);
6407 /* Release work tree lock. */
6408 got_worktree_close(worktree);
6412 error = add_tag(repo, tagger, tag_name,
6413 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
6414 signer_id, verbosity);
6418 const struct got_error *close_err = got_repo_close(repo);
6423 got_worktree_close(worktree);
6425 const struct got_error *pack_err =
6426 got_repo_pack_fds_close(pack_fds);
6432 free(gitconfig_path);
6433 free(commit_id_str);
6435 free(allowed_signers);
6436 free(revoked_signers);
6443 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
6447 static const struct got_error *
6448 add_progress(void *arg, unsigned char status, const char *path)
6450 while (path[0] == '/')
6452 printf("%c %s\n", status, path);
6456 static const struct got_error *
6457 cmd_add(int argc, char *argv[])
6459 const struct got_error *error = NULL;
6460 struct got_repository *repo = NULL;
6461 struct got_worktree *worktree = NULL;
6463 struct got_pathlist_head paths;
6464 struct got_pathlist_entry *pe;
6465 int ch, can_recurse = 0, no_ignores = 0;
6466 int *pack_fds = NULL;
6471 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6476 while ((ch = getopt(argc, argv, "IR")) != -1) {
6496 cwd = getcwd(NULL, 0);
6498 error = got_error_from_errno("getcwd");
6502 error = got_repo_pack_fds_open(&pack_fds);
6506 error = got_worktree_open(&worktree, cwd);
6508 if (error->code == GOT_ERR_NOT_WORKTREE)
6509 error = wrap_not_worktree_error(error, "add", cwd);
6513 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6518 error = apply_unveil(got_repo_get_path(repo), 1,
6519 got_worktree_get_root_path(worktree));
6523 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6530 TAILQ_FOREACH(pe, &paths, entry) {
6531 if (asprintf(&ondisk_path, "%s/%s",
6532 got_worktree_get_root_path(worktree),
6534 error = got_error_from_errno("asprintf");
6537 if (lstat(ondisk_path, &sb) == -1) {
6538 if (errno == ENOENT) {
6542 error = got_error_from_errno2("lstat",
6548 if (S_ISDIR(sb.st_mode)) {
6549 error = got_error_msg(GOT_ERR_BAD_PATH,
6550 "adding directories requires -R option");
6556 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6557 NULL, repo, no_ignores);
6560 const struct got_error *close_err = got_repo_close(repo);
6565 got_worktree_close(worktree);
6567 const struct got_error *pack_err =
6568 got_repo_pack_fds_close(pack_fds);
6572 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6580 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
6585 static const struct got_error *
6586 print_remove_status(void *arg, unsigned char status,
6587 unsigned char staged_status, const char *path)
6589 while (path[0] == '/')
6591 if (status == GOT_STATUS_NONEXISTENT)
6593 if (status == staged_status && (status == GOT_STATUS_DELETE))
6594 status = GOT_STATUS_NO_CHANGE;
6595 printf("%c%c %s\n", status, staged_status, path);
6599 static const struct got_error *
6600 cmd_remove(int argc, char *argv[])
6602 const struct got_error *error = NULL;
6603 struct got_worktree *worktree = NULL;
6604 struct got_repository *repo = NULL;
6605 const char *status_codes = NULL;
6607 struct got_pathlist_head paths;
6608 struct got_pathlist_entry *pe;
6609 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6610 int ignore_missing_paths = 0;
6611 int *pack_fds = NULL;
6616 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6621 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6624 delete_local_mods = 1;
6625 ignore_missing_paths = 1;
6634 for (i = 0; optarg[i] != '\0'; i++) {
6635 switch (optarg[i]) {
6636 case GOT_STATUS_MODIFY:
6637 delete_local_mods = 1;
6639 case GOT_STATUS_MISSING:
6640 ignore_missing_paths = 1;
6643 errx(1, "invalid status code '%c'",
6647 status_codes = optarg;
6661 cwd = getcwd(NULL, 0);
6663 error = got_error_from_errno("getcwd");
6667 error = got_repo_pack_fds_open(&pack_fds);
6671 error = got_worktree_open(&worktree, cwd);
6673 if (error->code == GOT_ERR_NOT_WORKTREE)
6674 error = wrap_not_worktree_error(error, "remove", cwd);
6678 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6683 error = apply_unveil(got_repo_get_path(repo), 1,
6684 got_worktree_get_root_path(worktree));
6688 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6695 TAILQ_FOREACH(pe, &paths, entry) {
6696 if (asprintf(&ondisk_path, "%s/%s",
6697 got_worktree_get_root_path(worktree),
6699 error = got_error_from_errno("asprintf");
6702 if (lstat(ondisk_path, &sb) == -1) {
6703 if (errno == ENOENT) {
6707 error = got_error_from_errno2("lstat",
6713 if (S_ISDIR(sb.st_mode)) {
6714 error = got_error_msg(GOT_ERR_BAD_PATH,
6715 "removing directories requires -R option");
6721 error = got_worktree_schedule_delete(worktree, &paths,
6722 delete_local_mods, status_codes, print_remove_status, NULL,
6723 repo, keep_on_disk, ignore_missing_paths);
6726 const struct got_error *close_err = got_repo_close(repo);
6731 got_worktree_close(worktree);
6733 const struct got_error *pack_err =
6734 got_repo_pack_fds_close(pack_fds);
6738 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6746 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
6747 "[patchfile]\n", getprogname());
6751 static const struct got_error *
6752 patch_from_stdin(int *patchfd)
6754 const struct got_error *err = NULL;
6757 sig_t sighup, sigint, sigquit;
6759 *patchfd = got_opentempfd();
6761 return got_error_from_errno("got_opentempfd");
6763 sighup = signal(SIGHUP, SIG_DFL);
6764 sigint = signal(SIGINT, SIG_DFL);
6765 sigquit = signal(SIGQUIT, SIG_DFL);
6768 r = read(0, buf, sizeof(buf));
6770 err = got_error_from_errno("read");
6775 if (write(*patchfd, buf, r) == -1) {
6776 err = got_error_from_errno("write");
6781 signal(SIGHUP, sighup);
6782 signal(SIGINT, sigint);
6783 signal(SIGQUIT, sigquit);
6785 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
6786 err = got_error_from_errno("lseek");
6796 struct got_patch_progress_arg {
6802 static const struct got_error *
6803 patch_progress(void *arg, const char *old, const char *new,
6804 unsigned char status, const struct got_error *error, int old_from,
6805 int old_lines, int new_from, int new_lines, int offset,
6806 int ws_mangled, const struct got_error *hunk_err)
6808 const char *path = new == NULL ? old : new;
6809 struct got_patch_progress_arg *a = arg;
6811 while (*path == '/')
6814 if (status != GOT_STATUS_NO_CHANGE &&
6815 status != 0 /* per-hunk progress */) {
6816 printf("%c %s\n", status, path);
6817 a->did_something = 1;
6820 if (hunk_err == NULL) {
6821 if (status == GOT_STATUS_CANNOT_UPDATE)
6823 else if (status == GOT_STATUS_CONFLICT)
6828 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
6830 if (offset != 0 || hunk_err != NULL || ws_mangled) {
6831 printf("@@ -%d,%d +%d,%d @@ ", old_from,
6832 old_lines, new_from, new_lines);
6833 if (hunk_err != NULL)
6834 printf("%s\n", hunk_err->msg);
6835 else if (offset != 0)
6836 printf("applied with offset %d\n", offset);
6838 printf("hunk contains mangled whitespace\n");
6845 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
6847 if (!ppa->did_something)
6850 if (ppa->conflicts > 0)
6851 printf("Files with merge conflicts: %d\n", ppa->conflicts);
6853 if (ppa->rejects > 0) {
6854 printf("Files where patch failed to apply: %d\n",
6859 static const struct got_error *
6860 cmd_patch(int argc, char *argv[])
6862 const struct got_error *error = NULL, *close_error = NULL;
6863 struct got_worktree *worktree = NULL;
6864 struct got_repository *repo = NULL;
6865 struct got_reflist_head refs;
6866 struct got_object_id *commit_id = NULL;
6867 const char *commit_id_str = NULL;
6871 int ch, nop = 0, strip = -1, reverse = 0;
6873 int *pack_fds = NULL;
6874 struct got_patch_progress_arg ppa;
6879 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
6880 "unveil", NULL) == -1)
6884 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
6887 commit_id_str = optarg;
6893 strip = strtonum(optarg, 0, INT_MAX, &errstr);
6895 errx(1, "pathname strip count is %s: %s",
6911 error = patch_from_stdin(&patchfd);
6914 } else if (argc == 1) {
6915 patchfd = open(argv[0], O_RDONLY);
6916 if (patchfd == -1) {
6917 error = got_error_from_errno2("open", argv[0]);
6920 if (fstat(patchfd, &sb) == -1) {
6921 error = got_error_from_errno2("fstat", argv[0]);
6924 if (!S_ISREG(sb.st_mode)) {
6925 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
6931 if ((cwd = getcwd(NULL, 0)) == NULL) {
6932 error = got_error_from_errno("getcwd");
6936 error = got_repo_pack_fds_open(&pack_fds);
6940 error = got_worktree_open(&worktree, cwd);
6944 const char *repo_path = got_worktree_get_repo_path(worktree);
6945 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6949 error = apply_unveil(got_repo_get_path(repo), 0,
6950 got_worktree_get_root_path(worktree));
6954 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6958 if (commit_id_str != NULL) {
6959 error = got_repo_match_object_id(&commit_id, NULL,
6960 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6965 memset(&ppa, 0, sizeof(ppa));
6966 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
6967 commit_id, patch_progress, &ppa, check_cancelled, NULL);
6968 print_patch_progress_stats(&ppa);
6970 got_ref_list_free(&refs);
6973 close_error = got_repo_close(repo);
6975 error = close_error;
6977 if (worktree != NULL) {
6978 close_error = got_worktree_close(worktree);
6980 error = close_error;
6983 const struct got_error *pack_err =
6984 got_repo_pack_fds_close(pack_fds);
6995 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
7000 static const struct got_error *
7001 revert_progress(void *arg, unsigned char status, const char *path)
7003 if (status == GOT_STATUS_UNVERSIONED)
7006 while (path[0] == '/')
7008 printf("%c %s\n", status, path);
7012 struct choose_patch_arg {
7013 FILE *patch_script_file;
7017 static const struct got_error *
7018 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7019 int nchanges, const char *action)
7021 const struct got_error *err;
7023 size_t linesize = 0;
7027 case GOT_STATUS_ADD:
7028 printf("A %s\n%s this addition? [y/n] ", path, action);
7030 case GOT_STATUS_DELETE:
7031 printf("D %s\n%s this deletion? [y/n] ", path, action);
7033 case GOT_STATUS_MODIFY:
7034 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7035 return got_error_from_errno("fseek");
7036 printf(GOT_COMMIT_SEP_STR);
7037 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7039 if (linelen == -1 && ferror(patch_file)) {
7040 err = got_error_from_errno("getline");
7045 printf(GOT_COMMIT_SEP_STR);
7046 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7047 path, n, nchanges, action);
7050 return got_error_path(path, GOT_ERR_FILE_STATUS);
7057 static const struct got_error *
7058 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7059 FILE *patch_file, int n, int nchanges)
7061 const struct got_error *err = NULL;
7063 size_t linesize = 0;
7066 struct choose_patch_arg *a = arg;
7068 *choice = GOT_PATCH_CHOICE_NONE;
7070 if (a->patch_script_file) {
7072 err = show_change(status, path, patch_file, n, nchanges,
7076 linelen = getline(&line, &linesize, a->patch_script_file);
7077 if (linelen == -1) {
7078 if (ferror(a->patch_script_file))
7079 return got_error_from_errno("getline");
7082 nl = strchr(line, '\n');
7085 if (strcmp(line, "y") == 0) {
7086 *choice = GOT_PATCH_CHOICE_YES;
7088 } else if (strcmp(line, "n") == 0) {
7089 *choice = GOT_PATCH_CHOICE_NO;
7091 } else if (strcmp(line, "q") == 0 &&
7092 status == GOT_STATUS_MODIFY) {
7093 *choice = GOT_PATCH_CHOICE_QUIT;
7096 printf("invalid response '%s'\n", line);
7101 while (resp != 'y' && resp != 'n' && resp != 'q') {
7102 err = show_change(status, path, patch_file, n, nchanges,
7109 if (status == GOT_STATUS_MODIFY) {
7110 if (resp != 'y' && resp != 'n' && resp != 'q') {
7111 printf("invalid response '%c'\n", resp);
7114 } else if (resp != 'y' && resp != 'n') {
7115 printf("invalid response '%c'\n", resp);
7121 *choice = GOT_PATCH_CHOICE_YES;
7122 else if (resp == 'n')
7123 *choice = GOT_PATCH_CHOICE_NO;
7124 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7125 *choice = GOT_PATCH_CHOICE_QUIT;
7130 struct wt_commitable_path_arg {
7131 struct got_pathlist_head *commit_paths;
7136 * Shortcut work tree status callback to determine if the set of paths scanned
7137 * has at least one versioned path that is being modified and, if not NULL, is
7138 * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
7139 * soon as a path is passed with a status that satisfies this criteria.
7141 static const struct got_error *
7142 worktree_has_commitable_path(void *arg, unsigned char status,
7143 unsigned char staged_status, const char *path,
7144 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7145 struct got_object_id *commit_id, int dirfd, const char *de_name)
7147 struct wt_commitable_path_arg *a = arg;
7149 if (status == staged_status && (status == GOT_STATUS_DELETE))
7150 status = GOT_STATUS_NO_CHANGE;
7152 if (!(status == GOT_STATUS_NO_CHANGE ||
7153 status == GOT_STATUS_UNVERSIONED) ||
7154 staged_status != GOT_STATUS_NO_CHANGE) {
7155 if (a->commit_paths != NULL) {
7156 struct got_pathlist_entry *pe;
7158 TAILQ_FOREACH(pe, a->commit_paths, entry) {
7159 if (strncmp(path, pe->path,
7160 pe->path_len) == 0) {
7161 *a->has_changes = 1;
7166 *a->has_changes = 1;
7168 if (*a->has_changes)
7169 return got_error(GOT_ERR_FILE_MODIFIED);
7176 * Check that the changeset of the commit identified by id is
7177 * comprised of at least one modified path that is being committed.
7179 static const struct got_error *
7180 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
7181 struct got_object_id *id, struct got_worktree *worktree,
7182 struct got_repository *repo)
7184 const struct got_error *err;
7185 struct got_pathlist_head paths;
7186 struct got_commit_object *commit = NULL, *pcommit = NULL;
7187 struct got_tree_object *tree = NULL, *ptree = NULL;
7188 struct got_object_qid *pid;
7192 err = got_object_open_as_commit(&commit, repo, id);
7196 err = got_object_open_as_tree(&tree, repo,
7197 got_object_commit_get_tree_id(commit));
7201 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7203 err = got_object_open_as_commit(&pcommit, repo, &pid->id);
7207 err = got_object_open_as_tree(&ptree, repo,
7208 got_object_commit_get_tree_id(pcommit));
7213 err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
7214 got_diff_tree_collect_changed_paths, &paths, 0);
7218 err = got_worktree_status(worktree, &paths, repo, 0,
7219 worktree_has_commitable_path, wcpa, check_cancelled, NULL);
7220 if (err && err->code == GOT_ERR_FILE_MODIFIED) {
7222 * At least one changed path in the referenced commit is
7223 * modified in the work tree, that's all we need to know!
7229 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
7231 got_object_commit_close(commit);
7233 got_object_commit_close(pcommit);
7235 got_object_tree_close(tree);
7237 got_object_tree_close(ptree);
7242 * Remove any "logmsg" reference comprised entirely of paths that have
7243 * been reverted in this work tree. If any path in the logmsg ref changeset
7244 * remains in a changed state in the worktree, do not remove the reference.
7246 static const struct got_error *
7247 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
7249 const struct got_error *err;
7250 struct got_reflist_head refs;
7251 struct got_reflist_entry *re;
7252 struct got_commit_object *commit = NULL;
7253 struct got_object_id *commit_id = NULL;
7254 struct wt_commitable_path_arg wcpa;
7255 char *uuidstr = NULL;
7259 err = got_worktree_get_uuid(&uuidstr, worktree);
7263 err = got_ref_list(&refs, repo, "refs/got/worktree",
7264 got_ref_cmp_by_name, repo);
7268 TAILQ_FOREACH(re, &refs, entry) {
7269 const char *refname;
7270 int has_changes = 0;
7272 refname = got_ref_get_name(re->ref);
7274 if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7275 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
7276 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7277 else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7278 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
7279 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7283 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7284 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7288 err = got_repo_match_object_id(&commit_id, NULL, refname,
7289 GOT_OBJ_TYPE_COMMIT, NULL, repo);
7293 err = got_object_open_as_commit(&commit, repo, commit_id);
7297 wcpa.commit_paths = NULL;
7298 wcpa.has_changes = &has_changes;
7300 err = commit_path_changed_in_worktree(&wcpa, commit_id,
7306 err = got_ref_delete(re->ref, repo);
7311 got_object_commit_close(commit);
7320 got_ref_list_free(&refs);
7322 got_object_commit_close(commit);
7326 static const struct got_error *
7327 cmd_revert(int argc, char *argv[])
7329 const struct got_error *error = NULL;
7330 struct got_worktree *worktree = NULL;
7331 struct got_repository *repo = NULL;
7332 char *cwd = NULL, *path = NULL;
7333 struct got_pathlist_head paths;
7334 struct got_pathlist_entry *pe;
7335 int ch, can_recurse = 0, pflag = 0;
7336 FILE *patch_script_file = NULL;
7337 const char *patch_script_path = NULL;
7338 struct choose_patch_arg cpa;
7339 int *pack_fds = NULL;
7344 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7345 "unveil", NULL) == -1)
7349 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
7352 patch_script_path = optarg;
7371 if (patch_script_path && !pflag)
7372 errx(1, "-F option can only be used together with -p option");
7374 cwd = getcwd(NULL, 0);
7376 error = got_error_from_errno("getcwd");
7380 error = got_repo_pack_fds_open(&pack_fds);
7384 error = got_worktree_open(&worktree, cwd);
7386 if (error->code == GOT_ERR_NOT_WORKTREE)
7387 error = wrap_not_worktree_error(error, "revert", cwd);
7391 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7396 if (patch_script_path) {
7397 patch_script_file = fopen(patch_script_path, "re");
7398 if (patch_script_file == NULL) {
7399 error = got_error_from_errno2("fopen",
7406 * XXX "c" perm needed on repo dir to delete merge references.
7408 error = apply_unveil(got_repo_get_path(repo), 0,
7409 got_worktree_get_root_path(worktree));
7413 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7420 TAILQ_FOREACH(pe, &paths, entry) {
7421 if (asprintf(&ondisk_path, "%s/%s",
7422 got_worktree_get_root_path(worktree),
7424 error = got_error_from_errno("asprintf");
7427 if (lstat(ondisk_path, &sb) == -1) {
7428 if (errno == ENOENT) {
7432 error = got_error_from_errno2("lstat",
7438 if (S_ISDIR(sb.st_mode)) {
7439 error = got_error_msg(GOT_ERR_BAD_PATH,
7440 "reverting directories requires -R option");
7446 cpa.patch_script_file = patch_script_file;
7447 cpa.action = "revert";
7448 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7449 pflag ? choose_patch : NULL, &cpa, repo);
7451 error = rm_logmsg_ref(worktree, repo);
7453 if (patch_script_file && fclose(patch_script_file) == EOF &&
7455 error = got_error_from_errno2("fclose", patch_script_path);
7457 const struct got_error *close_err = got_repo_close(repo);
7462 got_worktree_close(worktree);
7464 const struct got_error *pack_err =
7465 got_repo_pack_fds_close(pack_fds);
7469 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7478 fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
7479 "[-m message] [path ...]\n", getprogname());
7483 struct collect_commit_logmsg_arg {
7484 const char *cmdline_log;
7485 const char *prepared_log;
7486 const char *merged_log;
7487 int non_interactive;
7489 const char *worktree_path;
7490 const char *repo_path;
7491 const char *dial_proto;
7495 static const struct got_error *
7496 read_prepared_logmsg(char **logmsg, const char *path)
7498 const struct got_error *err = NULL;
7504 memset(&sb, 0, sizeof(sb));
7506 f = fopen(path, "re");
7508 return got_error_from_errno2("fopen", path);
7510 if (fstat(fileno(f), &sb) == -1) {
7511 err = got_error_from_errno2("fstat", path);
7514 if (sb.st_size == 0) {
7515 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7519 *logmsg = malloc(sb.st_size + 1);
7520 if (*logmsg == NULL) {
7521 err = got_error_from_errno("malloc");
7525 r = fread(*logmsg, 1, sb.st_size, f);
7526 if (r != sb.st_size) {
7528 err = got_error_from_errno2("fread", path);
7530 err = got_error(GOT_ERR_IO);
7533 (*logmsg)[sb.st_size] = '\0';
7535 if (fclose(f) == EOF && err == NULL)
7536 err = got_error_from_errno2("fclose", path);
7544 static const struct got_error *
7545 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
7546 const char *diff_path, char **logmsg, void *arg)
7548 char *initial_content = NULL;
7549 struct got_pathlist_entry *pe;
7550 const struct got_error *err = NULL;
7551 char *template = NULL;
7552 char *prepared_msg = NULL, *merged_msg = NULL;
7553 struct collect_commit_logmsg_arg *a = arg;
7554 int initial_content_len;
7558 /* if a message was specified on the command line, just use it */
7559 if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
7560 len = strlen(a->cmdline_log) + 1;
7561 *logmsg = malloc(len + 1);
7562 if (*logmsg == NULL)
7563 return got_error_from_errno("malloc");
7564 strlcpy(*logmsg, a->cmdline_log, len);
7566 } else if (a->prepared_log != NULL && a->non_interactive)
7567 return read_prepared_logmsg(logmsg, a->prepared_log);
7569 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7570 return got_error_from_errno("asprintf");
7572 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
7576 if (a->prepared_log) {
7577 err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
7580 } else if (a->merged_log) {
7581 err = read_prepared_logmsg(&merged_msg, a->merged_log);
7586 initial_content_len = asprintf(&initial_content,
7587 "%s%s\n# changes to be committed:\n",
7588 prepared_msg ? prepared_msg : "",
7589 merged_msg ? merged_msg : "");
7590 if (initial_content_len == -1) {
7591 err = got_error_from_errno("asprintf");
7595 if (write(fd, initial_content, initial_content_len) == -1) {
7596 err = got_error_from_errno2("write", a->logmsg_path);
7600 TAILQ_FOREACH(pe, commitable_paths, entry) {
7601 struct got_commitable *ct = pe->data;
7602 dprintf(fd, "# %c %s\n",
7603 got_commitable_get_status(ct),
7604 got_commitable_get_path(ct));
7608 dprintf(fd, "# detailed changes can be viewed in %s\n",
7612 if (close(fd) == -1) {
7613 err = got_error_from_errno2("close", a->logmsg_path);
7618 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7619 initial_content_len, a->prepared_log ? 0 : 1);
7621 free(initial_content);
7626 if (fd != -1 && close(fd) == -1 && err == NULL)
7627 err = got_error_from_errno2("close", a->logmsg_path);
7629 /* Editor is done; we can now apply unveil(2) */
7631 err = got_dial_apply_unveil(a->dial_proto);
7633 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7641 static const struct got_error *
7642 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
7643 const char *type, int has_content)
7645 const struct got_error *err = NULL;
7646 char *logmsg = NULL;
7648 err = got_object_commit_get_logmsg(&logmsg, commit);
7652 if (fprintf(f, "%s# log message of %s commit %s:%s",
7653 has_content ? "\n" : "", type, idstr, logmsg) < 0)
7654 err = got_ferror(f, GOT_ERR_IO);
7661 * Lookup "logmsg" references of backed-out and cherrypicked commits
7662 * belonging to the current work tree. If found, and the worktree has
7663 * at least one modified file that was changed in the referenced commit,
7664 * add its log message to a new temporary file at *logmsg_path.
7665 * Add all refs found to matched_refs to be scheduled for removal on
7666 * successful commit.
7668 static const struct got_error *
7669 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
7670 struct got_reflist_head *matched_refs, struct got_worktree *worktree,
7671 struct got_repository *repo)
7673 const struct got_error *err;
7674 struct got_commit_object *commit = NULL;
7675 struct got_object_id *id = NULL;
7676 struct got_reflist_head refs;
7677 struct got_reflist_entry *re, *re_match;
7679 char *uuidstr = NULL;
7680 int added_logmsg = 0;
7684 *logmsg_path = NULL;
7686 err = got_worktree_get_uuid(&uuidstr, worktree);
7690 err = got_ref_list(&refs, repo, "refs/got/worktree",
7691 got_ref_cmp_by_name, repo);
7695 TAILQ_FOREACH(re, &refs, entry) {
7696 const char *refname, *type;
7697 struct wt_commitable_path_arg wcpa;
7700 refname = got_ref_get_name(re->ref);
7702 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7703 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
7704 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7705 type = "cherrypicked";
7706 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7707 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
7708 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7709 type = "backed-out";
7713 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7714 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7718 err = got_repo_match_object_id(&id, NULL, refname,
7719 GOT_OBJ_TYPE_COMMIT, NULL, repo);
7723 err = got_object_open_as_commit(&commit, repo, id);
7727 wcpa.commit_paths = paths;
7728 wcpa.has_changes = &add_logmsg;
7730 err = commit_path_changed_in_worktree(&wcpa, id,
7737 err = got_opentemp_named(logmsg_path, &f,
7738 "got-commit-logmsg", "");
7742 err = cat_logmsg(f, commit, refname, type,
7749 err = got_reflist_entry_dup(&re_match, re);
7752 TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
7755 got_object_commit_close(commit);
7764 got_ref_list_free(&refs);
7766 got_object_commit_close(commit);
7767 if (f && fclose(f) == EOF && err == NULL)
7768 err = got_error_from_errno("fclose");
7769 if (!added_logmsg) {
7770 if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
7771 err = got_error_from_errno2("unlink", *logmsg_path);
7772 *logmsg_path = NULL;
7777 static const struct got_error *
7778 cmd_commit(int argc, char *argv[])
7780 const struct got_error *error = NULL;
7781 struct got_worktree *worktree = NULL;
7782 struct got_repository *repo = NULL;
7783 char *cwd = NULL, *id_str = NULL;
7784 struct got_object_id *id = NULL;
7785 const char *logmsg = NULL;
7786 char *prepared_logmsg = NULL, *merged_logmsg = NULL;
7787 struct collect_commit_logmsg_arg cl_arg;
7788 const char *author = NULL;
7789 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
7790 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7791 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7792 int show_diff = 1, commit_conflicts = 0;
7793 struct got_pathlist_head paths;
7794 struct got_reflist_head refs;
7795 struct got_reflist_entry *re;
7796 int *pack_fds = NULL;
7797 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
7798 const struct got_remote_repo *remotes, *remote = NULL;
7800 char *proto = NULL, *host = NULL, *port = NULL;
7801 char *repo_name = NULL, *server_path = NULL;
7802 const char *remote_name;
7808 cl_arg.logmsg_path = NULL;
7811 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7812 "unveil", NULL) == -1)
7816 while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
7820 error = valid_author(author);
7825 commit_conflicts = 1;
7829 option_conflict('F', 'm');
7830 prepared_logmsg = realpath(optarg, NULL);
7831 if (prepared_logmsg == NULL)
7832 return got_error_from_errno2("realpath",
7836 if (prepared_logmsg)
7837 option_conflict('m', 'F');
7841 non_interactive = 1;
7847 allow_bad_symlinks = 1;
7858 cwd = getcwd(NULL, 0);
7860 error = got_error_from_errno("getcwd");
7864 error = got_repo_pack_fds_open(&pack_fds);
7868 error = got_worktree_open(&worktree, cwd);
7870 if (error->code == GOT_ERR_NOT_WORKTREE)
7871 error = wrap_not_worktree_error(error, "commit", cwd);
7875 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7878 if (rebase_in_progress) {
7879 error = got_error(GOT_ERR_REBASING);
7883 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7888 error = get_gitconfig_path(&gitconfig_path);
7891 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7892 gitconfig_path, pack_fds);
7896 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7899 if (merge_in_progress) {
7900 error = got_error(GOT_ERR_MERGE_BUSY);
7904 error = get_author(&committer, repo, worktree);
7911 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
7912 worktree_conf = got_worktree_get_gotconfig(worktree);
7913 if (worktree_conf) {
7914 got_gotconfig_get_remotes(&nremotes, &remotes,
7916 for (i = 0; i < nremotes; i++) {
7917 if (strcmp(remotes[i].name, remote_name) == 0) {
7918 remote = &remotes[i];
7923 if (remote == NULL) {
7924 repo_conf = got_repo_get_gotconfig(repo);
7926 got_gotconfig_get_remotes(&nremotes, &remotes,
7928 for (i = 0; i < nremotes; i++) {
7929 if (strcmp(remotes[i].name, remote_name) == 0) {
7930 remote = &remotes[i];
7936 if (remote == NULL) {
7937 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
7938 for (i = 0; i < nremotes; i++) {
7939 if (strcmp(remotes[i].name, remote_name) == 0) {
7940 remote = &remotes[i];
7945 if (remote == NULL) {
7946 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
7950 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
7951 &repo_name, remote->fetch_url);
7955 if (strcmp(proto, "git") == 0) {
7957 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7958 "sendfd dns inet unveil", NULL) == -1)
7961 } else if (strcmp(proto, "git+ssh") == 0 ||
7962 strcmp(proto, "ssh") == 0) {
7964 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7965 "sendfd unveil", NULL) == -1)
7968 } else if (strcmp(proto, "http") == 0 ||
7969 strcmp(proto, "git+http") == 0) {
7970 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
7973 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
7978 /*if (verbosity >= 0) {
7979 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
7980 remote->name, proto, host,
7981 port ? ":" : "", port ? port : "",
7982 *server_path == '/' ? "" : "/", server_path);
7986 * unveil(2) traverses exec(2); if an editor is used we have
7987 * to apply unveil after the log message has been written during
7990 if (logmsg == NULL || strlen(logmsg) == 0)
7991 error = get_editor(&editor);
7993 error = got_dial_apply_unveil(proto);
7996 error = apply_unveil(got_repo_get_path(repo), 0,
7997 got_worktree_get_root_path(worktree));
8002 if (prepared_logmsg == NULL) {
8003 error = lookup_logmsg_ref(&merged_logmsg,
8004 argc > 0 ? &paths : NULL, &refs, worktree, repo);
8009 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8013 cl_arg.editor = editor;
8014 cl_arg.cmdline_log = logmsg;
8015 cl_arg.prepared_log = prepared_logmsg;
8016 cl_arg.merged_log = merged_logmsg;
8017 cl_arg.non_interactive = non_interactive;
8018 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8019 cl_arg.repo_path = got_repo_get_path(repo);
8020 cl_arg.dial_proto = proto;
8021 error = got_worktree_cvg_commit(&id, worktree, &paths, author,
8022 committer, allow_bad_symlinks, show_diff, commit_conflicts,
8023 collect_commit_logmsg, &cl_arg, print_status, NULL, proto, host,
8024 port, server_path, verbosity, remote, check_cancelled, repo);
8026 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8027 cl_arg.logmsg_path != NULL)
8028 preserve_logmsg = 1;
8032 error = got_object_id_str(&id_str, id);
8035 printf("Created commit %s\n", id_str);
8037 TAILQ_FOREACH(re, &refs, entry) {
8038 error = got_ref_delete(re->ref, repo);
8044 if (preserve_logmsg) {
8045 fprintf(stderr, "%s: log message preserved in %s\n",
8046 getprogname(), cl_arg.logmsg_path);
8047 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8049 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8050 free(cl_arg.logmsg_path);
8051 if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
8052 error = got_error_from_errno2("unlink", merged_logmsg);
8053 free(merged_logmsg);
8055 const struct got_error *close_err = got_repo_close(repo);
8060 got_worktree_close(worktree);
8062 const struct got_error *pack_err =
8063 got_repo_pack_fds_close(pack_fds);
8067 got_ref_list_free(&refs);
8068 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8071 free(gitconfig_path);
8074 free(prepared_logmsg);
8079 * Print and if delete is set delete all ref_prefix references.
8080 * If wanted_ref is not NULL, only print or delete this reference.
8082 static const struct got_error *
8083 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
8084 const char *wanted_ref, int delete, struct got_worktree *worktree,
8085 struct got_repository *repo)
8087 const struct got_error *err;
8088 struct got_pathlist_head paths;
8089 struct got_reflist_head refs;
8090 struct got_reflist_entry *re;
8091 struct got_reflist_object_id_map *refs_idmap = NULL;
8092 struct got_commit_object *commit = NULL;
8093 struct got_object_id *id = NULL;
8094 const char *header_prefix;
8095 char *uuidstr = NULL;
8101 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
8105 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8109 if (worktree != NULL) {
8110 err = got_worktree_get_uuid(&uuidstr, worktree);
8116 if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
8120 if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
8121 header_prefix = "backout";
8123 header_prefix = "cherrypick";
8125 TAILQ_FOREACH(re, &refs, entry) {
8126 const char *refname, *wt;
8128 refname = got_ref_get_name(re->ref);
8130 err = check_cancelled(NULL);
8134 if (strncmp(refname, ref_prefix, prefix_len) == 0)
8135 refname += prefix_len + 1; /* skip '-' delimiter */
8141 if (worktree == NULL || strncmp(refname, uuidstr,
8142 GOT_WORKTREE_UUID_STRLEN) == 0)
8143 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8147 err = got_repo_match_object_id(&id, NULL, refname,
8148 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8152 err = got_object_open_as_commit(&commit, repo, id);
8157 found = strncmp(wanted_ref, refname,
8158 strlen(wanted_ref)) == 0;
8159 if (wanted_ref && !found) {
8160 struct got_reflist_head *ci_refs;
8162 ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
8166 char *refs_str = NULL;
8167 char const *r = NULL;
8169 err = build_refs_str(&refs_str, ci_refs, id,
8176 if (strncmp(r, wanted_ref,
8177 strlen(wanted_ref)) == 0) {
8189 if (wanted_ref == NULL || found) {
8191 err = got_ref_delete(re->ref, repo);
8194 printf("Deleted: ");
8195 err = print_commit_oneline(commit, id, repo,
8199 * Print paths modified by commit to help
8200 * associate commits with worktree changes.
8202 err = get_changed_paths(&paths, commit,
8207 err = print_commit(commit, id, repo, NULL,
8208 &paths, NULL, 0, 0, refs_idmap, NULL,
8210 got_pathlist_free(&paths,
8211 GOT_PATHLIST_FREE_ALL);
8213 if (worktree == NULL)
8214 printf("work tree: %.*s\n\n",
8215 GOT_WORKTREE_UUID_STRLEN, wt);
8221 got_object_commit_close(commit);
8227 if (wanted_ref != NULL && !found)
8228 err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
8233 got_ref_list_free(&refs);
8234 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8236 got_reflist_object_id_map_free(refs_idmap);
8238 got_object_commit_close(commit);
8243 * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
8244 * identified by id for log messages to prepopulate the editor on commit.
8246 static const struct got_error *
8247 logmsg_ref(struct got_object_id *id, const char *prefix,
8248 struct got_worktree *worktree, struct got_repository *repo)
8250 const struct got_error *err = NULL;
8251 char *idstr, *ref = NULL, *refname = NULL;
8252 int histedit_in_progress;
8253 int rebase_in_progress, merge_in_progress;
8256 * Silenty refuse to create merge reference if any histedit, merge,
8257 * or rebase operation is in progress.
8259 err = got_worktree_histedit_in_progress(&histedit_in_progress,
8263 if (histedit_in_progress)
8266 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8269 if (rebase_in_progress)
8272 err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
8276 if (merge_in_progress)
8279 err = got_object_id_str(&idstr, id);
8283 err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
8287 if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
8288 err = got_error_from_errno("asprintf");
8292 err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
8302 usage_cherrypick(void)
8304 fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
8309 static const struct got_error *
8310 cmd_cherrypick(int argc, char *argv[])
8312 const struct got_error *error = NULL;
8313 struct got_worktree *worktree = NULL;
8314 struct got_repository *repo = NULL;
8315 char *cwd = NULL, *commit_id_str = NULL;
8316 struct got_object_id *commit_id = NULL;
8317 struct got_commit_object *commit = NULL;
8318 struct got_object_qid *pid;
8319 int ch, list_refs = 0, remove_refs = 0;
8320 struct got_update_progress_arg upa;
8321 int *pack_fds = NULL;
8324 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8325 "unveil", NULL) == -1)
8329 while ((ch = getopt(argc, argv, "lX")) != -1) {
8346 if (list_refs || remove_refs) {
8347 if (argc != 0 && argc != 1)
8349 } else if (argc != 1)
8351 if (list_refs && remove_refs)
8352 option_conflict('l', 'X');
8354 cwd = getcwd(NULL, 0);
8356 error = got_error_from_errno("getcwd");
8360 error = got_repo_pack_fds_open(&pack_fds);
8364 error = got_worktree_open(&worktree, cwd);
8366 if (list_refs || remove_refs) {
8367 if (error->code != GOT_ERR_NOT_WORKTREE)
8370 if (error->code == GOT_ERR_NOT_WORKTREE)
8371 error = wrap_not_worktree_error(error,
8377 error = got_repo_open(&repo,
8378 worktree ? got_worktree_get_repo_path(worktree) : cwd,
8383 error = apply_unveil(got_repo_get_path(repo), 0,
8384 worktree ? got_worktree_get_root_path(worktree) : NULL);
8388 if (list_refs || remove_refs) {
8389 error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8390 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
8391 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8395 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8396 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8399 error = got_object_id_str(&commit_id_str, commit_id);
8403 error = got_object_open_as_commit(&commit, repo, commit_id);
8406 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8407 memset(&upa, 0, sizeof(upa));
8408 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8409 commit_id, repo, update_progress, &upa, check_cancelled,
8414 if (upa.did_something) {
8415 error = logmsg_ref(commit_id,
8416 GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
8419 printf("Merged commit %s\n", commit_id_str);
8421 print_merge_progress_stats(&upa);
8425 got_object_commit_close(commit);
8426 free(commit_id_str);
8428 got_worktree_close(worktree);
8430 const struct got_error *close_err = got_repo_close(repo);
8435 const struct got_error *pack_err =
8436 got_repo_pack_fds_close(pack_fds);
8447 fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
8451 static const struct got_error *
8452 cmd_backout(int argc, char *argv[])
8454 const struct got_error *error = NULL;
8455 struct got_worktree *worktree = NULL;
8456 struct got_repository *repo = NULL;
8457 char *cwd = NULL, *commit_id_str = NULL;
8458 struct got_object_id *commit_id = NULL;
8459 struct got_commit_object *commit = NULL;
8460 struct got_object_qid *pid;
8461 int ch, list_refs = 0, remove_refs = 0;
8462 struct got_update_progress_arg upa;
8463 int *pack_fds = NULL;
8466 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8467 "unveil", NULL) == -1)
8471 while ((ch = getopt(argc, argv, "lX")) != -1) {
8488 if (list_refs || remove_refs) {
8489 if (argc != 0 && argc != 1)
8491 } else if (argc != 1)
8493 if (list_refs && remove_refs)
8494 option_conflict('l', 'X');
8496 cwd = getcwd(NULL, 0);
8498 error = got_error_from_errno("getcwd");
8502 error = got_repo_pack_fds_open(&pack_fds);
8506 error = got_worktree_open(&worktree, cwd);
8508 if (list_refs || remove_refs) {
8509 if (error->code != GOT_ERR_NOT_WORKTREE)
8512 if (error->code == GOT_ERR_NOT_WORKTREE)
8513 error = wrap_not_worktree_error(error,
8519 error = got_repo_open(&repo,
8520 worktree ? got_worktree_get_repo_path(worktree) : cwd,
8525 error = apply_unveil(got_repo_get_path(repo), 0,
8526 worktree ? got_worktree_get_root_path(worktree) : NULL);
8530 if (list_refs || remove_refs) {
8531 error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
8532 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
8533 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8537 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8538 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8541 error = got_object_id_str(&commit_id_str, commit_id);
8545 error = got_object_open_as_commit(&commit, repo, commit_id);
8548 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8550 error = got_error(GOT_ERR_ROOT_COMMIT);
8554 memset(&upa, 0, sizeof(upa));
8555 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8556 repo, update_progress, &upa, check_cancelled, NULL);
8560 if (upa.did_something) {
8561 error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8565 printf("Backed out commit %s\n", commit_id_str);
8567 print_merge_progress_stats(&upa);
8571 got_object_commit_close(commit);
8572 free(commit_id_str);
8574 got_worktree_close(worktree);
8576 const struct got_error *close_err = got_repo_close(repo);
8581 const struct got_error *pack_err =
8582 got_repo_pack_fds_close(pack_fds);
8592 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
8593 "arg ...\n", getprogname());
8597 static const struct got_error *
8598 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8600 const struct got_error *err;
8601 struct got_blob_object *blob;
8604 fd = got_opentempfd();
8606 return got_error_from_errno("got_opentempfd");
8608 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
8612 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8614 if (fd != -1 && close(fd) == -1 && err == NULL)
8615 err = got_error_from_errno("close");
8617 got_object_blob_close(blob);
8621 static const struct got_error *
8622 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8624 const struct got_error *err;
8625 struct got_tree_object *tree;
8628 err = got_object_open_as_tree(&tree, repo, id);
8632 nentries = got_object_tree_get_nentries(tree);
8633 for (i = 0; i < nentries; i++) {
8634 struct got_tree_entry *te;
8636 if (sigint_received || sigpipe_received)
8638 te = got_object_tree_get_entry(tree, i);
8639 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8642 fprintf(outfile, "%s %.7o %s\n", id_str,
8643 got_tree_entry_get_mode(te),
8644 got_tree_entry_get_name(te));
8648 got_object_tree_close(tree);
8652 static const struct got_error *
8653 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8655 const struct got_error *err;
8656 struct got_commit_object *commit;
8657 const struct got_object_id_queue *parent_ids;
8658 struct got_object_qid *pid;
8659 char *id_str = NULL;
8660 const char *logmsg = NULL;
8663 err = got_object_open_as_commit(&commit, repo, id);
8667 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8671 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8672 parent_ids = got_object_commit_get_parent_ids(commit);
8673 fprintf(outfile, "numparents %d\n",
8674 got_object_commit_get_nparents(commit));
8675 STAILQ_FOREACH(pid, parent_ids, entry) {
8677 err = got_object_id_str(&pid_str, &pid->id);
8680 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8683 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8684 got_object_commit_get_author_gmtoff(commit));
8685 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
8686 got_object_commit_get_author(commit),
8687 (long long)got_object_commit_get_author_time(commit),
8690 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8691 got_object_commit_get_committer_gmtoff(commit));
8692 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
8693 got_object_commit_get_committer(commit),
8694 (long long)got_object_commit_get_committer_time(commit),
8697 logmsg = got_object_commit_get_logmsg_raw(commit);
8698 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8699 fprintf(outfile, "%s", logmsg);
8702 got_object_commit_close(commit);
8706 static const struct got_error *
8707 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8709 const struct got_error *err;
8710 struct got_tag_object *tag;
8711 char *id_str = NULL;
8712 const char *tagmsg = NULL;
8715 err = got_object_open_as_tag(&tag, repo, id);
8719 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8723 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8725 switch (got_object_tag_get_object_type(tag)) {
8726 case GOT_OBJ_TYPE_BLOB:
8727 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8728 GOT_OBJ_LABEL_BLOB);
8730 case GOT_OBJ_TYPE_TREE:
8731 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8732 GOT_OBJ_LABEL_TREE);
8734 case GOT_OBJ_TYPE_COMMIT:
8735 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8736 GOT_OBJ_LABEL_COMMIT);
8738 case GOT_OBJ_TYPE_TAG:
8739 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8746 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8747 got_object_tag_get_name(tag));
8749 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8750 got_object_tag_get_tagger_gmtoff(tag));
8751 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
8752 got_object_tag_get_tagger(tag),
8753 (long long)got_object_tag_get_tagger_time(tag),
8756 tagmsg = got_object_tag_get_message(tag);
8757 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8758 fprintf(outfile, "%s", tagmsg);
8761 got_object_tag_close(tag);
8765 static const struct got_error *
8766 cmd_cat(int argc, char *argv[])
8768 const struct got_error *error;
8769 struct got_repository *repo = NULL;
8770 struct got_worktree *worktree = NULL;
8771 char *cwd = NULL, *repo_path = NULL, *label = NULL;
8772 const char *commit_id_str = NULL;
8773 struct got_object_id *id = NULL, *commit_id = NULL;
8774 struct got_commit_object *commit = NULL;
8775 int ch, obj_type, i, force_path = 0;
8776 struct got_reflist_head refs;
8777 int *pack_fds = NULL;
8782 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8787 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
8790 commit_id_str = optarg;
8796 repo_path = realpath(optarg, NULL);
8797 if (repo_path == NULL)
8798 return got_error_from_errno2("realpath",
8800 got_path_strip_trailing_slashes(repo_path);
8811 cwd = getcwd(NULL, 0);
8813 error = got_error_from_errno("getcwd");
8817 error = got_repo_pack_fds_open(&pack_fds);
8821 if (repo_path == NULL) {
8822 error = got_worktree_open(&worktree, cwd);
8823 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8827 got_worktree_get_repo_path(worktree));
8828 if (repo_path == NULL) {
8829 error = got_error_from_errno("strdup");
8833 /* Release work tree lock. */
8834 got_worktree_close(worktree);
8839 if (repo_path == NULL) {
8840 repo_path = strdup(cwd);
8841 if (repo_path == NULL)
8842 return got_error_from_errno("strdup");
8845 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8850 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8854 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8858 if (commit_id_str == NULL)
8859 commit_id_str = GOT_REF_HEAD;
8860 error = got_repo_match_object_id(&commit_id, NULL,
8861 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8865 error = got_object_open_as_commit(&commit, repo, commit_id);
8869 for (i = 0; i < argc; i++) {
8871 error = got_object_id_by_path(&id, repo, commit,
8876 error = got_repo_match_object_id(&id, &label, argv[i],
8877 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
8880 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8881 error->code != GOT_ERR_NOT_REF)
8883 error = got_object_id_by_path(&id, repo,
8890 error = got_object_get_type(&obj_type, repo, id);
8895 case GOT_OBJ_TYPE_BLOB:
8896 error = cat_blob(id, repo, stdout);
8898 case GOT_OBJ_TYPE_TREE:
8899 error = cat_tree(id, repo, stdout);
8901 case GOT_OBJ_TYPE_COMMIT:
8902 error = cat_commit(id, repo, stdout);
8904 case GOT_OBJ_TYPE_TAG:
8905 error = cat_tag(id, repo, stdout);
8908 error = got_error(GOT_ERR_OBJ_TYPE);
8923 got_object_commit_close(commit);
8925 got_worktree_close(worktree);
8927 const struct got_error *close_err = got_repo_close(repo);
8932 const struct got_error *pack_err =
8933 got_repo_pack_fds_close(pack_fds);
8938 got_ref_list_free(&refs);
8945 fprintf(stderr, "usage: %s info [path ...]\n",
8950 static const struct got_error *
8951 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
8952 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8953 struct got_object_id *commit_id)
8955 const struct got_error *err = NULL;
8956 char *id_str = NULL;
8958 struct tm mytm, *tm;
8959 struct got_pathlist_head *paths = arg;
8960 struct got_pathlist_entry *pe;
8963 * Clear error indication from any of the path arguments which
8964 * would cause this file index entry to be displayed.
8966 TAILQ_FOREACH(pe, paths, entry) {
8967 if (got_path_cmp(path, pe->path, strlen(path),
8968 pe->path_len) == 0 ||
8969 got_path_is_child(path, pe->path, pe->path_len))
8970 pe->data = NULL; /* no error */
8973 printf(GOT_COMMIT_SEP_STR);
8975 printf("symlink: %s\n", path);
8976 else if (S_ISREG(mode)) {
8977 printf("file: %s\n", path);
8978 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
8979 } else if (S_ISDIR(mode))
8980 printf("directory: %s\n", path);
8982 printf("something: %s\n", path);
8984 tm = localtime_r(&mtime, &mytm);
8987 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
8988 return got_error(GOT_ERR_NO_SPACE);
8989 printf("timestamp: %s\n", datebuf);
8992 err = got_object_id_str(&id_str, blob_id);
8995 printf("based on blob: %s\n", id_str);
8999 if (staged_blob_id) {
9000 err = got_object_id_str(&id_str, staged_blob_id);
9003 printf("based on staged blob: %s\n", id_str);
9008 err = got_object_id_str(&id_str, commit_id);
9011 printf("based on commit: %s\n", id_str);
9018 static const struct got_error *
9019 cmd_info(int argc, char *argv[])
9021 const struct got_error *error = NULL;
9022 struct got_worktree *worktree = NULL;
9023 char *cwd = NULL, *id_str = NULL;
9024 struct got_pathlist_head paths;
9025 char *uuidstr = NULL;
9026 int ch, show_files = 0;
9031 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9036 while ((ch = getopt(argc, argv, "")) != -1) {
9047 cwd = getcwd(NULL, 0);
9049 error = got_error_from_errno("getcwd");
9053 error = got_worktree_open(&worktree, cwd);
9055 if (error->code == GOT_ERR_NOT_WORKTREE)
9056 error = wrap_not_worktree_error(error, "info", cwd);
9061 /* Remove "wpath cpath proc exec sendfd" promises. */
9062 if (pledge("stdio rpath flock unveil", NULL) == -1)
9065 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9070 error = get_worktree_paths_from_argv(&paths, argc, argv,
9077 error = got_object_id_str(&id_str,
9078 got_worktree_get_base_commit_id(worktree));
9082 error = got_worktree_get_uuid(&uuidstr, worktree);
9086 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9087 printf("work tree base commit: %s\n", id_str);
9088 printf("work tree path prefix: %s\n",
9089 got_worktree_get_path_prefix(worktree));
9090 printf("work tree branch reference: %s\n",
9091 got_worktree_get_head_ref_name(worktree));
9092 printf("work tree UUID: %s\n", uuidstr);
9093 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9096 struct got_pathlist_entry *pe;
9097 TAILQ_FOREACH(pe, &paths, entry) {
9098 if (pe->path_len == 0)
9101 * Assume this path will fail. This will be corrected
9102 * in print_path_info() in case the path does suceeed.
9104 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
9106 error = got_worktree_path_info(worktree, &paths,
9107 print_path_info, &paths, check_cancelled, NULL);
9110 TAILQ_FOREACH(pe, &paths, entry) {
9111 if (pe->data != NULL) {
9112 const struct got_error *perr;
9115 error = got_error_fmt(perr->code, "%s",
9123 got_worktree_close(worktree);
9124 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);