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);
78 __dead static void usage_status(void);
80 static const struct got_error* cmd_checkout(int, char *[]);
81 static const struct got_error* cmd_update(int, char *[]);
82 static const struct got_error* cmd_log(int, char *[]);
83 static const struct got_error* cmd_diff(int, char *[]);
84 static const struct got_error* cmd_blame(int, char *[]);
85 static const struct got_error* cmd_tree(int, char *[]);
86 static const struct got_error* cmd_status(int, char *[]);
88 static struct cmd got_commands[] = {
89 { "checkout", cmd_checkout, usage_checkout,
90 "check out a new work tree from a repository" },
91 { "update", cmd_update, usage_update,
92 "update a work tree to a different commit" },
93 { "log", cmd_log, usage_log,
94 "show repository history" },
95 { "diff", cmd_diff, usage_diff,
96 "compare files and directories" },
97 { "blame", cmd_blame, usage_blame,
98 " show when lines in a file were changed" },
99 { "tree", cmd_tree, usage_tree,
100 " list files and directories in repository" },
101 { "status", cmd_status, usage_status,
102 "show modification status of files" },
103 };
105 int
106 main(int argc, char *argv[])
108 struct cmd *cmd;
109 unsigned int i;
110 int ch;
111 int hflag = 0;
113 setlocale(LC_CTYPE, "");
115 while ((ch = getopt(argc, argv, "h")) != -1) {
116 switch (ch) {
117 case 'h':
118 hflag = 1;
119 break;
120 default:
121 usage();
122 /* NOTREACHED */
126 argc -= optind;
127 argv += optind;
128 optind = 0;
130 if (argc <= 0)
131 usage();
133 signal(SIGINT, catch_sigint);
134 signal(SIGPIPE, catch_sigpipe);
136 for (i = 0; i < nitems(got_commands); i++) {
137 const struct got_error *error;
139 cmd = &got_commands[i];
141 if (strncmp(cmd->cmd_name, argv[0], strlen(argv[0])))
142 continue;
144 if (hflag)
145 got_commands[i].cmd_usage();
147 error = got_commands[i].cmd_main(argc, argv);
148 if (error && !(sigint_received || sigpipe_received)) {
149 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
150 return 1;
153 return 0;
156 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
157 return 1;
160 __dead static void
161 usage(void)
163 int i;
165 fprintf(stderr, "usage: %s [-h] command [arg ...]\n\n"
166 "Available commands:\n", getprogname());
167 for (i = 0; i < nitems(got_commands); i++) {
168 struct cmd *cmd = &got_commands[i];
169 fprintf(stderr, " %s: %s\n", cmd->cmd_name, cmd->cmd_descr);
171 exit(1);
174 static const struct got_error *
175 apply_unveil(const char *repo_path, const char *worktree_path)
177 const struct got_error *error;
179 if (repo_path && unveil(repo_path, "r") != 0)
180 return got_error_from_errno();
182 if (worktree_path && unveil(worktree_path, "rwc") != 0)
183 return got_error_from_errno();
185 if (unveil("/tmp", "rwc") != 0)
186 return got_error_from_errno();
188 error = got_privsep_unveil_exec_helpers();
189 if (error != NULL)
190 return error;
192 if (unveil(NULL, NULL) != 0)
193 return got_error_from_errno();
195 return NULL;
198 __dead static void
199 usage_checkout(void)
201 fprintf(stderr, "usage: %s checkout [-p prefix] repository-path "
202 "[worktree-path]\n", getprogname());
203 exit(1);
206 static void
207 checkout_progress(void *arg, unsigned char status, const char *path)
209 char *worktree_path = arg;
211 while (path[0] == '/')
212 path++;
214 printf("%c %s/%s\n", status, worktree_path, path);
217 static const struct got_error *
218 check_cancelled(void *arg)
220 if (sigint_received || sigpipe_received)
221 return got_error(GOT_ERR_CANCELLED);
222 return NULL;
225 static const struct got_error *
226 check_ancestry(struct got_worktree *worktree, struct got_object_id *commit_id,
227 struct got_repository *repo)
229 const struct got_error *err;
230 struct got_reference *head_ref = NULL;
231 struct got_object_id *head_commit_id = NULL;
232 struct got_commit_graph *graph = NULL;
234 head_ref = got_worktree_get_head_ref(worktree);
235 if (head_ref == NULL)
236 return got_error_from_errno();
238 /* TODO: Check the reflog. The head ref may have been rebased. */
239 err = got_ref_resolve(&head_commit_id, repo, head_ref);
240 if (err)
241 goto done;
243 err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
244 if (err)
245 goto done;
247 err = got_commit_graph_iter_start(graph, head_commit_id, repo);
248 if (err)
249 goto done;
250 while (1) {
251 struct got_object_id *id;
253 if (sigint_received || sigpipe_received)
254 break;
256 err = got_commit_graph_iter_next(&id, graph);
257 if (err) {
258 if (err->code == GOT_ERR_ITER_COMPLETED) {
259 err = got_error(GOT_ERR_ANCESTRY);
260 break;
262 if (err->code != GOT_ERR_ITER_NEED_MORE)
263 break;
264 err = got_commit_graph_fetch_commits(graph, 1, repo);
265 if (err)
266 break;
267 else
268 continue;
270 if (id == NULL)
271 break;
272 if (got_object_id_cmp(id, commit_id) == 0)
273 break;
275 done:
276 if (head_ref)
277 got_ref_close(head_ref);
278 if (graph)
279 got_commit_graph_close(graph);
280 return err;
284 static const struct got_error *
285 cmd_checkout(int argc, char *argv[])
287 const struct got_error *error = NULL;
288 struct got_repository *repo = NULL;
289 struct got_reference *head_ref = NULL;
290 struct got_worktree *worktree = NULL;
291 char *repo_path = NULL;
292 char *worktree_path = NULL;
293 const char *path_prefix = "";
294 char *commit_id_str = NULL;
295 int ch, same_path_prefix;
297 while ((ch = getopt(argc, argv, "c:p:")) != -1) {
298 switch (ch) {
299 case 'c':
300 commit_id_str = strdup(optarg);
301 if (commit_id_str == NULL)
302 return got_error_from_errno();
303 break;
304 case 'p':
305 path_prefix = optarg;
306 break;
307 default:
308 usage();
309 /* NOTREACHED */
313 argc -= optind;
314 argv += optind;
316 #ifndef PROFILE
317 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
318 NULL) == -1)
319 err(1, "pledge");
320 #endif
321 if (argc == 1) {
322 char *cwd, *base, *dotgit;
323 repo_path = realpath(argv[0], NULL);
324 if (repo_path == NULL)
325 return got_error_from_errno();
326 cwd = getcwd(NULL, 0);
327 if (cwd == NULL) {
328 error = got_error_from_errno();
329 goto done;
331 if (path_prefix[0])
332 base = basename(path_prefix);
333 else
334 base = basename(repo_path);
335 if (base == NULL) {
336 error = got_error_from_errno();
337 goto done;
339 dotgit = strstr(base, ".git");
340 if (dotgit)
341 *dotgit = '\0';
342 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
343 error = got_error_from_errno();
344 free(cwd);
345 goto done;
347 free(cwd);
348 } else if (argc == 2) {
349 repo_path = realpath(argv[0], NULL);
350 if (repo_path == NULL) {
351 error = got_error_from_errno();
352 goto done;
354 worktree_path = realpath(argv[1], NULL);
355 if (worktree_path == NULL) {
356 error = got_error_from_errno();
357 goto done;
359 } else
360 usage_checkout();
362 error = apply_unveil(repo_path, worktree_path);
363 if (error)
364 goto done;
366 error = got_repo_open(&repo, repo_path);
367 if (error != NULL)
368 goto done;
370 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
371 if (error != NULL)
372 goto done;
374 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
375 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
376 goto done;
378 error = got_worktree_open(&worktree, worktree_path);
379 if (error != NULL)
380 goto done;
382 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
383 path_prefix);
384 if (error != NULL)
385 goto done;
386 if (!same_path_prefix) {
387 error = got_error(GOT_ERR_PATH_PREFIX);
388 goto done;
391 if (commit_id_str) {
392 struct got_object_id *commit_id;
393 error = got_object_resolve_id_str(&commit_id, repo,
394 commit_id_str);
395 if (error != NULL)
396 goto done;
397 error = check_ancestry(worktree, commit_id, repo);
398 if (error != NULL) {
399 free(commit_id);
400 goto done;
402 error = got_worktree_set_base_commit_id(worktree, repo,
403 commit_id);
404 free(commit_id);
405 if (error)
406 goto done;
409 error = got_worktree_checkout_files(worktree, repo,
410 checkout_progress, worktree_path, check_cancelled, NULL);
411 if (error != NULL)
412 goto done;
414 printf("Now shut up and hack\n");
416 done:
417 free(commit_id_str);
418 free(repo_path);
419 free(worktree_path);
420 return error;
423 __dead static void
424 usage_update(void)
426 fprintf(stderr, "usage: %s update [-c commit] [worktree-path]\n",
427 getprogname());
428 exit(1);
431 static void
432 update_progress(void *arg, unsigned char status, const char *path)
434 int *did_something = arg;
436 if (status == GOT_STATUS_EXISTS)
437 return;
439 *did_something = 1;
440 while (path[0] == '/')
441 path++;
442 printf("%c %s\n", status, path);
445 static const struct got_error *
446 cmd_update(int argc, char *argv[])
448 const struct got_error *error = NULL;
449 struct got_repository *repo = NULL;
450 struct got_worktree *worktree = NULL;
451 char *worktree_path = NULL;
452 struct got_object_id *commit_id = NULL;
453 char *commit_id_str = NULL;
454 int ch, did_something = 0;
456 while ((ch = getopt(argc, argv, "c:")) != -1) {
457 switch (ch) {
458 case 'c':
459 commit_id_str = strdup(optarg);
460 if (commit_id_str == NULL)
461 return got_error_from_errno();
462 break;
463 default:
464 usage();
465 /* NOTREACHED */
469 argc -= optind;
470 argv += optind;
472 #ifndef PROFILE
473 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
474 NULL) == -1)
475 err(1, "pledge");
476 #endif
477 if (argc == 0) {
478 worktree_path = getcwd(NULL, 0);
479 if (worktree_path == NULL) {
480 error = got_error_from_errno();
481 goto done;
483 } else if (argc == 1) {
484 worktree_path = realpath(argv[0], NULL);
485 if (worktree_path == NULL) {
486 error = got_error_from_errno();
487 goto done;
489 } else
490 usage_update();
492 error = got_worktree_open(&worktree, worktree_path);
493 if (error != NULL)
494 goto done;
496 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
497 if (error != NULL)
498 goto done;
500 error = apply_unveil(got_repo_get_path(repo),
501 got_worktree_get_root_path(worktree));
502 if (error)
503 goto done;
505 if (commit_id_str == NULL) {
506 struct got_reference *head_ref;
507 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
508 if (error != NULL)
509 goto done;
510 error = got_ref_resolve(&commit_id, repo, head_ref);
511 if (error != NULL)
512 goto done;
513 error = got_object_id_str(&commit_id_str, commit_id);
514 if (error != NULL)
515 goto done;
516 } else {
517 error = got_object_resolve_id_str(&commit_id, repo,
518 commit_id_str);
519 if (error != NULL)
520 goto done;
523 error = check_ancestry(worktree, commit_id, repo);
524 if (error != NULL)
525 goto done;
527 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
528 commit_id) != 0) {
529 error = got_worktree_set_base_commit_id(worktree, repo,
530 commit_id);
531 if (error)
532 goto done;
535 error = got_worktree_checkout_files(worktree, repo,
536 update_progress, &did_something, check_cancelled, NULL);
537 if (error != NULL)
538 goto done;
540 if (did_something)
541 printf("Updated to commit %s\n", commit_id_str);
542 else
543 printf("Already up-to-date\n");
544 done:
545 free(worktree_path);
546 free(commit_id);
547 free(commit_id_str);
548 return error;
551 static const struct got_error *
552 print_patch(struct got_commit_object *commit, struct got_object_id *id,
553 int diff_context, struct got_repository *repo)
555 const struct got_error *err = NULL;
556 struct got_tree_object *tree1 = NULL, *tree2;
557 struct got_object_qid *qid;
558 char *id_str1 = NULL, *id_str2;
560 err = got_object_open_as_tree(&tree2, repo,
561 got_object_commit_get_tree_id(commit));
562 if (err)
563 return err;
565 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
566 if (qid != NULL) {
567 struct got_commit_object *pcommit;
569 err = got_object_open_as_commit(&pcommit, repo, qid->id);
570 if (err)
571 return err;
573 err = got_object_open_as_tree(&tree1, repo,
574 got_object_commit_get_tree_id(pcommit));
575 got_object_commit_close(pcommit);
576 if (err)
577 return err;
579 err = got_object_id_str(&id_str1, qid->id);
580 if (err)
581 return err;
584 err = got_object_id_str(&id_str2, id);
585 if (err)
586 goto done;
588 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
589 err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
590 done:
591 if (tree1)
592 got_object_tree_close(tree1);
593 got_object_tree_close(tree2);
594 free(id_str1);
595 free(id_str2);
596 return err;
599 static char *
600 get_datestr(time_t *time, char *datebuf)
602 char *p, *s = ctime_r(time, datebuf);
603 p = strchr(s, '\n');
604 if (p)
605 *p = '\0';
606 return s;
609 static const struct got_error *
610 print_commit(struct got_commit_object *commit, struct got_object_id *id,
611 struct got_repository *repo, int show_patch, int diff_context,
612 struct got_reflist_head *refs)
614 const struct got_error *err = NULL;
615 char *id_str, *datestr, *logmsg0, *logmsg, *line;
616 char datebuf[26];
617 time_t committer_time;
618 const char *author, *committer;
619 char *refs_str = NULL;
620 struct got_reflist_entry *re;
622 SIMPLEQ_FOREACH(re, refs, entry) {
623 char *s;
624 const char *name;
625 if (got_object_id_cmp(re->id, id) != 0)
626 continue;
627 name = got_ref_get_name(re->ref);
628 if (strncmp(name, "refs/", 5) == 0)
629 name += 5;
630 if (strncmp(name, "heads/", 6) == 0)
631 name += 6;
632 if (strncmp(name, "remotes/", 8) == 0)
633 name += 8;
634 s = refs_str;
635 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
636 name) == -1) {
637 err = got_error_from_errno();
638 free(s);
639 break;
641 free(s);
643 err = got_object_id_str(&id_str, id);
644 if (err)
645 return err;
647 printf("-----------------------------------------------\n");
648 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
649 refs_str ? refs_str : "", refs_str ? ")" : "");
650 free(id_str);
651 printf("from: %s\n", got_object_commit_get_author(commit));
652 committer_time = got_object_commit_get_committer_time(commit);
653 datestr = get_datestr(&committer_time, datebuf);
654 printf("date: %s UTC\n", datestr);
655 author = got_object_commit_get_author(commit);
656 committer = got_object_commit_get_committer(commit);
657 if (strcmp(author, committer) != 0)
658 printf("via: %s\n", committer);
659 if (got_object_commit_get_nparents(commit) > 1) {
660 const struct got_object_id_queue *parent_ids;
661 struct got_object_qid *qid;
662 int n = 1;
663 parent_ids = got_object_commit_get_parent_ids(commit);
664 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
665 err = got_object_id_str(&id_str, qid->id);
666 if (err)
667 return err;
668 printf("parent %d: %s\n", n++, id_str);
669 free(id_str);
673 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
674 if (logmsg0 == NULL)
675 return got_error_from_errno();
677 logmsg = logmsg0;
678 do {
679 line = strsep(&logmsg, "\n");
680 if (line)
681 printf(" %s\n", line);
682 } while (line);
683 free(logmsg0);
685 if (show_patch) {
686 err = print_patch(commit, id, diff_context, repo);
687 if (err == 0)
688 printf("\n");
691 fflush(stdout);
692 return err;
695 static const struct got_error *
696 print_commits(struct got_object_id *root_id, struct got_repository *repo,
697 char *path, int show_patch, int diff_context, int limit,
698 int first_parent_traversal, struct got_reflist_head *refs)
700 const struct got_error *err;
701 struct got_commit_graph *graph;
703 err = got_commit_graph_open(&graph, root_id, path,
704 first_parent_traversal, repo);
705 if (err)
706 return err;
707 err = got_commit_graph_iter_start(graph, root_id, repo);
708 if (err)
709 goto done;
710 while (1) {
711 struct got_commit_object *commit;
712 struct got_object_id *id;
714 if (sigint_received || sigpipe_received)
715 break;
717 err = got_commit_graph_iter_next(&id, graph);
718 if (err) {
719 if (err->code == GOT_ERR_ITER_COMPLETED) {
720 err = NULL;
721 break;
723 if (err->code != GOT_ERR_ITER_NEED_MORE)
724 break;
725 err = got_commit_graph_fetch_commits(graph, 1, repo);
726 if (err)
727 break;
728 else
729 continue;
731 if (id == NULL)
732 break;
734 err = got_object_open_as_commit(&commit, repo, id);
735 if (err)
736 break;
737 err = print_commit(commit, id, repo, show_patch, diff_context,
738 refs);
739 got_object_commit_close(commit);
740 if (err || (limit && --limit == 0))
741 break;
743 done:
744 got_commit_graph_close(graph);
745 return err;
748 __dead static void
749 usage_log(void)
751 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
752 "[-r repository-path] [path]\n", getprogname());
753 exit(1);
756 static const struct got_error *
757 cmd_log(int argc, char *argv[])
759 const struct got_error *error;
760 struct got_repository *repo = NULL;
761 struct got_worktree *worktree = NULL;
762 struct got_commit_object *commit = NULL;
763 struct got_object_id *id = NULL;
764 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
765 char *start_commit = NULL;
766 int diff_context = 3, ch;
767 int show_patch = 0, limit = 0, first_parent_traversal = 0;
768 const char *errstr;
769 struct got_reflist_head refs;
771 #ifndef PROFILE
772 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
773 NULL)
774 == -1)
775 err(1, "pledge");
776 #endif
778 while ((ch = getopt(argc, argv, "pc:C:l:fr:")) != -1) {
779 switch (ch) {
780 case 'p':
781 show_patch = 1;
782 break;
783 case 'c':
784 start_commit = optarg;
785 break;
786 case 'C':
787 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
788 &errstr);
789 if (errstr != NULL)
790 err(1, "-C option %s", errstr);
791 break;
792 case 'l':
793 limit = strtonum(optarg, 1, INT_MAX, &errstr);
794 if (errstr != NULL)
795 err(1, "-l option %s", errstr);
796 break;
797 case 'f':
798 first_parent_traversal = 1;
799 break;
800 case 'r':
801 repo_path = realpath(optarg, NULL);
802 if (repo_path == NULL)
803 err(1, "-r option");
804 break;
805 default:
806 usage();
807 /* NOTREACHED */
811 argc -= optind;
812 argv += optind;
814 if (argc == 0)
815 path = strdup("");
816 else if (argc == 1)
817 path = strdup(argv[0]);
818 else
819 usage_log();
820 if (path == NULL)
821 return got_error_from_errno();
823 cwd = getcwd(NULL, 0);
824 if (cwd == NULL) {
825 error = got_error_from_errno();
826 goto done;
829 error = got_worktree_open(&worktree, cwd);
830 if (error && error->code != GOT_ERR_NOT_WORKTREE)
831 goto done;
832 error = NULL;
834 repo_path = worktree ?
835 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
836 if (repo_path == NULL) {
837 error = got_error_from_errno();
838 goto done;
841 error = apply_unveil(repo_path, NULL);
842 if (error)
843 goto done;
845 error = got_repo_open(&repo, repo_path);
846 if (error != NULL)
847 goto done;
849 if (start_commit == NULL) {
850 struct got_reference *head_ref;
851 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
852 if (error != NULL)
853 return error;
854 error = got_ref_resolve(&id, repo, head_ref);
855 got_ref_close(head_ref);
856 if (error != NULL)
857 return error;
858 error = got_object_open_as_commit(&commit, repo, id);
859 } else {
860 struct got_reference *ref;
861 error = got_ref_open(&ref, repo, start_commit);
862 if (error == NULL) {
863 int obj_type;
864 error = got_ref_resolve(&id, repo, ref);
865 got_ref_close(ref);
866 if (error != NULL)
867 goto done;
868 error = got_object_get_type(&obj_type, repo, id);
869 if (error != NULL)
870 goto done;
871 if (obj_type == GOT_OBJ_TYPE_TAG) {
872 struct got_tag_object *tag;
873 error = got_object_open_as_tag(&tag, repo, id);
874 if (error != NULL)
875 goto done;
876 if (got_object_tag_get_object_type(tag) !=
877 GOT_OBJ_TYPE_COMMIT) {
878 got_object_tag_close(tag);
879 error = got_error(GOT_ERR_OBJ_TYPE);
880 goto done;
882 free(id);
883 id = got_object_id_dup(
884 got_object_tag_get_object_id(tag));
885 if (id == NULL)
886 error = got_error_from_errno();
887 got_object_tag_close(tag);
888 if (error)
889 goto done;
890 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
891 error = got_error(GOT_ERR_OBJ_TYPE);
892 goto done;
894 error = got_object_open_as_commit(&commit, repo, id);
895 if (error != NULL)
896 goto done;
898 if (commit == NULL) {
899 error = got_object_resolve_id_str(&id, repo,
900 start_commit);
901 if (error != NULL)
902 return error;
905 if (error != NULL)
906 goto done;
908 error = got_repo_map_path(&in_repo_path, repo, path, 1);
909 if (error != NULL)
910 goto done;
911 if (in_repo_path) {
912 free(path);
913 path = in_repo_path;
916 SIMPLEQ_INIT(&refs);
917 error = got_ref_list(&refs, repo);
918 if (error)
919 goto done;
921 error = print_commits(id, repo, path, show_patch,
922 diff_context, limit, first_parent_traversal, &refs);
923 done:
924 free(path);
925 free(repo_path);
926 free(cwd);
927 free(id);
928 if (worktree)
929 got_worktree_close(worktree);
930 if (repo) {
931 const struct got_error *repo_error;
932 repo_error = got_repo_close(repo);
933 if (error == NULL)
934 error = repo_error;
936 return error;
939 __dead static void
940 usage_diff(void)
942 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
943 "[object1 object2]\n", getprogname());
944 exit(1);
947 struct print_diff_arg {
948 struct got_repository *repo;
949 struct got_worktree *worktree;
950 int diff_context;
951 };
953 static const struct got_error *
954 print_diff(void *arg, unsigned char status, const char *path,
955 struct got_object_id *id)
957 struct print_diff_arg *a = arg;
958 const struct got_error *err = NULL;
959 struct got_blob_object *blob1 = NULL;
960 FILE *f2 = NULL;
961 char *abspath = NULL;
962 struct stat sb;
964 if (status != GOT_STATUS_MODIFIY)
965 return NULL;
967 err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
968 if (err)
969 goto done;
971 if (asprintf(&abspath, "%s/%s",
972 got_worktree_get_root_path(a->worktree), path) == -1) {
973 err = got_error_from_errno();
974 goto done;
977 f2 = fopen(abspath, "r");
978 if (f2 == NULL) {
979 err = got_error_from_errno();
980 goto done;
982 if (lstat(abspath, &sb) == -1) {
983 err = got_error_from_errno();
984 goto done;
987 err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
988 stdout);
989 done:
990 if (blob1)
991 got_object_blob_close(blob1);
992 if (f2)
993 fclose(f2);
994 free(abspath);
995 return err;
998 static const struct got_error *
999 cmd_diff(int argc, char *argv[])
1001 const struct got_error *error;
1002 struct got_repository *repo = NULL;
1003 struct got_worktree *worktree = NULL;
1004 char *cwd = NULL, *repo_path = NULL;
1005 struct got_object_id *id1 = NULL, *id2 = NULL;
1006 char *id_str1 = NULL, *id_str2 = NULL;
1007 int type1, type2;
1008 int diff_context = 3, ch;
1009 const char *errstr;
1011 #ifndef PROFILE
1012 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1013 NULL) == -1)
1014 err(1, "pledge");
1015 #endif
1017 while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1018 switch (ch) {
1019 case 'C':
1020 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1021 if (errstr != NULL)
1022 err(1, "-C option %s", errstr);
1023 break;
1024 case 'r':
1025 repo_path = realpath(optarg, NULL);
1026 if (repo_path == NULL)
1027 err(1, "-r option");
1028 break;
1029 default:
1030 usage();
1031 /* NOTREACHED */
1035 argc -= optind;
1036 argv += optind;
1038 cwd = getcwd(NULL, 0);
1039 if (cwd == NULL) {
1040 error = got_error_from_errno();
1041 goto done;
1043 if (argc == 0) {
1044 if (repo_path)
1045 errx(1,
1046 "-r option can't be used when diffing a work tree");
1047 error = got_worktree_open(&worktree, cwd);
1048 if (error)
1049 goto done;
1050 repo_path = strdup(got_worktree_get_repo_path(worktree));
1051 if (repo_path == NULL)
1052 return got_error_from_errno();
1053 } else if (argc == 2) {
1054 id_str1 = argv[0];
1055 id_str2 = argv[1];
1056 } else
1057 usage_diff();
1059 if (repo_path == NULL) {
1060 repo_path = getcwd(NULL, 0);
1061 if (repo_path == NULL)
1062 return got_error_from_errno();
1065 error = apply_unveil(repo_path,
1066 worktree ? got_worktree_get_root_path(worktree) : NULL);
1067 if (error)
1068 goto done;
1070 error = got_repo_open(&repo, repo_path);
1071 free(repo_path);
1072 if (error != NULL)
1073 goto done;
1075 if (worktree) {
1076 struct print_diff_arg arg;
1077 char *id_str;
1078 error = got_object_id_str(&id_str,
1079 got_worktree_get_base_commit_id(worktree));
1080 if (error)
1081 goto done;
1082 arg.repo = repo;
1083 arg.worktree = worktree;
1084 arg.diff_context = diff_context;
1086 printf("diff %s %s\n", id_str,
1087 got_worktree_get_root_path(worktree));
1088 error = got_worktree_status(worktree, repo, print_diff,
1089 &arg, check_cancelled, NULL);
1090 free(id_str);
1091 goto done;
1094 error = got_object_resolve_id_str(&id1, repo, id_str1);
1095 if (error)
1096 goto done;
1098 error = got_object_resolve_id_str(&id2, repo, id_str2);
1099 if (error)
1100 goto done;
1102 error = got_object_get_type(&type1, repo, id1);
1103 if (error)
1104 goto done;
1106 error = got_object_get_type(&type2, repo, id2);
1107 if (error)
1108 goto done;
1110 if (type1 != type2) {
1111 error = got_error(GOT_ERR_OBJ_TYPE);
1112 goto done;
1115 switch (type1) {
1116 case GOT_OBJ_TYPE_BLOB:
1117 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1118 diff_context, repo, stdout);
1119 break;
1120 case GOT_OBJ_TYPE_TREE:
1121 error = got_diff_objects_as_trees(id1, id2, "", "",
1122 diff_context, repo, stdout);
1123 break;
1124 case GOT_OBJ_TYPE_COMMIT:
1125 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
1126 id_str2);
1127 error = got_diff_objects_as_commits(id1, id2, diff_context,
1128 repo, stdout);
1129 break;
1130 default:
1131 error = got_error(GOT_ERR_OBJ_TYPE);
1134 done:
1135 free(id1);
1136 free(id2);
1137 if (worktree)
1138 got_worktree_close(worktree);
1139 if (repo) {
1140 const struct got_error *repo_error;
1141 repo_error = got_repo_close(repo);
1142 if (error == NULL)
1143 error = repo_error;
1145 return error;
1148 __dead static void
1149 usage_blame(void)
1151 fprintf(stderr,
1152 "usage: %s blame [-c commit] [-r repository-path] path\n",
1153 getprogname());
1154 exit(1);
1157 static const struct got_error *
1158 cmd_blame(int argc, char *argv[])
1160 const struct got_error *error;
1161 struct got_repository *repo = NULL;
1162 struct got_worktree *worktree = NULL;
1163 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1164 struct got_object_id *commit_id = NULL;
1165 char *commit_id_str = NULL;
1166 int ch;
1168 #ifndef PROFILE
1169 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1170 NULL) == -1)
1171 err(1, "pledge");
1172 #endif
1174 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1175 switch (ch) {
1176 case 'c':
1177 commit_id_str = optarg;
1178 break;
1179 case 'r':
1180 repo_path = realpath(optarg, NULL);
1181 if (repo_path == NULL)
1182 err(1, "-r option");
1183 break;
1184 default:
1185 usage();
1186 /* NOTREACHED */
1190 argc -= optind;
1191 argv += optind;
1193 if (argc == 1)
1194 path = argv[0];
1195 else
1196 usage_blame();
1198 cwd = getcwd(NULL, 0);
1199 if (cwd == NULL) {
1200 error = got_error_from_errno();
1201 goto done;
1203 if (repo_path == NULL) {
1204 error = got_worktree_open(&worktree, cwd);
1205 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1206 goto done;
1207 else
1208 error = NULL;
1209 if (worktree) {
1210 repo_path =
1211 strdup(got_worktree_get_repo_path(worktree));
1212 if (repo_path == NULL)
1213 error = got_error_from_errno();
1214 if (error)
1215 goto done;
1216 } else {
1217 repo_path = strdup(cwd);
1218 if (repo_path == NULL) {
1219 error = got_error_from_errno();
1220 goto done;
1225 error = apply_unveil(repo_path, NULL);
1226 if (error)
1227 goto done;
1229 error = got_repo_open(&repo, repo_path);
1230 if (error != NULL)
1231 goto done;
1233 if (worktree) {
1234 const char *prefix = got_worktree_get_path_prefix(worktree);
1235 char *p, *worktree_subdir = cwd +
1236 strlen(got_worktree_get_root_path(worktree));
1237 if (asprintf(&p, "%s%s%s%s%s",
1238 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
1239 worktree_subdir, worktree_subdir[0] ? "/" : "",
1240 path) == -1) {
1241 error = got_error_from_errno();
1242 goto done;
1244 error = got_repo_map_path(&in_repo_path, repo, p, 0);
1245 free(p);
1246 } else {
1247 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1249 if (error)
1250 goto done;
1252 if (commit_id_str == NULL) {
1253 struct got_reference *head_ref;
1254 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1255 if (error != NULL)
1256 goto done;
1257 error = got_ref_resolve(&commit_id, repo, head_ref);
1258 got_ref_close(head_ref);
1259 if (error != NULL)
1260 goto done;
1261 } else {
1262 error = got_object_resolve_id_str(&commit_id, repo,
1263 commit_id_str);
1264 if (error != NULL)
1265 goto done;
1268 error = got_blame(in_repo_path, commit_id, repo, stdout);
1269 done:
1270 free(in_repo_path);
1271 free(repo_path);
1272 free(cwd);
1273 free(commit_id);
1274 if (worktree)
1275 got_worktree_close(worktree);
1276 if (repo) {
1277 const struct got_error *repo_error;
1278 repo_error = got_repo_close(repo);
1279 if (error == NULL)
1280 error = repo_error;
1282 return error;
1285 __dead static void
1286 usage_tree(void)
1288 fprintf(stderr,
1289 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
1290 getprogname());
1291 exit(1);
1294 static void
1295 print_entry(struct got_tree_entry *te, const char *id, const char *path,
1296 const char *root_path)
1298 int is_root_path = (strcmp(path, root_path) == 0);
1300 path += strlen(root_path);
1301 while (path[0] == '/')
1302 path++;
1304 printf("%s%s%s%s%s\n", id ? id : "", path,
1305 is_root_path ? "" : "/",
1306 te->name, S_ISDIR(te->mode) ? "/" : "");
1309 static const struct got_error *
1310 print_tree(const char *path, struct got_object_id *commit_id,
1311 int show_ids, int recurse, const char *root_path,
1312 struct got_repository *repo)
1314 const struct got_error *err = NULL;
1315 struct got_object_id *tree_id = NULL;
1316 struct got_tree_object *tree = NULL;
1317 const struct got_tree_entries *entries;
1318 struct got_tree_entry *te;
1320 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
1321 if (err)
1322 goto done;
1324 err = got_object_open_as_tree(&tree, repo, tree_id);
1325 if (err)
1326 goto done;
1327 entries = got_object_tree_get_entries(tree);
1328 te = SIMPLEQ_FIRST(&entries->head);
1329 while (te) {
1330 char *id = NULL;
1332 if (sigint_received || sigpipe_received)
1333 break;
1335 if (show_ids) {
1336 char *id_str;
1337 err = got_object_id_str(&id_str, te->id);
1338 if (err)
1339 goto done;
1340 if (asprintf(&id, "%s ", id_str) == -1) {
1341 err = got_error_from_errno();
1342 free(id_str);
1343 goto done;
1345 free(id_str);
1347 print_entry(te, id, path, root_path);
1348 free(id);
1350 if (recurse && S_ISDIR(te->mode)) {
1351 char *child_path;
1352 if (asprintf(&child_path, "%s%s%s", path,
1353 path[0] == '/' && path[1] == '\0' ? "" : "/",
1354 te->name) == -1) {
1355 err = got_error_from_errno();
1356 goto done;
1358 err = print_tree(child_path, commit_id, show_ids, 1,
1359 root_path, repo);
1360 free(child_path);
1361 if (err)
1362 goto done;
1365 te = SIMPLEQ_NEXT(te, entry);
1367 done:
1368 if (tree)
1369 got_object_tree_close(tree);
1370 free(tree_id);
1371 return err;
1374 static const struct got_error *
1375 cmd_tree(int argc, char *argv[])
1377 const struct got_error *error;
1378 struct got_repository *repo = NULL;
1379 struct got_worktree *worktree = NULL;
1380 const char *path;
1381 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
1382 struct got_object_id *commit_id = NULL;
1383 char *commit_id_str = NULL;
1384 int show_ids = 0, recurse = 0;
1385 int ch;
1387 #ifndef PROFILE
1388 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1389 NULL) == -1)
1390 err(1, "pledge");
1391 #endif
1393 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
1394 switch (ch) {
1395 case 'c':
1396 commit_id_str = optarg;
1397 break;
1398 case 'r':
1399 repo_path = realpath(optarg, NULL);
1400 if (repo_path == NULL)
1401 err(1, "-r option");
1402 break;
1403 case 'i':
1404 show_ids = 1;
1405 break;
1406 case 'R':
1407 recurse = 1;
1408 break;
1409 default:
1410 usage();
1411 /* NOTREACHED */
1415 argc -= optind;
1416 argv += optind;
1418 if (argc == 1)
1419 path = argv[0];
1420 else if (argc > 1)
1421 usage_tree();
1422 else
1423 path = NULL;
1425 cwd = getcwd(NULL, 0);
1426 if (cwd == NULL) {
1427 error = got_error_from_errno();
1428 goto done;
1430 if (repo_path == NULL) {
1431 error = got_worktree_open(&worktree, cwd);
1432 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1433 goto done;
1434 else
1435 error = NULL;
1436 if (worktree) {
1437 repo_path =
1438 strdup(got_worktree_get_repo_path(worktree));
1439 if (repo_path == NULL)
1440 error = got_error_from_errno();
1441 if (error)
1442 goto done;
1443 } else {
1444 repo_path = strdup(cwd);
1445 if (repo_path == NULL) {
1446 error = got_error_from_errno();
1447 goto done;
1452 error = apply_unveil(repo_path, NULL);
1453 if (error)
1454 goto done;
1456 error = got_repo_open(&repo, repo_path);
1457 if (error != NULL)
1458 goto done;
1460 if (path == NULL) {
1461 if (worktree) {
1462 char *p, *worktree_subdir = cwd +
1463 strlen(got_worktree_get_root_path(worktree));
1464 if (asprintf(&p, "%s/%s",
1465 got_worktree_get_path_prefix(worktree),
1466 worktree_subdir) == -1) {
1467 error = got_error_from_errno();
1468 goto done;
1470 error = got_repo_map_path(&in_repo_path, repo, p, 1);
1471 free(p);
1472 if (error)
1473 goto done;
1474 } else
1475 path = "/";
1477 if (in_repo_path == NULL) {
1478 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1479 if (error != NULL)
1480 goto done;
1483 if (commit_id_str == NULL) {
1484 struct got_reference *head_ref;
1485 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1486 if (error != NULL)
1487 goto done;
1488 error = got_ref_resolve(&commit_id, repo, head_ref);
1489 got_ref_close(head_ref);
1490 if (error != NULL)
1491 goto done;
1492 } else {
1493 error = got_object_resolve_id_str(&commit_id, repo,
1494 commit_id_str);
1495 if (error != NULL)
1496 goto done;
1499 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
1500 in_repo_path, repo);
1501 done:
1502 free(in_repo_path);
1503 free(repo_path);
1504 free(cwd);
1505 free(commit_id);
1506 if (worktree)
1507 got_worktree_close(worktree);
1508 if (repo) {
1509 const struct got_error *repo_error;
1510 repo_error = got_repo_close(repo);
1511 if (error == NULL)
1512 error = repo_error;
1514 return error;
1517 __dead static void
1518 usage_status(void)
1520 fprintf(stderr, "usage: %s status [worktree-path]\n", getprogname());
1521 exit(1);
1524 static const struct got_error *
1525 print_status(void *arg, unsigned char status, const char *path,
1526 struct got_object_id *id)
1528 printf("%c %s\n", status, path);
1529 return NULL;
1532 static const struct got_error *
1533 cmd_status(int argc, char *argv[])
1535 const struct got_error *error = NULL;
1536 struct got_repository *repo = NULL;
1537 struct got_worktree *worktree = NULL;
1538 char *worktree_path = NULL;
1539 int ch;
1541 while ((ch = getopt(argc, argv, "")) != -1) {
1542 switch (ch) {
1543 default:
1544 usage();
1545 /* NOTREACHED */
1549 argc -= optind;
1550 argv += optind;
1552 #ifndef PROFILE
1553 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1554 NULL) == -1)
1555 err(1, "pledge");
1556 #endif
1557 if (argc == 0) {
1558 worktree_path = getcwd(NULL, 0);
1559 if (worktree_path == NULL) {
1560 error = got_error_from_errno();
1561 goto done;
1563 } else if (argc == 1) {
1564 worktree_path = realpath(argv[0], NULL);
1565 if (worktree_path == NULL) {
1566 error = got_error_from_errno();
1567 goto done;
1569 } else
1570 usage_status();
1572 error = got_worktree_open(&worktree, worktree_path);
1573 if (error != NULL)
1574 goto done;
1576 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1577 if (error != NULL)
1578 goto done;
1580 error = apply_unveil(got_repo_get_path(repo),
1581 got_worktree_get_root_path(worktree));
1582 if (error)
1583 goto done;
1585 error = got_worktree_status(worktree, repo, print_status, NULL,
1586 check_cancelled, NULL);
1587 done:
1588 free(worktree_path);
1589 return error;