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);
81 static const struct got_error* cmd_checkout(int, char *[]);
82 static const struct got_error* cmd_update(int, char *[]);
83 static const struct got_error* cmd_log(int, char *[]);
84 static const struct got_error* cmd_diff(int, char *[]);
85 static const struct got_error* cmd_blame(int, char *[]);
86 static const struct got_error* cmd_tree(int, char *[]);
87 static const struct got_error* cmd_status(int, char *[]);
88 static const struct got_error* cmd_ref(int, char *[]);
90 static struct cmd got_commands[] = {
91 { "checkout", cmd_checkout, usage_checkout,
92 "check out a new work tree from a repository" },
93 { "update", cmd_update, usage_update,
94 "update a work tree to a different commit" },
95 { "log", cmd_log, usage_log,
96 "show repository history" },
97 { "diff", cmd_diff, usage_diff,
98 "compare files and directories" },
99 { "blame", cmd_blame, usage_blame,
100 " show when lines in a file were changed" },
101 { "tree", cmd_tree, usage_tree,
102 " list files and directories in repository" },
103 { "status", cmd_status, usage_status,
104 "show modification status of files" },
105 { "ref", cmd_ref, usage_ref,
106 "manage references in repository" },
110 main(int argc, char *argv[])
117 setlocale(LC_CTYPE, "");
119 while ((ch = getopt(argc, argv, "h")) != -1) {
137 signal(SIGINT, catch_sigint);
138 signal(SIGPIPE, catch_sigpipe);
140 for (i = 0; i < nitems(got_commands); i++) {
141 const struct got_error *error;
143 cmd = &got_commands[i];
145 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
149 got_commands[i].cmd_usage();
151 error = got_commands[i].cmd_main(argc, argv);
152 if (error && !(sigint_received || sigpipe_received)) {
153 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
160 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
169 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
170 "Available commands:\n", getprogname());
171 for (i = 0; i < nitems(got_commands); i++) {
172 struct cmd *cmd = &got_commands[i];
173 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
178 static const struct got_error *
179 apply_unveil(const char *repo_path, int repo_read_only,
180 const char *worktree_path)
182 const struct got_error *error;
184 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
185 return got_error_from_errno();
187 if (worktree_path && unveil(worktree_path, "rwc") != 0)
188 return got_error_from_errno();
190 if (unveil("/tmp", "rwc") != 0)
191 return got_error_from_errno();
193 error = got_privsep_unveil_exec_helpers();
197 if (unveil(NULL, NULL) != 0)
198 return got_error_from_errno();
206 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
207 "[worktree-path]\n", getprogname());
212 checkout_progress(void *arg, unsigned char status, const char *path)
214 char *worktree_path = arg;
216 while (path[0] == '/')
219 printf("%c %s/%s\n", status, worktree_path, path);
222 static const struct got_error *
223 check_cancelled(void *arg)
225 if (sigint_received || sigpipe_received)
226 return got_error(GOT_ERR_CANCELLED);
230 static const struct got_error *
231 check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
232 struct got_repository *repo)
234 const struct got_error *err;
235 struct got_reference *head_ref = NULL;
236 struct got_object_id *head_commit_id = NULL;
237 struct got_commit_graph *graph = NULL;
239 head_ref = got_worktree_get_head_ref(worktree);
240 if (head_ref == NULL)
241 return got_error_from_errno();
243 /* TODO: Check the reflog. The head ref may have been rebased. */
244 err = got_ref_resolve(&head_commit_id, repo, head_ref);
248 err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
252 err = got_commit_graph_iter_start(graph, head_commit_id, repo);
256 struct got_object_id *id;
258 if (sigint_received || sigpipe_received)
261 err = got_commit_graph_iter_next(&id, graph);
263 if (err->code == GOT_ERR_ITER_COMPLETED) {
264 err = got_error(GOT_ERR_ANCESTRY);
267 if (err->code != GOT_ERR_ITER_NEED_MORE)
269 err = got_commit_graph_fetch_commits(graph, 1, repo);
277 if (got_object_id_cmp(id, commit_id) == 0)
282 got_ref_close(head_ref);
284 got_commit_graph_close(graph);
289 static const struct got_error *
290 cmd_checkout(int argc, char *argv[])
292 const struct got_error *error = NULL;
293 struct got_repository *repo = NULL;
294 struct got_reference *head_ref = NULL;
295 struct got_worktree *worktree = NULL;
296 char *repo_path = NULL;
297 char *worktree_path = NULL;
298 const char *path_prefix = "";
299 char *commit_id_str = NULL;
300 int ch, same_path_prefix;
302 while ((ch = getopt(argc, argv, "c:p:")) != -1) {
305 commit_id_str = strdup(optarg);
306 if (commit_id_str == NULL)
307 return got_error_from_errno();
310 path_prefix = optarg;
322 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
323 "unveil", NULL) == -1)
327 char *cwd, *base, *dotgit;
328 repo_path = realpath(argv[0], NULL);
329 if (repo_path == NULL)
330 return got_error_from_errno();
331 cwd = getcwd(NULL, 0);
333 error = got_error_from_errno();
337 base = basename(path_prefix);
339 base = basename(repo_path);
341 error = got_error_from_errno();
344 dotgit = strstr(base, ".git");
347 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
348 error = got_error_from_errno();
353 } else if (argc == 2) {
354 repo_path = realpath(argv[0], NULL);
355 if (repo_path == NULL) {
356 error = got_error_from_errno();
359 worktree_path = realpath(argv[1], NULL);
360 if (worktree_path == NULL) {
361 error = got_error_from_errno();
367 error = apply_unveil(repo_path, 0, worktree_path);
371 error = got_repo_open(&repo, repo_path);
375 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
379 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
380 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
383 error = got_worktree_open(&worktree, worktree_path);
387 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
391 if (!same_path_prefix) {
392 error = got_error(GOT_ERR_PATH_PREFIX);
397 struct got_object_id *commit_id;
398 error = got_object_resolve_id_str(&commit_id, repo,
402 error = check_ancestry(worktree, commit_id, repo);
407 error = got_worktree_set_base_commit_id(worktree, repo,
414 error = got_worktree_checkout_files(worktree, repo,
415 checkout_progress, worktree_path, check_cancelled, NULL);
419 printf("Now shut up and hack\n");
431 fprintf(stderr, "usage: %s update [-c commit] [worktree-path]\n",
437 update_progress(void *arg, unsigned char status, const char *path)
439 int *did_something = arg;
441 if (status == GOT_STATUS_EXISTS)
445 while (path[0] == '/')
447 printf("%c %s\n", status, path);
450 static const struct got_error *
451 cmd_update(int argc, char *argv[])
453 const struct got_error *error = NULL;
454 struct got_repository *repo = NULL;
455 struct got_worktree *worktree = NULL;
456 char *worktree_path = NULL;
457 struct got_object_id *commit_id = NULL;
458 char *commit_id_str = NULL;
459 int ch, did_something = 0;
461 while ((ch = getopt(argc, argv, "c:")) != -1) {
464 commit_id_str = strdup(optarg);
465 if (commit_id_str == NULL)
466 return got_error_from_errno();
478 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
479 "unveil", NULL) == -1)
483 worktree_path = getcwd(NULL, 0);
484 if (worktree_path == NULL) {
485 error = got_error_from_errno();
488 } else if (argc == 1) {
489 worktree_path = realpath(argv[0], NULL);
490 if (worktree_path == NULL) {
491 error = got_error_from_errno();
497 error = got_worktree_open(&worktree, worktree_path);
501 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
505 error = apply_unveil(got_repo_get_path(repo), 1,
506 got_worktree_get_root_path(worktree));
510 if (commit_id_str == NULL) {
511 struct got_reference *head_ref;
512 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
515 error = got_ref_resolve(&commit_id, repo, head_ref);
518 error = got_object_id_str(&commit_id_str, commit_id);
522 error = got_object_resolve_id_str(&commit_id, repo,
528 error = check_ancestry(worktree, commit_id, repo);
532 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
534 error = got_worktree_set_base_commit_id(worktree, repo,
540 error = got_worktree_checkout_files(worktree, repo,
541 update_progress, &did_something, check_cancelled, NULL);
546 printf("Updated to commit %s\n", commit_id_str);
548 printf("Already up-to-date\n");
556 static const struct got_error *
557 print_patch(struct got_commit_object *commit, struct got_object_id *id,
558 int diff_context, struct got_repository *repo)
560 const struct got_error *err = NULL;
561 struct got_tree_object *tree1 = NULL, *tree2;
562 struct got_object_qid *qid;
563 char *id_str1 = NULL, *id_str2;
565 err = got_object_open_as_tree(&tree2, repo,
566 got_object_commit_get_tree_id(commit));
570 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
572 struct got_commit_object *pcommit;
574 err = got_object_open_as_commit(&pcommit, repo, qid->id);
578 err = got_object_open_as_tree(&tree1, repo,
579 got_object_commit_get_tree_id(pcommit));
580 got_object_commit_close(pcommit);
584 err = got_object_id_str(&id_str1, qid->id);
589 err = got_object_id_str(&id_str2, id);
593 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
594 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
597 got_object_tree_close(tree1);
598 got_object_tree_close(tree2);
605 get_datestr(time_t *time, char *datebuf)
607 char *p, *s = ctime_r(time, datebuf);
614 static const struct got_error *
615 print_commit(struct got_commit_object *commit, struct got_object_id *id,
616 struct got_repository *repo, int show_patch, int diff_context,
617 struct got_reflist_head *refs)
619 const struct got_error *err = NULL;
620 char *id_str, *datestr, *logmsg0, *logmsg, *line;
622 time_t committer_time;
623 const char *author, *committer;
624 char *refs_str = NULL;
625 struct got_reflist_entry *re;
627 SIMPLEQ_FOREACH(re, refs, entry) {
630 if (got_object_id_cmp(re->id, id) != 0)
632 name = got_ref_get_name(re->ref);
633 if (strcmp(name, GOT_REF_HEAD) == 0)
635 if (strncmp(name, "refs/", 5) == 0)
637 if (strncmp(name, "heads/", 6) == 0)
639 if (strncmp(name, "remotes/", 8) == 0)
642 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
644 err = got_error_from_errno();
650 err = got_object_id_str(&id_str, id);
654 printf("-----------------------------------------------\n");
655 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
656 refs_str ? refs_str : "", refs_str ? ")" : "");
661 printf("from: %s\n", got_object_commit_get_author(commit));
662 committer_time = got_object_commit_get_committer_time(commit);
663 datestr = get_datestr(&committer_time, datebuf);
664 printf("date: %s UTC\n", datestr);
665 author = got_object_commit_get_author(commit);
666 committer = got_object_commit_get_committer(commit);
667 if (strcmp(author, committer) != 0)
668 printf("via: %s\n", committer);
669 if (got_object_commit_get_nparents(commit) > 1) {
670 const struct got_object_id_queue *parent_ids;
671 struct got_object_qid *qid;
673 parent_ids = got_object_commit_get_parent_ids(commit);
674 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
675 err = got_object_id_str(&id_str, qid->id);
678 printf("parent %d: %s\n", n++, id_str);
683 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
685 return got_error_from_errno();
689 line = strsep(&logmsg, "\n");
691 printf(" %s\n", line);
696 err = print_patch(commit, id, diff_context, repo);
701 if (fflush(stdout) != 0 && err == NULL)
702 err = got_error_from_errno();
706 static const struct got_error *
707 print_commits(struct got_object_id *root_id, struct got_repository *repo,
708 char *path, int show_patch, int diff_context, int limit,
709 int first_parent_traversal, struct got_reflist_head *refs)
711 const struct got_error *err;
712 struct got_commit_graph *graph;
714 err = got_commit_graph_open(&graph, root_id, path,
715 first_parent_traversal, repo);
718 err = got_commit_graph_iter_start(graph, root_id, repo);
722 struct got_commit_object *commit;
723 struct got_object_id *id;
725 if (sigint_received || sigpipe_received)
728 err = got_commit_graph_iter_next(&id, graph);
730 if (err->code == GOT_ERR_ITER_COMPLETED) {
734 if (err->code != GOT_ERR_ITER_NEED_MORE)
736 err = got_commit_graph_fetch_commits(graph, 1, repo);
745 err = got_object_open_as_commit(&commit, repo, id);
748 err = print_commit(commit, id, repo, show_patch, diff_context,
750 got_object_commit_close(commit);
751 if (err || (limit && --limit == 0))
755 got_commit_graph_close(graph);
762 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
763 "[-r repository-path] [path]\n", getprogname());
767 static const struct got_error *
768 cmd_log(int argc, char *argv[])
770 const struct got_error *error;
771 struct got_repository *repo = NULL;
772 struct got_worktree *worktree = NULL;
773 struct got_commit_object *commit = NULL;
774 struct got_object_id *id = NULL;
775 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
776 char *start_commit = NULL;
777 int diff_context = 3, ch;
778 int show_patch = 0, limit = 0, first_parent_traversal = 0;
780 struct got_reflist_head refs;
783 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
789 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
795 start_commit = optarg;
798 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
801 err(1, "-C option %s", errstr);
804 limit = strtonum(optarg, 1, INT_MAX, &errstr);
806 err(1, "-l option %s", errstr);
809 first_parent_traversal = 1;
812 repo_path = realpath(optarg, NULL);
813 if (repo_path == NULL)
828 path = strdup(argv[0]);
832 return got_error_from_errno();
834 cwd = getcwd(NULL, 0);
836 error = got_error_from_errno();
840 error = got_worktree_open(&worktree, cwd);
841 if (error && error->code != GOT_ERR_NOT_WORKTREE)
845 repo_path = worktree ?
846 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
847 if (repo_path == NULL) {
848 error = got_error_from_errno();
852 error = apply_unveil(repo_path, 1,
853 worktree ? got_worktree_get_root_path(worktree) : NULL);
857 error = got_repo_open(&repo, repo_path);
861 if (start_commit == NULL) {
862 struct got_reference *head_ref;
863 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
866 error = got_ref_resolve(&id, repo, head_ref);
867 got_ref_close(head_ref);
870 error = got_object_open_as_commit(&commit, repo, id);
872 struct got_reference *ref;
873 error = got_ref_open(&ref, repo, start_commit);
876 error = got_ref_resolve(&id, repo, ref);
880 error = got_object_get_type(&obj_type, repo, id);
883 if (obj_type == GOT_OBJ_TYPE_TAG) {
884 struct got_tag_object *tag;
885 error = got_object_open_as_tag(&tag, repo, id);
888 if (got_object_tag_get_object_type(tag) !=
889 GOT_OBJ_TYPE_COMMIT) {
890 got_object_tag_close(tag);
891 error = got_error(GOT_ERR_OBJ_TYPE);
895 id = got_object_id_dup(
896 got_object_tag_get_object_id(tag));
898 error = got_error_from_errno();
899 got_object_tag_close(tag);
902 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
903 error = got_error(GOT_ERR_OBJ_TYPE);
906 error = got_object_open_as_commit(&commit, repo, id);
910 if (commit == NULL) {
911 error = got_object_resolve_id_str(&id, repo,
920 error = got_repo_map_path(&in_repo_path, repo, path, 1);
929 error = got_ref_list(&refs, repo);
933 error = print_commits(id, repo, path, show_patch,
934 diff_context, limit, first_parent_traversal, &refs);
941 got_worktree_close(worktree);
943 const struct got_error *repo_error;
944 repo_error = got_repo_close(repo);
948 got_ref_list_free(&refs);
955 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
956 "[object1 object2 | path]\n", getprogname());
960 struct print_diff_arg {
961 struct got_repository *repo;
962 struct got_worktree *worktree;
968 static const struct got_error *
969 print_diff(void *arg, unsigned char status, const char *path,
970 struct got_object_id *id)
972 struct print_diff_arg *a = arg;
973 const struct got_error *err = NULL;
974 struct got_blob_object *blob1 = NULL;
976 char *abspath = NULL;
979 if (status != GOT_STATUS_MODIFY)
982 if (!a->header_shown) {
983 printf("diff %s %s\n", a->id_str,
984 got_worktree_get_root_path(a->worktree));
988 err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
992 if (asprintf(&abspath, "%s/%s",
993 got_worktree_get_root_path(a->worktree), path) == -1) {
994 err = got_error_from_errno();
998 f2 = fopen(abspath, "r");
1000 err = got_error_from_errno();
1003 if (lstat(abspath, &sb) == -1) {
1004 err = got_error_from_errno();
1008 err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1012 got_object_blob_close(blob1);
1013 if (f2 && fclose(f2) != 0 && err == NULL)
1014 err = got_error_from_errno();
1019 static const struct got_error *
1020 get_status_path(char **status_path, struct got_worktree *worktree,
1023 const struct got_error *err = NULL;
1024 char *resolved, *path = NULL;
1027 *status_path = NULL;
1029 resolved = realpath(arg, NULL);
1030 if (resolved == NULL)
1031 return got_error_from_errno();
1033 if (strncmp(got_worktree_get_root_path(worktree), resolved,
1034 strlen(got_worktree_get_root_path(worktree)))) {
1035 err = got_error(GOT_ERR_BAD_PATH);
1039 path = strdup(resolved + strlen(got_worktree_get_root_path(worktree)));
1041 err = got_error_from_errno();
1045 /* XXX status walk can't deal with trailing slash! */
1047 while (path[len - 1] == '/') {
1048 path[len - 1] = '\0';
1054 *status_path = path;
1060 static const struct got_error *
1061 cmd_diff(int argc, char *argv[])
1063 const struct got_error *error;
1064 struct got_repository *repo = NULL;
1065 struct got_worktree *worktree = NULL;
1066 char *cwd = NULL, *repo_path = NULL;
1067 struct got_object_id *id1 = NULL, *id2 = NULL;
1068 char *id_str1 = NULL, *id_str2 = NULL;
1070 int diff_context = 3, ch;
1075 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1080 while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1083 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1085 err(1, "-C option %s", errstr);
1088 repo_path = realpath(optarg, NULL);
1089 if (repo_path == NULL)
1090 err(1, "-r option");
1101 cwd = getcwd(NULL, 0);
1103 error = got_error_from_errno();
1106 error = got_worktree_open(&worktree, cwd);
1107 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1110 if (worktree == NULL) {
1111 error = got_error(GOT_ERR_NOT_WORKTREE);
1116 "-r option can't be used when diffing a work tree");
1117 repo_path = strdup(got_worktree_get_repo_path(worktree));
1118 if (repo_path == NULL) {
1119 error = got_error_from_errno();
1123 error = get_status_path(&path, worktree, argv[0]);
1129 error = got_error_from_errno();
1133 } else if (argc == 2) {
1139 if (repo_path == NULL) {
1140 repo_path = getcwd(NULL, 0);
1141 if (repo_path == NULL)
1142 return got_error_from_errno();
1145 error = apply_unveil(repo_path, 1,
1146 worktree ? got_worktree_get_root_path(worktree) : NULL);
1150 error = got_repo_open(&repo, repo_path);
1156 struct print_diff_arg arg;
1158 error = got_object_id_str(&id_str,
1159 got_worktree_get_base_commit_id(worktree));
1163 arg.worktree = worktree;
1164 arg.diff_context = diff_context;
1165 arg.id_str = id_str;
1166 arg.header_shown = 0;
1168 error = got_worktree_status(worktree, path, repo, print_diff,
1169 &arg, check_cancelled, NULL);
1174 error = got_object_resolve_id_str(&id1, repo, id_str1);
1178 error = got_object_resolve_id_str(&id2, repo, id_str2);
1182 error = got_object_get_type(&type1, repo, id1);
1186 error = got_object_get_type(&type2, repo, id2);
1190 if (type1 != type2) {
1191 error = got_error(GOT_ERR_OBJ_TYPE);
1196 case GOT_OBJ_TYPE_BLOB:
1197 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1198 diff_context, repo, stdout);
1200 case GOT_OBJ_TYPE_TREE:
1201 error = got_diff_objects_as_trees(id1, id2, "", "",
1202 diff_context, repo, stdout);
1204 case GOT_OBJ_TYPE_COMMIT:
1205 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1207 error = got_diff_objects_as_commits(id1, id2, diff_context,
1211 error = got_error(GOT_ERR_OBJ_TYPE);
1219 got_worktree_close(worktree);
1221 const struct got_error *repo_error;
1222 repo_error = got_repo_close(repo);
1233 "usage: %s blame [-c commit] [-r repository-path] path\n",
1238 static const struct got_error *
1239 cmd_blame(int argc, char *argv[])
1241 const struct got_error *error;
1242 struct got_repository *repo = NULL;
1243 struct got_worktree *worktree = NULL;
1244 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1245 struct got_object_id *commit_id = NULL;
1246 char *commit_id_str = NULL;
1250 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1255 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1258 commit_id_str = optarg;
1261 repo_path = realpath(optarg, NULL);
1262 if (repo_path == NULL)
1263 err(1, "-r option");
1279 cwd = getcwd(NULL, 0);
1281 error = got_error_from_errno();
1284 if (repo_path == NULL) {
1285 error = got_worktree_open(&worktree, cwd);
1286 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1292 strdup(got_worktree_get_repo_path(worktree));
1293 if (repo_path == NULL)
1294 error = got_error_from_errno();
1298 repo_path = strdup(cwd);
1299 if (repo_path == NULL) {
1300 error = got_error_from_errno();
1306 error = apply_unveil(repo_path, 1, NULL);
1310 error = got_repo_open(&repo, repo_path);
1315 const char *prefix = got_worktree_get_path_prefix(worktree);
1316 char *p, *worktree_subdir = cwd +
1317 strlen(got_worktree_get_root_path(worktree));
1318 if (asprintf(&p, "%s%s%s%s%s",
1319 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1320 worktree_subdir, worktree_subdir[0] ? "/" : "",
1322 error = got_error_from_errno();
1325 error = got_repo_map_path(&in_repo_path, repo, p, 0);
1328 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1333 if (commit_id_str == NULL) {
1334 struct got_reference *head_ref;
1335 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1338 error = got_ref_resolve(&commit_id, repo, head_ref);
1339 got_ref_close(head_ref);
1343 error = got_object_resolve_id_str(&commit_id, repo,
1349 error = got_blame(in_repo_path, commit_id, repo, stdout);
1356 got_worktree_close(worktree);
1358 const struct got_error *repo_error;
1359 repo_error = got_repo_close(repo);
1370 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1376 print_entry(struct got_tree_entry *te, const char *id, const char *path,
1377 const char *root_path)
1379 int is_root_path = (strcmp(path, root_path) == 0);
1381 path += strlen(root_path);
1382 while (path[0] == '/')
1385 printf("%s%s%s%s%s\n", id ? id : "", path,
1386 is_root_path ? "" : "/", te->name,
1387 S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
1390 static const struct got_error *
1391 print_tree(const char *path, struct got_object_id *commit_id,
1392 int show_ids, int recurse, const char *root_path,
1393 struct got_repository *repo)
1395 const struct got_error *err = NULL;
1396 struct got_object_id *tree_id = NULL;
1397 struct got_tree_object *tree = NULL;
1398 const struct got_tree_entries *entries;
1399 struct got_tree_entry *te;
1401 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1405 err = got_object_open_as_tree(&tree, repo, tree_id);
1408 entries = got_object_tree_get_entries(tree);
1409 te = SIMPLEQ_FIRST(&entries->head);
1413 if (sigint_received || sigpipe_received)
1418 err = got_object_id_str(&id_str, te->id);
1421 if (asprintf(&id, "%s ", id_str) == -1) {
1422 err = got_error_from_errno();
1428 print_entry(te, id, path, root_path);
1431 if (recurse && S_ISDIR(te->mode)) {
1433 if (asprintf(&child_path, "%s%s%s", path,
1434 path[0] == '/' && path[1] == '\0' ? "" : "/",
1436 err = got_error_from_errno();
1439 err = print_tree(child_path, commit_id, show_ids, 1,
1446 te = SIMPLEQ_NEXT(te, entry);
1450 got_object_tree_close(tree);
1455 static const struct got_error *
1456 cmd_tree(int argc, char *argv[])
1458 const struct got_error *error;
1459 struct got_repository *repo = NULL;
1460 struct got_worktree *worktree = NULL;
1462 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1463 struct got_object_id *commit_id = NULL;
1464 char *commit_id_str = NULL;
1465 int show_ids = 0, recurse = 0;
1469 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1474 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1477 commit_id_str = optarg;
1480 repo_path = realpath(optarg, NULL);
1481 if (repo_path == NULL)
1482 err(1, "-r option");
1506 cwd = getcwd(NULL, 0);
1508 error = got_error_from_errno();
1511 if (repo_path == NULL) {
1512 error = got_worktree_open(&worktree, cwd);
1513 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1519 strdup(got_worktree_get_repo_path(worktree));
1520 if (repo_path == NULL)
1521 error = got_error_from_errno();
1525 repo_path = strdup(cwd);
1526 if (repo_path == NULL) {
1527 error = got_error_from_errno();
1533 error = apply_unveil(repo_path, 1, NULL);
1537 error = got_repo_open(&repo, repo_path);
1543 char *p, *worktree_subdir = cwd +
1544 strlen(got_worktree_get_root_path(worktree));
1545 if (asprintf(&p, "%s/%s",
1546 got_worktree_get_path_prefix(worktree),
1547 worktree_subdir) == -1) {
1548 error = got_error_from_errno();
1551 error = got_repo_map_path(&in_repo_path, repo, p, 1);
1558 if (in_repo_path == NULL) {
1559 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1564 if (commit_id_str == NULL) {
1565 struct got_reference *head_ref;
1566 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1569 error = got_ref_resolve(&commit_id, repo, head_ref);
1570 got_ref_close(head_ref);
1574 error = got_object_resolve_id_str(&commit_id, repo,
1580 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1581 in_repo_path, repo);
1588 got_worktree_close(worktree);
1590 const struct got_error *repo_error;
1591 repo_error = got_repo_close(repo);
1601 fprintf(stderr, "usage: %s status [path]\n", getprogname());
1605 static const struct got_error *
1606 print_status(void *arg, unsigned char status, const char *path,
1607 struct got_object_id *id)
1609 printf("%c %s\n", status, path);
1613 static const struct got_error *
1614 cmd_status(int argc, char *argv[])
1616 const struct got_error *error = NULL;
1617 struct got_repository *repo = NULL;
1618 struct got_worktree *worktree = NULL;
1619 char *cwd = NULL, *path = NULL;
1622 while ((ch = getopt(argc, argv, "")) != -1) {
1634 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1638 cwd = getcwd(NULL, 0);
1640 error = got_error_from_errno();
1644 error = got_worktree_open(&worktree, cwd);
1651 error = got_error_from_errno();
1654 } else if (argc == 1) {
1655 error = get_status_path(&path, worktree, argv[0]);
1661 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1665 error = apply_unveil(got_repo_get_path(repo), 1,
1666 got_worktree_get_root_path(worktree));
1670 error = got_worktree_status(worktree, path, repo, print_status, NULL,
1671 check_cancelled, NULL);
1682 "usage: %s ref [-r repository] -l | -d name | name object\n",
1687 static const struct got_error *
1688 list_refs(struct got_repository *repo)
1690 static const struct got_error *err = NULL;
1691 struct got_reflist_head refs;
1692 struct got_reflist_entry *re;
1694 SIMPLEQ_INIT(&refs);
1695 err = got_ref_list(&refs, repo);
1699 SIMPLEQ_FOREACH(re, &refs, entry) {
1701 refstr = got_ref_to_str(re->ref);
1703 return got_error_from_errno();
1704 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
1708 got_ref_list_free(&refs);
1712 static const struct got_error *
1713 delete_ref(struct got_repository *repo, const char *refname)
1715 const struct got_error *err = NULL;
1716 struct got_reference *ref;
1718 err = got_ref_open(&ref, repo, refname);
1722 err = got_ref_delete(ref, repo);
1727 static const struct got_error *
1728 add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1730 const struct got_error *err = NULL;
1731 struct got_object_id *id;
1732 struct got_reference *ref = NULL;
1734 err = got_object_resolve_id_str(&id, repo, id_str);
1738 err = got_ref_alloc(&ref, refname, id);
1742 err = got_ref_write(ref, repo);
1750 static const struct got_error *
1751 cmd_ref(int argc, char *argv[])
1753 const struct got_error *error = NULL;
1754 struct got_repository *repo = NULL;
1755 struct got_worktree *worktree = NULL;
1756 char *cwd = NULL, *repo_path = NULL;
1757 int ch, do_list = 0;
1758 const char *delref = NULL;
1760 /* TODO: Add -s option for adding symbolic references. */
1761 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1767 repo_path = realpath(optarg, NULL);
1768 if (repo_path == NULL)
1769 err(1, "-r option");
1780 if (do_list && delref)
1781 errx(1, "-l and -d options are mutually exclusive\n");
1786 if (do_list || delref) {
1789 } else if (argc != 2)
1793 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1794 "unveil", NULL) == -1)
1797 cwd = getcwd(NULL, 0);
1799 error = got_error_from_errno();
1803 if (repo_path == NULL) {
1804 error = got_worktree_open(&worktree, cwd);
1805 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1811 strdup(got_worktree_get_repo_path(worktree));
1812 if (repo_path == NULL)
1813 error = got_error_from_errno();
1817 repo_path = strdup(cwd);
1818 if (repo_path == NULL) {
1819 error = got_error_from_errno();
1825 error = apply_unveil(repo_path, do_list,
1826 worktree ? got_worktree_get_root_path(worktree) : NULL);
1830 error = got_repo_open(&repo, repo_path);
1835 error = list_refs(repo);
1837 error = delete_ref(repo, delref);
1839 error = add_ref(repo, argv[0], argv[1]);
1842 got_repo_close(repo);
1844 got_worktree_close(worktree);