2 * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 #include <sys/queue.h>
21 #define _XOPEN_SOURCE_EXTENDED
23 #undef _XOPEN_SOURCE_EXTENDED
38 #include "got_error.h"
39 #include "got_object.h"
40 #include "got_reference.h"
41 #include "got_repository.h"
43 #include "got_opentemp.h"
44 #include "got_commit_graph.h"
46 #include "got_blame.h"
49 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
53 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
58 const struct got_error *(*cmd_main)(int, char *[]);
59 void (*cmd_usage)(void);
63 __dead static void usage(void);
64 __dead static void usage_log(void);
65 __dead static void usage_diff(void);
66 __dead static void usage_blame(void);
67 __dead static void usage_tree(void);
69 static const struct got_error* cmd_log(int, char *[]);
70 static const struct got_error* cmd_diff(int, char *[]);
71 static const struct got_error* cmd_blame(int, char *[]);
72 static const struct got_error* cmd_tree(int, char *[]);
74 static struct tog_cmd tog_commands[] = {
75 { "log", cmd_log, usage_log,
76 "show repository history" },
77 { "diff", cmd_diff, usage_diff,
78 "compare files and directories" },
79 { "blame", cmd_blame, usage_blame,
80 "show line-by-line file history" },
81 { "tree", cmd_tree, usage_tree,
82 "browse trees in repository" },
85 static struct tog_view {
88 } tog_log_view, tog_diff_view, tog_blame_view, tog_tree_view;
90 static const struct got_error *
91 show_diff_view(struct got_object *, struct got_object *,
92 struct got_repository *);
93 static const struct got_error *
94 show_log_view(struct got_object_id *, struct got_repository *);
95 static const struct got_error *
96 show_blame_view(const char *, struct got_object_id *, struct got_repository *);
97 static const struct got_error *
98 show_tree_view(struct got_tree_object *, struct got_object_id *,
99 struct got_repository *);
105 fprintf(stderr, "usage: %s log [-c commit] [repository-path]\n",
110 /* Create newly allocated wide-character string equivalent to a byte string. */
111 static const struct got_error *
112 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
115 const struct got_error *err = NULL;
118 *wlen = mbstowcs(NULL, s, 0);
119 if (*wlen == (size_t)-1) {
122 return got_error_from_errno();
124 /* byte string invalid in current encoding; try to "fix" it */
125 err = got_mbsavis(&vis, &vislen, s);
128 *wlen = mbstowcs(NULL, vis, 0);
129 if (*wlen == (size_t)-1) {
130 err = got_error_from_errno(); /* give up */
135 *ws = calloc(*wlen + 1, sizeof(*ws));
137 err = got_error_from_errno();
141 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
142 err = got_error_from_errno();
153 /* Format a line for display, ensuring that it won't overflow a width limit. */
154 static const struct got_error *
155 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
157 const struct got_error *err = NULL;
159 wchar_t *wline = NULL;
166 err = mbs2ws(&wline, &wlen, line);
171 while (i < wlen && cols < wlimit) {
172 int width = wcwidth(wline[i]);
179 if (cols + width <= wlimit) {
185 if (wline[i] == L'\t')
186 cols += TABSIZE - ((cols + 1) % TABSIZE);
190 err = got_error_from_errno();
205 static const struct got_error *
206 draw_commit(struct got_commit_object *commit, struct got_object_id *id)
208 const struct got_error *err = NULL;
209 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
210 char *logmsg0 = NULL, *logmsg = NULL;
211 char *author0 = NULL, *author = NULL;
212 wchar_t *wlogmsg = NULL, *wauthor = NULL;
213 int author_width, logmsg_width;
214 char *newline, *smallerthan;
217 static const size_t date_display_cols = 9;
218 static const size_t author_display_cols = 16;
219 const int avail = COLS;
221 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &commit->tm_committer)
223 return got_error(GOT_ERR_NO_SPACE);
225 if (avail < date_display_cols)
226 limit = MIN(sizeof(datebuf) - 1, avail);
228 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
229 waddnstr(tog_log_view.window, datebuf, limit);
234 author0 = strdup(commit->author);
235 if (author0 == NULL) {
236 err = got_error_from_errno();
240 smallerthan = strchr(author, '<');
244 char *at = strchr(author, '@');
249 err = format_line(&wauthor, &author_width, author, limit);
252 waddwstr(tog_log_view.window, wauthor);
254 while (col <= avail && author_width < author_display_cols + 1) {
255 waddch(tog_log_view.window, ' ');
262 logmsg0 = strdup(commit->logmsg);
263 if (logmsg0 == NULL) {
264 err = got_error_from_errno();
268 while (*logmsg == '\n')
270 newline = strchr(logmsg, '\n');
274 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
277 waddwstr(tog_log_view.window, wlogmsg);
279 while (col <= avail) {
280 waddch(tog_log_view.window, ' ');
292 struct commit_queue_entry {
293 TAILQ_ENTRY(commit_queue_entry) entry;
294 struct got_object_id *id;
295 struct got_commit_object *commit;
297 TAILQ_HEAD(commit_queue, commit_queue_entry);
299 static struct commit_queue_entry *
300 alloc_commit_queue_entry(struct got_commit_object *commit,
301 struct got_object_id *id)
303 struct commit_queue_entry *entry;
305 entry = calloc(1, sizeof(*entry));
310 entry->commit = commit;
315 pop_commit(struct commit_queue *commits)
317 struct commit_queue_entry *entry;
319 entry = TAILQ_FIRST(commits);
320 TAILQ_REMOVE(commits, entry, entry);
321 got_object_commit_close(entry->commit);
322 /* Don't free entry->id! It is owned by the commit graph. */
327 free_commits(struct commit_queue *commits)
329 while (!TAILQ_EMPTY(commits))
333 static const struct got_error *
334 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
335 struct got_object_id *start_id, struct got_repository *repo)
337 const struct got_error *err = NULL;
338 struct got_object_id *id;
339 struct commit_queue_entry *entry;
341 err = got_commit_graph_iter_start(graph, start_id);
345 entry = TAILQ_LAST(commits, commit_queue);
346 if (entry && got_object_id_cmp(entry->id, start_id) == 0) {
349 /* Start ID's commit is already on the queue; skip over it. */
350 err = got_commit_graph_iter_next(&id, graph);
351 if (err && err->code != GOT_ERR_ITER_NEED_MORE)
354 err = got_commit_graph_fetch_commits(&nfetched, graph, 1, repo);
360 struct got_commit_object *commit;
362 err = got_commit_graph_iter_next(&id, graph);
364 if (err->code == GOT_ERR_ITER_NEED_MORE)
369 err = got_object_open_as_commit(&commit, repo, id);
373 entry = alloc_commit_queue_entry(commit, id);
375 err = got_error_from_errno();
379 TAILQ_INSERT_TAIL(commits, entry, entry);
385 static const struct got_error *
386 fetch_next_commit(struct commit_queue_entry **pentry,
387 struct commit_queue_entry *entry, struct commit_queue *commits,
388 struct got_commit_graph *graph, struct got_repository *repo)
390 const struct got_error *err = NULL;
391 struct got_object_qid *qid;
395 /* Populate commit graph with entry's parent commits. */
396 SIMPLEQ_FOREACH(qid, &entry->commit->parent_ids, entry) {
398 err = got_commit_graph_fetch_commits_up_to(&nfetched,
399 graph, qid->id, repo);
404 /* Append outstanding commits to queue in graph sort order. */
405 err = queue_commits(graph, commits, entry->id, repo);
407 if (err->code == GOT_ERR_ITER_COMPLETED)
412 /* Next entry to display should now be available. */
413 *pentry = TAILQ_NEXT(entry, entry);
415 return got_error(GOT_ERR_NO_OBJ);
420 static const struct got_error *
421 get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
423 const struct got_error *err = NULL;
424 struct got_reference *head_ref;
428 err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
432 err = got_ref_resolve(head_id, repo, head_ref);
433 got_ref_close(head_ref);
442 static const struct got_error *
443 draw_commits(struct commit_queue_entry **last, struct commit_queue_entry **selected,
444 struct commit_queue_entry *first, int selected_idx, int limit)
446 const struct got_error *err = NULL;
447 struct commit_queue_entry *entry;
449 char *id_str, *header;
456 if (++ncommits - 1 == selected_idx) {
460 entry = TAILQ_NEXT(entry, entry);
462 if (*selected == NULL)
463 return got_error(GOT_ERR_RANGE);
465 err = got_object_id_str(&id_str, (*selected)->id);
469 if (asprintf(&header, "commit: %s", id_str) == -1) {
470 err = got_error_from_errno();
475 werase(tog_log_view.window);
477 header_len = strlen(header);
478 if (header_len > COLS) {
479 id_str[COLS + 1] = '\0';
482 wprintw(tog_log_view.window, header);
483 while (header_len < COLS) {
484 waddch(tog_log_view.window, ' ');
494 if (ncommits == limit - 1)
496 if (ncommits == selected_idx) {
497 wstandout(tog_log_view.window);
500 err = draw_commit(entry->commit, entry->id);
501 if (ncommits == selected_idx)
502 wstandend(tog_log_view.window);
507 entry = TAILQ_NEXT(entry, entry);
517 scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
518 struct commit_queue *commits)
520 struct commit_queue_entry *entry;
523 entry = TAILQ_FIRST(commits);
524 if (*first_displayed_entry == entry)
527 entry = *first_displayed_entry;
528 while (entry && nscrolled < maxscroll) {
529 entry = TAILQ_PREV(entry, commit_queue, entry);
531 *first_displayed_entry = entry;
537 static const struct got_error *
538 scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
539 struct commit_queue_entry *last_displayed_entry,
540 struct commit_queue *commits, struct got_commit_graph *graph,
541 struct got_repository *repo)
543 const struct got_error *err = NULL;
544 struct commit_queue_entry *pentry;
548 pentry = TAILQ_NEXT(last_displayed_entry, entry);
549 if (pentry == NULL) {
550 err = fetch_next_commit(&pentry, last_displayed_entry,
551 commits, graph, repo);
552 if (err || pentry == NULL)
555 last_displayed_entry = pentry;
557 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
560 *first_displayed_entry = pentry;
561 } while (++nscrolled < maxscroll);
567 num_parents(struct commit_queue_entry *entry)
572 entry = TAILQ_NEXT(entry, entry);
579 static const struct got_error *
580 show_commit(struct commit_queue_entry *entry, struct got_repository *repo)
582 const struct got_error *err;
583 struct got_object *obj1 = NULL, *obj2 = NULL;
584 struct got_object_qid *parent_id;
586 err = got_object_open(&obj2, repo, entry->id);
590 parent_id = SIMPLEQ_FIRST(&entry->commit->parent_ids);
592 err = got_object_open(&obj1, repo, parent_id->id);
597 err = show_diff_view(obj1, obj2, repo);
600 got_object_close(obj1);
602 got_object_close(obj2);
606 static const struct got_error *
607 browse_commit(struct commit_queue_entry *entry, struct got_repository *repo)
609 const struct got_error *err = NULL;
610 struct got_tree_object *tree;
612 err = got_object_open_as_tree(&tree, repo, entry->commit->tree_id);
616 err = show_tree_view(tree, entry->id, repo);
617 got_object_tree_close(tree);
621 static const struct got_error *
622 show_log_view(struct got_object_id *start_id, struct got_repository *repo)
624 const struct got_error *err = NULL;
625 struct got_object_id *head_id = NULL;
626 int ch, done = 0, selected = 0, nparents, nfetched;
627 struct got_commit_graph *graph;
628 struct commit_queue commits;
629 struct commit_queue_entry *entry = NULL;
630 struct commit_queue_entry *first_displayed_entry = NULL;
631 struct commit_queue_entry *last_displayed_entry = NULL;
632 struct commit_queue_entry *selected_entry = NULL;
634 if (tog_log_view.window == NULL) {
635 tog_log_view.window = newwin(0, 0, 0, 0);
636 if (tog_log_view.window == NULL)
637 return got_error_from_errno();
638 keypad(tog_log_view.window, TRUE);
640 if (tog_log_view.panel == NULL) {
641 tog_log_view.panel = new_panel(tog_log_view.window);
642 if (tog_log_view.panel == NULL)
643 return got_error_from_errno();
645 show_panel(tog_log_view.panel);
647 err = get_head_commit_id(&head_id, repo);
651 TAILQ_INIT(&commits);
653 err = got_commit_graph_open(&graph, head_id, 0, repo);
657 /* Populate commit graph with a sufficient number of commits. */
658 err = got_commit_graph_fetch_commits_up_to(&nfetched, graph, start_id,
662 err = got_commit_graph_fetch_commits(&nfetched, graph, LINES, repo);
667 * Open the initial batch of commits, sorted in commit graph order.
668 * We keep all commits open throughout the lifetime of the log view
669 * in order to avoid having to re-fetch commits from disk while
670 * updating the display.
672 err = queue_commits(graph, &commits, head_id, repo);
673 if (err && err->code != GOT_ERR_ITER_COMPLETED)
676 /* Find entry corresponding to the first commit to display. */
677 TAILQ_FOREACH(entry, &commits, entry) {
678 if (got_object_id_cmp(entry->id, start_id) == 0) {
679 first_displayed_entry = entry;
683 if (first_displayed_entry == NULL) {
684 err = got_error(GOT_ERR_NO_OBJ);
688 selected_entry = first_displayed_entry;
690 err = draw_commits(&last_displayed_entry, &selected_entry,
691 first_displayed_entry, selected, LINES);
695 nodelay(stdscr, FALSE);
696 ch = wgetch(tog_log_view.window);
697 nodelay(stdscr, TRUE);
701 err = got_error_from_errno();
714 scroll_up(&first_displayed_entry, 1, &commits);
717 if (TAILQ_FIRST(&commits) ==
718 first_displayed_entry) {
722 scroll_up(&first_displayed_entry, LINES,
727 nparents = num_parents(first_displayed_entry);
728 if (selected < LINES - 2 &&
729 selected < nparents - 1) {
733 err = scroll_down(&first_displayed_entry, 1,
734 last_displayed_entry, &commits, graph,
740 err = scroll_down(&first_displayed_entry, LINES,
741 last_displayed_entry, &commits, graph,
745 if (last_displayed_entry->commit->nparents > 0)
747 /* can't scroll any further; move cursor down */
748 nparents = num_parents(first_displayed_entry);
749 if (selected < LINES - 2 ||
750 selected < nparents - 1)
751 selected = MIN(LINES - 2, nparents - 1);
754 if (selected > LINES - 1)
755 selected = LINES - 2;
759 err = show_commit(selected_entry, repo);
762 show_panel(tog_log_view.panel);
765 err = browse_commit(selected_entry, repo);
768 show_panel(tog_log_view.panel);
777 got_commit_graph_close(graph);
778 free_commits(&commits);
782 static const struct got_error *
783 cmd_log(int argc, char *argv[])
785 const struct got_error *error;
786 struct got_repository *repo;
787 struct got_object_id *start_id = NULL;
788 char *repo_path = NULL;
789 char *start_commit = NULL;
793 if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
797 while ((ch = getopt(argc, argv, "c:")) != -1) {
800 start_commit = optarg;
812 repo_path = getcwd(NULL, 0);
813 if (repo_path == NULL)
814 return got_error_from_errno();
815 } else if (argc == 1) {
816 repo_path = realpath(argv[0], NULL);
817 if (repo_path == NULL)
818 return got_error_from_errno();
822 error = got_repo_open(&repo, repo_path);
827 if (start_commit == NULL) {
828 error = get_head_commit_id(&start_id, repo);
832 struct got_object *obj;
833 error = got_object_open_by_id_str(&obj, repo, start_commit);
835 start_id = got_object_get_id(obj);
836 if (start_id == NULL)
837 error = got_error_from_errno();
842 error = show_log_view(start_id, repo);
844 got_repo_close(repo);
852 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
858 parse_next_line(FILE *f, size_t *len)
863 const char delim[3] = { '\0', '\0', '\0'};
865 line = fparseln(f, &linelen, &lineno, delim, 0);
871 static const struct got_error *
872 draw_file(WINDOW *window, FILE *f, int *first_displayed_line,
873 int *last_displayed_line, int *eof, int max_lines)
875 const struct got_error *err;
876 int nlines = 0, nprinted = 0;
886 while (nprinted < max_lines) {
887 line = parse_next_line(f, &len);
892 if (++nlines < *first_displayed_line) {
897 err = format_line(&wline, &width, line, COLS);
902 waddwstr(window, wline);
904 waddch(window, '\n');
906 *first_displayed_line = nlines;
909 *last_displayed_line = nlines;
917 static const struct got_error *
918 show_diff_view(struct got_object *obj1, struct got_object *obj2,
919 struct got_repository *repo)
921 const struct got_error *err;
923 int ch, done = 0, first_displayed_line = 1, last_displayed_line = LINES;
926 if (obj1 != NULL && obj2 != NULL &&
927 got_object_get_type(obj1) != got_object_get_type(obj2))
928 return got_error(GOT_ERR_OBJ_TYPE);
932 return got_error_from_errno();
934 switch (got_object_get_type(obj1 ? obj1 : obj2)) {
935 case GOT_OBJ_TYPE_BLOB:
936 err = got_diff_objects_as_blobs(obj1, obj2, repo, f);
938 case GOT_OBJ_TYPE_TREE:
939 err = got_diff_objects_as_trees(obj1, obj2, repo, f);
941 case GOT_OBJ_TYPE_COMMIT:
942 err = got_diff_objects_as_commits(obj1, obj2, repo, f);
945 return got_error(GOT_ERR_OBJ_TYPE);
950 if (tog_diff_view.window == NULL) {
951 tog_diff_view.window = newwin(0, 0, 0, 0);
952 if (tog_diff_view.window == NULL)
953 return got_error_from_errno();
954 keypad(tog_diff_view.window, TRUE);
956 if (tog_diff_view.panel == NULL) {
957 tog_diff_view.panel = new_panel(tog_diff_view.window);
958 if (tog_diff_view.panel == NULL)
959 return got_error_from_errno();
961 show_panel(tog_diff_view.panel);
964 err = draw_file(tog_diff_view.window, f, &first_displayed_line,
965 &last_displayed_line, &eof, LINES);
968 nodelay(stdscr, FALSE);
969 ch = wgetch(tog_diff_view.window);
970 nodelay(stdscr, TRUE);
978 if (first_displayed_line > 1)
979 first_displayed_line--;
983 while (i++ < LINES - 1 &&
984 first_displayed_line > 1)
985 first_displayed_line--;
992 first_displayed_line++;
997 while (!eof && i++ < LINES - 1) {
998 char *line = parse_next_line(f, NULL);
999 first_displayed_line++;
1012 static const struct got_error *
1013 cmd_diff(int argc, char *argv[])
1015 const struct got_error *error = NULL;
1016 struct got_repository *repo = NULL;
1017 struct got_object *obj1 = NULL, *obj2 = NULL;
1018 char *repo_path = NULL;
1019 char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
1023 if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
1027 while ((ch = getopt(argc, argv, "")) != -1) {
1039 usage_diff(); /* TODO show local worktree changes */
1040 } else if (argc == 2) {
1041 repo_path = getcwd(NULL, 0);
1042 if (repo_path == NULL)
1043 return got_error_from_errno();
1044 obj_id_str1 = argv[0];
1045 obj_id_str2 = argv[1];
1046 } else if (argc == 3) {
1047 repo_path = realpath(argv[0], NULL);
1048 if (repo_path == NULL)
1049 return got_error_from_errno();
1050 obj_id_str1 = argv[1];
1051 obj_id_str2 = argv[2];
1055 error = got_repo_open(&repo, repo_path);
1060 error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
1064 error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
1068 error = show_diff_view(obj1, obj2, repo);
1070 got_repo_close(repo);
1072 got_object_close(obj1);
1074 got_object_close(obj2);
1082 fprintf(stderr, "usage: %s blame [-c commit] [repository-path] path\n",
1087 struct tog_blame_line {
1089 struct got_object_id *id;
1092 static const struct got_error *
1093 draw_blame(WINDOW *window, FILE *f, const char *path,
1094 struct tog_blame_line *lines, int nlines, int blame_complete,
1095 int selected_line, int *first_displayed_line, int *last_displayed_line,
1096 int *eof, int max_lines)
1098 const struct got_error *err;
1099 int lineno = 0, nprinted = 0;
1104 struct tog_blame_line *blame_line;
1105 struct got_object_id *prev_id = NULL;
1110 if (asprintf(&line, "[%d-%d/%d] annotation of %s%s",
1111 *first_displayed_line, *last_displayed_line, nlines,
1112 path, blame_complete ? "" : " in progress...") == -1)
1113 return got_error_from_errno();
1114 err = format_line(&wline, &width, line, COLS);
1118 waddwstr(window, wline);
1120 waddch(window, '\n');
1123 while (nprinted < max_lines - 1) {
1124 line = parse_next_line(f, &len);
1129 if (++lineno < *first_displayed_line) {
1134 wlimit = COLS < 9 ? 0 : COLS - 9;
1135 err = format_line(&wline, &width, line, wlimit);
1141 if (nprinted == selected_line - 1)
1144 blame_line = &lines[lineno - 1];
1145 if (blame_line->annotated && prev_id &&
1146 got_object_id_cmp(prev_id, blame_line->id) == 0)
1147 waddstr(window, " ");
1148 else if (blame_line->annotated) {
1150 err = got_object_id_str(&id_str, blame_line->id);
1155 wprintw(window, "%.8s ", id_str);
1157 prev_id = blame_line->id;
1159 waddstr(window, "........ ");
1163 waddwstr(window, wline);
1164 while (width < wlimit) {
1165 waddch(window, ' '); /* width == wlimit - 1 ? '\n' : ' '); */
1168 if (nprinted == selected_line - 1)
1170 if (++nprinted == 1)
1171 *first_displayed_line = lineno;
1174 *last_displayed_line = lineno;
1182 struct tog_blame_cb_args {
1183 pthread_mutex_t *mutex;
1184 struct tog_blame_line *lines; /* one per line */
1190 int *first_displayed_line;
1191 int *last_displayed_line;
1196 static const struct got_error *
1197 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
1199 const struct got_error *err = NULL;
1200 struct tog_blame_cb_args *a = arg;
1201 struct tog_blame_line *line;
1204 if (nlines != a->nlines ||
1205 (lineno != -1 && lineno < 1) || lineno > a->nlines)
1206 return got_error(GOT_ERR_RANGE);
1208 if (pthread_mutex_lock(a->mutex) != 0)
1209 return got_error_from_errno();
1211 if (*a->quit) { /* user has quit the blame view */
1212 err = got_error(GOT_ERR_ITER_COMPLETED);
1217 goto done; /* no change in this commit */
1219 line = &a->lines[lineno - 1];
1220 if (line->annotated)
1223 line->id = got_object_id_dup(id);
1224 if (line->id == NULL) {
1225 err = got_error_from_errno();
1228 line->annotated = 1;
1230 err = draw_blame(a->window, a->f, a->path, a->lines, a->nlines, 0,
1231 *a->selected_line, a->first_displayed_line, a->last_displayed_line,
1234 if (pthread_mutex_unlock(a->mutex) != 0)
1235 return got_error_from_errno();
1239 struct tog_blame_thread_args {
1241 struct got_object_id *commit_id;
1242 struct got_repository *repo;
1243 void *blame_cb_args;
1248 blame_thread(void *arg)
1250 const struct got_error *err;
1251 struct tog_blame_thread_args *ta = arg;
1252 struct tog_blame_cb_args *a = ta->blame_cb_args;
1255 err = got_blame_incremental(ta->path, ta->commit_id, ta->repo,
1256 blame_cb, ta->blame_cb_args);
1261 if (pthread_mutex_lock(a->mutex) != 0)
1262 return (void *)got_error_from_errno();
1264 err = draw_blame(a->window, a->f, a->path, a->lines, a->nlines, 1,
1265 *a->selected_line, a->first_displayed_line, a->last_displayed_line,
1268 if (pthread_mutex_unlock(a->mutex) != 0 && err == NULL)
1269 err = got_error_from_errno();
1275 static const struct got_error *
1276 open_blamed_commit_and_parent(struct got_object **pobj, struct got_object **obj,
1277 struct tog_blame_line *lines, int first_displayed_line,
1278 int selected_line, struct got_repository *repo)
1280 const struct got_error *err = NULL;
1281 struct tog_blame_line *line;
1282 struct got_commit_object *commit = NULL;
1283 struct got_object_qid *pid;
1288 line = &lines[first_displayed_line - 1 + selected_line - 1];
1289 if (!line->annotated || line->id == NULL)
1292 err = got_object_open(obj, repo, line->id);
1296 err = got_object_commit_open(&commit, repo, *obj);
1300 pid = SIMPLEQ_FIRST(&commit->parent_ids);
1302 err = got_object_open(pobj, repo, pid->id);
1308 got_object_commit_close(commit);
1312 static const struct got_error *
1313 show_blame_view(const char *path, struct got_object_id *commit_id,
1314 struct got_repository *repo)
1316 const struct got_error *err = NULL;
1317 int ch, done = 0, first_displayed_line = 1, last_displayed_line = LINES;
1318 int selected_line = first_displayed_line;
1319 int eof, i, blame_complete = 0;
1320 struct got_object *obj = NULL, *pobj = NULL;
1321 struct got_blob_object *blob = NULL;
1323 size_t filesize, nlines = 0;
1324 struct tog_blame_line *lines = NULL;
1325 pthread_t thread = NULL;
1326 pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
1327 struct tog_blame_cb_args blame_cb_args;
1328 struct tog_blame_thread_args blame_thread_args;
1329 struct got_repository *blame_thread_repo = NULL;
1331 err = got_object_open_by_path(&obj, repo, commit_id, path);
1334 if (got_object_get_type(obj) != GOT_OBJ_TYPE_BLOB) {
1335 err = got_error(GOT_ERR_OBJ_TYPE);
1339 err = got_object_blob_open(&blob, repo, obj, 8192);
1344 err = got_error_from_errno();
1347 err = got_object_blob_dump_to_file(&filesize, &nlines, f, blob);
1351 lines = calloc(nlines, sizeof(*lines));
1352 if (lines == NULL) {
1353 err = got_error_from_errno();
1357 err = got_repo_open(&blame_thread_repo, got_repo_get_path(repo));
1361 if (tog_blame_view.window == NULL) {
1362 tog_blame_view.window = newwin(0, 0, 0, 0);
1363 if (tog_blame_view.window == NULL)
1364 return got_error_from_errno();
1365 keypad(tog_blame_view.window, TRUE);
1367 if (tog_blame_view.panel == NULL) {
1368 tog_blame_view.panel = new_panel(tog_blame_view.window);
1369 if (tog_blame_view.panel == NULL)
1370 return got_error_from_errno();
1372 show_panel(tog_blame_view.panel);
1374 if (pthread_mutex_init(&mutex, NULL) != 0) {
1375 err = got_error_from_errno();
1378 blame_cb_args.lines = lines;
1379 blame_cb_args.nlines = nlines;
1380 blame_cb_args.mutex = &mutex;
1381 blame_cb_args.f = f;
1382 blame_cb_args.path = path;
1383 blame_cb_args.window = tog_blame_view.window;
1384 blame_cb_args.first_displayed_line = &first_displayed_line;
1385 blame_cb_args.selected_line = &selected_line;
1386 blame_cb_args.last_displayed_line = &last_displayed_line;
1387 blame_cb_args.quit = &done;
1389 blame_thread_args.path = path;
1390 blame_thread_args.commit_id = commit_id;
1391 blame_thread_args.repo = blame_thread_repo;
1392 blame_thread_args.blame_cb_args = &blame_cb_args;
1393 blame_thread_args.complete = &blame_complete;
1395 if (pthread_create(&thread, NULL, blame_thread,
1396 &blame_thread_args) != 0) {
1397 err = got_error_from_errno();
1402 if (pthread_mutex_lock(&mutex) != 0) {
1403 err = got_error_from_errno();
1406 err = draw_blame(tog_blame_view.window, f, path, lines, nlines,
1407 blame_complete, selected_line, &first_displayed_line,
1408 &last_displayed_line, &eof, LINES);
1409 if (pthread_mutex_unlock(&mutex) != 0) {
1410 err = got_error_from_errno();
1415 nodelay(stdscr, FALSE);
1416 ch = wgetch(tog_blame_view.window);
1417 nodelay(stdscr, TRUE);
1418 if (pthread_mutex_lock(&mutex) != 0) {
1419 err = got_error_from_errno();
1428 if (selected_line > 1)
1430 else if (selected_line == 1 &&
1431 first_displayed_line > 1)
1432 first_displayed_line--;
1435 if (first_displayed_line == 1) {
1439 if (first_displayed_line > LINES - 1)
1440 first_displayed_line -= (LINES - 1);
1442 first_displayed_line = 1;
1446 if (selected_line < LINES - 1)
1448 else if (last_displayed_line < nlines)
1449 first_displayed_line++;
1453 err = open_blamed_commit_and_parent(&pobj, &obj,
1454 lines, first_displayed_line, selected_line,
1458 if (pobj == NULL && obj == NULL)
1460 err = show_diff_view(pobj, obj, repo);
1462 got_object_close(pobj);
1465 got_object_close(obj);
1467 show_panel(tog_blame_view.panel);
1473 if (last_displayed_line >= nlines &&
1474 selected_line < LINES - 1) {
1475 selected_line = LINES - 1;
1478 if (last_displayed_line + LINES - 1 <= nlines)
1479 first_displayed_line += LINES - 1;
1481 first_displayed_line =
1482 nlines - (LINES - 2);
1487 if (pthread_mutex_unlock(&mutex) != 0) {
1488 err = got_error_from_errno();
1494 if (pthread_join(thread, (void **)&err) != 0)
1495 err = got_error_from_errno();
1496 if (err && err->code == GOT_ERR_ITER_COMPLETED)
1499 if (blame_thread_repo)
1500 got_repo_close(blame_thread_repo);
1502 got_object_blob_close(blob);
1504 got_object_close(pobj);
1506 got_object_close(obj);
1509 for (i = 0; i < nlines; i++)
1515 static const struct got_error *
1516 cmd_blame(int argc, char *argv[])
1518 const struct got_error *error;
1519 struct got_repository *repo = NULL;
1520 char *repo_path = NULL;
1522 struct got_object_id *commit_id = NULL;
1523 char *commit_id_str = NULL;
1527 if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
1531 while ((ch = getopt(argc, argv, "c:")) != -1) {
1534 commit_id_str = optarg;
1547 } else if (argc == 1) {
1548 repo_path = getcwd(NULL, 0);
1549 if (repo_path == NULL)
1550 return got_error_from_errno();
1552 } else if (argc == 2) {
1553 repo_path = realpath(argv[0], NULL);
1554 if (repo_path == NULL)
1555 return got_error_from_errno();
1560 error = got_repo_open(&repo, repo_path);
1565 if (commit_id_str == NULL) {
1566 struct got_reference *head_ref;
1567 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1570 error = got_ref_resolve(&commit_id, repo, head_ref);
1571 got_ref_close(head_ref);
1573 struct got_object *obj;
1574 error = got_object_open_by_id_str(&obj, repo, commit_id_str);
1577 commit_id = got_object_get_id(obj);
1578 if (commit_id == NULL)
1579 error = got_error_from_errno();
1580 got_object_close(obj);
1585 error = show_blame_view(path, commit_id, repo);
1589 got_repo_close(repo);
1593 static const struct got_error *
1594 draw_tree_entries(struct got_tree_entry **first_displayed_entry,
1595 struct got_tree_entry **last_displayed_entry,
1596 struct got_tree_entry **selected_entry, int *ndisplayed,
1597 WINDOW *window, const char *label, const char *parent_path,
1598 const struct got_tree_entries *entries, int selected, int limit, int isroot)
1600 const struct got_error *err = NULL;
1601 struct got_tree_entry *te;
1612 err = format_line(&wline, &width, label, COLS);
1615 waddwstr(window, wline);
1617 waddch(window, '\n');
1620 err = format_line(&wline, &width, parent_path, COLS);
1623 waddwstr(window, wline);
1625 waddch(window, '\n');
1628 waddch(window, '\n');
1632 te = SIMPLEQ_FIRST(&entries->head);
1633 if (*first_displayed_entry == NULL) {
1634 if (selected == 0) {
1636 *selected_entry = NULL;
1638 waddstr(window, " ..\n"); /* parent directory */
1647 while (te != *first_displayed_entry)
1648 te = SIMPLEQ_NEXT(te, entry);
1653 if (asprintf(&line, " %s%s",
1654 te->name, S_ISDIR(te->mode) ? "/" : "") == -1)
1655 return got_error_from_errno();
1656 err = format_line(&wline, &width, line, COLS);
1661 if (n == selected) {
1663 *selected_entry = te;
1665 waddwstr(window, wline);
1667 waddch(window, '\n');
1673 *last_displayed_entry = te;
1676 te = SIMPLEQ_NEXT(te, entry);
1683 tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
1684 const struct got_tree_entries *entries, int isroot)
1686 struct got_tree_entry *te, *prev;
1689 if (*first_displayed_entry == NULL)
1692 te = SIMPLEQ_FIRST(&entries->head);
1693 if (*first_displayed_entry == te) {
1695 *first_displayed_entry = NULL;
1699 /* XXX this is stupid... switch to TAILQ? */
1700 for (i = 0; i < maxscroll; i++) {
1701 while (te != *first_displayed_entry) {
1703 te = SIMPLEQ_NEXT(te, entry);
1705 *first_displayed_entry = prev;
1706 te = SIMPLEQ_FIRST(&entries->head);
1708 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
1709 *first_displayed_entry = NULL;
1713 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
1714 struct got_tree_entry *last_displayed_entry,
1715 const struct got_tree_entries *entries)
1717 struct got_tree_entry *next;
1720 if (SIMPLEQ_NEXT(last_displayed_entry, entry) == NULL)
1723 if (*first_displayed_entry)
1724 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
1726 next = SIMPLEQ_FIRST(&entries->head);
1728 *first_displayed_entry = next;
1729 if (++n >= maxscroll)
1731 next = SIMPLEQ_NEXT(next, entry);
1735 struct tog_parent_tree {
1736 TAILQ_ENTRY(tog_parent_tree) entry;
1737 struct got_tree_object *tree;
1738 struct got_tree_entry *first_displayed_entry;
1739 struct got_tree_entry *selected_entry;
1743 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
1745 static const struct got_error *
1746 tree_entry_path(char **path, struct tog_parent_trees *parents,
1747 struct got_tree_entry *te)
1749 const struct got_error *err = NULL;
1750 struct tog_parent_tree *pt;
1751 size_t len = 2; /* for leading slash and NUL */
1753 TAILQ_FOREACH(pt, parents, entry)
1754 len += strlen(pt->selected_entry->name) + 1 /* slash */;
1756 len += strlen(te->name);
1758 *path = calloc(1, len);
1760 return got_error_from_errno();
1763 pt = TAILQ_LAST(parents, tog_parent_trees);
1765 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
1766 err = got_error(GOT_ERR_NO_SPACE);
1769 if (strlcat(*path, "/", len) >= len) {
1770 err = got_error(GOT_ERR_NO_SPACE);
1773 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
1776 if (strlcat(*path, te->name, len) >= len) {
1777 err = got_error(GOT_ERR_NO_SPACE);
1789 static const struct got_error *
1790 blame_tree_entry(struct got_tree_entry *te, struct tog_parent_trees *parents,
1791 struct got_object_id *commit_id, struct got_repository *repo)
1793 const struct got_error *err = NULL;
1796 err = tree_entry_path(&path, parents, te);
1800 err = show_blame_view(path, commit_id, repo);
1805 static const struct got_error *
1806 show_tree_view(struct got_tree_object *root, struct got_object_id *commit_id,
1807 struct got_repository *repo)
1809 const struct got_error *err = NULL;
1810 int ch, done = 0, selected = 0;
1811 struct got_tree_object *tree = root;
1812 const struct got_tree_entries *entries;
1813 struct got_tree_entry *first_displayed_entry = NULL;
1814 struct got_tree_entry *last_displayed_entry = NULL;
1815 struct got_tree_entry *selected_entry = NULL;
1816 char *commit_id_str = NULL, *tree_label = NULL;
1817 int nentries, ndisplayed;
1818 struct tog_parent_trees parents;
1820 TAILQ_INIT(&parents);
1822 err = got_object_id_str(&commit_id_str, commit_id);
1826 if (asprintf(&tree_label, "tree of commit %s", commit_id_str) == -1) {
1827 err = got_error_from_errno();
1831 if (tog_tree_view.window == NULL) {
1832 tog_tree_view.window = newwin(0, 0, 0, 0);
1833 if (tog_tree_view.window == NULL)
1834 return got_error_from_errno();
1835 keypad(tog_tree_view.window, TRUE);
1837 if (tog_tree_view.panel == NULL) {
1838 tog_tree_view.panel = new_panel(tog_tree_view.window);
1839 if (tog_tree_view.panel == NULL)
1840 return got_error_from_errno();
1842 show_panel(tog_tree_view.panel);
1844 entries = got_object_tree_get_entries(root);
1845 first_displayed_entry = SIMPLEQ_FIRST(&entries->head);
1848 entries = got_object_tree_get_entries(tree);
1849 nentries = entries->nentries;
1851 nentries++; /* '..' directory */
1853 err = tree_entry_path(&parent_path, &parents, NULL);
1857 err = draw_tree_entries(&first_displayed_entry,
1858 &last_displayed_entry, &selected_entry, &ndisplayed,
1859 tog_tree_view.window, tree_label, parent_path, entries,
1860 selected, LINES, tree == root);
1865 nodelay(stdscr, FALSE);
1866 ch = wgetch(tog_tree_view.window);
1867 nodelay(stdscr, TRUE);
1878 tree_scroll_up(&first_displayed_entry, 1,
1879 entries, tree == root);
1882 if (SIMPLEQ_FIRST(&entries->head) ==
1883 first_displayed_entry) {
1885 first_displayed_entry = NULL;
1889 tree_scroll_up(&first_displayed_entry, LINES,
1890 entries, tree == root);
1894 if (selected < ndisplayed - 1) {
1898 tree_scroll_down(&first_displayed_entry, 1,
1899 last_displayed_entry, entries);
1902 tree_scroll_down(&first_displayed_entry, LINES,
1903 last_displayed_entry, entries);
1904 if (SIMPLEQ_NEXT(last_displayed_entry, entry))
1906 /* can't scroll any further; move cursor down */
1907 if (selected < ndisplayed - 1)
1908 selected = ndisplayed - 1;
1912 if (selected_entry == NULL) {
1913 struct tog_parent_tree *parent;
1915 /* user selected '..' */
1918 parent = TAILQ_FIRST(&parents);
1919 TAILQ_REMOVE(&parents, parent, entry);
1920 got_object_tree_close(tree);
1921 tree = parent->tree;
1922 first_displayed_entry =
1923 parent->first_displayed_entry;
1924 selected_entry = parent->selected_entry;
1925 selected = parent->selected;
1927 } else if (S_ISDIR(selected_entry->mode)) {
1928 struct tog_parent_tree *parent;
1929 struct got_tree_object *child;
1930 err = got_object_open_as_tree(
1931 &child, repo, selected_entry->id);
1934 parent = calloc(1, sizeof(*parent));
1935 if (parent == NULL) {
1936 err = got_error_from_errno();
1939 parent->tree = tree;
1940 parent->first_displayed_entry =
1941 first_displayed_entry;
1942 parent->selected_entry = selected_entry;
1943 parent->selected = selected;
1944 TAILQ_INSERT_HEAD(&parents, parent,
1948 first_displayed_entry = NULL;
1949 } else if (S_ISREG(selected_entry->mode)) {
1950 err = blame_tree_entry(selected_entry,
1951 &parents, commit_id, repo);
1957 if (selected > LINES)
1958 selected = ndisplayed - 1;
1966 free(commit_id_str);
1967 while (!TAILQ_EMPTY(&parents)) {
1968 struct tog_parent_tree *parent;
1969 parent = TAILQ_FIRST(&parents);
1970 TAILQ_REMOVE(&parents, parent, entry);
1975 got_object_tree_close(tree);
1983 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
1988 static const struct got_error *
1989 cmd_tree(int argc, char *argv[])
1991 const struct got_error *error;
1992 struct got_repository *repo = NULL;
1993 char *repo_path = NULL;
1994 struct got_object_id *commit_id = NULL;
1995 char *commit_id_arg = NULL;
1996 struct got_commit_object *commit = NULL;
1997 struct got_tree_object *tree = NULL;
2001 if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
2005 while ((ch = getopt(argc, argv, "c:")) != -1) {
2008 commit_id_arg = optarg;
2020 repo_path = getcwd(NULL, 0);
2021 if (repo_path == NULL)
2022 return got_error_from_errno();
2023 } else if (argc == 1) {
2024 repo_path = realpath(argv[0], NULL);
2025 if (repo_path == NULL)
2026 return got_error_from_errno();
2030 error = got_repo_open(&repo, repo_path);
2035 if (commit_id_arg == NULL) {
2036 error = get_head_commit_id(&commit_id, repo);
2040 struct got_object *obj;
2041 error = got_object_open_by_id_str(&obj, repo, commit_id_arg);
2042 if (error == NULL) {
2043 commit_id = got_object_get_id(obj);
2044 if (commit_id == NULL)
2045 error = got_error_from_errno();
2051 error = got_object_open_as_commit(&commit, repo, commit_id);
2055 error = got_object_open_as_tree(&tree, repo, commit->tree_id);
2059 error = show_tree_view(tree, commit_id, repo);
2063 got_object_commit_close(commit);
2065 got_object_tree_close(tree);
2067 got_repo_close(repo);
2077 intrflush(stdscr, FALSE);
2078 keypad(stdscr, TRUE);
2087 fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
2088 "Available commands:\n", getprogname());
2089 for (i = 0; i < nitems(tog_commands); i++) {
2090 struct tog_cmd *cmd = &tog_commands[i];
2091 fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
2097 make_argv(const char *arg0, const char *arg1)
2100 int argc = (arg1 == NULL ? 1 : 2);
2102 argv = calloc(argc, sizeof(char *));
2105 argv[0] = strdup(arg0);
2106 if (argv[0] == NULL)
2109 argv[1] = strdup(arg1);
2110 if (argv[1] == NULL)
2118 main(int argc, char *argv[])
2120 const struct got_error *error = NULL;
2121 struct tog_cmd *cmd = NULL;
2123 char **cmd_argv = NULL;
2125 setlocale(LC_ALL, "");
2127 while ((ch = getopt(argc, argv, "h")) != -1) {
2146 /* Build an argument vector which runs a default command. */
2147 cmd = &tog_commands[0];
2148 cmd_argv = make_argv(cmd->name, NULL);
2153 /* Did the user specific a command? */
2154 for (i = 0; i < nitems(tog_commands); i++) {
2155 if (strncmp(tog_commands[i].name, argv[0],
2156 strlen(argv[0])) == 0) {
2157 cmd = &tog_commands[i];
2159 tog_commands[i].cmd_usage();
2164 /* Did the user specify a repository? */
2165 char *repo_path = realpath(argv[0], NULL);
2167 struct got_repository *repo;
2168 error = got_repo_open(&repo, repo_path);
2170 got_repo_close(repo);
2172 error = got_error_from_errno();
2175 fprintf(stderr, "%s: '%s' is not a "
2176 "known command\n", getprogname(),
2180 fprintf(stderr, "%s: '%s' is neither a known "
2181 "command nor a path to a repository\n",
2182 getprogname(), argv[0]);
2186 cmd = &tog_commands[0];
2187 cmd_argv = make_argv(cmd->name, repo_path);
2195 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
2202 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);