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>
32 #include "got_error.h"
33 #include "got_object.h"
34 #include "got_reference.h"
35 #include "got_repository.h"
36 #include "got_worktree.h"
38 #include "got_commit_graph.h"
39 #include "got_blame.h"
42 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
47 const struct got_error *(*cmd_main)(int, char *[]);
48 void (*cmd_usage)(void);
49 const char *cmd_descr;
52 __dead static void usage(void);
53 __dead static void usage_checkout(void);
54 __dead static void usage_log(void);
55 __dead static void usage_diff(void);
56 __dead static void usage_blame(void);
58 static const struct got_error* cmd_checkout(int, char *[]);
59 static const struct got_error* cmd_log(int, char *[]);
60 static const struct got_error* cmd_diff(int, char *[]);
61 static const struct got_error* cmd_blame(int, char *[]);
63 static const struct got_error* cmd_status(int, char *[]);
66 static struct cmd got_commands[] = {
67 { "checkout", cmd_checkout, usage_checkout,
68 "check out a new work tree from a repository" },
69 { "log", cmd_log, usage_log,
70 "show repository history" },
71 { "diff", cmd_diff, usage_diff,
72 "compare files and directories" },
73 { "blame", cmd_blame, usage_blame,
74 " show when lines in a file were changed" },
76 { "status", cmd_status, usage_status,
77 "show modification status of files" },
82 main(int argc, char *argv[])
89 setlocale(LC_ALL, "");
91 while ((ch = getopt(argc, argv, "h")) != -1) {
109 for (i = 0; i < nitems(got_commands); i++) {
110 const struct got_error *error;
112 cmd = &got_commands[i];
114 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
118 got_commands[i].cmd_usage();
120 error = got_commands[i].cmd_main(argc, argv);
122 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
129 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
138 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
139 "Available commands:\n", getprogname());
140 for (i = 0; i < nitems(got_commands); i++) {
141 struct cmd *cmd = &got_commands[i];
142 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
150 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
151 "[worktree-path]\n", getprogname());
156 checkout_progress(void *arg, const char *path)
158 char *worktree_path = arg;
160 while (path[0] == '/')
163 printf("A %s/%s\n", worktree_path, path);
166 static const struct got_error *
167 cmd_checkout(int argc, char *argv[])
169 const struct got_error *error = NULL;
170 struct got_repository *repo = NULL;
171 struct got_reference *head_ref = NULL;
172 struct got_worktree *worktree = NULL;
173 char *repo_path = NULL;
174 char *worktree_path = NULL;
175 const char *path_prefix = "";
178 while ((ch = getopt(argc, argv, "p:")) != -1) {
181 path_prefix = optarg;
193 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
198 char *cwd, *base, *dotgit;
199 repo_path = realpath(argv[0], NULL);
200 if (repo_path == NULL)
201 return got_error_from_errno();
202 cwd = getcwd(NULL, 0);
204 error = got_error_from_errno();
208 base = basename(path_prefix);
210 base = basename(repo_path);
212 error = got_error_from_errno();
215 dotgit = strstr(base, ".git");
218 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
219 error = got_error_from_errno();
224 } else if (argc == 2) {
225 repo_path = realpath(argv[0], NULL);
226 if (repo_path == NULL) {
227 error = got_error_from_errno();
230 worktree_path = realpath(argv[1], NULL);
231 if (worktree_path == NULL) {
232 error = got_error_from_errno();
238 error = got_repo_open(&repo, repo_path);
241 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
245 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
249 error = got_worktree_open(&worktree, worktree_path);
253 error = got_worktree_checkout_files(worktree, head_ref, repo,
254 checkout_progress, worktree_path);
258 printf("Checked out %s\n", worktree_path);
259 printf("Now shut up and hack\n");
267 static const struct got_error *
268 print_patch(struct got_commit_object *commit, struct got_object_id *id,
269 int diff_context, struct got_repository *repo)
271 const struct got_error *err = NULL;
272 struct got_tree_object *tree1 = NULL, *tree2;
273 struct got_object_qid *qid;
275 err = got_object_open_as_tree(&tree2, repo, commit->tree_id);
279 qid = SIMPLEQ_FIRST(&commit->parent_ids);
281 struct got_commit_object *pcommit;
283 err = got_object_open_as_commit(&pcommit, repo, qid->id);
287 err = got_object_open_as_tree(&tree1, repo, pcommit->tree_id);
288 got_object_commit_close(pcommit);
293 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
295 got_object_tree_close(tree1);
296 got_object_tree_close(tree2);
301 get_datestr(time_t *time, char *datebuf)
303 char *p, *s = ctime_r(time, datebuf);
310 static const struct got_error *
311 print_commit(struct got_commit_object *commit, struct got_object_id *id,
312 struct got_repository *repo, int show_patch, int diff_context)
314 const struct got_error *err = NULL;
315 char *id_str, *datestr, *logmsg0, *logmsg, *line;
317 time_t author_time, committer_time;
319 err = got_object_id_str(&id_str, id);
323 author_time = mktime(&commit->tm_author);
324 committer_time = mktime(&commit->tm_committer);
326 /* This would express the date in committer's timezone. */
327 author_time += commit->tm_author.tm_gmtoff;
328 committer_time += commit->tm_committer.tm_gmtoff;
331 printf("-----------------------------------------------\n");
332 printf("commit %s\n", id_str);
334 printf("from: %s\n", commit->author);
335 datestr = get_datestr(&committer_time, datebuf);
336 printf("date: %s UTC\n", datestr);
337 if (strcmp(commit->author, commit->committer) != 0)
338 printf("via: %s\n", commit->committer);
339 if (commit->nparents > 1) {
340 struct got_object_qid *qid;
342 SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry) {
343 err = got_object_id_str(&id_str, qid->id);
346 printf("parent %d: %s\n", n++, id_str);
351 logmsg0 = strdup(commit->logmsg);
353 return got_error_from_errno();
357 line = strsep(&logmsg, "\n");
359 printf(" %s\n", line);
364 err = print_patch(commit, id, diff_context, repo);
373 static const struct got_error *
374 print_commits(struct got_object *root_obj, struct got_object_id *root_id,
375 struct got_repository *repo, char *path, int show_patch, int diff_context,
376 int limit, int first_parent_traversal)
378 const struct got_error *err;
379 struct got_commit_graph *graph;
381 err = got_commit_graph_open(&graph, root_id, path,
382 first_parent_traversal, repo);
385 err = got_commit_graph_iter_start(graph, root_id, repo);
389 struct got_commit_object *commit;
390 struct got_object_id *id;
392 err = got_commit_graph_iter_next(&id, graph);
394 if (err->code == GOT_ERR_ITER_COMPLETED) {
398 if (err->code != GOT_ERR_ITER_NEED_MORE)
400 err = got_commit_graph_fetch_commits(graph, 1, repo);
409 err = got_object_open_as_commit(&commit, repo, id);
412 err = print_commit(commit, id, repo, show_patch, diff_context);
413 got_object_commit_close(commit);
414 if (err || (limit && --limit == 0))
418 got_commit_graph_close(graph);
425 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
426 "[-r repository-path] [path]\n", getprogname());
430 static const struct got_error *
431 cmd_log(int argc, char *argv[])
433 const struct got_error *error;
434 struct got_repository *repo = NULL;
435 struct got_object_id *id = NULL;
436 struct got_object *obj = NULL;
437 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
438 char *start_commit = NULL;
439 int diff_context = 3, ch;
440 int show_patch = 0, limit = 0, first_parent_traversal = 0;
444 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
449 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
455 start_commit = optarg;
458 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
460 err(1, "-C option %s", errstr);
463 limit = strtonum(optarg, 1, INT_MAX, &errstr);
465 err(1, "-l option %s", errstr);
468 first_parent_traversal = 1;
471 repo_path = realpath(optarg, NULL);
472 if (repo_path == NULL)
487 path = strdup(argv[0]);
491 return got_error_from_errno();
493 cwd = getcwd(NULL, 0);
495 error = got_error_from_errno();
498 if (repo_path == NULL) {
499 repo_path = strdup(cwd);
500 if (repo_path == NULL) {
501 error = got_error_from_errno();
506 error = got_repo_open(&repo, repo_path);
510 if (start_commit == NULL) {
511 struct got_reference *head_ref;
512 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
515 error = got_ref_resolve(&id, repo, head_ref);
516 got_ref_close(head_ref);
519 error = got_object_open(&obj, repo, id);
521 struct got_reference *ref;
522 error = got_ref_open(&ref, repo, start_commit);
524 error = got_ref_resolve(&id, repo, ref);
528 error = got_object_open(&obj, repo, id);
533 error = got_object_open_by_id_str(&obj, repo,
537 id = got_object_id_dup(got_object_get_id(obj));
539 error = got_error_from_errno();
544 if (got_object_get_type(obj) != GOT_OBJ_TYPE_COMMIT) {
545 error = got_error(GOT_ERR_OBJ_TYPE);
549 error = got_repo_map_path(&in_repo_path, repo, path);
557 error = print_commits(obj, id, repo, path, show_patch,
558 diff_context, limit, first_parent_traversal);
564 got_object_close(obj);
567 const struct got_error *repo_error;
568 repo_error = got_repo_close(repo);
578 fprintf(stderr, "usage: %s diff [-C number] [repository-path] "
579 "object1 object2\n", getprogname());
583 static const struct got_error *
584 cmd_diff(int argc, char *argv[])
586 const struct got_error *error;
587 struct got_repository *repo = NULL;
588 struct got_object *obj1 = NULL, *obj2 = NULL;
589 char *repo_path = NULL;
590 char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
591 int diff_context = 3, ch;
595 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
600 while ((ch = getopt(argc, argv, "C:")) != -1) {
603 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
605 err(1, "-C option %s", errstr);
617 usage_diff(); /* TODO show local worktree changes */
618 } else if (argc == 2) {
619 repo_path = getcwd(NULL, 0);
620 if (repo_path == NULL)
621 return got_error_from_errno();
622 obj_id_str1 = argv[0];
623 obj_id_str2 = argv[1];
624 } else if (argc == 3) {
625 repo_path = realpath(argv[0], NULL);
626 if (repo_path == NULL)
627 return got_error_from_errno();
628 obj_id_str1 = argv[1];
629 obj_id_str2 = argv[2];
633 error = got_repo_open(&repo, repo_path);
638 error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
642 error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
646 if (got_object_get_type(obj1) != got_object_get_type(obj2)) {
647 error = got_error(GOT_ERR_OBJ_TYPE);
651 switch (got_object_get_type(obj1)) {
652 case GOT_OBJ_TYPE_BLOB:
653 error = got_diff_objects_as_blobs(obj1, obj2, NULL, NULL,
654 diff_context, repo, stdout);
656 case GOT_OBJ_TYPE_TREE:
657 error = got_diff_objects_as_trees(obj1, obj2, "", "",
658 diff_context, repo, stdout);
660 case GOT_OBJ_TYPE_COMMIT:
661 error = got_diff_objects_as_commits(obj1, obj2, diff_context,
665 error = got_error(GOT_ERR_OBJ_TYPE);
670 got_object_close(obj1);
672 got_object_close(obj2);
674 const struct got_error *repo_error;
675 repo_error = got_repo_close(repo);
685 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
690 static const struct got_error *
691 cmd_blame(int argc, char *argv[])
693 const struct got_error *error;
694 struct got_repository *repo = NULL;
695 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
696 struct got_object_id *commit_id = NULL;
697 char *commit_id_str = NULL;
701 if (pledge("stdio rpath wpath cpath flock proc exec sendfd", NULL)
706 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
709 commit_id_str = optarg;
712 repo_path = realpath(optarg, NULL);
713 if (repo_path == NULL)
730 cwd = getcwd(NULL, 0);
732 error = got_error_from_errno();
735 if (repo_path == NULL) {
736 repo_path = strdup(cwd);
737 if (repo_path == NULL) {
738 error = got_error_from_errno();
743 error = got_repo_open(&repo, repo_path);
747 error = got_repo_map_path(&in_repo_path, repo, path);
751 if (commit_id_str == NULL) {
752 struct got_reference *head_ref;
753 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
756 error = got_ref_resolve(&commit_id, repo, head_ref);
757 got_ref_close(head_ref);
761 struct got_object *obj;
762 error = got_object_open_by_id_str(&obj, repo, commit_id_str);
765 commit_id = got_object_id_dup(got_object_get_id(obj));
766 if (commit_id == NULL)
767 error = got_error_from_errno();
768 got_object_close(obj);
771 error = got_blame(in_repo_path, commit_id, repo, stdout);
778 const struct got_error *repo_error;
779 repo_error = got_repo_close(repo);
787 static const struct got_error *
788 cmd_status(int argc __unused, char *argv[] __unused)
790 git_repository *repo = NULL;
791 git_status_list *status;
792 git_status_options statusopts;
797 if (git_repository_open_ext(&repo, ".", 0, NULL))
798 errx(1, "git_repository_open: %s", giterr_last()->message);
800 if (git_repository_is_bare(repo))
801 errx(1, "bar repository");
803 if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
804 errx(1, "git_status_init_options: %s", giterr_last()->message);
806 statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
807 statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
808 GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
809 GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
811 if (git_status_list_new(&status, repo, &statusopts))
812 errx(1, "git_status_list_new: %s", giterr_last()->message);
814 for (i = 0; i < git_status_list_entrycount(status); i++) {
815 const git_status_entry *se;
817 se = git_status_byindex(status, i);
818 switch (se->status) {
819 case GIT_STATUS_WT_NEW:
820 printf("? %s\n", se->index_to_workdir->new_file.path);
822 case GIT_STATUS_WT_MODIFIED:
823 printf("M %s\n", se->index_to_workdir->new_file.path);
825 case GIT_STATUS_WT_DELETED:
826 printf("R %s\n", se->index_to_workdir->new_file.path);
828 case GIT_STATUS_WT_RENAMED:
829 printf("m %s -> %s\n",
830 se->index_to_workdir->old_file.path,
831 se->index_to_workdir->new_file.path);
833 case GIT_STATUS_WT_TYPECHANGE:
834 printf("t %s\n", se->index_to_workdir->new_file.path);
836 case GIT_STATUS_INDEX_NEW:
837 printf("A %s\n", se->head_to_index->new_file.path);
839 case GIT_STATUS_INDEX_MODIFIED:
840 printf("M %s\n", se->head_to_index->old_file.path);
842 case GIT_STATUS_INDEX_DELETED:
843 printf("R %s\n", se->head_to_index->old_file.path);
845 case GIT_STATUS_INDEX_RENAMED:
846 printf("m %s -> %s\n",
847 se->head_to_index->old_file.path,
848 se->head_to_index->new_file.path);
850 case GIT_STATUS_INDEX_TYPECHANGE:
851 printf("t %s\n", se->head_to_index->old_file.path);
853 case GIT_STATUS_CURRENT:
859 git_status_list_free(status);
860 git_repository_free(repo);
861 git_libgit2_shutdown();