Blob


1 /*
2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 *
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.
8 *
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.
16 */
18 #include <sys/queue.h>
19 #include <sys/limits.h>
20 #include <sys/types.h>
21 #include <sys/stat.h>
23 #include <err.h>
24 #include <errno.h>
25 #include <locale.h>
26 #include <signal.h>
27 #include <stdio.h>
28 #include <stdlib.h>
29 #include <string.h>
30 #include <unistd.h>
31 #include <libgen.h>
32 #include <time.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"
39 #include "got_diff.h"
40 #include "got_commit_graph.h"
41 #include "got_blame.h"
42 #include "got_privsep.h"
44 #ifndef nitems
45 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
46 #endif
48 static volatile sig_atomic_t sigint_received;
49 static volatile sig_atomic_t sigpipe_received;
51 static void
52 catch_sigint(int signo)
53 {
54 sigint_received = 1;
55 }
57 static void
58 catch_sigpipe(int signo)
59 {
60 sigpipe_received = 1;
61 }
64 struct cmd {
65 const char *cmd_name;
66 const struct got_error *(*cmd_main)(int, char *[]);
67 void (*cmd_usage)(void);
68 const char *cmd_descr;
69 };
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);
79 static const struct got_error* cmd_checkout(int, char *[]);
80 static const struct got_error* cmd_update(int, char *[]);
81 static const struct got_error* cmd_log(int, char *[]);
82 static const struct got_error* cmd_diff(int, char *[]);
83 static const struct got_error* cmd_blame(int, char *[]);
84 static const struct got_error* cmd_tree(int, char *[]);
85 #ifdef notyet
86 static const struct got_error* cmd_status(int, char *[]);
87 #endif
89 static struct cmd got_commands[] = {
90 { "checkout", cmd_checkout, usage_checkout,
91 "check out a new work tree from a repository" },
92 { "update", cmd_update, usage_update,
93 "update a work tree to a different commit" },
94 { "log", cmd_log, usage_log,
95 "show repository history" },
96 { "diff", cmd_diff, usage_diff,
97 "compare files and directories" },
98 { "blame", cmd_blame, usage_blame,
99 " show when lines in a file were changed" },
100 { "tree", cmd_tree, usage_tree,
101 " list files and directories in repository" },
102 #ifdef notyet
103 { "status", cmd_status, usage_status,
104 "show modification status of files" },
105 #endif
106 };
108 int
109 main(int argc, char *argv[])
111 struct cmd *cmd;
112 unsigned int i;
113 int ch;
114 int hflag = 0;
116 setlocale(LC_ALL, "");
118 while ((ch = getopt(argc, argv, "h")) != -1) {
119 switch (ch) {
120 case 'h':
121 hflag = 1;
122 break;
123 default:
124 usage();
125 /* NOTREACHED */
129 argc -= optind;
130 argv += optind;
131 optind = 0;
133 if (argc <= 0)
134 usage();
136 signal(SIGINT, catch_sigint);
137 signal(SIGPIPE, catch_sigpipe);
139 for (i = 0; i < nitems(got_commands); i++) {
140 const struct got_error *error;
142 cmd = &got_commands[i];
144 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
145 continue;
147 if (hflag)
148 got_commands[i].cmd_usage();
150 error = got_commands[i].cmd_main(argc, argv);
151 if (error && !(sigint_received || sigpipe_received)) {
152 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
153 return 1;
156 return 0;
159 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
160 return 1;
163 __dead static void
164 usage(void)
166 int i;
168 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
169 "Available commands:\n", getprogname());
170 for (i = 0; i < nitems(got_commands); i++) {
171 struct cmd *cmd = &got_commands[i];
172 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
174 exit(1);
177 static const struct got_error *
178 apply_unveil(const char *repo_path, const char *worktree_path)
180 const struct got_error *error;
182 if (repo_path && unveil(repo_path, "r") != 0)
183 return got_error_from_errno();
185 if (worktree_path && unveil(worktree_path, "rwc") != 0)
186 return got_error_from_errno();
188 if (unveil("/tmp", "rwc") != 0)
189 return got_error_from_errno();
191 error = got_privsep_unveil_exec_helpers();
192 if (error != NULL)
193 return error;
195 if (unveil(NULL, NULL) != 0)
196 return got_error_from_errno();
198 return NULL;
201 __dead static void
202 usage_checkout(void)
204 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
205 "[worktree-path]\n", getprogname());
206 exit(1);
209 static void
210 checkout_progress(void *arg, unsigned char status, const char *path)
212 char *worktree_path = arg;
214 while (path[0] == '/')
215 path++;
217 printf("%c %s/%s\n", status, worktree_path, path);
220 static const struct got_error *
221 checkout_cancel(void *arg)
223 if (sigint_received || sigpipe_received)
224 return got_error(GOT_ERR_CANCELLED);
225 return NULL;
228 static const struct got_error *
229 check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
230 struct got_repository *repo)
232 const struct got_error *err;
233 struct got_reference *head_ref = NULL;
234 struct got_object_id *head_commit_id = NULL;
235 struct got_commit_graph *graph = NULL;
237 head_ref = got_worktree_get_head_ref(worktree);
238 if (head_ref == NULL)
239 return got_error_from_errno();
241 /* TODO: Check the reflog. The head ref may have been rebased. */
242 err = got_ref_resolve(&head_commit_id, repo, head_ref);
243 if (err)
244 goto done;
246 err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
247 if (err)
248 goto done;
250 err = got_commit_graph_iter_start(graph, head_commit_id, repo);
251 if (err)
252 goto done;
253 while (1) {
254 struct got_object_id *id;
256 if (sigint_received || sigpipe_received)
257 break;
259 err = got_commit_graph_iter_next(&id, graph);
260 if (err) {
261 if (err->code == GOT_ERR_ITER_COMPLETED) {
262 err = got_error(GOT_ERR_ANCESTRY);
263 break;
265 if (err->code != GOT_ERR_ITER_NEED_MORE)
266 break;
267 err = got_commit_graph_fetch_commits(graph, 1, repo);
268 if (err)
269 break;
270 else
271 continue;
273 if (id == NULL)
274 break;
275 if (got_object_id_cmp(id, commit_id) == 0)
276 break;
278 done:
279 if (head_ref)
280 got_ref_close(head_ref);
281 if (graph)
282 got_commit_graph_close(graph);
283 return err;
287 static const struct got_error *
288 cmd_checkout(int argc, char *argv[])
290 const struct got_error *error = NULL;
291 struct got_repository *repo = NULL;
292 struct got_reference *head_ref = NULL;
293 struct got_worktree *worktree = NULL;
294 char *repo_path = NULL;
295 char *worktree_path = NULL;
296 const char *path_prefix = "";
297 char *commit_id_str = NULL;
298 int ch, same_path_prefix;
300 while ((ch = getopt(argc, argv, "c:p:")) != -1) {
301 switch (ch) {
302 case 'c':
303 commit_id_str = strdup(optarg);
304 if (commit_id_str == NULL)
305 return got_error_from_errno();
306 break;
307 case 'p':
308 path_prefix = optarg;
309 break;
310 default:
311 usage();
312 /* NOTREACHED */
316 argc -= optind;
317 argv += optind;
319 #ifndef PROFILE
320 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
321 NULL) == -1)
322 err(1, "pledge");
323 #endif
324 if (argc == 1) {
325 char *cwd, *base, *dotgit;
326 repo_path = realpath(argv[0], NULL);
327 if (repo_path == NULL)
328 return got_error_from_errno();
329 cwd = getcwd(NULL, 0);
330 if (cwd == NULL) {
331 error = got_error_from_errno();
332 goto done;
334 if (path_prefix[0])
335 base = basename(path_prefix);
336 else
337 base = basename(repo_path);
338 if (base == NULL) {
339 error = got_error_from_errno();
340 goto done;
342 dotgit = strstr(base, ".git");
343 if (dotgit)
344 *dotgit = '\0';
345 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
346 error = got_error_from_errno();
347 free(cwd);
348 goto done;
350 free(cwd);
351 } else if (argc == 2) {
352 repo_path = realpath(argv[0], NULL);
353 if (repo_path == NULL) {
354 error = got_error_from_errno();
355 goto done;
357 worktree_path = realpath(argv[1], NULL);
358 if (worktree_path == NULL) {
359 error = got_error_from_errno();
360 goto done;
362 } else
363 usage_checkout();
365 error = apply_unveil(repo_path, worktree_path);
366 if (error)
367 goto done;
369 error = got_repo_open(&repo, repo_path);
370 if (error != NULL)
371 goto done;
373 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
374 if (error != NULL)
375 goto done;
377 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
378 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
379 goto done;
381 error = got_worktree_open(&worktree, worktree_path);
382 if (error != NULL)
383 goto done;
385 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
386 path_prefix);
387 if (error != NULL)
388 goto done;
389 if (!same_path_prefix) {
390 error = got_error(GOT_ERR_PATH_PREFIX);
391 goto done;
394 if (commit_id_str) {
395 struct got_object_id *commit_id;
396 error = got_object_resolve_id_str(&commit_id, repo,
397 commit_id_str);
398 if (error != NULL)
399 goto done;
400 error = check_ancestry(worktree, commit_id, repo);
401 if (error != NULL) {
402 free(commit_id);
403 goto done;
405 error = got_worktree_set_base_commit_id(worktree, repo,
406 commit_id);
407 free(commit_id);
408 if (error)
409 goto done;
412 error = got_worktree_checkout_files(worktree, repo,
413 checkout_progress, worktree_path, checkout_cancel, NULL);
414 if (error != NULL)
415 goto done;
417 printf("Now shut up and hack\n");
419 done:
420 free(commit_id_str);
421 free(repo_path);
422 free(worktree_path);
423 return error;
426 __dead static void
427 usage_update(void)
429 fprintf(stderr, "usage: %s update [-c commit] [worktree-path]\n",
430 getprogname());
431 exit(1);
434 static void
435 update_progress(void *arg, unsigned char status, const char *path)
437 int *did_something = arg;
439 if (status == GOT_STATUS_EXISTS)
440 return;
442 *did_something = 1;
443 while (path[0] == '/')
444 path++;
445 printf("%c %s\n", status, path);
448 static const struct got_error *
449 cmd_update(int argc, char *argv[])
451 const struct got_error *error = NULL;
452 struct got_repository *repo = NULL;
453 struct got_worktree *worktree = NULL;
454 char *worktree_path = NULL;
455 struct got_object_id *commit_id = NULL;
456 char *commit_id_str = NULL;
457 int ch, did_something = 0;
459 while ((ch = getopt(argc, argv, "c:")) != -1) {
460 switch (ch) {
461 case 'c':
462 commit_id_str = strdup(optarg);
463 if (commit_id_str == NULL)
464 return got_error_from_errno();
465 break;
466 default:
467 usage();
468 /* NOTREACHED */
472 argc -= optind;
473 argv += optind;
475 #ifndef PROFILE
476 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
477 NULL) == -1)
478 err(1, "pledge");
479 #endif
480 if (argc == 0) {
481 worktree_path = getcwd(NULL, 0);
482 if (worktree_path == NULL) {
483 error = got_error_from_errno();
484 goto done;
486 } else if (argc == 1) {
487 worktree_path = realpath(argv[0], NULL);
488 if (worktree_path == NULL) {
489 error = got_error_from_errno();
490 goto done;
492 } else
493 usage_update();
495 error = got_worktree_open(&worktree, worktree_path);
496 if (error != NULL)
497 goto done;
499 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
500 if (error != NULL)
501 goto done;
503 error = apply_unveil(got_repo_get_path(repo), worktree_path);
504 if (error)
505 goto done;
507 if (commit_id_str == NULL) {
508 struct got_reference *head_ref;
509 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
510 if (error != NULL)
511 goto done;
512 error = got_ref_resolve(&commit_id, repo, head_ref);
513 if (error != NULL)
514 goto done;
515 error = got_object_id_str(&commit_id_str, commit_id);
516 if (error != NULL)
517 goto done;
518 } else {
519 error = got_object_resolve_id_str(&commit_id, repo,
520 commit_id_str);
521 if (error != NULL)
522 goto done;
525 error = check_ancestry(worktree, commit_id, repo);
526 if (error != NULL)
527 goto done;
529 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
530 commit_id) != 0) {
531 error = got_worktree_set_base_commit_id(worktree, repo,
532 commit_id);
533 if (error)
534 goto done;
537 error = got_worktree_checkout_files(worktree, repo,
538 update_progress, &did_something, checkout_cancel, NULL);
539 if (error != NULL)
540 goto done;
542 if (did_something)
543 printf("Updated to commit %s\n", commit_id_str);
544 else
545 printf("Already up-to-date\n");
546 done:
547 free(worktree_path);
548 free(commit_id);
549 free(commit_id_str);
550 return error;
553 static const struct got_error *
554 print_patch(struct got_commit_object *commit, struct got_object_id *id,
555 int diff_context, struct got_repository *repo)
557 const struct got_error *err = NULL;
558 struct got_tree_object *tree1 = NULL, *tree2;
559 struct got_object_qid *qid;
560 char *id_str1 = NULL, *id_str2;
562 err = got_object_open_as_tree(&tree2, repo,
563 got_object_commit_get_tree_id(commit));
564 if (err)
565 return err;
567 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
568 if (qid != NULL) {
569 struct got_commit_object *pcommit;
571 err = got_object_open_as_commit(&pcommit, repo, qid->id);
572 if (err)
573 return err;
575 err = got_object_open_as_tree(&tree1, repo,
576 got_object_commit_get_tree_id(pcommit));
577 got_object_commit_close(pcommit);
578 if (err)
579 return err;
581 err = got_object_id_str(&id_str1, qid->id);
582 if (err)
583 return err;
586 err = got_object_id_str(&id_str2, id);
587 if (err)
588 goto done;
590 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
591 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
592 done:
593 if (tree1)
594 got_object_tree_close(tree1);
595 got_object_tree_close(tree2);
596 free(id_str1);
597 free(id_str2);
598 return err;
601 static char *
602 get_datestr(time_t *time, char *datebuf)
604 char *p, *s = ctime_r(time, datebuf);
605 p = strchr(s, '\n');
606 if (p)
607 *p = '\0';
608 return s;
611 static const struct got_error *
612 print_commit(struct got_commit_object *commit, struct got_object_id *id,
613 struct got_repository *repo, int show_patch, int diff_context)
615 const struct got_error *err = NULL;
616 char *id_str, *datestr, *logmsg0, *logmsg, *line;
617 char datebuf[26];
618 time_t committer_time;
619 const char *author, *committer;
621 err = got_object_id_str(&id_str, id);
622 if (err)
623 return err;
625 printf("-----------------------------------------------\n");
626 printf("commit %s\n", id_str);
627 free(id_str);
628 printf("from: %s\n", got_object_commit_get_author(commit));
629 committer_time = got_object_commit_get_committer_time(commit);
630 datestr = get_datestr(&committer_time, datebuf);
631 printf("date: %s UTC\n", datestr);
632 author = got_object_commit_get_author(commit);
633 committer = got_object_commit_get_committer(commit);
634 if (strcmp(author, committer) != 0)
635 printf("via: %s\n", committer);
636 if (got_object_commit_get_nparents(commit) > 1) {
637 const struct got_object_id_queue *parent_ids;
638 struct got_object_qid *qid;
639 int n = 1;
640 parent_ids = got_object_commit_get_parent_ids(commit);
641 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
642 err = got_object_id_str(&id_str, qid->id);
643 if (err)
644 return err;
645 printf("parent %d: %s\n", n++, id_str);
646 free(id_str);
650 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
651 if (logmsg0 == NULL)
652 return got_error_from_errno();
654 logmsg = logmsg0;
655 do {
656 line = strsep(&logmsg, "\n");
657 if (line)
658 printf(" %s\n", line);
659 } while (line);
660 free(logmsg0);
662 if (show_patch) {
663 err = print_patch(commit, id, diff_context, repo);
664 if (err == 0)
665 printf("\n");
668 fflush(stdout);
669 return err;
672 static const struct got_error *
673 print_commits(struct got_object_id *root_id, struct got_repository *repo,
674 char *path, int show_patch, int diff_context, int limit,
675 int first_parent_traversal)
677 const struct got_error *err;
678 struct got_commit_graph *graph;
680 err = got_commit_graph_open(&graph, root_id, path,
681 first_parent_traversal, repo);
682 if (err)
683 return err;
684 err = got_commit_graph_iter_start(graph, root_id, repo);
685 if (err)
686 goto done;
687 while (1) {
688 struct got_commit_object *commit;
689 struct got_object_id *id;
691 if (sigint_received || sigpipe_received)
692 break;
694 err = got_commit_graph_iter_next(&id, graph);
695 if (err) {
696 if (err->code == GOT_ERR_ITER_COMPLETED) {
697 err = NULL;
698 break;
700 if (err->code != GOT_ERR_ITER_NEED_MORE)
701 break;
702 err = got_commit_graph_fetch_commits(graph, 1, repo);
703 if (err)
704 break;
705 else
706 continue;
708 if (id == NULL)
709 break;
711 err = got_object_open_as_commit(&commit, repo, id);
712 if (err)
713 break;
714 err = print_commit(commit, id, repo, show_patch, diff_context);
715 got_object_commit_close(commit);
716 if (err || (limit && --limit == 0))
717 break;
719 done:
720 got_commit_graph_close(graph);
721 return err;
724 __dead static void
725 usage_log(void)
727 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
728 "[-r repository-path] [path]\n", getprogname());
729 exit(1);
732 static const struct got_error *
733 cmd_log(int argc, char *argv[])
735 const struct got_error *error;
736 struct got_repository *repo = NULL;
737 struct got_commit_object *commit = NULL;
738 struct got_object_id *id = NULL;
739 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
740 char *start_commit = NULL;
741 int diff_context = 3, ch;
742 int show_patch = 0, limit = 0, first_parent_traversal = 0;
743 const char *errstr;
745 #ifndef PROFILE
746 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
747 NULL)
748 == -1)
749 err(1, "pledge");
750 #endif
752 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
753 switch (ch) {
754 case 'p':
755 show_patch = 1;
756 break;
757 case 'c':
758 start_commit = optarg;
759 break;
760 case 'C':
761 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
762 &errstr);
763 if (errstr != NULL)
764 err(1, "-C option %s", errstr);
765 break;
766 case 'l':
767 limit = strtonum(optarg, 1, INT_MAX, &errstr);
768 if (errstr != NULL)
769 err(1, "-l option %s", errstr);
770 break;
771 case 'f':
772 first_parent_traversal = 1;
773 break;
774 case 'r':
775 repo_path = realpath(optarg, NULL);
776 if (repo_path == NULL)
777 err(1, "-r option");
778 break;
779 default:
780 usage();
781 /* NOTREACHED */
785 argc -= optind;
786 argv += optind;
788 if (argc == 0)
789 path = strdup("");
790 else if (argc == 1)
791 path = strdup(argv[0]);
792 else
793 usage_log();
794 if (path == NULL)
795 return got_error_from_errno();
797 cwd = getcwd(NULL, 0);
798 if (cwd == NULL) {
799 error = got_error_from_errno();
800 goto done;
802 if (repo_path == NULL) {
803 repo_path = strdup(cwd);
804 if (repo_path == NULL) {
805 error = got_error_from_errno();
806 goto done;
810 error = apply_unveil(repo_path, NULL);
811 if (error)
812 goto done;
814 error = got_repo_open(&repo, repo_path);
815 if (error != NULL)
816 goto done;
818 if (start_commit == NULL) {
819 struct got_reference *head_ref;
820 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
821 if (error != NULL)
822 return error;
823 error = got_ref_resolve(&id, repo, head_ref);
824 got_ref_close(head_ref);
825 if (error != NULL)
826 return error;
827 error = got_object_open_as_commit(&commit, repo, id);
828 } else {
829 struct got_reference *ref;
830 error = got_ref_open(&ref, repo, start_commit);
831 if (error == NULL) {
832 int obj_type;
833 error = got_ref_resolve(&id, repo, ref);
834 got_ref_close(ref);
835 if (error != NULL)
836 goto done;
837 error = got_object_get_type(&obj_type, repo, id);
838 if (error != NULL)
839 goto done;
840 if (obj_type == GOT_OBJ_TYPE_TAG) {
841 struct got_tag_object *tag;
842 error = got_object_open_as_tag(&tag, repo, id);
843 if (error != NULL)
844 goto done;
845 if (got_object_tag_get_object_type(tag) !=
846 GOT_OBJ_TYPE_COMMIT) {
847 got_object_tag_close(tag);
848 error = got_error(GOT_ERR_OBJ_TYPE);
849 goto done;
851 free(id);
852 id = got_object_id_dup(
853 got_object_tag_get_object_id(tag));
854 if (id == NULL)
855 error = got_error_from_errno();
856 got_object_tag_close(tag);
857 if (error)
858 goto done;
859 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
860 error = got_error(GOT_ERR_OBJ_TYPE);
861 goto done;
863 error = got_object_open_as_commit(&commit, repo, id);
864 if (error != NULL)
865 goto done;
867 if (commit == NULL) {
868 error = got_object_resolve_id_str(&id, repo,
869 start_commit);
870 if (error != NULL)
871 return error;
874 if (error != NULL)
875 goto done;
877 error = got_repo_map_path(&in_repo_path, repo, path, 1);
878 if (error != NULL)
879 goto done;
880 if (in_repo_path) {
881 free(path);
882 path = in_repo_path;
885 error = print_commits(id, repo, path, show_patch,
886 diff_context, limit, first_parent_traversal);
887 done:
888 free(path);
889 free(repo_path);
890 free(cwd);
891 free(id);
892 if (repo) {
893 const struct got_error *repo_error;
894 repo_error = got_repo_close(repo);
895 if (error == NULL)
896 error = repo_error;
898 return error;
901 __dead static void
902 usage_diff(void)
904 fprintf(stderr, "usage: %s diff [-C number] [repository-path] "
905 "object1 object2\n", getprogname());
906 exit(1);
909 static const struct got_error *
910 cmd_diff(int argc, char *argv[])
912 const struct got_error *error;
913 struct got_repository *repo = NULL;
914 char *repo_path = NULL;
915 struct got_object_id *id1 = NULL, *id2 = NULL;
916 char *id_str1 = NULL, *id_str2 = NULL;
917 int type1, type2;
918 int diff_context = 3, ch;
919 const char *errstr;
921 #ifndef PROFILE
922 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
923 NULL) == -1)
924 err(1, "pledge");
925 #endif
927 while ((ch = getopt(argc, argv, "C:")) != -1) {
928 switch (ch) {
929 case 'C':
930 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
931 if (errstr != NULL)
932 err(1, "-C option %s", errstr);
933 break;
934 default:
935 usage();
936 /* NOTREACHED */
940 argc -= optind;
941 argv += optind;
943 if (argc == 0) {
944 usage_diff(); /* TODO show local worktree changes */
945 } else if (argc == 2) {
946 repo_path = getcwd(NULL, 0);
947 if (repo_path == NULL)
948 return got_error_from_errno();
949 id_str1 = argv[0];
950 id_str2 = argv[1];
951 } else if (argc == 3) {
952 repo_path = realpath(argv[0], NULL);
953 if (repo_path == NULL)
954 return got_error_from_errno();
955 id_str1 = argv[1];
956 id_str2 = argv[2];
957 } else
958 usage_diff();
960 error = apply_unveil(repo_path, NULL);
961 if (error)
962 goto done;
964 error = got_repo_open(&repo, repo_path);
965 free(repo_path);
966 if (error != NULL)
967 goto done;
969 error = got_object_resolve_id_str(&id1, repo, id_str1);
970 if (error)
971 goto done;
973 error = got_object_resolve_id_str(&id2, repo, id_str2);
974 if (error)
975 goto done;
977 error = got_object_get_type(&type1, repo, id1);
978 if (error)
979 goto done;
981 error = got_object_get_type(&type2, repo, id2);
982 if (error)
983 goto done;
985 if (type1 != type2) {
986 error = got_error(GOT_ERR_OBJ_TYPE);
987 goto done;
990 switch (type1) {
991 case GOT_OBJ_TYPE_BLOB:
992 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
993 diff_context, repo, stdout);
994 break;
995 case GOT_OBJ_TYPE_TREE:
996 error = got_diff_objects_as_trees(id1, id2, "", "",
997 diff_context, repo, stdout);
998 break;
999 case GOT_OBJ_TYPE_COMMIT:
1000 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1001 id_str2);
1002 error = got_diff_objects_as_commits(id1, id2, diff_context,
1003 repo, stdout);
1004 break;
1005 default:
1006 error = got_error(GOT_ERR_OBJ_TYPE);
1009 done:
1010 free(id1);
1011 free(id2);
1012 if (repo) {
1013 const struct got_error *repo_error;
1014 repo_error = got_repo_close(repo);
1015 if (error == NULL)
1016 error = repo_error;
1018 return error;
1021 __dead static void
1022 usage_blame(void)
1024 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
1025 getprogname());
1026 exit(1);
1029 static const struct got_error *
1030 cmd_blame(int argc, char *argv[])
1032 const struct got_error *error;
1033 struct got_repository *repo = NULL;
1034 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1035 struct got_object_id *commit_id = NULL;
1036 char *commit_id_str = NULL;
1037 int ch;
1039 #ifndef PROFILE
1040 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1041 NULL) == -1)
1042 err(1, "pledge");
1043 #endif
1045 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1046 switch (ch) {
1047 case 'c':
1048 commit_id_str = optarg;
1049 break;
1050 case 'r':
1051 repo_path = realpath(optarg, NULL);
1052 if (repo_path == NULL)
1053 err(1, "-r option");
1054 break;
1055 default:
1056 usage();
1057 /* NOTREACHED */
1061 argc -= optind;
1062 argv += optind;
1064 if (argc == 1)
1065 path = argv[0];
1066 else
1067 usage_blame();
1069 cwd = getcwd(NULL, 0);
1070 if (cwd == NULL) {
1071 error = got_error_from_errno();
1072 goto done;
1074 if (repo_path == NULL) {
1075 repo_path = strdup(cwd);
1076 if (repo_path == NULL) {
1077 error = got_error_from_errno();
1078 goto done;
1082 error = apply_unveil(repo_path, NULL);
1083 if (error)
1084 goto done;
1086 error = got_repo_open(&repo, repo_path);
1087 if (error != NULL)
1088 goto done;
1090 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1091 if (error != NULL)
1092 goto done;
1094 if (commit_id_str == NULL) {
1095 struct got_reference *head_ref;
1096 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1097 if (error != NULL)
1098 goto done;
1099 error = got_ref_resolve(&commit_id, repo, head_ref);
1100 got_ref_close(head_ref);
1101 if (error != NULL)
1102 goto done;
1103 } else {
1104 error = got_object_resolve_id_str(&commit_id, repo,
1105 commit_id_str);
1106 if (error != NULL)
1107 goto done;
1110 error = got_blame(in_repo_path, commit_id, repo, stdout);
1111 done:
1112 free(in_repo_path);
1113 free(repo_path);
1114 free(cwd);
1115 free(commit_id);
1116 if (repo) {
1117 const struct got_error *repo_error;
1118 repo_error = got_repo_close(repo);
1119 if (error == NULL)
1120 error = repo_error;
1122 return error;
1125 __dead static void
1126 usage_tree(void)
1128 fprintf(stderr,
1129 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1130 getprogname());
1131 exit(1);
1134 static void
1135 print_entry(struct got_tree_entry *te, const char *id, const char *path,
1136 const char *root_path)
1138 int is_root_path = (strcmp(path, root_path) == 0);
1140 path += strlen(root_path);
1141 while (path[0] == '/')
1142 path++;
1144 printf("%s%s%s%s%s\n", id ? id : "", path,
1145 is_root_path ? "" : "/",
1146 te->name, S_ISDIR(te->mode) ? "/" : "");
1149 static const struct got_error *
1150 print_tree(const char *path, struct got_object_id *commit_id,
1151 int show_ids, int recurse, const char *root_path,
1152 struct got_repository *repo)
1154 const struct got_error *err = NULL;
1155 struct got_object_id *tree_id = NULL;
1156 struct got_tree_object *tree = NULL;
1157 const struct got_tree_entries *entries;
1158 struct got_tree_entry *te;
1160 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1161 if (err)
1162 goto done;
1164 err = got_object_open_as_tree(&tree, repo, tree_id);
1165 if (err)
1166 goto done;
1167 entries = got_object_tree_get_entries(tree);
1168 te = SIMPLEQ_FIRST(&entries->head);
1169 while (te) {
1170 char *id = NULL;
1172 if (sigint_received || sigpipe_received)
1173 break;
1175 if (show_ids) {
1176 char *id_str;
1177 err = got_object_id_str(&id_str, te->id);
1178 if (err)
1179 goto done;
1180 if (asprintf(&id, "%s ", id_str) == -1) {
1181 err = got_error_from_errno();
1182 free(id_str);
1183 goto done;
1185 free(id_str);
1187 print_entry(te, id, path, root_path);
1188 free(id);
1190 if (recurse && S_ISDIR(te->mode)) {
1191 char *child_path;
1192 if (asprintf(&child_path, "%s%s%s", path,
1193 path[0] == '/' && path[1] == '\0' ? "" : "/",
1194 te->name) == -1) {
1195 err = got_error_from_errno();
1196 goto done;
1198 err = print_tree(child_path, commit_id, show_ids, 1,
1199 root_path, repo);
1200 free(child_path);
1201 if (err)
1202 goto done;
1205 te = SIMPLEQ_NEXT(te, entry);
1207 done:
1208 if (tree)
1209 got_object_tree_close(tree);
1210 free(tree_id);
1211 return err;
1214 static const struct got_error *
1215 cmd_tree(int argc, char *argv[])
1217 const struct got_error *error;
1218 struct got_repository *repo = NULL;
1219 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1220 struct got_object_id *commit_id = NULL;
1221 char *commit_id_str = NULL;
1222 int show_ids = 0, recurse = 0;
1223 int ch;
1225 #ifndef PROFILE
1226 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1227 NULL) == -1)
1228 err(1, "pledge");
1229 #endif
1231 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1232 switch (ch) {
1233 case 'c':
1234 commit_id_str = optarg;
1235 break;
1236 case 'r':
1237 repo_path = realpath(optarg, NULL);
1238 if (repo_path == NULL)
1239 err(1, "-r option");
1240 break;
1241 case 'i':
1242 show_ids = 1;
1243 break;
1244 case 'R':
1245 recurse = 1;
1246 break;
1247 default:
1248 usage();
1249 /* NOTREACHED */
1253 argc -= optind;
1254 argv += optind;
1256 if (argc == 1)
1257 path = argv[0];
1258 else if (argc > 1)
1259 usage_tree();
1260 else
1261 path = "/";
1263 cwd = getcwd(NULL, 0);
1264 if (cwd == NULL) {
1265 error = got_error_from_errno();
1266 goto done;
1268 if (repo_path == NULL) {
1269 repo_path = strdup(cwd);
1270 if (repo_path == NULL) {
1271 error = got_error_from_errno();
1272 goto done;
1276 error = apply_unveil(repo_path, NULL);
1277 if (error)
1278 goto done;
1280 error = got_repo_open(&repo, repo_path);
1281 if (error != NULL)
1282 goto done;
1284 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1285 if (error != NULL)
1286 goto done;
1288 if (commit_id_str == NULL) {
1289 struct got_reference *head_ref;
1290 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1291 if (error != NULL)
1292 goto done;
1293 error = got_ref_resolve(&commit_id, repo, head_ref);
1294 got_ref_close(head_ref);
1295 if (error != NULL)
1296 goto done;
1297 } else {
1298 error = got_object_resolve_id_str(&commit_id, repo,
1299 commit_id_str);
1300 if (error != NULL)
1301 goto done;
1304 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1305 in_repo_path, repo);
1306 done:
1307 free(in_repo_path);
1308 free(repo_path);
1309 free(cwd);
1310 free(commit_id);
1311 if (repo) {
1312 const struct got_error *repo_error;
1313 repo_error = got_repo_close(repo);
1314 if (error == NULL)
1315 error = repo_error;
1317 return error;
1320 #ifdef notyet
1321 static const struct got_error *
1322 cmd_status(int argc __unused, char *argv[] __unused)
1324 git_repository *repo = NULL;
1325 git_status_list *status;
1326 git_status_options statusopts;
1327 size_t i;
1329 git_libgit2_init();
1331 if (git_repository_open_ext(&repo, ".", 0, NULL))
1332 errx(1, "git_repository_open: %s", giterr_last()->message);
1334 if (git_repository_is_bare(repo))
1335 errx(1, "bar repository");
1337 if (git_status_init_options(&statusopts, GIT_STATUS_OPTIONS_VERSION))
1338 errx(1, "git_status_init_options: %s", giterr_last()->message);
1340 statusopts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
1341 statusopts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED |
1342 GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
1343 GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
1345 if (git_status_list_new(&status, repo, &statusopts))
1346 errx(1, "git_status_list_new: %s", giterr_last()->message);
1348 for (i = 0; i < git_status_list_entrycount(status); i++) {
1349 const git_status_entry *se;
1351 se = git_status_byindex(status, i);
1352 switch (se->status) {
1353 case GIT_STATUS_WT_NEW:
1354 printf("? %s\n", se->index_to_workdir->new_file.path);
1355 break;
1356 case GIT_STATUS_WT_MODIFIED:
1357 printf("M %s\n", se->index_to_workdir->new_file.path);
1358 break;
1359 case GIT_STATUS_WT_DELETED:
1360 printf("R %s\n", se->index_to_workdir->new_file.path);
1361 break;
1362 case GIT_STATUS_WT_RENAMED:
1363 printf("m %s -> %s\n",
1364 se->index_to_workdir->old_file.path,
1365 se->index_to_workdir->new_file.path);
1366 break;
1367 case GIT_STATUS_WT_TYPECHANGE:
1368 printf("t %s\n", se->index_to_workdir->new_file.path);
1369 break;
1370 case GIT_STATUS_INDEX_NEW:
1371 printf("A %s\n", se->head_to_index->new_file.path);
1372 break;
1373 case GIT_STATUS_INDEX_MODIFIED:
1374 printf("M %s\n", se->head_to_index->old_file.path);
1375 break;
1376 case GIT_STATUS_INDEX_DELETED:
1377 printf("R %s\n", se->head_to_index->old_file.path);
1378 break;
1379 case GIT_STATUS_INDEX_RENAMED:
1380 printf("m %s -> %s\n",
1381 se->head_to_index->old_file.path,
1382 se->head_to_index->new_file.path);
1383 break;
1384 case GIT_STATUS_INDEX_TYPECHANGE:
1385 printf("t %s\n", se->head_to_index->old_file.path);
1386 break;
1387 case GIT_STATUS_CURRENT:
1388 default:
1389 break;
1393 git_status_list_free(status);
1394 git_repository_free(repo);
1395 git_libgit2_shutdown();
1397 return 0;
1399 #endif