2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 #include <sys/queue.h>
19 #include <sys/limits.h>
20 #include <sys/types.h>
22 #include <sys/param.h>
37 #include "got_error.h"
38 #include "got_object.h"
39 #include "got_reference.h"
40 #include "got_repository.h"
42 #include "got_worktree.h"
44 #include "got_commit_graph.h"
45 #include "got_blame.h"
46 #include "got_privsep.h"
47 #include "got_opentemp.h"
50 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
53 static volatile sig_atomic_t sigint_received;
54 static volatile sig_atomic_t sigpipe_received;
57 catch_sigint(int signo)
63 catch_sigpipe(int signo)
71 const struct got_error *(*cmd_main)(int, char *[]);
72 void (*cmd_usage)(void);
73 const char *cmd_descr;
76 __dead static void usage(void);
77 __dead static void usage_checkout(void);
78 __dead static void usage_update(void);
79 __dead static void usage_log(void);
80 __dead static void usage_diff(void);
81 __dead static void usage_blame(void);
82 __dead static void usage_tree(void);
83 __dead static void usage_status(void);
84 __dead static void usage_ref(void);
85 __dead static void usage_add(void);
86 __dead static void usage_rm(void);
87 __dead static void usage_revert(void);
88 __dead static void usage_commit(void);
90 static const struct got_error* cmd_checkout(int, char *[]);
91 static const struct got_error* cmd_update(int, char *[]);
92 static const struct got_error* cmd_log(int, char *[]);
93 static const struct got_error* cmd_diff(int, char *[]);
94 static const struct got_error* cmd_blame(int, char *[]);
95 static const struct got_error* cmd_tree(int, char *[]);
96 static const struct got_error* cmd_status(int, char *[]);
97 static const struct got_error* cmd_ref(int, char *[]);
98 static const struct got_error* cmd_add(int, char *[]);
99 static const struct got_error* cmd_rm(int, char *[]);
100 static const struct got_error* cmd_revert(int, char *[]);
101 static const struct got_error* cmd_commit(int, char *[]);
103 static struct cmd got_commands[] = {
104 { "checkout", cmd_checkout, usage_checkout,
105 "check out a new work tree from a repository" },
106 { "update", cmd_update, usage_update,
107 "update a work tree to a different commit" },
108 { "log", cmd_log, usage_log,
109 "show repository history" },
110 { "diff", cmd_diff, usage_diff,
111 "compare files and directories" },
112 { "blame", cmd_blame, usage_blame,
113 "show when lines in a file were changed" },
114 { "tree", cmd_tree, usage_tree,
115 "list files and directories in repository" },
116 { "status", cmd_status, usage_status,
117 "show modification status of files" },
118 { "ref", cmd_ref, usage_ref,
119 "manage references in repository" },
120 { "add", cmd_add, usage_add,
121 "add new files to version control" },
122 { "rm", cmd_rm, usage_rm,
123 "remove a versioned file" },
124 { "revert", cmd_revert, usage_revert,
125 "revert uncommitted changes" },
126 { "commit", cmd_commit, usage_commit,
127 "write changes from work tree to repository" },
131 main(int argc, char *argv[])
138 setlocale(LC_CTYPE, "");
140 while ((ch = getopt(argc, argv, "h")) != -1) {
158 signal(SIGINT, catch_sigint);
159 signal(SIGPIPE, catch_sigpipe);
161 for (i = 0; i < nitems(got_commands); i++) {
162 const struct got_error *error;
164 cmd = &got_commands[i];
166 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
170 got_commands[i].cmd_usage();
172 error = got_commands[i].cmd_main(argc, argv);
173 if (error && !(sigint_received || sigpipe_received)) {
174 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
181 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
190 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
191 "Available commands:\n", getprogname());
192 for (i = 0; i < nitems(got_commands); i++) {
193 struct cmd *cmd = &got_commands[i];
194 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
199 static const struct got_error *
200 get_editor(char **abspath)
202 const struct got_error *err = NULL;
205 editor = getenv("VISUAL");
207 editor = getenv("EDITOR");
210 err = got_path_find_prog(abspath, editor);
215 if (*abspath == NULL) {
216 *abspath = strdup("/bin/ed");
217 if (*abspath == NULL)
218 return got_error_from_errno("strdup");
224 static const struct got_error *
225 apply_unveil(const char *repo_path, int repo_read_only,
226 const char *worktree_path, int create_worktree)
228 const struct got_error *err;
229 static char err_msg[MAXPATHLEN + 36];
231 if (create_worktree) {
232 /* Pre-create work tree path to avoid unveiling its parents. */
233 err = got_path_mkdir(worktree_path);
235 if (errno == EEXIST) {
236 if (got_path_dir_is_empty(worktree_path)) {
240 snprintf(err_msg, sizeof(err_msg),
241 "%s: directory exists but is not empty",
243 err = got_error_msg(GOT_ERR_BAD_PATH,
248 if (err && (err->code != GOT_ERR_ERRNO || errno != EISDIR))
252 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
253 return got_error_from_errno2("unveil", repo_path);
255 if (worktree_path && unveil(worktree_path, "rwc") != 0)
256 return got_error_from_errno2("unveil", worktree_path);
258 if (unveil("/tmp", "rwc") != 0)
259 return got_error_from_errno2("unveil", "/tmp");
261 err = got_privsep_unveil_exec_helpers();
265 if (unveil(NULL, NULL) != 0)
266 return got_error_from_errno("unveil");
274 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
275 "[worktree-path]\n", getprogname());
280 checkout_progress(void *arg, unsigned char status, const char *path)
282 char *worktree_path = arg;
284 while (path[0] == '/')
287 printf("%c %s/%s\n", status, worktree_path, path);
290 static const struct got_error *
291 check_cancelled(void *arg)
293 if (sigint_received || sigpipe_received)
294 return got_error(GOT_ERR_CANCELLED);
298 static const struct got_error *
299 check_linear_ancestry(struct got_worktree *worktree,
300 struct got_object_id *commit_id, struct got_repository *repo)
302 const struct got_error *err = NULL;
303 struct got_object_id *yca_id, *base_commit_id;
305 base_commit_id = got_worktree_get_base_commit_id(worktree);
306 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
307 commit_id, base_commit_id, repo);
312 return got_error(GOT_ERR_ANCESTRY);
315 * Require a straight line of history between the target commit
316 * and the work tree's base commit.
318 * Non-linear situation such as the this require a rebase:
320 * (commit) D F (base_commit)
328 * 'got update' only handles linear cases:
329 * Update forwards in time: A (base/yca) - B - C - D (commit)
330 * Update backwards in time: D (base) - C - D - A (commit/yca)
332 if (got_object_id_cmp(commit_id, yca_id) != 0 &&
333 got_object_id_cmp(base_commit_id, yca_id) != 0)
334 return got_error(GOT_ERR_ANCESTRY);
341 static const struct got_error *
342 cmd_checkout(int argc, char *argv[])
344 const struct got_error *error = NULL;
345 struct got_repository *repo = NULL;
346 struct got_reference *head_ref = NULL;
347 struct got_worktree *worktree = NULL;
348 char *repo_path = NULL;
349 char *worktree_path = NULL;
350 const char *path_prefix = "";
351 char *commit_id_str = NULL;
352 int ch, same_path_prefix;
354 while ((ch = getopt(argc, argv, "c:p:")) != -1) {
357 commit_id_str = strdup(optarg);
358 if (commit_id_str == NULL)
359 return got_error_from_errno("strdup");
362 path_prefix = optarg;
374 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
375 "unveil", NULL) == -1)
379 char *cwd, *base, *dotgit;
380 repo_path = realpath(argv[0], NULL);
381 if (repo_path == NULL)
382 return got_error_from_errno2("realpath", argv[0]);
383 cwd = getcwd(NULL, 0);
385 error = got_error_from_errno("getcwd");
388 if (path_prefix[0]) {
389 base = basename(path_prefix);
391 error = got_error_from_errno2("basename",
396 base = basename(repo_path);
398 error = got_error_from_errno2("basename",
403 dotgit = strstr(base, ".git");
406 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
407 error = got_error_from_errno("asprintf");
412 } else if (argc == 2) {
413 repo_path = realpath(argv[0], NULL);
414 if (repo_path == NULL) {
415 error = got_error_from_errno2("realpath", argv[0]);
418 worktree_path = realpath(argv[1], NULL);
419 if (worktree_path == NULL) {
420 error = got_error_from_errno2("realpath", argv[1]);
426 got_path_strip_trailing_slashes(repo_path);
427 got_path_strip_trailing_slashes(worktree_path);
429 error = got_repo_open(&repo, repo_path);
433 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
437 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
441 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
442 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
445 error = got_worktree_open(&worktree, worktree_path);
449 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
453 if (!same_path_prefix) {
454 error = got_error(GOT_ERR_PATH_PREFIX);
459 struct got_object_id *commit_id;
460 error = got_object_resolve_id_str(&commit_id, repo,
464 error = check_linear_ancestry(worktree, commit_id, repo);
469 error = got_worktree_set_base_commit_id(worktree, repo,
476 error = got_worktree_checkout_files(worktree, "", repo,
477 checkout_progress, worktree_path, check_cancelled, NULL);
481 printf("Now shut up and hack\n");
493 fprintf(stderr, "usage: %s update [-c commit] [path]\n",
499 update_progress(void *arg, unsigned char status, const char *path)
501 int *did_something = arg;
503 if (status == GOT_STATUS_EXISTS)
507 while (path[0] == '/')
509 printf("%c %s\n", status, path);
512 static const struct got_error *
513 cmd_update(int argc, char *argv[])
515 const struct got_error *error = NULL;
516 struct got_repository *repo = NULL;
517 struct got_worktree *worktree = NULL;
518 char *worktree_path = NULL, *path = NULL;
519 struct got_object_id *commit_id = NULL;
520 char *commit_id_str = NULL;
521 int ch, did_something = 0;
523 while ((ch = getopt(argc, argv, "c:")) != -1) {
526 commit_id_str = strdup(optarg);
527 if (commit_id_str == NULL)
528 return got_error_from_errno("strdup");
540 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
541 "unveil", NULL) == -1)
544 worktree_path = getcwd(NULL, 0);
545 if (worktree_path == NULL) {
546 error = got_error_from_errno("getcwd");
549 error = got_worktree_open(&worktree, worktree_path);
556 error = got_error_from_errno("strdup");
559 } else if (argc == 1) {
560 error = got_worktree_resolve_path(&path, worktree, argv[0]);
566 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
570 error = apply_unveil(got_repo_get_path(repo), 0,
571 got_worktree_get_root_path(worktree), 0);
575 if (commit_id_str == NULL) {
576 struct got_reference *head_ref;
577 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
580 error = got_ref_resolve(&commit_id, repo, head_ref);
583 error = got_object_id_str(&commit_id_str, commit_id);
587 error = got_object_resolve_id_str(&commit_id, repo,
593 error = check_linear_ancestry(worktree, commit_id, repo);
597 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
599 error = got_worktree_set_base_commit_id(worktree, repo,
605 error = got_worktree_checkout_files(worktree, path, repo,
606 update_progress, &did_something, check_cancelled, NULL);
611 printf("Updated to commit %s\n", commit_id_str);
613 printf("Already up-to-date\n");
622 static const struct got_error *
623 print_patch(struct got_commit_object *commit, struct got_object_id *id,
624 int diff_context, struct got_repository *repo)
626 const struct got_error *err = NULL;
627 struct got_tree_object *tree1 = NULL, *tree2;
628 struct got_object_qid *qid;
629 char *id_str1 = NULL, *id_str2;
631 err = got_object_open_as_tree(&tree2, repo,
632 got_object_commit_get_tree_id(commit));
636 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
638 struct got_commit_object *pcommit;
640 err = got_object_open_as_commit(&pcommit, repo, qid->id);
644 err = got_object_open_as_tree(&tree1, repo,
645 got_object_commit_get_tree_id(pcommit));
646 got_object_commit_close(pcommit);
650 err = got_object_id_str(&id_str1, qid->id);
655 err = got_object_id_str(&id_str2, id);
659 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
660 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
663 got_object_tree_close(tree1);
664 got_object_tree_close(tree2);
671 get_datestr(time_t *time, char *datebuf)
673 char *p, *s = ctime_r(time, datebuf);
680 static const struct got_error *
681 print_commit(struct got_commit_object *commit, struct got_object_id *id,
682 struct got_repository *repo, int show_patch, int diff_context,
683 struct got_reflist_head *refs)
685 const struct got_error *err = NULL;
686 char *id_str, *datestr, *logmsg0, *logmsg, *line;
688 time_t committer_time;
689 const char *author, *committer;
690 char *refs_str = NULL;
691 struct got_reflist_entry *re;
693 SIMPLEQ_FOREACH(re, refs, entry) {
696 if (got_object_id_cmp(re->id, id) != 0)
698 name = got_ref_get_name(re->ref);
699 if (strcmp(name, GOT_REF_HEAD) == 0)
701 if (strncmp(name, "refs/", 5) == 0)
703 if (strncmp(name, "got/", 4) == 0)
705 if (strncmp(name, "heads/", 6) == 0)
707 if (strncmp(name, "remotes/", 8) == 0)
710 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
712 err = got_error_from_errno("asprintf");
718 err = got_object_id_str(&id_str, id);
722 printf("-----------------------------------------------\n");
723 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
724 refs_str ? refs_str : "", refs_str ? ")" : "");
729 printf("from: %s\n", got_object_commit_get_author(commit));
730 committer_time = got_object_commit_get_committer_time(commit);
731 datestr = get_datestr(&committer_time, datebuf);
732 printf("date: %s UTC\n", datestr);
733 author = got_object_commit_get_author(commit);
734 committer = got_object_commit_get_committer(commit);
735 if (strcmp(author, committer) != 0)
736 printf("via: %s\n", committer);
737 if (got_object_commit_get_nparents(commit) > 1) {
738 const struct got_object_id_queue *parent_ids;
739 struct got_object_qid *qid;
741 parent_ids = got_object_commit_get_parent_ids(commit);
742 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
743 err = got_object_id_str(&id_str, qid->id);
746 printf("parent %d: %s\n", n++, id_str);
751 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
753 return got_error_from_errno("strdup");
757 line = strsep(&logmsg, "\n");
759 printf(" %s\n", line);
764 err = print_patch(commit, id, diff_context, repo);
769 if (fflush(stdout) != 0 && err == NULL)
770 err = got_error_from_errno("fflush");
774 static const struct got_error *
775 print_commits(struct got_object_id *root_id, struct got_repository *repo,
776 char *path, int show_patch, int diff_context, int limit,
777 int first_parent_traversal, struct got_reflist_head *refs)
779 const struct got_error *err;
780 struct got_commit_graph *graph;
782 err = got_commit_graph_open(&graph, root_id, path,
783 first_parent_traversal, repo);
786 err = got_commit_graph_iter_start(graph, root_id, repo);
790 struct got_commit_object *commit;
791 struct got_object_id *id;
793 if (sigint_received || sigpipe_received)
796 err = got_commit_graph_iter_next(&id, graph);
798 if (err->code == GOT_ERR_ITER_COMPLETED) {
802 if (err->code != GOT_ERR_ITER_NEED_MORE)
804 err = got_commit_graph_fetch_commits(graph, 1, repo);
813 err = got_object_open_as_commit(&commit, repo, id);
816 err = print_commit(commit, id, repo, show_patch, diff_context,
818 got_object_commit_close(commit);
819 if (err || (limit && --limit == 0))
823 got_commit_graph_close(graph);
830 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
831 "[-r repository-path] [path]\n", getprogname());
835 static const struct got_error *
836 cmd_log(int argc, char *argv[])
838 const struct got_error *error;
839 struct got_repository *repo = NULL;
840 struct got_worktree *worktree = NULL;
841 struct got_commit_object *commit = NULL;
842 struct got_object_id *id = NULL;
843 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
844 char *start_commit = NULL;
845 int diff_context = 3, ch;
846 int show_patch = 0, limit = 0, first_parent_traversal = 0;
848 struct got_reflist_head refs;
853 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
859 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
865 start_commit = optarg;
868 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
871 err(1, "-C option %s", errstr);
874 limit = strtonum(optarg, 1, INT_MAX, &errstr);
876 err(1, "-l option %s", errstr);
879 first_parent_traversal = 1;
882 repo_path = realpath(optarg, NULL);
883 if (repo_path == NULL)
885 got_path_strip_trailing_slashes(repo_path);
896 cwd = getcwd(NULL, 0);
898 error = got_error_from_errno("getcwd");
902 error = got_worktree_open(&worktree, cwd);
903 if (error && error->code != GOT_ERR_NOT_WORKTREE)
910 error = got_error_from_errno("strdup");
913 } else if (argc == 1) {
915 error = got_worktree_resolve_path(&path, worktree,
920 path = strdup(argv[0]);
922 error = got_error_from_errno("strdup");
929 if (repo_path == NULL) {
930 repo_path = worktree ?
931 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
933 if (repo_path == NULL) {
934 error = got_error_from_errno("strdup");
938 error = got_repo_open(&repo, repo_path);
942 error = apply_unveil(got_repo_get_path(repo), 1,
943 worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
947 if (start_commit == NULL) {
948 struct got_reference *head_ref;
949 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
952 error = got_ref_resolve(&id, repo, head_ref);
953 got_ref_close(head_ref);
956 error = got_object_open_as_commit(&commit, repo, id);
958 struct got_reference *ref;
959 error = got_ref_open(&ref, repo, start_commit, 0);
962 error = got_ref_resolve(&id, repo, ref);
966 error = got_object_get_type(&obj_type, repo, id);
969 if (obj_type == GOT_OBJ_TYPE_TAG) {
970 struct got_tag_object *tag;
971 error = got_object_open_as_tag(&tag, repo, id);
974 if (got_object_tag_get_object_type(tag) !=
975 GOT_OBJ_TYPE_COMMIT) {
976 got_object_tag_close(tag);
977 error = got_error(GOT_ERR_OBJ_TYPE);
981 id = got_object_id_dup(
982 got_object_tag_get_object_id(tag));
984 error = got_error_from_errno(
985 "got_object_id_dup");
986 got_object_tag_close(tag);
989 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
990 error = got_error(GOT_ERR_OBJ_TYPE);
993 error = got_object_open_as_commit(&commit, repo, id);
997 if (commit == NULL) {
998 error = got_object_resolve_id_str(&id, repo,
1007 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1012 path = in_repo_path;
1015 error = got_ref_list(&refs, repo);
1019 error = print_commits(id, repo, path, show_patch,
1020 diff_context, limit, first_parent_traversal, &refs);
1027 got_worktree_close(worktree);
1029 const struct got_error *repo_error;
1030 repo_error = got_repo_close(repo);
1034 got_ref_list_free(&refs);
1041 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1042 "[object1 object2 | path]\n", getprogname());
1046 struct print_diff_arg {
1047 struct got_repository *repo;
1048 struct got_worktree *worktree;
1054 static const struct got_error *
1055 print_diff(void *arg, unsigned char status, const char *path,
1056 struct got_object_id *id)
1058 struct print_diff_arg *a = arg;
1059 const struct got_error *err = NULL;
1060 struct got_blob_object *blob1 = NULL;
1062 char *abspath = NULL;
1065 if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1066 status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1069 if (!a->header_shown) {
1070 printf("diff %s %s\n", a->id_str,
1071 got_worktree_get_root_path(a->worktree));
1072 a->header_shown = 1;
1075 if (status != GOT_STATUS_ADD) {
1076 err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
1082 if (status != GOT_STATUS_DELETE) {
1083 if (asprintf(&abspath, "%s/%s",
1084 got_worktree_get_root_path(a->worktree), path) == -1) {
1085 err = got_error_from_errno("asprintf");
1089 f2 = fopen(abspath, "r");
1091 err = got_error_from_errno2("fopen", abspath);
1094 if (lstat(abspath, &sb) == -1) {
1095 err = got_error_from_errno2("lstat", abspath);
1101 err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1105 got_object_blob_close(blob1);
1106 if (f2 && fclose(f2) != 0 && err == NULL)
1107 err = got_error_from_errno("fclose");
1112 static const struct got_error *
1113 cmd_diff(int argc, char *argv[])
1115 const struct got_error *error;
1116 struct got_repository *repo = NULL;
1117 struct got_worktree *worktree = NULL;
1118 char *cwd = NULL, *repo_path = NULL;
1119 struct got_object_id *id1 = NULL, *id2 = NULL;
1120 char *id_str1 = NULL, *id_str2 = NULL;
1122 int diff_context = 3, ch;
1127 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1132 while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1135 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1137 err(1, "-C option %s", errstr);
1140 repo_path = realpath(optarg, NULL);
1141 if (repo_path == NULL)
1142 err(1, "-r option");
1143 got_path_strip_trailing_slashes(repo_path);
1154 cwd = getcwd(NULL, 0);
1156 error = got_error_from_errno("getcwd");
1159 error = got_worktree_open(&worktree, cwd);
1160 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1163 if (worktree == NULL) {
1164 error = got_error(GOT_ERR_NOT_WORKTREE);
1169 "-r option can't be used when diffing a work tree");
1170 repo_path = strdup(got_worktree_get_repo_path(worktree));
1171 if (repo_path == NULL) {
1172 error = got_error_from_errno("strdup");
1176 error = got_worktree_resolve_path(&path, worktree,
1183 error = got_error_from_errno("strdup");
1187 } else if (argc == 2) {
1193 if (repo_path == NULL) {
1194 repo_path = getcwd(NULL, 0);
1195 if (repo_path == NULL)
1196 return got_error_from_errno("getcwd");
1199 error = got_repo_open(&repo, repo_path);
1204 error = apply_unveil(got_repo_get_path(repo), 1,
1205 worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1210 struct print_diff_arg arg;
1212 error = got_object_id_str(&id_str,
1213 got_worktree_get_base_commit_id(worktree));
1217 arg.worktree = worktree;
1218 arg.diff_context = diff_context;
1219 arg.id_str = id_str;
1220 arg.header_shown = 0;
1222 error = got_worktree_status(worktree, path, repo, print_diff,
1223 &arg, check_cancelled, NULL);
1228 error = got_object_resolve_id_str(&id1, repo, id_str1);
1232 error = got_object_resolve_id_str(&id2, repo, id_str2);
1236 error = got_object_get_type(&type1, repo, id1);
1240 error = got_object_get_type(&type2, repo, id2);
1244 if (type1 != type2) {
1245 error = got_error(GOT_ERR_OBJ_TYPE);
1250 case GOT_OBJ_TYPE_BLOB:
1251 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1252 diff_context, repo, stdout);
1254 case GOT_OBJ_TYPE_TREE:
1255 error = got_diff_objects_as_trees(id1, id2, "", "",
1256 diff_context, repo, stdout);
1258 case GOT_OBJ_TYPE_COMMIT:
1259 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1261 error = got_diff_objects_as_commits(id1, id2, diff_context,
1265 error = got_error(GOT_ERR_OBJ_TYPE);
1273 got_worktree_close(worktree);
1275 const struct got_error *repo_error;
1276 repo_error = got_repo_close(repo);
1287 "usage: %s blame [-c commit] [-r repository-path] path\n",
1292 static const struct got_error *
1293 cmd_blame(int argc, char *argv[])
1295 const struct got_error *error;
1296 struct got_repository *repo = NULL;
1297 struct got_worktree *worktree = NULL;
1298 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1299 struct got_object_id *commit_id = NULL;
1300 char *commit_id_str = NULL;
1304 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1309 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1312 commit_id_str = optarg;
1315 repo_path = realpath(optarg, NULL);
1316 if (repo_path == NULL)
1317 err(1, "-r option");
1318 got_path_strip_trailing_slashes(repo_path);
1334 cwd = getcwd(NULL, 0);
1336 error = got_error_from_errno("getcwd");
1339 if (repo_path == NULL) {
1340 error = got_worktree_open(&worktree, cwd);
1341 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1347 strdup(got_worktree_get_repo_path(worktree));
1348 if (repo_path == NULL)
1349 error = got_error_from_errno("strdup");
1353 repo_path = strdup(cwd);
1354 if (repo_path == NULL) {
1355 error = got_error_from_errno("strdup");
1361 error = got_repo_open(&repo, repo_path);
1365 error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1370 const char *prefix = got_worktree_get_path_prefix(worktree);
1371 char *p, *worktree_subdir = cwd +
1372 strlen(got_worktree_get_root_path(worktree));
1373 if (asprintf(&p, "%s%s%s%s%s",
1374 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1375 worktree_subdir, worktree_subdir[0] ? "/" : "",
1377 error = got_error_from_errno("asprintf");
1380 error = got_repo_map_path(&in_repo_path, repo, p, 0);
1383 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1388 if (commit_id_str == NULL) {
1389 struct got_reference *head_ref;
1390 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1393 error = got_ref_resolve(&commit_id, repo, head_ref);
1394 got_ref_close(head_ref);
1398 error = got_object_resolve_id_str(&commit_id, repo,
1404 error = got_blame(in_repo_path, commit_id, repo, stdout);
1411 got_worktree_close(worktree);
1413 const struct got_error *repo_error;
1414 repo_error = got_repo_close(repo);
1425 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1431 print_entry(struct got_tree_entry *te, const char *id, const char *path,
1432 const char *root_path)
1434 int is_root_path = (strcmp(path, root_path) == 0);
1436 path += strlen(root_path);
1437 while (path[0] == '/')
1440 printf("%s%s%s%s%s\n", id ? id : "", path,
1441 is_root_path ? "" : "/", te->name,
1442 S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1445 static const struct got_error *
1446 print_tree(const char *path, struct got_object_id *commit_id,
1447 int show_ids, int recurse, const char *root_path,
1448 struct got_repository *repo)
1450 const struct got_error *err = NULL;
1451 struct got_object_id *tree_id = NULL;
1452 struct got_tree_object *tree = NULL;
1453 const struct got_tree_entries *entries;
1454 struct got_tree_entry *te;
1456 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1460 err = got_object_open_as_tree(&tree, repo, tree_id);
1463 entries = got_object_tree_get_entries(tree);
1464 te = SIMPLEQ_FIRST(&entries->head);
1468 if (sigint_received || sigpipe_received)
1473 err = got_object_id_str(&id_str, te->id);
1476 if (asprintf(&id, "%s ", id_str) == -1) {
1477 err = got_error_from_errno("asprintf");
1483 print_entry(te, id, path, root_path);
1486 if (recurse && S_ISDIR(te->mode)) {
1488 if (asprintf(&child_path, "%s%s%s", path,
1489 path[0] == '/' && path[1] == '\0' ? "" : "/",
1491 err = got_error_from_errno("asprintf");
1494 err = print_tree(child_path, commit_id, show_ids, 1,
1501 te = SIMPLEQ_NEXT(te, entry);
1505 got_object_tree_close(tree);
1510 static const struct got_error *
1511 cmd_tree(int argc, char *argv[])
1513 const struct got_error *error;
1514 struct got_repository *repo = NULL;
1515 struct got_worktree *worktree = NULL;
1517 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1518 struct got_object_id *commit_id = NULL;
1519 char *commit_id_str = NULL;
1520 int show_ids = 0, recurse = 0;
1524 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1529 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1532 commit_id_str = optarg;
1535 repo_path = realpath(optarg, NULL);
1536 if (repo_path == NULL)
1537 err(1, "-r option");
1538 got_path_strip_trailing_slashes(repo_path);
1562 cwd = getcwd(NULL, 0);
1564 error = got_error_from_errno("getcwd");
1567 if (repo_path == NULL) {
1568 error = got_worktree_open(&worktree, cwd);
1569 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1575 strdup(got_worktree_get_repo_path(worktree));
1576 if (repo_path == NULL)
1577 error = got_error_from_errno("strdup");
1581 repo_path = strdup(cwd);
1582 if (repo_path == NULL) {
1583 error = got_error_from_errno("strdup");
1589 error = got_repo_open(&repo, repo_path);
1593 error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1599 char *p, *worktree_subdir = cwd +
1600 strlen(got_worktree_get_root_path(worktree));
1601 if (asprintf(&p, "%s/%s",
1602 got_worktree_get_path_prefix(worktree),
1603 worktree_subdir) == -1) {
1604 error = got_error_from_errno("asprintf");
1607 error = got_repo_map_path(&in_repo_path, repo, p, 1);
1614 if (in_repo_path == NULL) {
1615 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1620 if (commit_id_str == NULL) {
1621 struct got_reference *head_ref;
1622 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1625 error = got_ref_resolve(&commit_id, repo, head_ref);
1626 got_ref_close(head_ref);
1630 error = got_object_resolve_id_str(&commit_id, repo,
1636 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1637 in_repo_path, repo);
1644 got_worktree_close(worktree);
1646 const struct got_error *repo_error;
1647 repo_error = got_repo_close(repo);
1657 fprintf(stderr, "usage: %s status [path]\n", getprogname());
1661 static const struct got_error *
1662 print_status(void *arg, unsigned char status, const char *path,
1663 struct got_object_id *id)
1665 printf("%c %s\n", status, path);
1669 static const struct got_error *
1670 cmd_status(int argc, char *argv[])
1672 const struct got_error *error = NULL;
1673 struct got_repository *repo = NULL;
1674 struct got_worktree *worktree = NULL;
1675 char *cwd = NULL, *path = NULL;
1678 while ((ch = getopt(argc, argv, "")) != -1) {
1690 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1694 cwd = getcwd(NULL, 0);
1696 error = got_error_from_errno("getcwd");
1700 error = got_worktree_open(&worktree, cwd);
1707 error = got_error_from_errno("strdup");
1710 } else if (argc == 1) {
1711 error = got_worktree_resolve_path(&path, worktree, argv[0]);
1717 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1721 error = apply_unveil(got_repo_get_path(repo), 1,
1722 got_worktree_get_root_path(worktree), 0);
1726 error = got_worktree_status(worktree, path, repo, print_status, NULL,
1727 check_cancelled, NULL);
1738 "usage: %s ref [-r repository] -l | -d name | name target\n",
1743 static const struct got_error *
1744 list_refs(struct got_repository *repo)
1746 static const struct got_error *err = NULL;
1747 struct got_reflist_head refs;
1748 struct got_reflist_entry *re;
1750 SIMPLEQ_INIT(&refs);
1751 err = got_ref_list(&refs, repo);
1755 SIMPLEQ_FOREACH(re, &refs, entry) {
1757 refstr = got_ref_to_str(re->ref);
1759 return got_error_from_errno("got_ref_to_str");
1760 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1764 got_ref_list_free(&refs);
1768 static const struct got_error *
1769 delete_ref(struct got_repository *repo, const char *refname)
1771 const struct got_error *err = NULL;
1772 struct got_reference *ref;
1774 err = got_ref_open(&ref, repo, refname, 0);
1778 err = got_ref_delete(ref, repo);
1783 static const struct got_error *
1784 add_ref(struct got_repository *repo, const char *refname, const char *target)
1786 const struct got_error *err = NULL;
1787 struct got_object_id *id;
1788 struct got_reference *ref = NULL;
1790 err = got_object_resolve_id_str(&id, repo, target);
1792 struct got_reference *target_ref;
1794 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1796 err = got_ref_open(&target_ref, repo, target, 0);
1799 err = got_ref_resolve(&id, repo, target_ref);
1800 got_ref_close(target_ref);
1805 err = got_ref_alloc(&ref, refname, id);
1809 err = got_ref_write(ref, repo);
1817 static const struct got_error *
1818 cmd_ref(int argc, char *argv[])
1820 const struct got_error *error = NULL;
1821 struct got_repository *repo = NULL;
1822 struct got_worktree *worktree = NULL;
1823 char *cwd = NULL, *repo_path = NULL;
1824 int ch, do_list = 0;
1825 const char *delref = NULL;
1827 /* TODO: Add -s option for adding symbolic references. */
1828 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1834 repo_path = realpath(optarg, NULL);
1835 if (repo_path == NULL)
1836 err(1, "-r option");
1837 got_path_strip_trailing_slashes(repo_path);
1848 if (do_list && delref)
1849 errx(1, "-l and -d options are mutually exclusive\n");
1854 if (do_list || delref) {
1857 } else if (argc != 2)
1862 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1866 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1867 "sendfd unveil", NULL) == -1)
1871 cwd = getcwd(NULL, 0);
1873 error = got_error_from_errno("getcwd");
1877 if (repo_path == NULL) {
1878 error = got_worktree_open(&worktree, cwd);
1879 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1885 strdup(got_worktree_get_repo_path(worktree));
1886 if (repo_path == NULL)
1887 error = got_error_from_errno("strdup");
1891 repo_path = strdup(cwd);
1892 if (repo_path == NULL) {
1893 error = got_error_from_errno("strdup");
1899 error = got_repo_open(&repo, repo_path);
1903 error = apply_unveil(got_repo_get_path(repo), do_list,
1904 worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1909 error = list_refs(repo);
1911 error = delete_ref(repo, delref);
1913 error = add_ref(repo, argv[0], argv[1]);
1916 got_repo_close(repo);
1918 got_worktree_close(worktree);
1927 fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
1931 static const struct got_error *
1932 cmd_add(int argc, char *argv[])
1934 const struct got_error *error = NULL;
1935 struct got_repository *repo = NULL;
1936 struct got_worktree *worktree = NULL;
1938 struct got_pathlist_head paths;
1939 struct got_pathlist_entry *pe;
1944 while ((ch = getopt(argc, argv, "")) != -1) {
1958 /* make sure each file exists before doing anything halfway */
1959 for (x = 0; x < argc; x++) {
1960 char *path = realpath(argv[x], NULL);
1962 error = got_error_from_errno2("realpath", argv[x]);
1968 cwd = getcwd(NULL, 0);
1970 error = got_error_from_errno("getcwd");
1974 error = got_worktree_open(&worktree, cwd);
1978 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1982 error = apply_unveil(got_repo_get_path(repo), 1,
1983 got_worktree_get_root_path(worktree), 0);
1987 for (x = 0; x < argc; x++) {
1988 char *path = realpath(argv[x], NULL);
1990 error = got_error_from_errno2("realpath", argv[x]);
1994 got_path_strip_trailing_slashes(path);
1995 error = got_pathlist_insert(&pe, &paths, path, NULL);
2001 error = got_worktree_schedule_add(worktree, &paths, print_status,
2005 got_repo_close(repo);
2007 got_worktree_close(worktree);
2008 TAILQ_FOREACH(pe, &paths, entry)
2009 free((char *)pe->path);
2010 got_pathlist_free(&paths);
2018 fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
2022 static const struct got_error *
2023 cmd_rm(int argc, char *argv[])
2025 const struct got_error *error = NULL;
2026 struct got_worktree *worktree = NULL;
2027 struct got_repository *repo = NULL;
2028 char *cwd = NULL, *path = NULL;
2029 int ch, delete_local_mods = 0;
2031 while ((ch = getopt(argc, argv, "f")) != -1) {
2034 delete_local_mods = 1;
2048 path = realpath(argv[0], NULL);
2050 error = got_error_from_errno2("realpath", argv[0]);
2053 got_path_strip_trailing_slashes(path);
2055 cwd = getcwd(NULL, 0);
2057 error = got_error_from_errno("getcwd");
2060 error = got_worktree_open(&worktree, cwd);
2064 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2068 error = apply_unveil(got_repo_get_path(repo), 1,
2069 got_worktree_get_root_path(worktree), 0);
2073 error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
2074 print_status, NULL, repo);
2079 got_repo_close(repo);
2081 got_worktree_close(worktree);
2090 fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2095 revert_progress(void *arg, unsigned char status, const char *path)
2097 while (path[0] == '/')
2099 printf("%c %s\n", status, path);
2102 static const struct got_error *
2103 cmd_revert(int argc, char *argv[])
2105 const struct got_error *error = NULL;
2106 struct got_worktree *worktree = NULL;
2107 struct got_repository *repo = NULL;
2108 char *cwd = NULL, *path = NULL;
2111 while ((ch = getopt(argc, argv, "")) != -1) {
2125 path = realpath(argv[0], NULL);
2127 error = got_error_from_errno2("realpath", argv[0]);
2130 got_path_strip_trailing_slashes(path);
2132 cwd = getcwd(NULL, 0);
2134 error = got_error_from_errno("getcwd");
2137 error = got_worktree_open(&worktree, cwd);
2141 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2145 error = apply_unveil(got_repo_get_path(repo), 1,
2146 got_worktree_get_root_path(worktree), 0);
2150 error = got_worktree_revert(worktree, path,
2151 revert_progress, NULL, repo);
2156 got_repo_close(repo);
2158 got_worktree_close(worktree);
2167 fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2172 spawn_editor(const char *editor, const char *file)
2175 sig_t sighup, sigint, sigquit;
2178 sighup = signal(SIGHUP, SIG_IGN);
2179 sigint = signal(SIGINT, SIG_IGN);
2180 sigquit = signal(SIGQUIT, SIG_IGN);
2182 switch (pid = fork()) {
2186 execl(editor, editor, file, (char *)NULL);
2190 while (waitpid(pid, &st, 0) == -1)
2195 (void)signal(SIGHUP, sighup);
2196 (void)signal(SIGINT, sigint);
2197 (void)signal(SIGQUIT, sigquit);
2199 if (!WIFEXITED(st)) {
2204 return WEXITSTATUS(st);
2207 struct collect_commit_logmsg_arg {
2208 const char *cmdline_log;
2210 const char *worktree_path;
2211 const char *repo_path;
2216 static const struct got_error *
2217 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2220 const char *initial_content = "\n# changes to be committed:\n";
2221 struct got_pathlist_entry *pe;
2222 const struct got_error *err = NULL;
2223 char *template = NULL;
2224 struct collect_commit_logmsg_arg *a = arg;
2226 struct stat st, st2;
2229 int fd, content_changed = 0;
2231 /* if a message was specified on the command line, just use it */
2232 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2233 len = strlen(a->cmdline_log) + 1;
2234 *logmsg = malloc(len + 1);
2235 if (*logmsg == NULL)
2236 return got_error_from_errno("malloc");
2237 strlcpy(*logmsg, a->cmdline_log, len);
2241 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2242 return got_error_from_errno("asprintf");
2244 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2248 dprintf(fd, initial_content);
2250 TAILQ_FOREACH(pe, commitable_paths, entry) {
2251 struct got_commitable *ct = pe->data;
2252 dprintf(fd, "# %c %s\n", ct->status, pe->path);
2256 if (stat(a->logmsg_path, &st) == -1) {
2257 err = got_error_from_errno2("stat", a->logmsg_path);
2261 if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2262 err = got_error_from_errno("failed spawning editor");
2266 if (stat(a->logmsg_path, &st2) == -1) {
2267 err = got_error_from_errno("stat");
2271 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2272 unlink(a->logmsg_path);
2273 free(a->logmsg_path);
2274 a->logmsg_path = NULL;
2275 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2276 "no changes made to commit message, aborting");
2280 /* remove comments */
2281 *logmsg = malloc(st2.st_size + 1);
2282 if (*logmsg == NULL) {
2283 err = got_error_from_errno("malloc");
2288 fp = fopen(a->logmsg_path, "r");
2289 while (fgets(buf, sizeof(buf), fp) != NULL) {
2290 if (!content_changed && strcmp(buf, initial_content) != 0)
2291 content_changed = 1;
2292 if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2294 len = strlcat(*logmsg, buf, st2.st_size);
2298 while (len > 0 && (*logmsg)[len - 1] == '\n') {
2299 (*logmsg)[len - 1] = '\0';
2303 if (len == 0 || !content_changed) {
2304 unlink(a->logmsg_path);
2305 free(a->logmsg_path);
2306 a->logmsg_path = NULL;
2307 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2308 "commit message cannot be empty, aborting");
2314 /* Editor is done; we can now apply unveil(2) */
2316 err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
2320 static const struct got_error *
2321 cmd_commit(int argc, char *argv[])
2323 const struct got_error *error = NULL;
2324 struct got_worktree *worktree = NULL;
2325 struct got_repository *repo = NULL;
2326 char *cwd = NULL, *path = NULL, *id_str = NULL;
2327 struct got_object_id *id = NULL;
2328 const char *logmsg = NULL;
2329 const char *got_author = getenv("GOT_AUTHOR");
2330 struct collect_commit_logmsg_arg cl_arg;
2331 char *editor = NULL;
2334 while ((ch = getopt(argc, argv, "m:")) != -1) {
2349 path = realpath(argv[0], NULL);
2351 error = got_error_from_errno2("realpath", argv[0]);
2354 got_path_strip_trailing_slashes(path);
2355 } else if (argc != 0)
2358 if (got_author == NULL) {
2359 /* TODO: Look current user up in password database */
2360 error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2364 cwd = getcwd(NULL, 0);
2366 error = got_error_from_errno("getcwd");
2369 error = got_worktree_open(&worktree, cwd);
2373 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2378 * unveil(2) traverses exec(2); if an editor is used we have
2379 * to apply unveil after the log message has been written.
2381 if (logmsg == NULL || strlen(logmsg) == 0)
2382 error = get_editor(&editor);
2384 error = apply_unveil(got_repo_get_path(repo), 0,
2385 got_worktree_get_root_path(worktree), 0);
2389 cl_arg.editor = editor;
2390 cl_arg.cmdline_log = logmsg;
2391 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2392 cl_arg.repo_path = got_repo_get_path(repo);
2393 cl_arg.logmsg_path = NULL;
2394 error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2395 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2397 if (cl_arg.logmsg_path)
2398 fprintf(stderr, "%s: log message preserved in %s\n",
2399 getprogname(), cl_arg.logmsg_path);
2403 if (cl_arg.logmsg_path)
2404 unlink(cl_arg.logmsg_path);
2406 error = got_object_id_str(&id_str, id);
2409 printf("created commit %s\n", id_str);
2412 got_repo_close(repo);
2414 got_worktree_close(worktree);