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 [-b branch] [-c commit] "
275 "[-p prefix] repository-path [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 const char *branch_name = GOT_REF_HEAD;
352 char *commit_id_str = NULL;
353 int ch, same_path_prefix;
355 while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
358 branch_name = optarg;
361 commit_id_str = strdup(optarg);
362 if (commit_id_str == NULL)
363 return got_error_from_errno("strdup");
366 path_prefix = optarg;
378 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
379 "unveil", NULL) == -1)
383 char *cwd, *base, *dotgit;
384 repo_path = realpath(argv[0], NULL);
385 if (repo_path == NULL)
386 return got_error_from_errno2("realpath", argv[0]);
387 cwd = getcwd(NULL, 0);
389 error = got_error_from_errno("getcwd");
392 if (path_prefix[0]) {
393 base = basename(path_prefix);
395 error = got_error_from_errno2("basename",
400 base = basename(repo_path);
402 error = got_error_from_errno2("basename",
407 dotgit = strstr(base, ".git");
410 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
411 error = got_error_from_errno("asprintf");
416 } else if (argc == 2) {
417 repo_path = realpath(argv[0], NULL);
418 if (repo_path == NULL) {
419 error = got_error_from_errno2("realpath", argv[0]);
422 worktree_path = realpath(argv[1], NULL);
423 if (worktree_path == NULL) {
424 error = got_error_from_errno2("realpath", argv[1]);
430 got_path_strip_trailing_slashes(repo_path);
431 got_path_strip_trailing_slashes(worktree_path);
433 error = got_repo_open(&repo, repo_path);
437 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 1);
441 error = got_ref_open(&head_ref, repo, branch_name, 0);
445 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
446 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
449 error = got_worktree_open(&worktree, worktree_path);
453 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
457 if (!same_path_prefix) {
458 error = got_error(GOT_ERR_PATH_PREFIX);
463 struct got_object_id *commit_id;
464 error = got_object_resolve_id_str(&commit_id, repo,
468 error = check_linear_ancestry(worktree, commit_id, repo);
473 error = got_worktree_set_base_commit_id(worktree, repo,
480 error = got_worktree_checkout_files(worktree, "", repo,
481 checkout_progress, worktree_path, check_cancelled, NULL);
485 printf("Now shut up and hack\n");
497 fprintf(stderr, "usage: %s update [-c commit] [path]\n",
503 update_progress(void *arg, unsigned char status, const char *path)
505 int *did_something = arg;
507 if (status == GOT_STATUS_EXISTS)
511 while (path[0] == '/')
513 printf("%c %s\n", status, path);
516 static const struct got_error *
517 cmd_update(int argc, char *argv[])
519 const struct got_error *error = NULL;
520 struct got_repository *repo = NULL;
521 struct got_worktree *worktree = NULL;
522 char *worktree_path = NULL, *path = NULL;
523 struct got_object_id *commit_id = NULL;
524 char *commit_id_str = NULL;
525 int ch, did_something = 0;
527 while ((ch = getopt(argc, argv, "c:")) != -1) {
530 commit_id_str = strdup(optarg);
531 if (commit_id_str == NULL)
532 return got_error_from_errno("strdup");
544 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
545 "unveil", NULL) == -1)
548 worktree_path = getcwd(NULL, 0);
549 if (worktree_path == NULL) {
550 error = got_error_from_errno("getcwd");
553 error = got_worktree_open(&worktree, worktree_path);
560 error = got_error_from_errno("strdup");
563 } else if (argc == 1) {
564 error = got_worktree_resolve_path(&path, worktree, argv[0]);
570 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
574 error = apply_unveil(got_repo_get_path(repo), 0,
575 got_worktree_get_root_path(worktree), 0);
579 if (commit_id_str == NULL) {
580 struct got_reference *head_ref;
581 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
584 error = got_ref_resolve(&commit_id, repo, head_ref);
587 error = got_object_id_str(&commit_id_str, commit_id);
591 error = got_object_resolve_id_str(&commit_id, repo,
597 error = check_linear_ancestry(worktree, commit_id, repo);
601 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
603 error = got_worktree_set_base_commit_id(worktree, repo,
609 error = got_worktree_checkout_files(worktree, path, repo,
610 update_progress, &did_something, check_cancelled, NULL);
615 printf("Updated to commit %s\n", commit_id_str);
617 printf("Already up-to-date\n");
626 static const struct got_error *
627 print_patch(struct got_commit_object *commit, struct got_object_id *id,
628 int diff_context, struct got_repository *repo)
630 const struct got_error *err = NULL;
631 struct got_tree_object *tree1 = NULL, *tree2;
632 struct got_object_qid *qid;
633 char *id_str1 = NULL, *id_str2;
635 err = got_object_open_as_tree(&tree2, repo,
636 got_object_commit_get_tree_id(commit));
640 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
642 struct got_commit_object *pcommit;
644 err = got_object_open_as_commit(&pcommit, repo, qid->id);
648 err = got_object_open_as_tree(&tree1, repo,
649 got_object_commit_get_tree_id(pcommit));
650 got_object_commit_close(pcommit);
654 err = got_object_id_str(&id_str1, qid->id);
659 err = got_object_id_str(&id_str2, id);
663 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
664 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
667 got_object_tree_close(tree1);
668 got_object_tree_close(tree2);
675 get_datestr(time_t *time, char *datebuf)
677 char *p, *s = ctime_r(time, datebuf);
684 static const struct got_error *
685 print_commit(struct got_commit_object *commit, struct got_object_id *id,
686 struct got_repository *repo, int show_patch, int diff_context,
687 struct got_reflist_head *refs)
689 const struct got_error *err = NULL;
690 char *id_str, *datestr, *logmsg0, *logmsg, *line;
692 time_t committer_time;
693 const char *author, *committer;
694 char *refs_str = NULL;
695 struct got_reflist_entry *re;
697 SIMPLEQ_FOREACH(re, refs, entry) {
700 if (got_object_id_cmp(re->id, id) != 0)
702 name = got_ref_get_name(re->ref);
703 if (strcmp(name, GOT_REF_HEAD) == 0)
705 if (strncmp(name, "refs/", 5) == 0)
707 if (strncmp(name, "got/", 4) == 0)
709 if (strncmp(name, "heads/", 6) == 0)
711 if (strncmp(name, "remotes/", 8) == 0)
714 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
716 err = got_error_from_errno("asprintf");
722 err = got_object_id_str(&id_str, id);
726 printf("-----------------------------------------------\n");
727 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
728 refs_str ? refs_str : "", refs_str ? ")" : "");
733 printf("from: %s\n", got_object_commit_get_author(commit));
734 committer_time = got_object_commit_get_committer_time(commit);
735 datestr = get_datestr(&committer_time, datebuf);
736 printf("date: %s UTC\n", datestr);
737 author = got_object_commit_get_author(commit);
738 committer = got_object_commit_get_committer(commit);
739 if (strcmp(author, committer) != 0)
740 printf("via: %s\n", committer);
741 if (got_object_commit_get_nparents(commit) > 1) {
742 const struct got_object_id_queue *parent_ids;
743 struct got_object_qid *qid;
745 parent_ids = got_object_commit_get_parent_ids(commit);
746 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
747 err = got_object_id_str(&id_str, qid->id);
750 printf("parent %d: %s\n", n++, id_str);
755 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
757 return got_error_from_errno("strdup");
761 line = strsep(&logmsg, "\n");
763 printf(" %s\n", line);
768 err = print_patch(commit, id, diff_context, repo);
773 if (fflush(stdout) != 0 && err == NULL)
774 err = got_error_from_errno("fflush");
778 static const struct got_error *
779 print_commits(struct got_object_id *root_id, struct got_repository *repo,
780 char *path, int show_patch, int diff_context, int limit,
781 int first_parent_traversal, struct got_reflist_head *refs)
783 const struct got_error *err;
784 struct got_commit_graph *graph;
786 err = got_commit_graph_open(&graph, root_id, path,
787 first_parent_traversal, repo);
790 err = got_commit_graph_iter_start(graph, root_id, repo);
794 struct got_commit_object *commit;
795 struct got_object_id *id;
797 if (sigint_received || sigpipe_received)
800 err = got_commit_graph_iter_next(&id, graph);
802 if (err->code == GOT_ERR_ITER_COMPLETED) {
806 if (err->code != GOT_ERR_ITER_NEED_MORE)
808 err = got_commit_graph_fetch_commits(graph, 1, repo);
817 err = got_object_open_as_commit(&commit, repo, id);
820 err = print_commit(commit, id, repo, show_patch, diff_context,
822 got_object_commit_close(commit);
823 if (err || (limit && --limit == 0))
827 got_commit_graph_close(graph);
834 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
835 "[-r repository-path] [path]\n", getprogname());
839 static const struct got_error *
840 cmd_log(int argc, char *argv[])
842 const struct got_error *error;
843 struct got_repository *repo = NULL;
844 struct got_worktree *worktree = NULL;
845 struct got_commit_object *commit = NULL;
846 struct got_object_id *id = NULL;
847 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
848 char *start_commit = NULL;
849 int diff_context = 3, ch;
850 int show_patch = 0, limit = 0, first_parent_traversal = 0;
852 struct got_reflist_head refs;
857 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
863 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
869 start_commit = optarg;
872 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
875 err(1, "-C option %s", errstr);
878 limit = strtonum(optarg, 1, INT_MAX, &errstr);
880 err(1, "-l option %s", errstr);
883 first_parent_traversal = 1;
886 repo_path = realpath(optarg, NULL);
887 if (repo_path == NULL)
889 got_path_strip_trailing_slashes(repo_path);
900 cwd = getcwd(NULL, 0);
902 error = got_error_from_errno("getcwd");
906 error = got_worktree_open(&worktree, cwd);
907 if (error && error->code != GOT_ERR_NOT_WORKTREE)
914 error = got_error_from_errno("strdup");
917 } else if (argc == 1) {
919 error = got_worktree_resolve_path(&path, worktree,
924 path = strdup(argv[0]);
926 error = got_error_from_errno("strdup");
933 if (repo_path == NULL) {
934 repo_path = worktree ?
935 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
937 if (repo_path == NULL) {
938 error = got_error_from_errno("strdup");
942 error = got_repo_open(&repo, repo_path);
946 error = apply_unveil(got_repo_get_path(repo), 1,
947 worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
951 if (start_commit == NULL) {
952 struct got_reference *head_ref;
953 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
956 error = got_ref_resolve(&id, repo, head_ref);
957 got_ref_close(head_ref);
960 error = got_object_open_as_commit(&commit, repo, id);
962 struct got_reference *ref;
963 error = got_ref_open(&ref, repo, start_commit, 0);
966 error = got_ref_resolve(&id, repo, ref);
970 error = got_object_get_type(&obj_type, repo, id);
973 if (obj_type == GOT_OBJ_TYPE_TAG) {
974 struct got_tag_object *tag;
975 error = got_object_open_as_tag(&tag, repo, id);
978 if (got_object_tag_get_object_type(tag) !=
979 GOT_OBJ_TYPE_COMMIT) {
980 got_object_tag_close(tag);
981 error = got_error(GOT_ERR_OBJ_TYPE);
985 id = got_object_id_dup(
986 got_object_tag_get_object_id(tag));
988 error = got_error_from_errno(
989 "got_object_id_dup");
990 got_object_tag_close(tag);
993 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
994 error = got_error(GOT_ERR_OBJ_TYPE);
997 error = got_object_open_as_commit(&commit, repo, id);
1001 if (commit == NULL) {
1002 error = got_object_resolve_id_str(&id, repo,
1011 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1016 path = in_repo_path;
1019 error = got_ref_list(&refs, repo);
1023 error = print_commits(id, repo, path, show_patch,
1024 diff_context, limit, first_parent_traversal, &refs);
1031 got_worktree_close(worktree);
1033 const struct got_error *repo_error;
1034 repo_error = got_repo_close(repo);
1038 got_ref_list_free(&refs);
1045 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1046 "[object1 object2 | path]\n", getprogname());
1050 struct print_diff_arg {
1051 struct got_repository *repo;
1052 struct got_worktree *worktree;
1058 static const struct got_error *
1059 print_diff(void *arg, unsigned char status, const char *path,
1060 struct got_object_id *blob_id, struct got_object_id *commit_id)
1062 struct print_diff_arg *a = arg;
1063 const struct got_error *err = NULL;
1064 struct got_blob_object *blob1 = NULL;
1066 char *abspath = NULL;
1069 if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1070 status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1073 if (!a->header_shown) {
1074 printf("diff %s %s\n", a->id_str,
1075 got_worktree_get_root_path(a->worktree));
1076 a->header_shown = 1;
1079 if (status != GOT_STATUS_ADD) {
1080 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1086 if (status != GOT_STATUS_DELETE) {
1087 if (asprintf(&abspath, "%s/%s",
1088 got_worktree_get_root_path(a->worktree), path) == -1) {
1089 err = got_error_from_errno("asprintf");
1093 f2 = fopen(abspath, "r");
1095 err = got_error_from_errno2("fopen", abspath);
1098 if (lstat(abspath, &sb) == -1) {
1099 err = got_error_from_errno2("lstat", abspath);
1105 err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1109 got_object_blob_close(blob1);
1110 if (f2 && fclose(f2) != 0 && err == NULL)
1111 err = got_error_from_errno("fclose");
1116 static const struct got_error *
1117 cmd_diff(int argc, char *argv[])
1119 const struct got_error *error;
1120 struct got_repository *repo = NULL;
1121 struct got_worktree *worktree = NULL;
1122 char *cwd = NULL, *repo_path = NULL;
1123 struct got_object_id *id1 = NULL, *id2 = NULL;
1124 char *id_str1 = NULL, *id_str2 = NULL;
1126 int diff_context = 3, ch;
1131 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1136 while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1139 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1141 err(1, "-C option %s", errstr);
1144 repo_path = realpath(optarg, NULL);
1145 if (repo_path == NULL)
1146 err(1, "-r option");
1147 got_path_strip_trailing_slashes(repo_path);
1158 cwd = getcwd(NULL, 0);
1160 error = got_error_from_errno("getcwd");
1163 error = got_worktree_open(&worktree, cwd);
1164 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1167 if (worktree == NULL) {
1168 error = got_error(GOT_ERR_NOT_WORKTREE);
1173 "-r option can't be used when diffing a work tree");
1174 repo_path = strdup(got_worktree_get_repo_path(worktree));
1175 if (repo_path == NULL) {
1176 error = got_error_from_errno("strdup");
1180 error = got_worktree_resolve_path(&path, worktree,
1187 error = got_error_from_errno("strdup");
1191 } else if (argc == 2) {
1197 if (repo_path == NULL) {
1198 repo_path = getcwd(NULL, 0);
1199 if (repo_path == NULL)
1200 return got_error_from_errno("getcwd");
1203 error = got_repo_open(&repo, repo_path);
1208 error = apply_unveil(got_repo_get_path(repo), 1,
1209 worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1214 struct print_diff_arg arg;
1216 error = got_object_id_str(&id_str,
1217 got_worktree_get_base_commit_id(worktree));
1221 arg.worktree = worktree;
1222 arg.diff_context = diff_context;
1223 arg.id_str = id_str;
1224 arg.header_shown = 0;
1226 error = got_worktree_status(worktree, path, repo, print_diff,
1227 &arg, check_cancelled, NULL);
1232 error = got_object_resolve_id_str(&id1, repo, id_str1);
1236 error = got_object_resolve_id_str(&id2, repo, id_str2);
1240 error = got_object_get_type(&type1, repo, id1);
1244 error = got_object_get_type(&type2, repo, id2);
1248 if (type1 != type2) {
1249 error = got_error(GOT_ERR_OBJ_TYPE);
1254 case GOT_OBJ_TYPE_BLOB:
1255 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1256 diff_context, repo, stdout);
1258 case GOT_OBJ_TYPE_TREE:
1259 error = got_diff_objects_as_trees(id1, id2, "", "",
1260 diff_context, repo, stdout);
1262 case GOT_OBJ_TYPE_COMMIT:
1263 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1265 error = got_diff_objects_as_commits(id1, id2, diff_context,
1269 error = got_error(GOT_ERR_OBJ_TYPE);
1277 got_worktree_close(worktree);
1279 const struct got_error *repo_error;
1280 repo_error = got_repo_close(repo);
1291 "usage: %s blame [-c commit] [-r repository-path] path\n",
1296 static const struct got_error *
1297 cmd_blame(int argc, char *argv[])
1299 const struct got_error *error;
1300 struct got_repository *repo = NULL;
1301 struct got_worktree *worktree = NULL;
1302 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1303 struct got_object_id *commit_id = NULL;
1304 char *commit_id_str = NULL;
1308 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1313 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1316 commit_id_str = optarg;
1319 repo_path = realpath(optarg, NULL);
1320 if (repo_path == NULL)
1321 err(1, "-r option");
1322 got_path_strip_trailing_slashes(repo_path);
1338 cwd = getcwd(NULL, 0);
1340 error = got_error_from_errno("getcwd");
1343 if (repo_path == NULL) {
1344 error = got_worktree_open(&worktree, cwd);
1345 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1351 strdup(got_worktree_get_repo_path(worktree));
1352 if (repo_path == NULL)
1353 error = got_error_from_errno("strdup");
1357 repo_path = strdup(cwd);
1358 if (repo_path == NULL) {
1359 error = got_error_from_errno("strdup");
1365 error = got_repo_open(&repo, repo_path);
1369 error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1374 const char *prefix = got_worktree_get_path_prefix(worktree);
1375 char *p, *worktree_subdir = cwd +
1376 strlen(got_worktree_get_root_path(worktree));
1377 if (asprintf(&p, "%s%s%s%s%s",
1378 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1379 worktree_subdir, worktree_subdir[0] ? "/" : "",
1381 error = got_error_from_errno("asprintf");
1384 error = got_repo_map_path(&in_repo_path, repo, p, 0);
1387 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1392 if (commit_id_str == NULL) {
1393 struct got_reference *head_ref;
1394 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1397 error = got_ref_resolve(&commit_id, repo, head_ref);
1398 got_ref_close(head_ref);
1402 error = got_object_resolve_id_str(&commit_id, repo,
1408 error = got_blame(in_repo_path, commit_id, repo, stdout);
1415 got_worktree_close(worktree);
1417 const struct got_error *repo_error;
1418 repo_error = got_repo_close(repo);
1429 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1435 print_entry(struct got_tree_entry *te, const char *id, const char *path,
1436 const char *root_path)
1438 int is_root_path = (strcmp(path, root_path) == 0);
1440 path += strlen(root_path);
1441 while (path[0] == '/')
1444 printf("%s%s%s%s%s\n", id ? id : "", path,
1445 is_root_path ? "" : "/", te->name,
1446 S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1449 static const struct got_error *
1450 print_tree(const char *path, struct got_object_id *commit_id,
1451 int show_ids, int recurse, const char *root_path,
1452 struct got_repository *repo)
1454 const struct got_error *err = NULL;
1455 struct got_object_id *tree_id = NULL;
1456 struct got_tree_object *tree = NULL;
1457 const struct got_tree_entries *entries;
1458 struct got_tree_entry *te;
1460 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1464 err = got_object_open_as_tree(&tree, repo, tree_id);
1467 entries = got_object_tree_get_entries(tree);
1468 te = SIMPLEQ_FIRST(&entries->head);
1472 if (sigint_received || sigpipe_received)
1477 err = got_object_id_str(&id_str, te->id);
1480 if (asprintf(&id, "%s ", id_str) == -1) {
1481 err = got_error_from_errno("asprintf");
1487 print_entry(te, id, path, root_path);
1490 if (recurse && S_ISDIR(te->mode)) {
1492 if (asprintf(&child_path, "%s%s%s", path,
1493 path[0] == '/' && path[1] == '\0' ? "" : "/",
1495 err = got_error_from_errno("asprintf");
1498 err = print_tree(child_path, commit_id, show_ids, 1,
1505 te = SIMPLEQ_NEXT(te, entry);
1509 got_object_tree_close(tree);
1514 static const struct got_error *
1515 cmd_tree(int argc, char *argv[])
1517 const struct got_error *error;
1518 struct got_repository *repo = NULL;
1519 struct got_worktree *worktree = NULL;
1521 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1522 struct got_object_id *commit_id = NULL;
1523 char *commit_id_str = NULL;
1524 int show_ids = 0, recurse = 0;
1528 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1533 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1536 commit_id_str = optarg;
1539 repo_path = realpath(optarg, NULL);
1540 if (repo_path == NULL)
1541 err(1, "-r option");
1542 got_path_strip_trailing_slashes(repo_path);
1566 cwd = getcwd(NULL, 0);
1568 error = got_error_from_errno("getcwd");
1571 if (repo_path == NULL) {
1572 error = got_worktree_open(&worktree, cwd);
1573 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1579 strdup(got_worktree_get_repo_path(worktree));
1580 if (repo_path == NULL)
1581 error = got_error_from_errno("strdup");
1585 repo_path = strdup(cwd);
1586 if (repo_path == NULL) {
1587 error = got_error_from_errno("strdup");
1593 error = got_repo_open(&repo, repo_path);
1597 error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
1603 char *p, *worktree_subdir = cwd +
1604 strlen(got_worktree_get_root_path(worktree));
1605 if (asprintf(&p, "%s/%s",
1606 got_worktree_get_path_prefix(worktree),
1607 worktree_subdir) == -1) {
1608 error = got_error_from_errno("asprintf");
1611 error = got_repo_map_path(&in_repo_path, repo, p, 1);
1618 if (in_repo_path == NULL) {
1619 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1624 if (commit_id_str == NULL) {
1625 struct got_reference *head_ref;
1626 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
1629 error = got_ref_resolve(&commit_id, repo, head_ref);
1630 got_ref_close(head_ref);
1634 error = got_object_resolve_id_str(&commit_id, repo,
1640 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1641 in_repo_path, repo);
1648 got_worktree_close(worktree);
1650 const struct got_error *repo_error;
1651 repo_error = got_repo_close(repo);
1661 fprintf(stderr, "usage: %s status [path]\n", getprogname());
1665 static const struct got_error *
1666 print_status(void *arg, unsigned char status, const char *path,
1667 struct got_object_id *blob_id, struct got_object_id *commit_id)
1669 printf("%c %s\n", status, path);
1673 static const struct got_error *
1674 cmd_status(int argc, char *argv[])
1676 const struct got_error *error = NULL;
1677 struct got_repository *repo = NULL;
1678 struct got_worktree *worktree = NULL;
1679 char *cwd = NULL, *path = NULL;
1682 while ((ch = getopt(argc, argv, "")) != -1) {
1694 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1698 cwd = getcwd(NULL, 0);
1700 error = got_error_from_errno("getcwd");
1704 error = got_worktree_open(&worktree, cwd);
1711 error = got_error_from_errno("strdup");
1714 } else if (argc == 1) {
1715 error = got_worktree_resolve_path(&path, worktree, argv[0]);
1721 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1725 error = apply_unveil(got_repo_get_path(repo), 1,
1726 got_worktree_get_root_path(worktree), 0);
1730 error = got_worktree_status(worktree, path, repo, print_status, NULL,
1731 check_cancelled, NULL);
1742 "usage: %s ref [-r repository] -l | -d name | name target\n",
1747 static const struct got_error *
1748 list_refs(struct got_repository *repo)
1750 static const struct got_error *err = NULL;
1751 struct got_reflist_head refs;
1752 struct got_reflist_entry *re;
1754 SIMPLEQ_INIT(&refs);
1755 err = got_ref_list(&refs, repo);
1759 SIMPLEQ_FOREACH(re, &refs, entry) {
1761 refstr = got_ref_to_str(re->ref);
1763 return got_error_from_errno("got_ref_to_str");
1764 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1768 got_ref_list_free(&refs);
1772 static const struct got_error *
1773 delete_ref(struct got_repository *repo, const char *refname)
1775 const struct got_error *err = NULL;
1776 struct got_reference *ref;
1778 err = got_ref_open(&ref, repo, refname, 0);
1782 err = got_ref_delete(ref, repo);
1787 static const struct got_error *
1788 add_ref(struct got_repository *repo, const char *refname, const char *target)
1790 const struct got_error *err = NULL;
1791 struct got_object_id *id;
1792 struct got_reference *ref = NULL;
1794 err = got_object_resolve_id_str(&id, repo, target);
1796 struct got_reference *target_ref;
1798 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1800 err = got_ref_open(&target_ref, repo, target, 0);
1803 err = got_ref_resolve(&id, repo, target_ref);
1804 got_ref_close(target_ref);
1809 err = got_ref_alloc(&ref, refname, id);
1813 err = got_ref_write(ref, repo);
1821 static const struct got_error *
1822 cmd_ref(int argc, char *argv[])
1824 const struct got_error *error = NULL;
1825 struct got_repository *repo = NULL;
1826 struct got_worktree *worktree = NULL;
1827 char *cwd = NULL, *repo_path = NULL;
1828 int ch, do_list = 0;
1829 const char *delref = NULL;
1831 /* TODO: Add -s option for adding symbolic references. */
1832 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1838 repo_path = realpath(optarg, NULL);
1839 if (repo_path == NULL)
1840 err(1, "-r option");
1841 got_path_strip_trailing_slashes(repo_path);
1852 if (do_list && delref)
1853 errx(1, "-l and -d options are mutually exclusive\n");
1858 if (do_list || delref) {
1861 } else if (argc != 2)
1866 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1870 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1871 "sendfd unveil", NULL) == -1)
1875 cwd = getcwd(NULL, 0);
1877 error = got_error_from_errno("getcwd");
1881 if (repo_path == NULL) {
1882 error = got_worktree_open(&worktree, cwd);
1883 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1889 strdup(got_worktree_get_repo_path(worktree));
1890 if (repo_path == NULL)
1891 error = got_error_from_errno("strdup");
1895 repo_path = strdup(cwd);
1896 if (repo_path == NULL) {
1897 error = got_error_from_errno("strdup");
1903 error = got_repo_open(&repo, repo_path);
1907 error = apply_unveil(got_repo_get_path(repo), do_list,
1908 worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
1913 error = list_refs(repo);
1915 error = delete_ref(repo, delref);
1917 error = add_ref(repo, argv[0], argv[1]);
1920 got_repo_close(repo);
1922 got_worktree_close(worktree);
1931 fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
1935 static const struct got_error *
1936 cmd_add(int argc, char *argv[])
1938 const struct got_error *error = NULL;
1939 struct got_repository *repo = NULL;
1940 struct got_worktree *worktree = NULL;
1942 struct got_pathlist_head paths;
1943 struct got_pathlist_entry *pe;
1948 while ((ch = getopt(argc, argv, "")) != -1) {
1962 /* make sure each file exists before doing anything halfway */
1963 for (x = 0; x < argc; x++) {
1964 char *path = realpath(argv[x], NULL);
1966 error = got_error_from_errno2("realpath", argv[x]);
1972 cwd = getcwd(NULL, 0);
1974 error = got_error_from_errno("getcwd");
1978 error = got_worktree_open(&worktree, cwd);
1982 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1986 error = apply_unveil(got_repo_get_path(repo), 1,
1987 got_worktree_get_root_path(worktree), 0);
1991 for (x = 0; x < argc; x++) {
1992 char *path = realpath(argv[x], NULL);
1994 error = got_error_from_errno2("realpath", argv[x]);
1998 got_path_strip_trailing_slashes(path);
1999 error = got_pathlist_insert(&pe, &paths, path, NULL);
2005 error = got_worktree_schedule_add(worktree, &paths, print_status,
2009 got_repo_close(repo);
2011 got_worktree_close(worktree);
2012 TAILQ_FOREACH(pe, &paths, entry)
2013 free((char *)pe->path);
2014 got_pathlist_free(&paths);
2022 fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
2026 static const struct got_error *
2027 cmd_rm(int argc, char *argv[])
2029 const struct got_error *error = NULL;
2030 struct got_worktree *worktree = NULL;
2031 struct got_repository *repo = NULL;
2032 char *cwd = NULL, *path = NULL;
2033 int ch, delete_local_mods = 0;
2035 while ((ch = getopt(argc, argv, "f")) != -1) {
2038 delete_local_mods = 1;
2052 path = realpath(argv[0], NULL);
2054 error = got_error_from_errno2("realpath", argv[0]);
2057 got_path_strip_trailing_slashes(path);
2059 cwd = getcwd(NULL, 0);
2061 error = got_error_from_errno("getcwd");
2064 error = got_worktree_open(&worktree, cwd);
2068 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2072 error = apply_unveil(got_repo_get_path(repo), 1,
2073 got_worktree_get_root_path(worktree), 0);
2077 error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
2078 print_status, NULL, repo);
2083 got_repo_close(repo);
2085 got_worktree_close(worktree);
2094 fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2099 revert_progress(void *arg, unsigned char status, const char *path)
2101 while (path[0] == '/')
2103 printf("%c %s\n", status, path);
2106 static const struct got_error *
2107 cmd_revert(int argc, char *argv[])
2109 const struct got_error *error = NULL;
2110 struct got_worktree *worktree = NULL;
2111 struct got_repository *repo = NULL;
2112 char *cwd = NULL, *path = NULL;
2115 while ((ch = getopt(argc, argv, "")) != -1) {
2129 path = realpath(argv[0], NULL);
2131 error = got_error_from_errno2("realpath", argv[0]);
2134 got_path_strip_trailing_slashes(path);
2136 cwd = getcwd(NULL, 0);
2138 error = got_error_from_errno("getcwd");
2141 error = got_worktree_open(&worktree, cwd);
2145 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2149 error = apply_unveil(got_repo_get_path(repo), 1,
2150 got_worktree_get_root_path(worktree), 0);
2154 error = got_worktree_revert(worktree, path,
2155 revert_progress, NULL, repo);
2160 got_repo_close(repo);
2162 got_worktree_close(worktree);
2171 fprintf(stderr, "usage: %s commit [-m msg] file-path\n", getprogname());
2176 spawn_editor(const char *editor, const char *file)
2179 sig_t sighup, sigint, sigquit;
2182 sighup = signal(SIGHUP, SIG_IGN);
2183 sigint = signal(SIGINT, SIG_IGN);
2184 sigquit = signal(SIGQUIT, SIG_IGN);
2186 switch (pid = fork()) {
2190 execl(editor, editor, file, (char *)NULL);
2194 while (waitpid(pid, &st, 0) == -1)
2199 (void)signal(SIGHUP, sighup);
2200 (void)signal(SIGINT, sigint);
2201 (void)signal(SIGQUIT, sigquit);
2203 if (!WIFEXITED(st)) {
2208 return WEXITSTATUS(st);
2211 struct collect_commit_logmsg_arg {
2212 const char *cmdline_log;
2214 const char *worktree_path;
2215 const char *repo_path;
2220 static const struct got_error *
2221 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
2224 const char *initial_content = "\n# changes to be committed:\n";
2225 struct got_pathlist_entry *pe;
2226 const struct got_error *err = NULL;
2227 char *template = NULL;
2228 struct collect_commit_logmsg_arg *a = arg;
2230 struct stat st, st2;
2233 int fd, content_changed = 0;
2235 /* if a message was specified on the command line, just use it */
2236 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
2237 len = strlen(a->cmdline_log) + 1;
2238 *logmsg = malloc(len + 1);
2239 if (*logmsg == NULL)
2240 return got_error_from_errno("malloc");
2241 strlcpy(*logmsg, a->cmdline_log, len);
2245 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
2246 return got_error_from_errno("asprintf");
2248 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
2252 dprintf(fd, initial_content);
2254 TAILQ_FOREACH(pe, commitable_paths, entry) {
2255 struct got_commitable *ct = pe->data;
2256 dprintf(fd, "# %c %s\n", ct->status, pe->path);
2260 if (stat(a->logmsg_path, &st) == -1) {
2261 err = got_error_from_errno2("stat", a->logmsg_path);
2265 if (spawn_editor(a->editor, a->logmsg_path) == -1) {
2266 err = got_error_from_errno("failed spawning editor");
2270 if (stat(a->logmsg_path, &st2) == -1) {
2271 err = got_error_from_errno("stat");
2275 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size) {
2276 unlink(a->logmsg_path);
2277 free(a->logmsg_path);
2278 a->logmsg_path = NULL;
2279 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2280 "no changes made to commit message, aborting");
2284 /* remove comments */
2285 *logmsg = malloc(st2.st_size + 1);
2286 if (*logmsg == NULL) {
2287 err = got_error_from_errno("malloc");
2292 fp = fopen(a->logmsg_path, "r");
2293 while (fgets(buf, sizeof(buf), fp) != NULL) {
2294 if (!content_changed && strcmp(buf, initial_content) != 0)
2295 content_changed = 1;
2296 if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
2298 len = strlcat(*logmsg, buf, st2.st_size);
2302 while (len > 0 && (*logmsg)[len - 1] == '\n') {
2303 (*logmsg)[len - 1] = '\0';
2307 if (len == 0 || !content_changed) {
2308 unlink(a->logmsg_path);
2309 free(a->logmsg_path);
2310 a->logmsg_path = NULL;
2311 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
2312 "commit message cannot be empty, aborting");
2318 /* Editor is done; we can now apply unveil(2) */
2320 err = apply_unveil(a->repo_path, 0, a->worktree_path, 0);
2324 static const struct got_error *
2325 cmd_commit(int argc, char *argv[])
2327 const struct got_error *error = NULL;
2328 struct got_worktree *worktree = NULL;
2329 struct got_repository *repo = NULL;
2330 char *cwd = NULL, *path = NULL, *id_str = NULL;
2331 struct got_object_id *id = NULL;
2332 const char *logmsg = NULL;
2333 const char *got_author = getenv("GOT_AUTHOR");
2334 struct collect_commit_logmsg_arg cl_arg;
2335 char *editor = NULL;
2338 while ((ch = getopt(argc, argv, "m:")) != -1) {
2353 path = realpath(argv[0], NULL);
2355 error = got_error_from_errno2("realpath", argv[0]);
2358 got_path_strip_trailing_slashes(path);
2359 } else if (argc != 0)
2362 if (got_author == NULL) {
2363 /* TODO: Look current user up in password database */
2364 error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
2368 cwd = getcwd(NULL, 0);
2370 error = got_error_from_errno("getcwd");
2373 error = got_worktree_open(&worktree, cwd);
2377 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2382 * unveil(2) traverses exec(2); if an editor is used we have
2383 * to apply unveil after the log message has been written.
2385 if (logmsg == NULL || strlen(logmsg) == 0)
2386 error = get_editor(&editor);
2388 error = apply_unveil(got_repo_get_path(repo), 0,
2389 got_worktree_get_root_path(worktree), 0);
2393 cl_arg.editor = editor;
2394 cl_arg.cmdline_log = logmsg;
2395 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
2396 cl_arg.repo_path = got_repo_get_path(repo);
2397 cl_arg.logmsg_path = NULL;
2398 error = got_worktree_commit(&id, worktree, path, got_author, NULL,
2399 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
2401 if (cl_arg.logmsg_path)
2402 fprintf(stderr, "%s: log message preserved in %s\n",
2403 getprogname(), cl_arg.logmsg_path);
2407 if (cl_arg.logmsg_path)
2408 unlink(cl_arg.logmsg_path);
2410 error = got_object_id_str(&id_str, id);
2413 printf("created commit %s\n", id_str);
2416 got_repo_close(repo);
2418 got_worktree_close(worktree);