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 = apply_unveil(repo_path, 0, worktree_path);
383 error = got_repo_open(&repo, repo_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] [worktree-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;
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)
495 worktree_path = getcwd(NULL, 0);
496 if (worktree_path == NULL) {
497 error = got_error_from_errno();
500 } else if (argc == 1) {
501 worktree_path = realpath(argv[0], NULL);
502 if (worktree_path == NULL) {
503 error = got_error_from_errno();
509 error = got_worktree_open(&worktree, worktree_path);
513 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
517 error = apply_unveil(got_repo_get_path(repo), 0,
518 got_worktree_get_root_path(worktree));
522 if (commit_id_str == NULL) {
523 struct got_reference *head_ref;
524 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
527 error = got_ref_resolve(&commit_id, repo, head_ref);
530 error = got_object_id_str(&commit_id_str, commit_id);
534 error = got_object_resolve_id_str(&commit_id, repo,
540 error = check_ancestry(worktree, commit_id, repo);
544 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
546 error = got_worktree_set_base_commit_id(worktree, repo,
552 error = got_worktree_checkout_files(worktree, repo,
553 update_progress, &did_something, check_cancelled, NULL);
558 printf("Updated to commit %s\n", commit_id_str);
560 printf("Already up-to-date\n");
568 static const struct got_error *
569 print_patch(struct got_commit_object *commit, struct got_object_id *id,
570 int diff_context, struct got_repository *repo)
572 const struct got_error *err = NULL;
573 struct got_tree_object *tree1 = NULL, *tree2;
574 struct got_object_qid *qid;
575 char *id_str1 = NULL, *id_str2;
577 err = got_object_open_as_tree(&tree2, repo,
578 got_object_commit_get_tree_id(commit));
582 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
584 struct got_commit_object *pcommit;
586 err = got_object_open_as_commit(&pcommit, repo, qid->id);
590 err = got_object_open_as_tree(&tree1, repo,
591 got_object_commit_get_tree_id(pcommit));
592 got_object_commit_close(pcommit);
596 err = got_object_id_str(&id_str1, qid->id);
601 err = got_object_id_str(&id_str2, id);
605 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
606 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
609 got_object_tree_close(tree1);
610 got_object_tree_close(tree2);
617 get_datestr(time_t *time, char *datebuf)
619 char *p, *s = ctime_r(time, datebuf);
626 static const struct got_error *
627 print_commit(struct got_commit_object *commit, struct got_object_id *id,
628 struct got_repository *repo, int show_patch, int diff_context,
629 struct got_reflist_head *refs)
631 const struct got_error *err = NULL;
632 char *id_str, *datestr, *logmsg0, *logmsg, *line;
634 time_t committer_time;
635 const char *author, *committer;
636 char *refs_str = NULL;
637 struct got_reflist_entry *re;
639 SIMPLEQ_FOREACH(re, refs, entry) {
642 if (got_object_id_cmp(re->id, id) != 0)
644 name = got_ref_get_name(re->ref);
645 if (strcmp(name, GOT_REF_HEAD) == 0)
647 if (strncmp(name, "refs/", 5) == 0)
649 if (strncmp(name, "got/", 4) == 0)
651 if (strncmp(name, "heads/", 6) == 0)
653 if (strncmp(name, "remotes/", 8) == 0)
656 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
658 err = got_error_from_errno();
664 err = got_object_id_str(&id_str, id);
668 printf("-----------------------------------------------\n");
669 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
670 refs_str ? refs_str : "", refs_str ? ")" : "");
675 printf("from: %s\n", got_object_commit_get_author(commit));
676 committer_time = got_object_commit_get_committer_time(commit);
677 datestr = get_datestr(&committer_time, datebuf);
678 printf("date: %s UTC\n", datestr);
679 author = got_object_commit_get_author(commit);
680 committer = got_object_commit_get_committer(commit);
681 if (strcmp(author, committer) != 0)
682 printf("via: %s\n", committer);
683 if (got_object_commit_get_nparents(commit) > 1) {
684 const struct got_object_id_queue *parent_ids;
685 struct got_object_qid *qid;
687 parent_ids = got_object_commit_get_parent_ids(commit);
688 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
689 err = got_object_id_str(&id_str, qid->id);
692 printf("parent %d: %s\n", n++, id_str);
697 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
699 return got_error_from_errno();
703 line = strsep(&logmsg, "\n");
705 printf(" %s\n", line);
710 err = print_patch(commit, id, diff_context, repo);
715 if (fflush(stdout) != 0 && err == NULL)
716 err = got_error_from_errno();
720 static const struct got_error *
721 print_commits(struct got_object_id *root_id, struct got_repository *repo,
722 char *path, int show_patch, int diff_context, int limit,
723 int first_parent_traversal, struct got_reflist_head *refs)
725 const struct got_error *err;
726 struct got_commit_graph *graph;
728 err = got_commit_graph_open(&graph, root_id, path,
729 first_parent_traversal, repo);
732 err = got_commit_graph_iter_start(graph, root_id, repo);
736 struct got_commit_object *commit;
737 struct got_object_id *id;
739 if (sigint_received || sigpipe_received)
742 err = got_commit_graph_iter_next(&id, graph);
744 if (err->code == GOT_ERR_ITER_COMPLETED) {
748 if (err->code != GOT_ERR_ITER_NEED_MORE)
750 err = got_commit_graph_fetch_commits(graph, 1, repo);
759 err = got_object_open_as_commit(&commit, repo, id);
762 err = print_commit(commit, id, repo, show_patch, diff_context,
764 got_object_commit_close(commit);
765 if (err || (limit && --limit == 0))
769 got_commit_graph_close(graph);
776 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
777 "[-r repository-path] [path]\n", getprogname());
781 static const struct got_error *
782 cmd_log(int argc, char *argv[])
784 const struct got_error *error;
785 struct got_repository *repo = NULL;
786 struct got_worktree *worktree = NULL;
787 struct got_commit_object *commit = NULL;
788 struct got_object_id *id = NULL;
789 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
790 char *start_commit = NULL;
791 int diff_context = 3, ch;
792 int show_patch = 0, limit = 0, first_parent_traversal = 0;
794 struct got_reflist_head refs;
799 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
805 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
811 start_commit = optarg;
814 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
817 err(1, "-C option %s", errstr);
820 limit = strtonum(optarg, 1, INT_MAX, &errstr);
822 err(1, "-l option %s", errstr);
825 first_parent_traversal = 1;
828 repo_path = realpath(optarg, NULL);
829 if (repo_path == NULL)
841 cwd = getcwd(NULL, 0);
843 error = got_error_from_errno();
847 error = got_worktree_open(&worktree, cwd);
848 if (error && error->code != GOT_ERR_NOT_WORKTREE)
855 error = got_error_from_errno();
858 } else if (argc == 1) {
860 error = got_worktree_resolve_path(&path, worktree,
865 path = strdup(argv[0]);
867 error = got_error_from_errno();
874 repo_path = worktree ?
875 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
876 if (repo_path == NULL) {
877 error = got_error_from_errno();
881 error = apply_unveil(repo_path, 1,
882 worktree ? got_worktree_get_root_path(worktree) : NULL);
886 error = got_repo_open(&repo, repo_path);
890 if (start_commit == NULL) {
891 struct got_reference *head_ref;
892 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
895 error = got_ref_resolve(&id, repo, head_ref);
896 got_ref_close(head_ref);
899 error = got_object_open_as_commit(&commit, repo, id);
901 struct got_reference *ref;
902 error = got_ref_open(&ref, repo, start_commit);
905 error = got_ref_resolve(&id, repo, ref);
909 error = got_object_get_type(&obj_type, repo, id);
912 if (obj_type == GOT_OBJ_TYPE_TAG) {
913 struct got_tag_object *tag;
914 error = got_object_open_as_tag(&tag, repo, id);
917 if (got_object_tag_get_object_type(tag) !=
918 GOT_OBJ_TYPE_COMMIT) {
919 got_object_tag_close(tag);
920 error = got_error(GOT_ERR_OBJ_TYPE);
924 id = got_object_id_dup(
925 got_object_tag_get_object_id(tag));
927 error = got_error_from_errno();
928 got_object_tag_close(tag);
931 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
932 error = got_error(GOT_ERR_OBJ_TYPE);
935 error = got_object_open_as_commit(&commit, repo, id);
939 if (commit == NULL) {
940 error = got_object_resolve_id_str(&id, repo,
949 error = got_repo_map_path(&in_repo_path, repo, path, 1);
957 error = got_ref_list(&refs, repo);
961 error = print_commits(id, repo, path, show_patch,
962 diff_context, limit, first_parent_traversal, &refs);
969 got_worktree_close(worktree);
971 const struct got_error *repo_error;
972 repo_error = got_repo_close(repo);
976 got_ref_list_free(&refs);
983 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
984 "[object1 object2 | path]\n", getprogname());
988 struct print_diff_arg {
989 struct got_repository *repo;
990 struct got_worktree *worktree;
996 static const struct got_error *
997 print_diff(void *arg, unsigned char status, const char *path,
998 struct got_object_id *id)
1000 struct print_diff_arg *a = arg;
1001 const struct got_error *err = NULL;
1002 struct got_blob_object *blob1 = NULL;
1004 char *abspath = NULL;
1007 if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1008 status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1011 if (!a->header_shown) {
1012 printf("diff %s %s\n", a->id_str,
1013 got_worktree_get_root_path(a->worktree));
1014 a->header_shown = 1;
1017 if (status != GOT_STATUS_ADD) {
1018 err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
1024 if (status != GOT_STATUS_DELETE) {
1025 if (asprintf(&abspath, "%s/%s",
1026 got_worktree_get_root_path(a->worktree), path) == -1) {
1027 err = got_error_from_errno();
1031 f2 = fopen(abspath, "r");
1033 err = got_error_from_errno();
1036 if (lstat(abspath, &sb) == -1) {
1037 err = got_error_from_errno();
1043 err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1047 got_object_blob_close(blob1);
1048 if (f2 && fclose(f2) != 0 && err == NULL)
1049 err = got_error_from_errno();
1054 static const struct got_error *
1055 cmd_diff(int argc, char *argv[])
1057 const struct got_error *error;
1058 struct got_repository *repo = NULL;
1059 struct got_worktree *worktree = NULL;
1060 char *cwd = NULL, *repo_path = NULL;
1061 struct got_object_id *id1 = NULL, *id2 = NULL;
1062 char *id_str1 = NULL, *id_str2 = NULL;
1064 int diff_context = 3, ch;
1069 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1074 while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1077 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1079 err(1, "-C option %s", errstr);
1082 repo_path = realpath(optarg, NULL);
1083 if (repo_path == NULL)
1084 err(1, "-r option");
1095 cwd = getcwd(NULL, 0);
1097 error = got_error_from_errno();
1100 error = got_worktree_open(&worktree, cwd);
1101 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1104 if (worktree == NULL) {
1105 error = got_error(GOT_ERR_NOT_WORKTREE);
1110 "-r option can't be used when diffing a work tree");
1111 repo_path = strdup(got_worktree_get_repo_path(worktree));
1112 if (repo_path == NULL) {
1113 error = got_error_from_errno();
1117 error = got_worktree_resolve_path(&path, worktree,
1124 error = got_error_from_errno();
1128 } else if (argc == 2) {
1134 if (repo_path == NULL) {
1135 repo_path = getcwd(NULL, 0);
1136 if (repo_path == NULL)
1137 return got_error_from_errno();
1140 error = apply_unveil(repo_path, 1,
1141 worktree ? got_worktree_get_root_path(worktree) : NULL);
1145 error = got_repo_open(&repo, repo_path);
1151 struct print_diff_arg arg;
1153 error = got_object_id_str(&id_str,
1154 got_worktree_get_base_commit_id(worktree));
1158 arg.worktree = worktree;
1159 arg.diff_context = diff_context;
1160 arg.id_str = id_str;
1161 arg.header_shown = 0;
1163 error = got_worktree_status(worktree, path, repo, print_diff,
1164 &arg, check_cancelled, NULL);
1169 error = got_object_resolve_id_str(&id1, repo, id_str1);
1173 error = got_object_resolve_id_str(&id2, repo, id_str2);
1177 error = got_object_get_type(&type1, repo, id1);
1181 error = got_object_get_type(&type2, repo, id2);
1185 if (type1 != type2) {
1186 error = got_error(GOT_ERR_OBJ_TYPE);
1191 case GOT_OBJ_TYPE_BLOB:
1192 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1193 diff_context, repo, stdout);
1195 case GOT_OBJ_TYPE_TREE:
1196 error = got_diff_objects_as_trees(id1, id2, "", "",
1197 diff_context, repo, stdout);
1199 case GOT_OBJ_TYPE_COMMIT:
1200 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1202 error = got_diff_objects_as_commits(id1, id2, diff_context,
1206 error = got_error(GOT_ERR_OBJ_TYPE);
1214 got_worktree_close(worktree);
1216 const struct got_error *repo_error;
1217 repo_error = got_repo_close(repo);
1228 "usage: %s blame [-c commit] [-r repository-path] path\n",
1233 static const struct got_error *
1234 cmd_blame(int argc, char *argv[])
1236 const struct got_error *error;
1237 struct got_repository *repo = NULL;
1238 struct got_worktree *worktree = NULL;
1239 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1240 struct got_object_id *commit_id = NULL;
1241 char *commit_id_str = NULL;
1245 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1250 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1253 commit_id_str = optarg;
1256 repo_path = realpath(optarg, NULL);
1257 if (repo_path == NULL)
1258 err(1, "-r option");
1274 cwd = getcwd(NULL, 0);
1276 error = got_error_from_errno();
1279 if (repo_path == NULL) {
1280 error = got_worktree_open(&worktree, cwd);
1281 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1287 strdup(got_worktree_get_repo_path(worktree));
1288 if (repo_path == NULL)
1289 error = got_error_from_errno();
1293 repo_path = strdup(cwd);
1294 if (repo_path == NULL) {
1295 error = got_error_from_errno();
1301 error = apply_unveil(repo_path, 1, NULL);
1305 error = got_repo_open(&repo, repo_path);
1310 const char *prefix = got_worktree_get_path_prefix(worktree);
1311 char *p, *worktree_subdir = cwd +
1312 strlen(got_worktree_get_root_path(worktree));
1313 if (asprintf(&p, "%s%s%s%s%s",
1314 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1315 worktree_subdir, worktree_subdir[0] ? "/" : "",
1317 error = got_error_from_errno();
1320 error = got_repo_map_path(&in_repo_path, repo, p, 0);
1323 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1328 if (commit_id_str == NULL) {
1329 struct got_reference *head_ref;
1330 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1333 error = got_ref_resolve(&commit_id, repo, head_ref);
1334 got_ref_close(head_ref);
1338 error = got_object_resolve_id_str(&commit_id, repo,
1344 error = got_blame(in_repo_path, commit_id, repo, stdout);
1351 got_worktree_close(worktree);
1353 const struct got_error *repo_error;
1354 repo_error = got_repo_close(repo);
1365 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1371 print_entry(struct got_tree_entry *te, const char *id, const char *path,
1372 const char *root_path)
1374 int is_root_path = (strcmp(path, root_path) == 0);
1376 path += strlen(root_path);
1377 while (path[0] == '/')
1380 printf("%s%s%s%s%s\n", id ? id : "", path,
1381 is_root_path ? "" : "/", te->name,
1382 S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1385 static const struct got_error *
1386 print_tree(const char *path, struct got_object_id *commit_id,
1387 int show_ids, int recurse, const char *root_path,
1388 struct got_repository *repo)
1390 const struct got_error *err = NULL;
1391 struct got_object_id *tree_id = NULL;
1392 struct got_tree_object *tree = NULL;
1393 const struct got_tree_entries *entries;
1394 struct got_tree_entry *te;
1396 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1400 err = got_object_open_as_tree(&tree, repo, tree_id);
1403 entries = got_object_tree_get_entries(tree);
1404 te = SIMPLEQ_FIRST(&entries->head);
1408 if (sigint_received || sigpipe_received)
1413 err = got_object_id_str(&id_str, te->id);
1416 if (asprintf(&id, "%s ", id_str) == -1) {
1417 err = got_error_from_errno();
1423 print_entry(te, id, path, root_path);
1426 if (recurse && S_ISDIR(te->mode)) {
1428 if (asprintf(&child_path, "%s%s%s", path,
1429 path[0] == '/' && path[1] == '\0' ? "" : "/",
1431 err = got_error_from_errno();
1434 err = print_tree(child_path, commit_id, show_ids, 1,
1441 te = SIMPLEQ_NEXT(te, entry);
1445 got_object_tree_close(tree);
1450 static const struct got_error *
1451 cmd_tree(int argc, char *argv[])
1453 const struct got_error *error;
1454 struct got_repository *repo = NULL;
1455 struct got_worktree *worktree = NULL;
1457 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1458 struct got_object_id *commit_id = NULL;
1459 char *commit_id_str = NULL;
1460 int show_ids = 0, recurse = 0;
1464 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1469 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1472 commit_id_str = optarg;
1475 repo_path = realpath(optarg, NULL);
1476 if (repo_path == NULL)
1477 err(1, "-r option");
1501 cwd = getcwd(NULL, 0);
1503 error = got_error_from_errno();
1506 if (repo_path == NULL) {
1507 error = got_worktree_open(&worktree, cwd);
1508 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1514 strdup(got_worktree_get_repo_path(worktree));
1515 if (repo_path == NULL)
1516 error = got_error_from_errno();
1520 repo_path = strdup(cwd);
1521 if (repo_path == NULL) {
1522 error = got_error_from_errno();
1528 error = apply_unveil(repo_path, 1, NULL);
1532 error = got_repo_open(&repo, repo_path);
1538 char *p, *worktree_subdir = cwd +
1539 strlen(got_worktree_get_root_path(worktree));
1540 if (asprintf(&p, "%s/%s",
1541 got_worktree_get_path_prefix(worktree),
1542 worktree_subdir) == -1) {
1543 error = got_error_from_errno();
1546 error = got_repo_map_path(&in_repo_path, repo, p, 1);
1553 if (in_repo_path == NULL) {
1554 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1559 if (commit_id_str == NULL) {
1560 struct got_reference *head_ref;
1561 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1564 error = got_ref_resolve(&commit_id, repo, head_ref);
1565 got_ref_close(head_ref);
1569 error = got_object_resolve_id_str(&commit_id, repo,
1575 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1576 in_repo_path, repo);
1583 got_worktree_close(worktree);
1585 const struct got_error *repo_error;
1586 repo_error = got_repo_close(repo);
1596 fprintf(stderr, "usage: %s status [path]\n", getprogname());
1600 static const struct got_error *
1601 print_status(void *arg, unsigned char status, const char *path,
1602 struct got_object_id *id)
1604 printf("%c %s\n", status, path);
1608 static const struct got_error *
1609 cmd_status(int argc, char *argv[])
1611 const struct got_error *error = NULL;
1612 struct got_repository *repo = NULL;
1613 struct got_worktree *worktree = NULL;
1614 char *cwd = NULL, *path = NULL;
1617 while ((ch = getopt(argc, argv, "")) != -1) {
1629 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1633 cwd = getcwd(NULL, 0);
1635 error = got_error_from_errno();
1639 error = got_worktree_open(&worktree, cwd);
1646 error = got_error_from_errno();
1649 } else if (argc == 1) {
1650 error = got_worktree_resolve_path(&path, worktree, argv[0]);
1656 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1660 error = apply_unveil(got_repo_get_path(repo), 1,
1661 got_worktree_get_root_path(worktree));
1665 error = got_worktree_status(worktree, path, repo, print_status, NULL,
1666 check_cancelled, NULL);
1677 "usage: %s ref [-r repository] -l | -d name | name object\n",
1682 static const struct got_error *
1683 list_refs(struct got_repository *repo)
1685 static const struct got_error *err = NULL;
1686 struct got_reflist_head refs;
1687 struct got_reflist_entry *re;
1689 SIMPLEQ_INIT(&refs);
1690 err = got_ref_list(&refs, repo);
1694 SIMPLEQ_FOREACH(re, &refs, entry) {
1696 refstr = got_ref_to_str(re->ref);
1698 return got_error_from_errno();
1699 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1703 got_ref_list_free(&refs);
1707 static const struct got_error *
1708 delete_ref(struct got_repository *repo, const char *refname)
1710 const struct got_error *err = NULL;
1711 struct got_reference *ref;
1713 err = got_ref_open(&ref, repo, refname);
1717 err = got_ref_delete(ref, repo);
1722 static const struct got_error *
1723 add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1725 const struct got_error *err = NULL;
1726 struct got_object_id *id;
1727 struct got_reference *ref = NULL;
1729 err = got_object_resolve_id_str(&id, repo, id_str);
1733 err = got_ref_alloc(&ref, refname, id);
1737 err = got_ref_write(ref, repo);
1745 static const struct got_error *
1746 cmd_ref(int argc, char *argv[])
1748 const struct got_error *error = NULL;
1749 struct got_repository *repo = NULL;
1750 struct got_worktree *worktree = NULL;
1751 char *cwd = NULL, *repo_path = NULL;
1752 int ch, do_list = 0;
1753 const char *delref = NULL;
1755 /* TODO: Add -s option for adding symbolic references. */
1756 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1762 repo_path = realpath(optarg, NULL);
1763 if (repo_path == NULL)
1764 err(1, "-r option");
1775 if (do_list && delref)
1776 errx(1, "-l and -d options are mutually exclusive\n");
1781 if (do_list || delref) {
1784 } else if (argc != 2)
1789 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
1793 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1794 "sendfd unveil", NULL) == -1)
1798 cwd = getcwd(NULL, 0);
1800 error = got_error_from_errno();
1804 if (repo_path == NULL) {
1805 error = got_worktree_open(&worktree, cwd);
1806 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1812 strdup(got_worktree_get_repo_path(worktree));
1813 if (repo_path == NULL)
1814 error = got_error_from_errno();
1818 repo_path = strdup(cwd);
1819 if (repo_path == NULL) {
1820 error = got_error_from_errno();
1826 error = apply_unveil(repo_path, do_list,
1827 worktree ? got_worktree_get_root_path(worktree) : NULL);
1831 error = got_repo_open(&repo, repo_path);
1836 error = list_refs(repo);
1838 error = delete_ref(repo, delref);
1840 error = add_ref(repo, argv[0], argv[1]);
1843 got_repo_close(repo);
1845 got_worktree_close(worktree);
1854 fprintf(stderr, "usage: %s add file-path\n", getprogname());
1858 static const struct got_error *
1859 cmd_add(int argc, char *argv[])
1861 const struct got_error *error = NULL;
1862 struct got_repository *repo = NULL;
1863 struct got_worktree *worktree = NULL;
1864 char *cwd = NULL, *path = NULL, *relpath = NULL;
1867 while ((ch = getopt(argc, argv, "")) != -1) {
1881 path = realpath(argv[0], NULL);
1883 error = got_error_from_errno();
1887 cwd = getcwd(NULL, 0);
1889 error = got_error_from_errno();
1892 error = got_worktree_open(&worktree, cwd);
1896 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1900 error = apply_unveil(got_repo_get_path(repo), 1,
1901 got_worktree_get_root_path(worktree));
1905 error = got_worktree_schedule_add(worktree, path, print_status, NULL,
1911 got_repo_close(repo);
1913 got_worktree_close(worktree);
1923 fprintf(stderr, "usage: %s rm [-f] file-path\n", getprogname());
1927 static const struct got_error *
1928 cmd_rm(int argc, char *argv[])
1930 const struct got_error *error = NULL;
1931 struct got_worktree *worktree = NULL;
1932 struct got_repository *repo = NULL;
1933 char *cwd = NULL, *path = NULL;
1934 int ch, delete_local_mods = 0;
1936 while ((ch = getopt(argc, argv, "f")) != -1) {
1939 delete_local_mods = 1;
1953 path = realpath(argv[0], NULL);
1955 error = got_error_from_errno();
1959 cwd = getcwd(NULL, 0);
1961 error = got_error_from_errno();
1964 error = got_worktree_open(&worktree, cwd);
1968 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1972 error = apply_unveil(got_repo_get_path(repo), 1,
1973 got_worktree_get_root_path(worktree));
1977 error = got_worktree_schedule_delete(worktree, path, delete_local_mods,
1978 print_status, NULL, repo);
1983 got_repo_close(repo);
1985 got_worktree_close(worktree);
1994 fprintf(stderr, "usage: %s revert file-path\n", getprogname());
1999 revert_progress(void *arg, unsigned char status, const char *path)
2001 while (path[0] == '/')
2003 printf("%c %s\n", status, path);
2006 static const struct got_error *
2007 cmd_revert(int argc, char *argv[])
2009 const struct got_error *error = NULL;
2010 struct got_worktree *worktree = NULL;
2011 struct got_repository *repo = NULL;
2012 char *cwd = NULL, *path = NULL;
2015 while ((ch = getopt(argc, argv, "")) != -1) {
2029 path = realpath(argv[0], NULL);
2031 error = got_error_from_errno();
2035 cwd = getcwd(NULL, 0);
2037 error = got_error_from_errno();
2040 error = got_worktree_open(&worktree, cwd);
2044 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2048 error = apply_unveil(got_repo_get_path(repo), 1,
2049 got_worktree_get_root_path(worktree));
2053 error = got_worktree_revert(worktree, path,
2054 revert_progress, NULL, repo);
2059 got_repo_close(repo);
2061 got_worktree_close(worktree);