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>
30 #include "got_error.h"
31 #include "got_object.h"
33 #include "got_repository.h"
34 #include "got_worktree.h"
38 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
43 const struct got_error *(*cmd_main)(int, char *[]);
44 void (*cmd_usage)(void);
45 const char *cmd_descr;
48 __dead void usage(void);
49 __dead void usage_checkout(void);
50 __dead void usage_log(void);
51 __dead void usage_diff(void);
53 const struct got_error* cmd_checkout(int, char *[]);
54 const struct got_error* cmd_log(int, char *[]);
55 const struct got_error* cmd_diff(int, char *[]);
56 const struct got_error* cmd_status(int, char *[]);
58 struct cmd got_commands[] = {
59 { "checkout", cmd_checkout, usage_checkout,
60 "check out a new work tree from a repository" },
61 { "log", cmd_log, usage_log,
62 "show repository history" },
63 { "diff", cmd_diff, usage_diff,
64 "compare files and directories" },
66 { "status", cmd_status, usage_status,
67 "show modification status of files" },
72 main(int argc, char *argv[])
79 setlocale(LC_ALL, "");
81 while ((ch = getopt(argc, argv, "h")) != -1) {
99 for (i = 0; i < nitems(got_commands); i++) {
100 const struct got_error *error;
102 cmd = &got_commands[i];
104 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
108 got_commands[i].cmd_usage();
110 error = got_commands[i].cmd_main(argc, argv);
112 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
119 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
128 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
129 "Available commands:\n", getprogname());
130 for (i = 0; i < nitems(got_commands); i++) {
131 struct cmd *cmd = &got_commands[i];
132 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
140 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
141 "[worktree-path]\n", getprogname());
146 checkout_progress(void *arg, const char *path)
148 char *worktree_path = arg;
150 while (path[0] == '/')
153 printf("A %s/%s\n", worktree_path, path);
156 const struct got_error *
157 cmd_checkout(int argc, char *argv[])
159 const struct got_error *error = NULL;
160 struct got_repository *repo = NULL;
161 struct got_reference *head_ref = NULL;
162 struct got_worktree *worktree = NULL;
163 char *repo_path = NULL;
164 char *worktree_path = NULL;
165 const char *path_prefix = "";
168 while ((ch = getopt(argc, argv, "p:")) != -1) {
171 path_prefix = optarg;
183 if (pledge("stdio rpath wpath cpath flock", NULL) == -1)
187 char *cwd, *base, *dotgit;
188 repo_path = realpath(argv[0], NULL);
189 if (repo_path == NULL)
190 return got_error_from_errno();
191 cwd = getcwd(NULL, 0);
193 error = got_error_from_errno();
197 base = basename(path_prefix);
199 base = basename(repo_path);
201 error = got_error_from_errno();
204 dotgit = strstr(base, ".git");
207 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
208 error = got_error_from_errno();
213 } else if (argc == 2) {
214 repo_path = realpath(argv[0], NULL);
215 if (repo_path == NULL) {
216 error = got_error_from_errno();
219 worktree_path = realpath(argv[1], NULL);
220 if (worktree_path == NULL) {
221 error = got_error_from_errno();
227 error = got_repo_open(&repo, repo_path);
231 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
235 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
239 error = got_worktree_open(&worktree, worktree_path);
243 error = got_worktree_checkout_files(worktree, head_ref, repo,
244 checkout_progress, worktree_path);
248 printf("checked out %s\n", worktree_path);
256 static const struct got_error *
257 print_patch(struct got_commit_object *commit, struct got_object_id *id,
258 struct got_repository *repo)
260 const struct got_error *err = NULL;
261 struct got_tree_object *tree1 = NULL, *tree2;
262 struct got_object *obj;
263 struct got_parent_id *pid;
265 err = got_object_open(&obj, repo, commit->tree_id);
269 err = got_object_tree_open(&tree2, repo, obj);
270 got_object_close(obj);
274 pid = SIMPLEQ_FIRST(&commit->parent_ids);
276 struct got_commit_object *pcommit;
278 err = got_object_open(&obj, repo, pid->id);
282 err = got_object_commit_open(&pcommit, repo, obj);
283 got_object_close(obj);
287 err = got_object_open(&obj, repo, pcommit->tree_id);
288 got_object_commit_close(pcommit);
291 err = got_object_tree_open(&tree1, repo, obj);
292 got_object_close(obj);
297 err = got_diff_tree(tree1, tree2, repo, stdout);
299 got_object_tree_close(tree1);
300 got_object_tree_close(tree2);
304 static const struct got_error *
305 print_commit(struct got_commit_object *commit, struct got_object_id *id,
306 struct got_repository *repo, int show_patch)
308 const struct got_error *err = NULL;
311 err = got_object_id_str(&buf, id);
315 printf("-----------------------------------------------\n");
316 printf("commit: %s\n", buf);
317 printf("Author: %s\n", commit->author);
318 printf("\n%s\n", commit->logmsg);
321 err = print_patch(commit, id, repo);
330 struct commit_queue_entry {
331 TAILQ_ENTRY(commit_queue_entry) entry;
332 struct got_object_id *id;
333 struct got_commit_object *commit;
336 static const struct got_error *
337 print_commits(struct got_object *root_obj, struct got_object_id *root_id,
338 struct got_repository *repo, int show_patch, int limit)
340 const struct got_error *err;
341 struct got_commit_object *root_commit;
342 TAILQ_HEAD(, commit_queue_entry) commits;
343 struct commit_queue_entry *entry;
345 TAILQ_INIT(&commits);
347 err = got_object_commit_open(&root_commit, repo, root_obj);
351 entry = calloc(1, sizeof(*entry));
353 return got_error_from_errno();
354 entry->id = got_object_id_dup(root_id);
355 if (entry->id == NULL) {
356 err = got_error_from_errno();
360 entry->commit = root_commit;
361 TAILQ_INSERT_HEAD(&commits, entry, entry);
363 while (!TAILQ_EMPTY(&commits)) {
364 struct got_parent_id *pid;
366 entry = TAILQ_FIRST(&commits);
367 err = print_commit(entry->commit, entry->id, repo, show_patch);
369 while (!TAILQ_EMPTY(&commits)) {
370 entry = TAILQ_FIRST(&commits);
371 TAILQ_REMOVE(&commits, entry, entry);
372 got_object_commit_close(entry->commit);
379 if (limit && --limit == 0)
382 SIMPLEQ_FOREACH(pid, &entry->commit->parent_ids, entry) {
383 struct got_object *obj;
384 struct got_commit_object *pcommit;
385 struct commit_queue_entry *pentry;
387 err = got_object_open(&obj, repo, pid->id);
390 if (got_object_get_type(obj) != GOT_OBJ_TYPE_COMMIT) {
391 err = got_error(GOT_ERR_OBJ_TYPE);
395 err = got_object_commit_open(&pcommit, repo, obj);
396 got_object_close(obj);
400 pentry = calloc(1, sizeof(*pentry));
401 if (pentry == NULL) {
402 err = got_error_from_errno();
403 got_object_commit_close(pcommit);
406 pentry->id = got_object_id_dup(pid->id);
407 if (pentry->id == NULL) {
408 err = got_error_from_errno();
409 got_object_commit_close(pcommit);
412 pentry->commit = pcommit;
413 TAILQ_INSERT_TAIL(&commits, pentry, entry);
416 TAILQ_REMOVE(&commits, entry, entry);
417 got_object_commit_close(entry->commit);
428 fprintf(stderr, "usage: %s log [-p] [-c commit] [ -l N ] "
429 "[repository-path]\n", getprogname());
433 const struct got_error *
434 cmd_log(int argc, char *argv[])
436 const struct got_error *error;
437 struct got_repository *repo;
438 struct got_object_id *id = NULL;
439 struct got_object *obj;
440 char *repo_path = NULL;
441 char *start_commit = NULL;
443 int show_patch = 0, limit = 0;
447 if (pledge("stdio rpath wpath cpath", NULL) == -1)
451 while ((ch = getopt(argc, argv, "pc:l:")) != -1) {
457 start_commit = optarg;
460 limit = strtonum(optarg, 1, INT_MAX, &errstr);
462 err(1, "-l option %s", errstr);
474 repo_path = getcwd(NULL, 0);
475 if (repo_path == NULL)
476 return got_error_from_errno();
477 } else if (argc == 1) {
478 repo_path = realpath(argv[0], NULL);
479 if (repo_path == NULL)
480 return got_error_from_errno();
484 error = got_repo_open(&repo, repo_path);
489 if (start_commit == NULL) {
490 struct got_reference *head_ref;
491 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
494 error = got_ref_resolve(&id, repo, head_ref);
495 got_ref_close(head_ref);
498 error = got_object_open(&obj, repo, id);
500 error = got_object_open_by_id_str(&obj, repo, start_commit);
502 id = got_object_get_id(obj);
504 error = got_error_from_errno();
509 if (got_object_get_type(obj) == GOT_OBJ_TYPE_COMMIT)
510 error = print_commits(obj, id, repo, show_patch, limit);
512 error = got_error(GOT_ERR_OBJ_TYPE);
513 got_object_close(obj);
515 got_repo_close(repo);
519 static const struct got_error *
520 diff_blobs(struct got_object *obj1, struct got_object *obj2,
521 struct got_repository *repo)
523 const struct got_error *err;
524 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
526 err = got_object_blob_open(&blob1, repo, obj1, 8192);
529 err = got_object_blob_open(&blob2, repo, obj2, 81992);
533 err = got_diff_blob(blob1, blob2, NULL, NULL, stdout);
536 got_object_blob_close(blob1);
538 got_object_blob_close(blob2);
542 static const struct got_error *
543 diff_trees(struct got_object *obj1, struct got_object *obj2,
544 struct got_repository *repo)
546 const struct got_error *err;
547 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
549 err = got_object_tree_open(&tree1, repo, obj1);
552 err = got_object_tree_open(&tree2, repo, obj2);
556 err = got_diff_tree(tree1, tree2, repo, stdout);
559 got_object_tree_close(tree1);
561 got_object_tree_close(tree2);
565 static const struct got_error *
566 diff_commits(struct got_object *obj1, struct got_object *obj2,
567 struct got_repository *repo)
569 const struct got_error *err;
570 struct got_commit_object *commit1 = NULL, *commit2 = NULL;
571 struct got_object *tree_obj1 = NULL, *tree_obj2 = NULL;
573 err = got_object_commit_open(&commit1, repo, obj1);
576 err = got_object_commit_open(&commit2, repo, obj2);
580 err = got_object_open(&tree_obj1, repo, commit1->tree_id);
583 err = got_object_open(&tree_obj2, repo, commit2->tree_id);
587 err = diff_trees(tree_obj1, tree_obj2, repo);
590 got_object_close(tree_obj1);
592 got_object_close(tree_obj2);
594 got_object_commit_close(commit1);
596 got_object_commit_close(commit2);
604 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
609 const struct got_error *
610 cmd_diff(int argc, char *argv[])
612 const struct got_error *error;
613 struct got_repository *repo = NULL;
614 struct got_object_id *id1 = NULL, *id2 = NULL;
615 struct got_object *obj1 = NULL, *obj2 = NULL;
616 char *repo_path = NULL;
617 char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
621 if (pledge("stdio rpath wpath cpath", NULL) == -1)
625 while ((ch = getopt(argc, argv, "")) != -1) {
637 usage_diff(); /* TODO show local worktree changes */
638 } else if (argc == 2) {
639 repo_path = getcwd(NULL, 0);
640 if (repo_path == NULL)
641 return got_error_from_errno();
642 obj_id_str1 = argv[0];
643 obj_id_str2 = argv[1];
644 } else if (argc == 3) {
645 repo_path = realpath(argv[0], NULL);
646 if (repo_path == NULL)
647 return got_error_from_errno();
648 obj_id_str1 = argv[1];
649 obj_id_str2 = argv[2];
653 error = got_repo_open(&repo, repo_path);
658 error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
660 id1 = got_object_get_id(obj1);
662 error = got_error_from_errno();
667 error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
669 id2 = got_object_get_id(obj2);
671 error = got_error_from_errno();
676 if (got_object_get_type(obj1) != got_object_get_type(obj2)) {
677 error = got_error(GOT_ERR_OBJ_TYPE);
681 switch (got_object_get_type(obj1)) {
682 case GOT_OBJ_TYPE_BLOB:
683 error = diff_blobs(obj1, obj2, repo);
685 case GOT_OBJ_TYPE_TREE:
686 error = diff_trees(obj1, obj2, repo);
688 case GOT_OBJ_TYPE_COMMIT:
689 error = diff_commits(obj1, obj2, repo);
692 error = got_error(GOT_ERR_OBJ_TYPE);
697 got_object_close(obj1);
699 got_object_close(obj2);
705 got_repo_close(repo);
710 const struct got_error *
711 cmd_status(int argc __unused, char *argv[] __unused)
713 git_repository *repo = NULL;
714 git_status_list *status;
715 git_status_options statusopts;
720 if (git_repository_open_ext(&repo, ".", 0, NULL))
721 errx(1, "git_repository_open: %s", giterr_last()->message);
723 if (git_repository_is_bare(repo))
724 errx(1, "bar repository");
726 if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
727 errx(1, "git_status_init_options: %s", giterr_last()->message);
729 statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
730 statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
731 GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
732 GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
734 if (git_status_list_new(&status, repo, &statusopts))
735 errx(1, "git_status_list_new: %s", giterr_last()->message);
737 for (i = 0; i < git_status_list_entrycount(status); i++) {
738 const git_status_entry *se;
740 se = git_status_byindex(status, i);
741 switch (se->status) {
742 case GIT_STATUS_WT_NEW:
743 printf("? %s\n", se->index_to_workdir->new_file.path);
745 case GIT_STATUS_WT_MODIFIED:
746 printf("M %s\n", se->index_to_workdir->new_file.path);
748 case GIT_STATUS_WT_DELETED:
749 printf("R %s\n", se->index_to_workdir->new_file.path);
751 case GIT_STATUS_WT_RENAMED:
752 printf("m %s -> %s\n",
753 se->index_to_workdir->old_file.path,
754 se->index_to_workdir->new_file.path);
756 case GIT_STATUS_WT_TYPECHANGE:
757 printf("t %s\n", se->index_to_workdir->new_file.path);
759 case GIT_STATUS_INDEX_NEW:
760 printf("A %s\n", se->head_to_index->new_file.path);
762 case GIT_STATUS_INDEX_MODIFIED:
763 printf("M %s\n", se->head_to_index->old_file.path);
765 case GIT_STATUS_INDEX_DELETED:
766 printf("R %s\n", se->head_to_index->old_file.path);
768 case GIT_STATUS_INDEX_RENAMED:
769 printf("m %s -> %s\n",
770 se->head_to_index->old_file.path,
771 se->head_to_index->new_file.path);
773 case GIT_STATUS_INDEX_TYPECHANGE:
774 printf("t %s\n", se->head_to_index->old_file.path);
776 case GIT_STATUS_CURRENT:
782 git_status_list_free(status);
783 git_repository_free(repo);
784 git_libgit2_shutdown();