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, 1, 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);
954 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
955 "[object1 object2 | path]\n", getprogname());
959 struct print_diff_arg {
960 struct got_repository *repo;
961 struct got_worktree *worktree;
967 static const struct got_error *
968 print_diff(void *arg, unsigned char status, const char *path,
969 struct got_object_id *id)
971 struct print_diff_arg *a = arg;
972 const struct got_error *err = NULL;
973 struct got_blob_object *blob1 = NULL;
975 char *abspath = NULL;
978 if (status != GOT_STATUS_MODIFY)
981 if (!a->header_shown) {
982 printf("diff %s %s\n", a->id_str,
983 got_worktree_get_root_path(a->worktree));
987 err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
991 if (asprintf(&abspath, "%s/%s",
992 got_worktree_get_root_path(a->worktree), path) == -1) {
993 err = got_error_from_errno();
997 f2 = fopen(abspath, "r");
999 err = got_error_from_errno();
1002 if (lstat(abspath, &sb) == -1) {
1003 err = got_error_from_errno();
1007 err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1011 got_object_blob_close(blob1);
1012 if (f2 && fclose(f2) != 0 && err == NULL)
1013 err = got_error_from_errno();
1018 static const struct got_error *
1019 get_status_path(char **status_path, struct got_worktree *worktree,
1022 const struct got_error *err = NULL;
1023 char *resolved, *path = NULL;
1026 *status_path = NULL;
1028 resolved = realpath(arg, NULL);
1029 if (resolved == NULL)
1030 return got_error_from_errno();
1032 if (strncmp(got_worktree_get_root_path(worktree), resolved,
1033 strlen(got_worktree_get_root_path(worktree)))) {
1034 err = got_error(GOT_ERR_BAD_PATH);
1038 path = strdup(resolved + strlen(got_worktree_get_root_path(worktree)));
1040 err = got_error_from_errno();
1044 /* XXX status walk can't deal with trailing slash! */
1046 while (path[len - 1] == '/') {
1047 path[len - 1] = '\0';
1053 *status_path = path;
1059 static const struct got_error *
1060 cmd_diff(int argc, char *argv[])
1062 const struct got_error *error;
1063 struct got_repository *repo = NULL;
1064 struct got_worktree *worktree = NULL;
1065 char *cwd = NULL, *repo_path = NULL;
1066 struct got_object_id *id1 = NULL, *id2 = NULL;
1067 char *id_str1 = NULL, *id_str2 = NULL;
1069 int diff_context = 3, ch;
1074 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1079 while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1082 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1084 err(1, "-C option %s", errstr);
1087 repo_path = realpath(optarg, NULL);
1088 if (repo_path == NULL)
1089 err(1, "-r option");
1100 cwd = getcwd(NULL, 0);
1102 error = got_error_from_errno();
1105 error = got_worktree_open(&worktree, cwd);
1106 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1109 if (worktree == NULL) {
1110 error = got_error(GOT_ERR_NOT_WORKTREE);
1115 "-r option can't be used when diffing a work tree");
1116 repo_path = strdup(got_worktree_get_repo_path(worktree));
1117 if (repo_path == NULL) {
1118 error = got_error_from_errno();
1122 error = get_status_path(&path, worktree, argv[0]);
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 = apply_unveil(repo_path, 1,
1145 worktree ? got_worktree_get_root_path(worktree) : NULL);
1149 error = got_repo_open(&repo, repo_path);
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 = apply_unveil(repo_path, 1, NULL);
1309 error = got_repo_open(&repo, repo_path);
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 = apply_unveil(repo_path, 1, NULL);
1536 error = got_repo_open(&repo, repo_path);
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 = get_status_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);
1710 static const struct got_error *
1711 delete_ref(struct got_repository *repo, const char *refname)
1713 const struct got_error *err = NULL;
1714 struct got_reference *ref;
1716 err = got_ref_open(&ref, repo, refname);
1720 err = got_ref_delete(ref, repo);
1725 static const struct got_error *
1726 add_ref(struct got_repository *repo, const char *refname, const char *id_str)
1728 const struct got_error *err = NULL;
1729 struct got_object_id *id;
1730 struct got_reference *ref = NULL;
1732 err = got_object_resolve_id_str(&id, repo, id_str);
1736 err = got_ref_alloc(&ref, refname, id);
1740 err = got_ref_write(ref, repo);
1748 static const struct got_error *
1749 cmd_ref(int argc, char *argv[])
1751 const struct got_error *error = NULL;
1752 struct got_repository *repo = NULL;
1753 struct got_worktree *worktree = NULL;
1754 char *cwd = NULL, *repo_path = NULL;
1755 int ch, do_list = 0;
1756 const char *delref = NULL;
1758 /* TODO: Add -s option for adding symbolic references. */
1759 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
1765 repo_path = realpath(optarg, NULL);
1766 if (repo_path == NULL)
1767 err(1, "-r option");
1778 if (do_list && delref)
1779 errx(1, "-l and -d options are mutually exclusive\n");
1784 if (do_list || delref) {
1787 } else if (argc != 2)
1791 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1792 "unveil", NULL) == -1)
1795 cwd = getcwd(NULL, 0);
1797 error = got_error_from_errno();
1801 if (repo_path == NULL) {
1802 error = got_worktree_open(&worktree, cwd);
1803 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1809 strdup(got_worktree_get_repo_path(worktree));
1810 if (repo_path == NULL)
1811 error = got_error_from_errno();
1815 repo_path = strdup(cwd);
1816 if (repo_path == NULL) {
1817 error = got_error_from_errno();
1823 error = apply_unveil(repo_path, do_list,
1824 worktree ? got_worktree_get_root_path(worktree) : NULL);
1828 error = got_repo_open(&repo, repo_path);
1833 error = list_refs(repo);
1835 error = delete_ref(repo, delref);
1837 error = add_ref(repo, argv[0], argv[1]);
1840 got_repo_close(repo);
1842 got_worktree_close(worktree);