2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018 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"
44 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
47 static volatile sig_atomic_t sigint_received;
48 static volatile sig_atomic_t sigpipe_received;
51 catch_sigint(int signo)
57 catch_sigpipe(int signo)
65 const struct got_error *(*cmd_main)(int, char *[]);
66 void (*cmd_usage)(void);
67 const char *cmd_descr;
70 __dead static void usage(void);
71 __dead static void usage_checkout(void);
72 __dead static void usage_log(void);
73 __dead static void usage_diff(void);
74 __dead static void usage_blame(void);
75 __dead static void usage_tree(void);
77 static const struct got_error* cmd_checkout(int, char *[]);
78 static const struct got_error* cmd_log(int, char *[]);
79 static const struct got_error* cmd_diff(int, char *[]);
80 static const struct got_error* cmd_blame(int, char *[]);
81 static const struct got_error* cmd_tree(int, char *[]);
83 static const struct got_error* cmd_status(int, char *[]);
86 static struct cmd got_commands[] = {
87 { "checkout", cmd_checkout, usage_checkout,
88 "check out a new work tree from a repository" },
89 { "log", cmd_log, usage_log,
90 "show repository history" },
91 { "diff", cmd_diff, usage_diff,
92 "compare files and directories" },
93 { "blame", cmd_blame, usage_blame,
94 " show when lines in a file were changed" },
95 { "tree", cmd_tree, usage_tree,
96 " list files and directories in repository" },
98 { "status", cmd_status, usage_status,
99 "show modification status of files" },
104 main(int argc, char *argv[])
111 setlocale(LC_ALL, "");
113 while ((ch = getopt(argc, argv, "h")) != -1) {
131 signal(SIGINT, catch_sigint);
132 signal(SIGPIPE, catch_sigpipe);
134 for (i = 0; i < nitems(got_commands); i++) {
135 const struct got_error *error;
137 cmd = &got_commands[i];
139 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
143 got_commands[i].cmd_usage();
145 error = got_commands[i].cmd_main(argc, argv);
146 if (error && !(sigint_received || sigpipe_received)) {
147 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
154 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
163 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
164 "Available commands:\n", getprogname());
165 for (i = 0; i < nitems(got_commands); i++) {
166 struct cmd *cmd = &got_commands[i];
167 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
175 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
176 "[worktree-path]\n", getprogname());
181 checkout_progress(void *arg, unsigned char status, const char *path)
183 char *worktree_path = arg;
185 while (path[0] == '/')
188 printf("%c %s/%s\n", status, worktree_path, path);
191 static const struct got_error *
192 checkout_cancel(void *arg)
194 if (sigint_received || sigpipe_received)
195 return got_error(GOT_ERR_CANCELLED);
199 static const struct got_error *
200 cmd_checkout(int argc, char *argv[])
202 const struct got_error *error = NULL;
203 struct got_repository *repo = NULL;
204 struct got_reference *head_ref = NULL;
205 struct got_worktree *worktree = NULL;
206 char *repo_path = NULL;
207 char *worktree_path = NULL;
208 const char *path_prefix = "";
211 while ((ch = getopt(argc, argv, "p:")) != -1) {
214 path_prefix = optarg;
226 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
231 char *cwd, *base, *dotgit;
232 repo_path = realpath(argv[0], NULL);
233 if (repo_path == NULL)
234 return got_error_from_errno();
235 cwd = getcwd(NULL, 0);
237 error = got_error_from_errno();
241 base = basename(path_prefix);
243 base = basename(repo_path);
245 error = got_error_from_errno();
248 dotgit = strstr(base, ".git");
251 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
252 error = got_error_from_errno();
257 } else if (argc == 2) {
258 repo_path = realpath(argv[0], NULL);
259 if (repo_path == NULL) {
260 error = got_error_from_errno();
263 worktree_path = realpath(argv[1], NULL);
264 if (worktree_path == NULL) {
265 error = got_error_from_errno();
271 error = got_repo_open(&repo, repo_path);
274 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
278 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
279 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
282 error = got_worktree_open(&worktree, worktree_path);
286 if (strcmp(path_prefix, got_worktree_get_path_prefix(worktree)) != 0) {
287 error = got_error(GOT_ERR_PATH_PREFIX);
291 error = got_worktree_checkout_files(worktree, repo,
292 checkout_progress, worktree_path, checkout_cancel, NULL);
296 printf("Now shut up and hack\n");
304 static const struct got_error *
305 print_patch(struct got_commit_object *commit, struct got_object_id *id,
306 int diff_context, struct got_repository *repo)
308 const struct got_error *err = NULL;
309 struct got_tree_object *tree1 = NULL, *tree2;
310 struct got_object_qid *qid;
311 char *id_str1 = NULL, *id_str2;
313 err = got_object_open_as_tree(&tree2, repo,
314 got_object_commit_get_tree_id(commit));
318 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
320 struct got_commit_object *pcommit;
322 err = got_object_open_as_commit(&pcommit, repo, qid->id);
326 err = got_object_open_as_tree(&tree1, repo,
327 got_object_commit_get_tree_id(pcommit));
328 got_object_commit_close(pcommit);
332 err = got_object_id_str(&id_str1, qid->id);
337 err = got_object_id_str(&id_str2, id);
341 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
342 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
345 got_object_tree_close(tree1);
346 got_object_tree_close(tree2);
353 get_datestr(time_t *time, char *datebuf)
355 char *p, *s = ctime_r(time, datebuf);
362 static const struct got_error *
363 print_commit(struct got_commit_object *commit, struct got_object_id *id,
364 struct got_repository *repo, int show_patch, int diff_context)
366 const struct got_error *err = NULL;
367 char *id_str, *datestr, *logmsg0, *logmsg, *line;
369 time_t committer_time;
370 const char *author, *committer;
372 err = got_object_id_str(&id_str, id);
376 printf("-----------------------------------------------\n");
377 printf("commit %s\n", id_str);
379 printf("from: %s\n", got_object_commit_get_author(commit));
380 committer_time = got_object_commit_get_committer_time(commit);
381 datestr = get_datestr(&committer_time, datebuf);
382 printf("date: %s UTC\n", datestr);
383 author = got_object_commit_get_author(commit);
384 committer = got_object_commit_get_committer(commit);
385 if (strcmp(author, committer) != 0)
386 printf("via: %s\n", committer);
387 if (got_object_commit_get_nparents(commit) > 1) {
388 const struct got_object_id_queue *parent_ids;
389 struct got_object_qid *qid;
391 parent_ids = got_object_commit_get_parent_ids(commit);
392 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
393 err = got_object_id_str(&id_str, qid->id);
396 printf("parent %d: %s\n", n++, id_str);
401 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
403 return got_error_from_errno();
407 line = strsep(&logmsg, "\n");
409 printf(" %s\n", line);
414 err = print_patch(commit, id, diff_context, repo);
423 static const struct got_error *
424 print_commits(struct got_object_id *root_id, struct got_repository *repo,
425 char *path, int show_patch, int diff_context, int limit,
426 int first_parent_traversal)
428 const struct got_error *err;
429 struct got_commit_graph *graph;
431 err = got_commit_graph_open(&graph, root_id, path,
432 first_parent_traversal, repo);
435 err = got_commit_graph_iter_start(graph, root_id, repo);
439 struct got_commit_object *commit;
440 struct got_object_id *id;
442 if (sigint_received || sigpipe_received)
445 err = got_commit_graph_iter_next(&id, graph);
447 if (err->code == GOT_ERR_ITER_COMPLETED) {
451 if (err->code != GOT_ERR_ITER_NEED_MORE)
453 err = got_commit_graph_fetch_commits(graph, 1, repo);
462 err = got_object_open_as_commit(&commit, repo, id);
465 err = print_commit(commit, id, repo, show_patch, diff_context);
466 got_object_commit_close(commit);
467 if (err || (limit && --limit == 0))
471 got_commit_graph_close(graph);
478 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
479 "[-r repository-path] [path]\n", getprogname());
483 static const struct got_error *
484 cmd_log(int argc, char *argv[])
486 const struct got_error *error;
487 struct got_repository *repo = NULL;
488 struct got_commit_object *commit = NULL;
489 struct got_object_id *id = NULL;
490 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
491 char *start_commit = NULL;
492 int diff_context = 3, ch;
493 int show_patch = 0, limit = 0, first_parent_traversal = 0;
497 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
502 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
508 start_commit = optarg;
511 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
514 err(1, "-C option %s", errstr);
517 limit = strtonum(optarg, 1, INT_MAX, &errstr);
519 err(1, "-l option %s", errstr);
522 first_parent_traversal = 1;
525 repo_path = realpath(optarg, NULL);
526 if (repo_path == NULL)
541 path = strdup(argv[0]);
545 return got_error_from_errno();
547 cwd = getcwd(NULL, 0);
549 error = got_error_from_errno();
552 if (repo_path == NULL) {
553 repo_path = strdup(cwd);
554 if (repo_path == NULL) {
555 error = got_error_from_errno();
560 error = got_repo_open(&repo, repo_path);
564 if (start_commit == NULL) {
565 struct got_reference *head_ref;
566 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
569 error = got_ref_resolve(&id, repo, head_ref);
570 got_ref_close(head_ref);
573 error = got_object_open_as_commit(&commit, repo, id);
575 struct got_reference *ref;
576 error = got_ref_open(&ref, repo, start_commit);
578 error = got_ref_resolve(&id, repo, ref);
582 error = got_object_open_as_commit(&commit, repo, id);
586 if (commit == NULL) {
587 error = got_object_resolve_id_str(&id, repo,
596 error = got_repo_map_path(&in_repo_path, repo, path, 1);
604 error = print_commits(id, repo, path, show_patch,
605 diff_context, limit, first_parent_traversal);
612 const struct got_error *repo_error;
613 repo_error = got_repo_close(repo);
623 fprintf(stderr, "usage: %s diff [-C number] [repository-path] "
624 "object1 object2\n", getprogname());
628 static const struct got_error *
629 cmd_diff(int argc, char *argv[])
631 const struct got_error *error;
632 struct got_repository *repo = NULL;
633 char *repo_path = NULL;
634 struct got_object_id *id1 = NULL, *id2 = NULL;
635 char *id_str1 = NULL, *id_str2 = NULL;
637 int diff_context = 3, ch;
641 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
646 while ((ch = getopt(argc, argv, "C:")) != -1) {
649 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
651 err(1, "-C option %s", errstr);
663 usage_diff(); /* TODO show local worktree changes */
664 } else if (argc == 2) {
665 repo_path = getcwd(NULL, 0);
666 if (repo_path == NULL)
667 return got_error_from_errno();
670 } else if (argc == 3) {
671 repo_path = realpath(argv[0], NULL);
672 if (repo_path == NULL)
673 return got_error_from_errno();
679 error = got_repo_open(&repo, repo_path);
684 error = got_object_resolve_id_str(&id1, repo, id_str1);
688 error = got_object_resolve_id_str(&id2, repo, id_str2);
692 error = got_object_get_type(&type1, repo, id1);
696 error = got_object_get_type(&type2, repo, id2);
700 if (type1 != type2) {
701 error = got_error(GOT_ERR_OBJ_TYPE);
706 case GOT_OBJ_TYPE_BLOB:
707 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
708 diff_context, repo, stdout);
710 case GOT_OBJ_TYPE_TREE:
711 error = got_diff_objects_as_trees(id1, id2, "", "",
712 diff_context, repo, stdout);
714 case GOT_OBJ_TYPE_COMMIT:
715 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
717 error = got_diff_objects_as_commits(id1, id2, diff_context,
721 error = got_error(GOT_ERR_OBJ_TYPE);
728 const struct got_error *repo_error;
729 repo_error = got_repo_close(repo);
739 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
744 static const struct got_error *
745 cmd_blame(int argc, char *argv[])
747 const struct got_error *error;
748 struct got_repository *repo = NULL;
749 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
750 struct got_object_id *commit_id = NULL;
751 char *commit_id_str = NULL;
755 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
760 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
763 commit_id_str = optarg;
766 repo_path = realpath(optarg, NULL);
767 if (repo_path == NULL)
784 cwd = getcwd(NULL, 0);
786 error = got_error_from_errno();
789 if (repo_path == NULL) {
790 repo_path = strdup(cwd);
791 if (repo_path == NULL) {
792 error = got_error_from_errno();
797 error = got_repo_open(&repo, repo_path);
801 error = got_repo_map_path(&in_repo_path, repo, path, 1);
805 if (commit_id_str == NULL) {
806 struct got_reference *head_ref;
807 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
810 error = got_ref_resolve(&commit_id, repo, head_ref);
811 got_ref_close(head_ref);
815 error = got_object_resolve_id_str(&commit_id, repo,
821 error = got_blame(in_repo_path, commit_id, repo, stdout);
828 const struct got_error *repo_error;
829 repo_error = got_repo_close(repo);
839 fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [-i] path\n",
845 static const struct got_error *
846 print_tree(const char *path, struct got_object_id *commit_id,
847 int show_ids, struct got_repository *repo)
849 const struct got_error *err = NULL;
850 struct got_object_id *tree_id = NULL;
851 struct got_tree_object *tree = NULL;
852 const struct got_tree_entries *entries;
853 struct got_tree_entry *te;
855 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
859 err = got_object_open_as_tree(&tree, repo, tree_id);
862 entries = got_object_tree_get_entries(tree);
863 te = SIMPLEQ_FIRST(&entries->head);
867 if (sigint_received || sigpipe_received)
872 err = got_object_id_str(&id_str, te->id);
875 if (asprintf(&id, "%s ", id_str) == -1) {
876 err = got_error_from_errno();
882 printf("%s%s%s\n", id ? id : "",
883 te->name, S_ISDIR(te->mode) ? "/" : "");
884 te = SIMPLEQ_NEXT(te, entry);
889 got_object_tree_close(tree);
894 static const struct got_error *
895 cmd_tree(int argc, char *argv[])
897 const struct got_error *error;
898 struct got_repository *repo = NULL;
899 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
900 struct got_object_id *commit_id = NULL;
901 char *commit_id_str = NULL;
906 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
911 while ((ch = getopt(argc, argv, "c:r:i")) != -1) {
914 commit_id_str = optarg;
917 repo_path = realpath(optarg, NULL);
918 if (repo_path == NULL)
940 cwd = getcwd(NULL, 0);
942 error = got_error_from_errno();
945 if (repo_path == NULL) {
946 repo_path = strdup(cwd);
947 if (repo_path == NULL) {
948 error = got_error_from_errno();
953 error = got_repo_open(&repo, repo_path);
957 error = got_repo_map_path(&in_repo_path, repo, path, 1);
961 if (commit_id_str == NULL) {
962 struct got_reference *head_ref;
963 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
966 error = got_ref_resolve(&commit_id, repo, head_ref);
967 got_ref_close(head_ref);
971 error = got_object_resolve_id_str(&commit_id, repo,
977 error = print_tree(in_repo_path, commit_id, show_ids, repo);
984 const struct got_error *repo_error;
985 repo_error = got_repo_close(repo);
993 static const struct got_error *
994 cmd_status(int argc __unused, char *argv[] __unused)
996 git_repository *repo = NULL;
997 git_status_list *status;
998 git_status_options statusopts;
1003 if (git_repository_open_ext(&repo, ".", 0, NULL))
1004 errx(1, "git_repository_open: %s", giterr_last()->message);
1006 if (git_repository_is_bare(repo))
1007 errx(1, "bar repository");
1009 if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
1010 errx(1, "git_status_init_options: %s", giterr_last()->message);
1012 statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
1013 statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
1014 GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
1015 GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
1017 if (git_status_list_new(&status, repo, &statusopts))
1018 errx(1, "git_status_list_new: %s", giterr_last()->message);
1020 for (i = 0; i < git_status_list_entrycount(status); i++) {
1021 const git_status_entry *se;
1023 se = git_status_byindex(status, i);
1024 switch (se->status) {
1025 case GIT_STATUS_WT_NEW:
1026 printf("? %s\n", se->index_to_workdir->new_file.path);
1028 case GIT_STATUS_WT_MODIFIED:
1029 printf("M %s\n", se->index_to_workdir->new_file.path);
1031 case GIT_STATUS_WT_DELETED:
1032 printf("R %s\n", se->index_to_workdir->new_file.path);
1034 case GIT_STATUS_WT_RENAMED:
1035 printf("m %s -> %s\n",
1036 se->index_to_workdir->old_file.path,
1037 se->index_to_workdir->new_file.path);
1039 case GIT_STATUS_WT_TYPECHANGE:
1040 printf("t %s\n", se->index_to_workdir->new_file.path);
1042 case GIT_STATUS_INDEX_NEW:
1043 printf("A %s\n", se->head_to_index->new_file.path);
1045 case GIT_STATUS_INDEX_MODIFIED:
1046 printf("M %s\n", se->head_to_index->old_file.path);
1048 case GIT_STATUS_INDEX_DELETED:
1049 printf("R %s\n", se->head_to_index->old_file.path);
1051 case GIT_STATUS_INDEX_RENAMED:
1052 printf("m %s -> %s\n",
1053 se->head_to_index->old_file.path,
1054 se->head_to_index->new_file.path);
1056 case GIT_STATUS_INDEX_TYPECHANGE:
1057 printf("t %s\n", se->head_to_index->old_file.path);
1059 case GIT_STATUS_CURRENT:
1065 git_status_list_free(status);
1066 git_repository_free(repo);
1067 git_libgit2_shutdown();