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>
34 #include "got_error.h"
35 #include "got_object.h"
36 #include "got_reference.h"
37 #include "got_repository.h"
38 #include "got_worktree.h"
40 #include "got_commit_graph.h"
41 #include "got_blame.h"
42 #include "got_privsep.h"
45 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
48 static volatile sig_atomic_t sigint_received;
49 static volatile sig_atomic_t sigpipe_received;
52 catch_sigint(int signo)
58 catch_sigpipe(int signo)
66 const struct got_error *(*cmd_main)(int, char *[]);
67 void (*cmd_usage)(void);
68 const char *cmd_descr;
71 __dead static void usage(void);
72 __dead static void usage_checkout(void);
73 __dead static void usage_update(void);
74 __dead static void usage_log(void);
75 __dead static void usage_diff(void);
76 __dead static void usage_blame(void);
77 __dead static void usage_tree(void);
78 __dead static void usage_status(void);
79 __dead static void usage_ref(void);
80 __dead static void usage_add(void);
81 __dead static void usage_rm(void);
82 __dead static void usage_revert(void);
84 static const struct got_error* cmd_checkout(int, char *[]);
85 static const struct got_error* cmd_update(int, char *[]);
86 static const struct got_error* cmd_log(int, char *[]);
87 static const struct got_error* cmd_diff(int, char *[]);
88 static const struct got_error* cmd_blame(int, char *[]);
89 static const struct got_error* cmd_tree(int, char *[]);
90 static const struct got_error* cmd_status(int, char *[]);
91 static const struct got_error* cmd_ref(int, char *[]);
92 static const struct got_error* cmd_add(int, char *[]);
93 static const struct got_error* cmd_rm(int, char *[]);
94 static const struct got_error* cmd_revert(int, char *[]);
96 static struct cmd got_commands[] = {
97 { "checkout", cmd_checkout, usage_checkout,
98 "check out a new work tree from a repository" },
99 { "update", cmd_update, usage_update,
100 "update a work tree to a different commit" },
101 { "log", cmd_log, usage_log,
102 "show repository history" },
103 { "diff", cmd_diff, usage_diff,
104 "compare files and directories" },
105 { "blame", cmd_blame, usage_blame,
106 "show when lines in a file were changed" },
107 { "tree", cmd_tree, usage_tree,
108 "list files and directories in repository" },
109 { "status", cmd_status, usage_status,
110 "show modification status of files" },
111 { "ref", cmd_ref, usage_ref,
112 "manage references in repository" },
113 { "add", cmd_add, usage_add,
114 "add a new file to version control" },
115 { "rm", cmd_rm, usage_rm,
116 "remove a versioned file" },
117 { "revert", cmd_revert, usage_revert,
118 "revert uncommitted changes" },
122 main(int argc, char *argv[])
129 setlocale(LC_CTYPE, "");
131 while ((ch = getopt(argc, argv, "h")) != -1) {
149 signal(SIGINT, catch_sigint);
150 signal(SIGPIPE, catch_sigpipe);
152 for (i = 0; i < nitems(got_commands); i++) {
153 const struct got_error *error;
155 cmd = &got_commands[i];
157 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
161 got_commands[i].cmd_usage();
163 error = got_commands[i].cmd_main(argc, argv);
164 if (error && !(sigint_received || sigpipe_received)) {
165 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
172 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
181 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
182 "Available commands:\n", getprogname());
183 for (i = 0; i < nitems(got_commands); i++) {
184 struct cmd *cmd = &got_commands[i];
185 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
190 static const struct got_error *
191 apply_unveil(const char *repo_path, int repo_read_only,
192 const char *worktree_path)
194 const struct got_error *error;
196 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
197 return got_error_from_errno();
199 if (worktree_path && unveil(worktree_path, "rwc") != 0)
200 return got_error_from_errno();
202 if (unveil("/tmp", "rwc") != 0)
203 return got_error_from_errno();
205 error = got_privsep_unveil_exec_helpers();
209 if (unveil(NULL, NULL) != 0)
210 return got_error_from_errno();
218 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
219 "[worktree-path]\n", getprogname());
224 checkout_progress(void *arg, unsigned char status, const char *path)
226 char *worktree_path = arg;
228 while (path[0] == '/')
231 printf("%c %s/%s\n", status, worktree_path, path);
234 static const struct got_error *
235 check_cancelled(void *arg)
237 if (sigint_received || sigpipe_received)
238 return got_error(GOT_ERR_CANCELLED);
242 static const struct got_error *
243 check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
244 struct got_repository *repo)
246 const struct got_error *err;
247 struct got_reference *head_ref = NULL;
248 struct got_object_id *head_commit_id = NULL;
249 struct got_commit_graph *graph = NULL;
251 head_ref = got_worktree_get_head_ref(worktree);
252 if (head_ref == NULL)
253 return got_error_from_errno();
255 /* TODO: Check the reflog. The head ref may have been rebased. */
256 err = got_ref_resolve(&head_commit_id, repo, head_ref);
260 err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
264 err = got_commit_graph_iter_start(graph, head_commit_id, repo);
268 struct got_object_id *id;
270 if (sigint_received || sigpipe_received)
273 err = got_commit_graph_iter_next(&id, graph);
275 if (err->code == GOT_ERR_ITER_COMPLETED) {
276 err = got_error(GOT_ERR_ANCESTRY);
279 if (err->code != GOT_ERR_ITER_NEED_MORE)
281 err = got_commit_graph_fetch_commits(graph, 1, repo);
289 if (got_object_id_cmp(id, commit_id) == 0)
294 got_ref_close(head_ref);
296 got_commit_graph_close(graph);
301 static const struct got_error *
302 cmd_checkout(int argc, char *argv[])
304 const struct got_error *error = NULL;
305 struct got_repository *repo = NULL;
306 struct got_reference *head_ref = NULL;
307 struct got_worktree *worktree = NULL;
308 char *repo_path = NULL;
309 char *worktree_path = NULL;
310 const char *path_prefix = "";
311 char *commit_id_str = NULL;
312 int ch, same_path_prefix;
314 while ((ch = getopt(argc, argv, "c:p:")) != -1) {
317 commit_id_str = strdup(optarg);
318 if (commit_id_str == NULL)
319 return got_error_from_errno();
322 path_prefix = optarg;
334 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
335 "unveil", NULL) == -1)
339 char *cwd, *base, *dotgit;
340 repo_path = realpath(argv[0], NULL);
341 if (repo_path == NULL)
342 return got_error_from_errno();
343 cwd = getcwd(NULL, 0);
345 error = got_error_from_errno();
349 base = basename(path_prefix);
351 base = basename(repo_path);
353 error = got_error_from_errno();
356 dotgit = strstr(base, ".git");
359 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
360 error = got_error_from_errno();
365 } else if (argc == 2) {
366 repo_path = realpath(argv[0], NULL);
367 if (repo_path == NULL) {
368 error = got_error_from_errno();
371 worktree_path = realpath(argv[1], NULL);
372 if (worktree_path == NULL) {
373 error = got_error_from_errno();
379 error = got_repo_open(&repo, repo_path);
383 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
387 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
391 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
392 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
395 error = got_worktree_open(&worktree, worktree_path);
399 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
403 if (!same_path_prefix) {
404 error = got_error(GOT_ERR_PATH_PREFIX);
409 struct got_object_id *commit_id;
410 error = got_object_resolve_id_str(&commit_id, repo,
414 error = check_ancestry(worktree, commit_id, repo);
419 error = got_worktree_set_base_commit_id(worktree, repo,
426 error = got_worktree_checkout_files(worktree, "", repo,
427 checkout_progress, worktree_path, check_cancelled, NULL);
431 printf("Now shut up and hack\n");
443 fprintf(stderr, "usage: %s update [-c commit] [path]\n",
449 update_progress(void *arg, unsigned char status, const char *path)
451 int *did_something = arg;
453 if (status == GOT_STATUS_EXISTS)
457 while (path[0] == '/')
459 printf("%c %s\n", status, path);
462 static const struct got_error *
463 cmd_update(int argc, char *argv[])
465 const struct got_error *error = NULL;
466 struct got_repository *repo = NULL;
467 struct got_worktree *worktree = NULL;
468 char *worktree_path = NULL, *path = NULL;
469 struct got_object_id *commit_id = NULL;
470 char *commit_id_str = NULL;
471 int ch, did_something = 0;
473 while ((ch = getopt(argc, argv, "c:")) != -1) {
476 commit_id_str = strdup(optarg);
477 if (commit_id_str == NULL)
478 return got_error_from_errno();
490 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
491 "unveil", NULL) == -1)
494 worktree_path = getcwd(NULL, 0);
495 if (worktree_path == NULL) {
496 error = got_error_from_errno();
499 error = got_worktree_open(&worktree, worktree_path);
506 error = got_error_from_errno();
509 } else if (argc == 1) {
510 error = got_worktree_resolve_path(&path, worktree, argv[0]);
516 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
520 error = apply_unveil(got_repo_get_path(repo), 0,
521 got_worktree_get_root_path(worktree));
525 if (commit_id_str == NULL) {
526 struct got_reference *head_ref;
527 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
530 error = got_ref_resolve(&commit_id, repo, head_ref);
533 error = got_object_id_str(&commit_id_str, commit_id);
537 error = got_object_resolve_id_str(&commit_id, repo,
543 error = check_ancestry(worktree, commit_id, repo);
547 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
549 error = got_worktree_set_base_commit_id(worktree, repo,
555 error = got_worktree_checkout_files(worktree, path, repo,
556 update_progress, &did_something, check_cancelled, NULL);
561 printf("Updated to commit %s\n", commit_id_str);
563 printf("Already up-to-date\n");
572 static const struct got_error *
573 print_patch(struct got_commit_object *commit, struct got_object_id *id,
574 int diff_context, struct got_repository *repo)
576 const struct got_error *err = NULL;
577 struct got_tree_object *tree1 = NULL, *tree2;
578 struct got_object_qid *qid;
579 char *id_str1 = NULL, *id_str2;
581 err = got_object_open_as_tree(&tree2, repo,
582 got_object_commit_get_tree_id(commit));
586 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
588 struct got_commit_object *pcommit;
590 err = got_object_open_as_commit(&pcommit, repo, qid->id);
594 err = got_object_open_as_tree(&tree1, repo,
595 got_object_commit_get_tree_id(pcommit));
596 got_object_commit_close(pcommit);
600 err = got_object_id_str(&id_str1, qid->id);
605 err = got_object_id_str(&id_str2, id);
609 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
610 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
613 got_object_tree_close(tree1);
614 got_object_tree_close(tree2);
621 get_datestr(time_t *time, char *datebuf)
623 char *p, *s = ctime_r(time, datebuf);
630 static const struct got_error *
631 print_commit(struct got_commit_object *commit, struct got_object_id *id,
632 struct got_repository *repo, int show_patch, int diff_context,
633 struct got_reflist_head *refs)
635 const struct got_error *err = NULL;
636 char *id_str, *datestr, *logmsg0, *logmsg, *line;
638 time_t committer_time;
639 const char *author, *committer;
640 char *refs_str = NULL;
641 struct got_reflist_entry *re;
643 SIMPLEQ_FOREACH(re, refs, entry) {
646 if (got_object_id_cmp(re->id, id) != 0)
648 name = got_ref_get_name(re->ref);
649 if (strcmp(name, GOT_REF_HEAD) == 0)
651 if (strncmp(name, "refs/", 5) == 0)
653 if (strncmp(name, "got/", 4) == 0)
655 if (strncmp(name, "heads/", 6) == 0)
657 if (strncmp(name, "remotes/", 8) == 0)
660 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
662 err = got_error_from_errno();
668 err = got_object_id_str(&id_str, id);
672 printf("-----------------------------------------------\n");
673 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
674 refs_str ? refs_str : "", refs_str ? ")" : "");
679 printf("from: %s\n", got_object_commit_get_author(commit));
680 committer_time = got_object_commit_get_committer_time(commit);
681 datestr = get_datestr(&committer_time, datebuf);
682 printf("date: %s UTC\n", datestr);
683 author = got_object_commit_get_author(commit);
684 committer = got_object_commit_get_committer(commit);
685 if (strcmp(author, committer) != 0)
686 printf("via: %s\n", committer);
687 if (got_object_commit_get_nparents(commit) > 1) {
688 const struct got_object_id_queue *parent_ids;
689 struct got_object_qid *qid;
691 parent_ids = got_object_commit_get_parent_ids(commit);
692 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
693 err = got_object_id_str(&id_str, qid->id);
696 printf("parent %d: %s\n", n++, id_str);
701 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
703 return got_error_from_errno();
707 line = strsep(&logmsg, "\n");
709 printf(" %s\n", line);
714 err = print_patch(commit, id, diff_context, repo);
719 if (fflush(stdout) != 0 && err == NULL)
720 err = got_error_from_errno();
724 static const struct got_error *
725 print_commits(struct got_object_id *root_id, struct got_repository *repo,
726 char *path, int show_patch, int diff_context, int limit,
727 int first_parent_traversal, struct got_reflist_head *refs)
729 const struct got_error *err;
730 struct got_commit_graph *graph;
732 err = got_commit_graph_open(&graph, root_id, path,
733 first_parent_traversal, repo);
736 err = got_commit_graph_iter_start(graph, root_id, repo);
740 struct got_commit_object *commit;
741 struct got_object_id *id;
743 if (sigint_received || sigpipe_received)
746 err = got_commit_graph_iter_next(&id, graph);
748 if (err->code == GOT_ERR_ITER_COMPLETED) {
752 if (err->code != GOT_ERR_ITER_NEED_MORE)
754 err = got_commit_graph_fetch_commits(graph, 1, repo);
763 err = got_object_open_as_commit(&commit, repo, id);
766 err = print_commit(commit, id, repo, show_patch, diff_context,
768 got_object_commit_close(commit);
769 if (err || (limit && --limit == 0))
773 got_commit_graph_close(graph);
780 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
781 "[-r repository-path] [path]\n", getprogname());
785 static const struct got_error *
786 cmd_log(int argc, char *argv[])
788 const struct got_error *error;
789 struct got_repository *repo = NULL;
790 struct got_worktree *worktree = NULL;
791 struct got_commit_object *commit = NULL;
792 struct got_object_id *id = NULL;
793 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
794 char *start_commit = NULL;
795 int diff_context = 3, ch;
796 int show_patch = 0, limit = 0, first_parent_traversal = 0;
798 struct got_reflist_head refs;
803 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
809 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
815 start_commit = optarg;
818 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
821 err(1, "-C option %s", errstr);
824 limit = strtonum(optarg, 1, INT_MAX, &errstr);
826 err(1, "-l option %s", errstr);
829 first_parent_traversal = 1;
832 repo_path = realpath(optarg, NULL);
833 if (repo_path == NULL)
845 cwd = getcwd(NULL, 0);
847 error = got_error_from_errno();
851 error = got_worktree_open(&worktree, cwd);
852 if (error && error->code != GOT_ERR_NOT_WORKTREE)
859 error = got_error_from_errno();
862 } else if (argc == 1) {
864 error = got_worktree_resolve_path(&path, worktree,
869 path = strdup(argv[0]);
871 error = got_error_from_errno();
878 repo_path = worktree ?
879 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
880 if (repo_path == NULL) {
881 error = got_error_from_errno();
885 error = got_repo_open(&repo, repo_path);
889 error = apply_unveil(got_repo_get_path(repo), 1,
890 worktree ? got_worktree_get_root_path(worktree) : NULL);
894 if (start_commit == NULL) {
895 struct got_reference *head_ref;
896 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
899 error = got_ref_resolve(&id, repo, head_ref);
900 got_ref_close(head_ref);
903 error = got_object_open_as_commit(&commit, repo, id);
905 struct got_reference *ref;
906 error = got_ref_open(&ref, repo, start_commit);
909 error = got_ref_resolve(&id, repo, ref);
913 error = got_object_get_type(&obj_type, repo, id);
916 if (obj_type == GOT_OBJ_TYPE_TAG) {
917 struct got_tag_object *tag;
918 error = got_object_open_as_tag(&tag, repo, id);
921 if (got_object_tag_get_object_type(tag) !=
922 GOT_OBJ_TYPE_COMMIT) {
923 got_object_tag_close(tag);
924 error = got_error(GOT_ERR_OBJ_TYPE);
928 id = got_object_id_dup(
929 got_object_tag_get_object_id(tag));
931 error = got_error_from_errno();
932 got_object_tag_close(tag);
935 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
936 error = got_error(GOT_ERR_OBJ_TYPE);
939 error = got_object_open_as_commit(&commit, repo, id);
943 if (commit == NULL) {
944 error = got_object_resolve_id_str(&id, repo,
953 error = got_repo_map_path(&in_repo_path, repo, path, 1);
961 error = got_ref_list(&refs, repo);
965 error = print_commits(id, repo, path, show_patch,
966 diff_context, limit, first_parent_traversal, &refs);
973 got_worktree_close(worktree);
975 const struct got_error *repo_error;
976 repo_error = got_repo_close(repo);
980 got_ref_list_free(&refs);
987 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
988 "[object1 object2 | path]\n", getprogname());
992 struct print_diff_arg {
993 struct got_repository *repo;
994 struct got_worktree *worktree;
1000 static const struct got_error *
1001 print_diff(void *arg, unsigned char status, const char *path,
1002 struct got_object_id *id)
1004 struct print_diff_arg *a = arg;
1005 const struct got_error *err = NULL;
1006 struct got_blob_object *blob1 = NULL;
1008 char *abspath = NULL;
1011 if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1012 status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1015 if (!a->header_shown) {
1016 printf("diff %s %s\n", a->id_str,
1017 got_worktree_get_root_path(a->worktree));
1018 a->header_shown = 1;
1021 if (status != GOT_STATUS_ADD) {
1022 err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
1028 if (status != GOT_STATUS_DELETE) {
1029 if (asprintf(&abspath, "%s/%s",
1030 got_worktree_get_root_path(a->worktree), path) == -1) {
1031 err = got_error_from_errno();
1035 f2 = fopen(abspath, "r");
1037 err = got_error_from_errno();
1040 if (lstat(abspath, &sb) == -1) {
1041 err = got_error_from_errno();
1047 err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1051 got_object_blob_close(blob1);
1052 if (f2 && fclose(f2) != 0 && err == NULL)
1053 err = got_error_from_errno();
1058 static const struct got_error *
1059 cmd_diff(int argc, char *argv[])
1061 const struct got_error *error;
1062 struct got_repository *repo = NULL;
1063 struct got_worktree *worktree = NULL;
1064 char *cwd = NULL, *repo_path = NULL;
1065 struct got_object_id *id1 = NULL, *id2 = NULL;
1066 char *id_str1 = NULL, *id_str2 = NULL;
1068 int diff_context = 3, ch;
1073 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1078 while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1081 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1083 err(1, "-C option %s", errstr);
1086 repo_path = realpath(optarg, NULL);
1087 if (repo_path == NULL)
1088 err(1, "-r option");
1099 cwd = getcwd(NULL, 0);
1101 error = got_error_from_errno();
1104 error = got_worktree_open(&worktree, cwd);
1105 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1108 if (worktree == NULL) {
1109 error = got_error(GOT_ERR_NOT_WORKTREE);
1114 "-r option can't be used when diffing a work tree");
1115 repo_path = strdup(got_worktree_get_repo_path(worktree));
1116 if (repo_path == NULL) {
1117 error = got_error_from_errno();
1121 error = got_worktree_resolve_path(&path, worktree,
1128 error = got_error_from_errno();
1132 } else if (argc == 2) {
1138 if (repo_path == NULL) {
1139 repo_path = getcwd(NULL, 0);
1140 if (repo_path == NULL)
1141 return got_error_from_errno();
1144 error = got_repo_open(&repo, repo_path);
1149 error = apply_unveil(got_repo_get_path(repo), 1,
1150 worktree ? got_worktree_get_root_path(worktree) : NULL);
1155 struct print_diff_arg arg;
1157 error = got_object_id_str(&id_str,
1158 got_worktree_get_base_commit_id(worktree));
1162 arg.worktree = worktree;
1163 arg.diff_context = diff_context;
1164 arg.id_str = id_str;
1165 arg.header_shown = 0;
1167 error = got_worktree_status(worktree, path, repo, print_diff,
1168 &arg, check_cancelled, NULL);
1173 error = got_object_resolve_id_str(&id1, repo, id_str1);
1177 error = got_object_resolve_id_str(&id2, repo, id_str2);
1181 error = got_object_get_type(&type1, repo, id1);
1185 error = got_object_get_type(&type2, repo, id2);
1189 if (type1 != type2) {
1190 error = got_error(GOT_ERR_OBJ_TYPE);
1195 case GOT_OBJ_TYPE_BLOB:
1196 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1197 diff_context, repo, stdout);
1199 case GOT_OBJ_TYPE_TREE:
1200 error = got_diff_objects_as_trees(id1, id2, "", "",
1201 diff_context, repo, stdout);
1203 case GOT_OBJ_TYPE_COMMIT:
1204 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1206 error = got_diff_objects_as_commits(id1, id2, diff_context,
1210 error = got_error(GOT_ERR_OBJ_TYPE);
1218 got_worktree_close(worktree);
1220 const struct got_error *repo_error;
1221 repo_error = got_repo_close(repo);
1232 "usage: %s blame [-c commit] [-r repository-path] path\n",
1237 static const struct got_error *
1238 cmd_blame(int argc, char *argv[])
1240 const struct got_error *error;
1241 struct got_repository *repo = NULL;
1242 struct got_worktree *worktree = NULL;
1243 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1244 struct got_object_id *commit_id = NULL;
1245 char *commit_id_str = NULL;
1249 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1254 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1257 commit_id_str = optarg;
1260 repo_path = realpath(optarg, NULL);
1261 if (repo_path == NULL)
1262 err(1, "-r option");
1278 cwd = getcwd(NULL, 0);
1280 error = got_error_from_errno();
1283 if (repo_path == NULL) {
1284 error = got_worktree_open(&worktree, cwd);
1285 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1291 strdup(got_worktree_get_repo_path(worktree));
1292 if (repo_path == NULL)
1293 error = got_error_from_errno();
1297 repo_path = strdup(cwd);
1298 if (repo_path == NULL) {
1299 error = got_error_from_errno();
1305 error = got_repo_open(&repo, repo_path);
1309 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
1314 const char *prefix = got_worktree_get_path_prefix(worktree);
1315 char *p, *worktree_subdir = cwd +
1316 strlen(got_worktree_get_root_path(worktree));
1317 if (asprintf(&p, "%s%s%s%s%s",
1318 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1319 worktree_subdir, worktree_subdir[0] ? "/" : "",
1321 error = got_error_from_errno();
1324 error = got_repo_map_path(&in_repo_path, repo, p, 0);
1327 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1332 if (commit_id_str == NULL) {
1333 struct got_reference *head_ref;
1334 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1337 error = got_ref_resolve(&commit_id, repo, head_ref);
1338 got_ref_close(head_ref);
1342 error = got_object_resolve_id_str(&commit_id, repo,
1348 error = got_blame(in_repo_path, commit_id, repo, stdout);
1355 got_worktree_close(worktree);
1357 const struct got_error *repo_error;
1358 repo_error = got_repo_close(repo);
1369 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1375 print_entry(struct got_tree_entry *te, const char *id, const char *path,
1376 const char *root_path)
1378 int is_root_path = (strcmp(path, root_path) == 0);
1380 path += strlen(root_path);
1381 while (path[0] == '/')
1384 printf("%s%s%s%s%s\n", id ? id : "", path,
1385 is_root_path ? "" : "/", te->name,
1386 S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1389 static const struct got_error *
1390 print_tree(const char *path, struct got_object_id *commit_id,
1391 int show_ids, int recurse, const char *root_path,
1392 struct got_repository *repo)
1394 const struct got_error *err = NULL;
1395 struct got_object_id *tree_id = NULL;
1396 struct got_tree_object *tree = NULL;
1397 const struct got_tree_entries *entries;
1398 struct got_tree_entry *te;
1400 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1404 err = got_object_open_as_tree(&tree, repo, tree_id);
1407 entries = got_object_tree_get_entries(tree);
1408 te = SIMPLEQ_FIRST(&entries->head);
1412 if (sigint_received || sigpipe_received)
1417 err = got_object_id_str(&id_str, te->id);
1420 if (asprintf(&id, "%s ", id_str) == -1) {
1421 err = got_error_from_errno();
1427 print_entry(te, id, path, root_path);
1430 if (recurse && S_ISDIR(te->mode)) {
1432 if (asprintf(&child_path, "%s%s%s", path,
1433 path[0] == '/' && path[1] == '\0' ? "" : "/",
1435 err = got_error_from_errno();
1438 err = print_tree(child_path, commit_id, show_ids, 1,
1445 te = SIMPLEQ_NEXT(te, entry);
1449 got_object_tree_close(tree);
1454 static const struct got_error *
1455 cmd_tree(int argc, char *argv[])
1457 const struct got_error *error;
1458 struct got_repository *repo = NULL;
1459 struct got_worktree *worktree = NULL;
1461 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1462 struct got_object_id *commit_id = NULL;
1463 char *commit_id_str = NULL;
1464 int show_ids = 0, recurse = 0;
1468 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1473 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1476 commit_id_str = optarg;
1479 repo_path = realpath(optarg, NULL);
1480 if (repo_path == NULL)
1481 err(1, "-r option");
1505 cwd = getcwd(NULL, 0);
1507 error = got_error_from_errno();
1510 if (repo_path == NULL) {
1511 error = got_worktree_open(&worktree, cwd);
1512 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1518 strdup(got_worktree_get_repo_path(worktree));
1519 if (repo_path == NULL)
1520 error = got_error_from_errno();
1524 repo_path = strdup(cwd);
1525 if (repo_path == NULL) {
1526 error = got_error_from_errno();
1532 error = got_repo_open(&repo, repo_path);
1536 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
1542 char *p, *worktree_subdir = cwd +
1543 strlen(got_worktree_get_root_path(worktree));
1544 if (asprintf(&p, "%s/%s",
1545 got_worktree_get_path_prefix(worktree),
1546 worktree_subdir) == -1) {
1547 error = got_error_from_errno();
1550 error = got_repo_map_path(&in_repo_path, repo, p, 1);
1557 if (in_repo_path == NULL) {
1558 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1563 if (commit_id_str == NULL) {
1564 struct got_reference *head_ref;
1565 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1568 error = got_ref_resolve(&commit_id, repo, head_ref);
1569 got_ref_close(head_ref);
1573 error = got_object_resolve_id_str(&commit_id, repo,
1579 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1580 in_repo_path, repo);
1587 got_worktree_close(worktree);
1589 const struct got_error *repo_error;
1590 repo_error = got_repo_close(repo);
1600 fprintf(stderr, "usage: %s status [path]\n", getprogname());
1604 static const struct got_error *
1605 print_status(void *arg, unsigned char status, const char *path,
1606 struct got_object_id *id)
1608 printf("%c %s\n", status, path);
1612 static const struct got_error *
1613 cmd_status(int argc, char *argv[])
1615 const struct got_error *error = NULL;
1616 struct got_repository *repo = NULL;
1617 struct got_worktree *worktree = NULL;
1618 char *cwd = NULL, *path = NULL;
1621 while ((ch = getopt(argc, argv, "")) != -1) {
1633 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1637 cwd = getcwd(NULL, 0);
1639 error = got_error_from_errno();
1643 error = got_worktree_open(&worktree, cwd);
1650 error = got_error_from_errno();
1653 } else if (argc == 1) {
1654 error = got_worktree_resolve_path(&path, worktree, argv[0]);
1660 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1664 error = apply_unveil(got_repo_get_path(repo), 1,
1665 got_worktree_get_root_path(worktree));
1669 error = got_worktree_status(worktree, path, repo, print_status, NULL,
1670 check_cancelled, NULL);
1681 "usage: %s ref [-r repository] -l | -d name | name object\n",
1686 static const struct got_error *
1687 list_refs(struct got_repository *repo)
1689 static const struct got_error *err = NULL;
1690 struct got_reflist_head refs;
1691 struct got_reflist_entry *re;
1693 SIMPLEQ_INIT(&refs);
1694 err = got_ref_list(&refs, repo);
1698 SIMPLEQ_FOREACH(re, &refs, entry) {
1700 refstr = got_ref_to_str(re->ref);
1702 return got_error_from_errno();
1703 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1707 got_ref_list_free(&refs);
1711 static const struct got_error *
1712 delete_ref(struct got_repository *repo, const char *refname)
1714 const struct got_error *err = NULL;
1715 struct got_reference *ref;
1717 err = got_ref_open(&ref, repo, refname);
1721 err = got_ref_delete(ref, repo);
1726 static const struct got_error *
1727 add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1729 const struct got_error *err = NULL;
1730 struct got_object_id *id;
1731 struct got_reference *ref = NULL;
1733 err = got_object_resolve_id_str(&id, repo, id_str);
1737 err = got_ref_alloc(&ref, refname, id);
1741 err = got_ref_write(ref, repo);
1749 static const struct got_error *
1750 cmd_ref(int argc, char *argv[])
1752 const struct got_error *error = NULL;
1753 struct got_repository *repo = NULL;
1754 struct got_worktree *worktree = NULL;
1755 char *cwd = NULL, *repo_path = NULL;
1756 int ch, do_list = 0;
1757 const char *delref = NULL;
1759 /* TODO: Add -s option for adding symbolic references. */
1760 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1766 repo_path = realpath(optarg, NULL);
1767 if (repo_path == NULL)
1768 err(1, "-r option");
1779 if (do_list && delref)
1780 errx(1, "-l and -d options are mutually exclusive\n");
1785 if (do_list || delref) {
1788 } else if (argc != 2)
1793 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1797 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1798 "sendfd unveil", NULL) == -1)
1802 cwd = getcwd(NULL, 0);
1804 error = got_error_from_errno();
1808 if (repo_path == NULL) {
1809 error = got_worktree_open(&worktree, cwd);
1810 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1816 strdup(got_worktree_get_repo_path(worktree));
1817 if (repo_path == NULL)
1818 error = got_error_from_errno();
1822 repo_path = strdup(cwd);
1823 if (repo_path == NULL) {
1824 error = got_error_from_errno();
1830 error = got_repo_open(&repo, repo_path);
1834 error = apply_unveil(got_repo_get_path(repo), do_list,
1835 worktree ? got_worktree_get_root_path(worktree) : NULL);
1840 error = list_refs(repo);
1842 error = delete_ref(repo, delref);
1844 error = add_ref(repo, argv[0], argv[1]);
1847 got_repo_close(repo);
1849 got_worktree_close(worktree);
1858 fprintf(stderr, "usage: %s add file-path\n", getprogname());
1862 static const struct got_error *
1863 cmd_add(int argc, char *argv[])
1865 const struct got_error *error = NULL;
1866 struct got_repository *repo = NULL;
1867 struct got_worktree *worktree = NULL;
1868 char *cwd = NULL, *path = NULL, *relpath = NULL;
1871 while ((ch = getopt(argc, argv, "")) != -1) {
1885 path = realpath(argv[0], NULL);
1887 error = got_error_from_errno();
1891 cwd = getcwd(NULL, 0);
1893 error = got_error_from_errno();
1896 error = got_worktree_open(&worktree, cwd);
1900 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1904 error = apply_unveil(got_repo_get_path(repo), 1,
1905 got_worktree_get_root_path(worktree));
1909 error = got_worktree_schedule_add(worktree, path, print_status, NULL,
1915 got_repo_close(repo);
1917 got_worktree_close(worktree);
1927 fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
1931 static const struct got_error *
1932 cmd_rm(int argc, char *argv[])
1934 const struct got_error *error = NULL;
1935 struct got_worktree *worktree = NULL;
1936 struct got_repository *repo = NULL;
1937 char *cwd = NULL, *path = NULL;
1938 int ch, delete_local_mods = 0;
1940 while ((ch = getopt(argc, argv, "f")) != -1) {
1943 delete_local_mods = 1;
1957 path = realpath(argv[0], NULL);
1959 error = got_error_from_errno();
1963 cwd = getcwd(NULL, 0);
1965 error = got_error_from_errno();
1968 error = got_worktree_open(&worktree, cwd);
1972 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1976 error = apply_unveil(got_repo_get_path(repo), 1,
1977 got_worktree_get_root_path(worktree));
1981 error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
1982 print_status, NULL, repo);
1987 got_repo_close(repo);
1989 got_worktree_close(worktree);
1998 fprintf(stderr, "usage: %s revert file-path\n", getprogname());
2003 revert_progress(void *arg, unsigned char status, const char *path)
2005 while (path[0] == '/')
2007 printf("%c %s\n", status, path);
2010 static const struct got_error *
2011 cmd_revert(int argc, char *argv[])
2013 const struct got_error *error = NULL;
2014 struct got_worktree *worktree = NULL;
2015 struct got_repository *repo = NULL;
2016 char *cwd = NULL, *path = NULL;
2019 while ((ch = getopt(argc, argv, "")) != -1) {
2033 path = realpath(argv[0], NULL);
2035 error = got_error_from_errno();
2039 cwd = getcwd(NULL, 0);
2041 error = got_error_from_errno();
2044 error = got_worktree_open(&worktree, cwd);
2048 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2052 error = apply_unveil(got_repo_get_path(repo), 1,
2053 got_worktree_get_root_path(worktree));
2057 error = got_worktree_revert(worktree, path,
2058 revert_progress, NULL, repo);
2063 got_repo_close(repo);
2065 got_worktree_close(worktree);