2 * Copyright (c) 2018, 2019 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>
19 #include <sys/ioctl.h>
22 #define _XOPEN_SOURCE_EXTENDED
24 #undef _XOPEN_SOURCE_EXTENDED
40 #include "got_error.h"
41 #include "got_object.h"
42 #include "got_reference.h"
43 #include "got_repository.h"
45 #include "got_opentemp.h"
46 #include "got_commit_graph.h"
48 #include "got_blame.h"
49 #include "got_privsep.h"
50 #include "got_worktree.h"
53 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
57 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
62 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
67 const struct got_error *(*cmd_main)(int, char *[]);
68 void (*cmd_usage)(void);
72 __dead static void usage(void);
73 __dead static void usage_log(void);
74 __dead static void usage_diff(void);
75 __dead static void usage_blame(void);
76 __dead static void usage_tree(void);
78 static const struct got_error* cmd_log(int, char *[]);
79 static const struct got_error* cmd_diff(int, char *[]);
80 static const struct got_error* cmd_blame(int, char *[]);
81 static const struct got_error* cmd_tree(int, char *[]);
83 static struct tog_cmd tog_commands[] = {
84 { "log", cmd_log, usage_log,
85 "show repository history" },
86 { "diff", cmd_diff, usage_diff,
87 "compare files and directories" },
88 { "blame", cmd_blame, usage_blame,
89 "show line-by-line file history" },
90 { "tree", cmd_tree, usage_tree,
91 "browse trees in repository" },
101 struct commit_queue_entry {
102 TAILQ_ENTRY(commit_queue_entry) entry;
103 struct got_object_id *id;
104 struct got_commit_object *commit;
107 TAILQ_HEAD(commit_queue_head, commit_queue_entry);
108 struct commit_queue {
110 struct commit_queue_head head;
113 struct tog_diff_view_state {
114 struct got_object_id *id1, *id2;
116 int first_displayed_line;
117 int last_displayed_line;
120 struct got_repository *repo;
121 struct got_reflist_head *refs;
123 /* passed from log view; may be NULL */
124 struct tog_view *log_view;
127 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
129 struct tog_log_thread_args {
130 pthread_cond_t need_commits;
132 struct got_commit_graph *graph;
133 struct commit_queue *commits;
134 const char *in_repo_path;
135 struct got_object_id *start_id;
136 struct got_repository *repo;
139 struct tog_view *view;
140 struct commit_queue_entry **first_displayed_entry;
141 struct commit_queue_entry **selected_entry;
144 struct tog_log_view_state {
145 struct commit_queue commits;
146 struct commit_queue_entry *first_displayed_entry;
147 struct commit_queue_entry *last_displayed_entry;
148 struct commit_queue_entry *selected_entry;
151 struct got_repository *repo;
152 struct got_reflist_head *refs;
153 struct got_object_id *start_id;
156 struct tog_log_thread_args thread_args;
159 struct tog_blame_cb_args {
160 struct tog_blame_line *lines; /* one per line */
163 struct tog_view *view;
164 struct got_object_id *commit_id;
168 struct tog_blame_thread_args {
170 struct got_repository *repo;
171 struct tog_blame_cb_args *cb_args;
178 struct tog_blame_line *lines;
181 struct tog_blame_thread_args thread_args;
182 struct tog_blame_cb_args cb_args;
186 struct tog_blame_view_state {
187 int first_displayed_line;
188 int last_displayed_line;
193 struct got_object_id_queue blamed_commits;
194 struct got_object_qid *blamed_commit;
196 struct got_repository *repo;
197 struct got_reflist_head *refs;
198 struct got_object_id *commit_id;
199 struct tog_blame blame;
202 struct tog_parent_tree {
203 TAILQ_ENTRY(tog_parent_tree) entry;
204 struct got_tree_object *tree;
205 struct got_tree_entry *first_displayed_entry;
206 struct got_tree_entry *selected_entry;
210 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
212 struct tog_tree_view_state {
214 struct got_tree_object *root;
215 struct got_tree_object *tree;
216 const struct got_tree_entries *entries;
217 struct got_tree_entry *first_displayed_entry;
218 struct got_tree_entry *last_displayed_entry;
219 struct got_tree_entry *selected_entry;
220 int ndisplayed, selected, show_ids;
221 struct tog_parent_trees parents;
222 struct got_object_id *commit_id;
223 struct got_repository *repo;
224 struct got_reflist_head *refs;
228 * We implement two types of views: parent views and child views.
230 * The 'Tab' key switches between a parent view and its child view.
231 * Child views are shown side-by-side to their parent view, provided
232 * there is enough screen estate.
234 * When a new view is opened from within a parent view, this new view
235 * becomes a child view of the parent view, replacing any existing child.
237 * When a new view is opened from within a child view, this new view
238 * becomes a parent view which will obscure the views below until the
239 * user quits the new parent view by typing 'q'.
241 * This list of views contains parent views only.
242 * Child views are only pointed to by their parent view.
244 TAILQ_HEAD(tog_view_list_head, tog_view);
247 TAILQ_ENTRY(tog_view) entry;
250 int nlines, ncols, begin_y, begin_x;
251 int lines, cols; /* copies of LINES and COLS */
253 struct tog_view *parent;
254 struct tog_view *child;
257 /* type-specific state */
258 enum tog_view_type type;
260 struct tog_diff_view_state diff;
261 struct tog_log_view_state log;
262 struct tog_blame_view_state blame;
263 struct tog_tree_view_state tree;
266 const struct got_error *(*show)(struct tog_view *);
267 const struct got_error *(*input)(struct tog_view **,
268 struct tog_view **, struct tog_view**, struct tog_view *, int);
269 const struct got_error *(*close)(struct tog_view *);
272 static const struct got_error *open_diff_view(struct tog_view *,
273 struct got_object_id *, struct got_object_id *, struct tog_view *,
274 struct got_reflist_head *, struct got_repository *);
275 static const struct got_error *show_diff_view(struct tog_view *);
276 static const struct got_error *input_diff_view(struct tog_view **,
277 struct tog_view **, struct tog_view **, struct tog_view *, int);
278 static const struct got_error* close_diff_view(struct tog_view *);
280 static const struct got_error *open_log_view(struct tog_view *,
281 struct got_object_id *, struct got_reflist_head *,
282 struct got_repository *, const char *, int);
283 static const struct got_error * show_log_view(struct tog_view *);
284 static const struct got_error *input_log_view(struct tog_view **,
285 struct tog_view **, struct tog_view **, struct tog_view *, int);
286 static const struct got_error *close_log_view(struct tog_view *);
288 static const struct got_error *open_blame_view(struct tog_view *, char *,
289 struct got_object_id *, struct got_reflist_head *, struct got_repository *);
290 static const struct got_error *show_blame_view(struct tog_view *);
291 static const struct got_error *input_blame_view(struct tog_view **,
292 struct tog_view **, struct tog_view **, struct tog_view *, int);
293 static const struct got_error *close_blame_view(struct tog_view *);
295 static const struct got_error *open_tree_view(struct tog_view *,
296 struct got_tree_object *, struct got_object_id *,
297 struct got_reflist_head *, struct got_repository *);
298 static const struct got_error *show_tree_view(struct tog_view *);
299 static const struct got_error *input_tree_view(struct tog_view **,
300 struct tog_view **, struct tog_view **, struct tog_view *, int);
301 static const struct got_error *close_tree_view(struct tog_view *);
303 static volatile sig_atomic_t tog_sigwinch_received;
306 tog_sigwinch(int signo)
308 tog_sigwinch_received = 1;
311 static const struct got_error *
312 view_close(struct tog_view *view)
314 const struct got_error *err = NULL;
317 view_close(view->child);
321 err = view->close(view);
323 del_panel(view->panel);
325 delwin(view->window);
330 static struct tog_view *
331 view_open(int nlines, int ncols, int begin_y, int begin_x,
332 enum tog_view_type type)
334 struct tog_view *view = calloc(1, sizeof(*view));
342 view->nlines = nlines ? nlines : LINES - begin_y;
343 view->ncols = ncols ? ncols : COLS - begin_x;
344 view->begin_y = begin_y;
345 view->begin_x = begin_x;
346 view->window = newwin(nlines, ncols, begin_y, begin_x);
347 if (view->window == NULL) {
351 view->panel = new_panel(view->window);
352 if (view->panel == NULL ||
353 set_panel_userptr(view->panel, view) != OK) {
358 keypad(view->window, TRUE);
363 view_split_begin_x(int begin_x)
365 if (begin_x > 0 || COLS < 120)
367 return (COLS - MAX(COLS / 2, 80));
370 static const struct got_error *view_resize(struct tog_view *);
372 static const struct got_error *
373 view_splitscreen(struct tog_view *view)
375 const struct got_error *err = NULL;
378 view->begin_x = view_split_begin_x(0);
379 view->nlines = LINES;
380 view->ncols = COLS - view->begin_x;
383 err = view_resize(view);
387 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
388 return got_error_from_errno();
393 static const struct got_error *
394 view_fullscreen(struct tog_view *view)
396 const struct got_error *err = NULL;
400 view->nlines = LINES;
404 err = view_resize(view);
408 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
409 return got_error_from_errno();
415 view_is_parent_view(struct tog_view *view)
417 return view->parent == NULL;
420 static const struct got_error *
421 view_resize(struct tog_view *view)
425 if (view->lines > LINES)
426 nlines = view->nlines - (view->lines - LINES);
428 nlines = view->nlines + (LINES - view->lines);
430 if (view->cols > COLS)
431 ncols = view->ncols - (view->cols - COLS);
433 ncols = view->ncols + (COLS - view->cols);
435 if (wresize(view->window, nlines, ncols) == ERR)
436 return got_error_from_errno();
437 if (replace_panel(view->panel, view->window) == ERR)
438 return got_error_from_errno();
439 wclear(view->window);
441 view->nlines = nlines;
447 view->child->begin_x = view_split_begin_x(view->begin_x);
448 if (view->child->begin_x == 0) {
449 view_fullscreen(view->child);
450 if (view->child->focussed)
451 show_panel(view->child->panel);
453 show_panel(view->panel);
455 view_splitscreen(view->child);
456 show_panel(view->child->panel);
463 static const struct got_error *
464 view_close_child(struct tog_view *view)
466 const struct got_error *err = NULL;
468 if (view->child == NULL)
471 err = view_close(view->child);
476 static const struct got_error *
477 view_set_child(struct tog_view *view, struct tog_view *child)
479 const struct got_error *err = NULL;
482 child->parent = view;
487 view_is_splitscreen(struct tog_view *view)
489 return !view_is_parent_view(view) && view->begin_x > 0;
498 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
499 cols = 80; /* Default */
505 resize_term(lines, cols);
508 static const struct got_error *
509 view_input(struct tog_view **new, struct tog_view **dead,
510 struct tog_view **focus, int *done, struct tog_view *view,
511 struct tog_view_list_head *views)
513 const struct got_error *err = NULL;
521 nodelay(stdscr, FALSE);
522 /* Allow threads to make progress while we are waiting for input. */
523 errcode = pthread_mutex_unlock(&tog_mutex);
525 return got_error_set_errno(errcode);
526 ch = wgetch(view->window);
527 errcode = pthread_mutex_lock(&tog_mutex);
529 return got_error_set_errno(errcode);
530 nodelay(stdscr, TRUE);
532 if (tog_sigwinch_received) {
534 tog_sigwinch_received = 0;
535 TAILQ_FOREACH(v, views, entry) {
536 err = view_resize(v);
539 err = v->input(new, dead, focus, v, KEY_RESIZE);
550 *focus = view->child;
551 view->child_focussed = 1;
552 } else if (view->parent) {
553 *focus = view->parent;
554 view->parent->child_focussed = 0;
558 err = view->input(new, dead, focus, view, ch);
565 if (view_is_parent_view(view)) {
566 if (view->child == NULL)
568 if (view_is_splitscreen(view->child)) {
569 *focus = view->child;
570 view->child_focussed = 1;
571 err = view_fullscreen(view->child);
573 err = view_splitscreen(view->child);
576 err = view->child->input(new, dead, focus,
577 view->child, KEY_RESIZE);
579 if (view_is_splitscreen(view)) {
581 view->parent->child_focussed = 1;
582 err = view_fullscreen(view);
584 err = view_splitscreen(view);
588 err = view->input(new, dead, focus, view,
595 err = view->input(new, dead, focus, view, ch);
603 view_vborder(struct tog_view *view)
606 struct tog_view *view_above;
609 return view_vborder(view->parent);
611 panel = panel_above(view->panel);
615 view_above = panel_userptr(panel);
616 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
617 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
621 view_needs_focus_indication(struct tog_view *view)
623 if (view_is_parent_view(view)) {
624 if (view->child == NULL || view->child_focussed)
626 if (!view_is_splitscreen(view->child))
628 } else if (!view_is_splitscreen(view))
631 return view->focussed;
634 static const struct got_error *
635 view_loop(struct tog_view *view)
637 const struct got_error *err = NULL;
638 struct tog_view_list_head views;
639 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
640 int fast_refresh = 10;
641 int done = 0, errcode;
643 errcode = pthread_mutex_lock(&tog_mutex);
645 return got_error_set_errno(errcode);
648 TAILQ_INSERT_HEAD(&views, view, entry);
652 err = view->show(view);
657 while (!TAILQ_EMPTY(&views) && !done) {
658 /* Refresh fast during initialization, then become slower. */
659 if (fast_refresh && fast_refresh-- == 0)
660 halfdelay(10); /* switch to once per second */
662 err = view_input(&new_view, &dead_view, &focus_view, &done,
667 struct tog_view *prev = NULL;
669 if (view_is_parent_view(dead_view))
670 prev = TAILQ_PREV(dead_view,
671 tog_view_list_head, entry);
672 else if (view->parent != dead_view)
675 if (dead_view->parent)
676 dead_view->parent->child = NULL;
678 TAILQ_REMOVE(&views, dead_view, entry);
680 err = view_close(dead_view);
681 if (err || dead_view == main_view)
684 if (view == dead_view) {
689 else if (!TAILQ_EMPTY(&views))
690 view = TAILQ_LAST(&views,
695 if (view->child && view->child_focussed)
696 focus_view = view->child;
703 struct tog_view *v, *t;
704 /* Only allow one parent view per type. */
705 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
706 if (v->type != new_view->type)
708 TAILQ_REMOVE(&views, v, entry);
714 TAILQ_INSERT_TAIL(&views, new_view, entry);
716 if (focus_view == NULL)
717 focus_view = new_view;
720 show_panel(focus_view->panel);
723 focus_view->focussed = 1;
726 show_panel(new_view->panel);
727 if (view->child && view_is_splitscreen(view->child))
728 show_panel(view->child->panel);
731 if (focus_view == NULL) {
733 show_panel(view->panel);
734 if (view->child && view_is_splitscreen(view->child))
735 show_panel(view->child->panel);
739 err = view->parent->show(view->parent);
743 err = view->show(view);
747 err = view->child->show(view->child);
756 while (!TAILQ_EMPTY(&views)) {
757 view = TAILQ_FIRST(&views);
758 TAILQ_REMOVE(&views, view, entry);
762 errcode = pthread_mutex_unlock(&tog_mutex);
764 return got_error_set_errno(errcode);
774 "usage: %s log [-c commit] [-r repository-path] [path]\n",
779 /* Create newly allocated wide-character string equivalent to a byte string. */
780 static const struct got_error *
781 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
784 const struct got_error *err = NULL;
787 *wlen = mbstowcs(NULL, s, 0);
788 if (*wlen == (size_t)-1) {
791 return got_error_from_errno();
793 /* byte string invalid in current encoding; try to "fix" it */
794 err = got_mbsavis(&vis, &vislen, s);
797 *wlen = mbstowcs(NULL, vis, 0);
798 if (*wlen == (size_t)-1) {
799 err = got_error_from_errno(); /* give up */
804 *ws = calloc(*wlen + 1, sizeof(*ws));
806 err = got_error_from_errno();
810 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
811 err = got_error_from_errno();
822 /* Format a line for display, ensuring that it won't overflow a width limit. */
823 static const struct got_error *
824 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
826 const struct got_error *err = NULL;
828 wchar_t *wline = NULL;
835 err = mbs2ws(&wline, &wlen, line);
840 while (i < wlen && cols < wlimit) {
841 int width = wcwidth(wline[i]);
848 if (cols + width <= wlimit)
853 if (wline[i] == L'\t')
854 cols += TABSIZE - ((cols + 1) % TABSIZE);
858 err = got_error_from_errno();
873 static const struct got_error*
874 build_refs_str(char **refs_str, struct got_reflist_head *refs,
875 struct got_object_id *id)
877 static const struct got_error *err = NULL;
878 struct got_reflist_entry *re;
884 SIMPLEQ_FOREACH(re, refs, entry) {
885 if (got_object_id_cmp(re->id, id) != 0)
887 name = got_ref_get_name(re->ref);
888 if (strcmp(name, GOT_REF_HEAD) == 0)
890 if (strncmp(name, "refs/", 5) == 0)
892 if (strncmp(name, "heads/", 6) == 0)
894 if (strncmp(name, "remotes/", 8) == 0)
897 if (asprintf(refs_str, "%s%s%s", s ? s : "",
898 s ? ", " : "", name) == -1) {
899 err = got_error_from_errno();
910 static const struct got_error *
911 draw_commit(struct tog_view *view, struct got_commit_object *commit,
912 struct got_object_id *id, struct got_reflist_head *refs)
914 const struct got_error *err = NULL;
915 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
916 char *logmsg0 = NULL, *logmsg = NULL;
917 char *author0 = NULL, *author = NULL;
918 wchar_t *wlogmsg = NULL, *wauthor = NULL;
919 int author_width, logmsg_width;
920 char *newline, *smallerthan;
923 static const size_t date_display_cols = 9;
924 static const size_t author_display_cols = 16;
925 const int avail = view->ncols;
927 time_t committer_time;
929 committer_time = got_object_commit_get_committer_time(commit);
930 if (localtime_r(&committer_time, &tm) == NULL)
931 return got_error_from_errno();
932 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
934 return got_error(GOT_ERR_NO_SPACE);
936 if (avail < date_display_cols)
937 limit = MIN(sizeof(datebuf) - 1, avail);
939 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
940 waddnstr(view->window, datebuf, limit);
945 author0 = strdup(got_object_commit_get_author(commit));
946 if (author0 == NULL) {
947 err = got_error_from_errno();
951 smallerthan = strchr(author, '<');
955 char *at = strchr(author, '@');
960 err = format_line(&wauthor, &author_width, author, limit);
963 waddwstr(view->window, wauthor);
965 while (col <= avail && author_width < author_display_cols + 1) {
966 waddch(view->window, ' ');
973 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
974 if (logmsg0 == NULL) {
975 err = got_error_from_errno();
979 while (*logmsg == '\n')
981 newline = strchr(logmsg, '\n');
985 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
988 waddwstr(view->window, wlogmsg);
990 while (col <= avail) {
991 waddch(view->window, ' ');
1003 static struct commit_queue_entry *
1004 alloc_commit_queue_entry(struct got_commit_object *commit,
1005 struct got_object_id *id)
1007 struct commit_queue_entry *entry;
1009 entry = calloc(1, sizeof(*entry));
1014 entry->commit = commit;
1019 pop_commit(struct commit_queue *commits)
1021 struct commit_queue_entry *entry;
1023 entry = TAILQ_FIRST(&commits->head);
1024 TAILQ_REMOVE(&commits->head, entry, entry);
1025 got_object_commit_close(entry->commit);
1026 commits->ncommits--;
1027 /* Don't free entry->id! It is owned by the commit graph. */
1032 free_commits(struct commit_queue *commits)
1034 while (!TAILQ_EMPTY(&commits->head))
1035 pop_commit(commits);
1038 static const struct got_error *
1039 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1040 int minqueue, struct got_repository *repo, const char *path)
1042 const struct got_error *err = NULL;
1046 * We keep all commits open throughout the lifetime of the log
1047 * view in order to avoid having to re-fetch commits from disk
1048 * while updating the display.
1050 while (nqueued < minqueue) {
1051 struct got_object_id *id;
1052 struct got_commit_object *commit;
1053 struct commit_queue_entry *entry;
1056 err = got_commit_graph_iter_next(&id, graph);
1058 if (err->code != GOT_ERR_ITER_NEED_MORE)
1060 err = got_commit_graph_fetch_commits(graph,
1070 err = got_object_open_as_commit(&commit, repo, id);
1073 entry = alloc_commit_queue_entry(commit, id);
1074 if (entry == NULL) {
1075 err = got_error_from_errno();
1079 errcode = pthread_mutex_lock(&tog_mutex);
1081 err = got_error_set_errno(errcode);
1085 entry->idx = commits->ncommits;
1086 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1088 commits->ncommits++;
1090 errcode = pthread_mutex_unlock(&tog_mutex);
1091 if (errcode && err == NULL)
1092 err = got_error_set_errno(errcode);
1098 static const struct got_error *
1099 get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1101 const struct got_error *err = NULL;
1102 struct got_reference *head_ref;
1106 err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1110 err = got_ref_resolve(head_id, repo, head_ref);
1111 got_ref_close(head_ref);
1120 static const struct got_error *
1121 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1122 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1123 struct commit_queue *commits, int selected_idx, int limit,
1124 struct got_reflist_head *refs, const char *path, int commits_needed)
1126 const struct got_error *err = NULL;
1127 struct commit_queue_entry *entry;
1128 int ncommits, width;
1129 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1130 char *refs_str = NULL;
1136 if (ncommits == selected_idx) {
1140 entry = TAILQ_NEXT(entry, entry);
1145 err = got_object_id_str(&id_str, (*selected)->id);
1149 err = build_refs_str(&refs_str, refs, (*selected)->id);
1155 if (asprintf(&ncommits_str, " [%d/%d] %s",
1156 entry ? entry->idx + 1 : 0, commits->ncommits,
1157 commits_needed > 0 ? "loading... " :
1158 (refs_str ? refs_str : "")) == -1) {
1159 err = got_error_from_errno();
1163 if (path && strcmp(path, "/") != 0) {
1164 if (asprintf(&header, "commit %s %s%s",
1165 id_str ? id_str : "........................................",
1166 path, ncommits_str) == -1) {
1167 err = got_error_from_errno();
1171 } else if (asprintf(&header, "commit %s%s",
1172 id_str ? id_str : "........................................",
1173 ncommits_str) == -1) {
1174 err = got_error_from_errno();
1178 err = format_line(&wline, &width, header, view->ncols);
1182 werase(view->window);
1184 if (view_needs_focus_indication(view))
1185 wstandout(view->window);
1186 waddwstr(view->window, wline);
1187 while (width < view->ncols) {
1188 waddch(view->window, ' ');
1191 if (view_needs_focus_indication(view))
1192 wstandend(view->window);
1201 if (ncommits >= limit - 1)
1203 if (view->focussed && ncommits == selected_idx)
1204 wstandout(view->window);
1205 err = draw_commit(view, entry->commit, entry->id, refs);
1206 if (view->focussed && ncommits == selected_idx)
1207 wstandend(view->window);
1212 entry = TAILQ_NEXT(entry, entry);
1225 scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1226 struct commit_queue *commits)
1228 struct commit_queue_entry *entry;
1231 entry = TAILQ_FIRST(&commits->head);
1232 if (*first_displayed_entry == entry)
1235 entry = *first_displayed_entry;
1236 while (entry && nscrolled < maxscroll) {
1237 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1239 *first_displayed_entry = entry;
1245 static const struct got_error *
1246 trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1247 pthread_cond_t *need_commits)
1251 while (*commits_needed > 0) {
1255 /* Wake the log thread. */
1256 errcode = pthread_cond_signal(need_commits);
1258 return got_error_set_errno(errcode);
1259 errcode = pthread_mutex_unlock(&tog_mutex);
1261 return got_error_set_errno(errcode);
1263 errcode = pthread_mutex_lock(&tog_mutex);
1265 return got_error_set_errno(errcode);
1267 if (*commits_needed > 0 && !load_all) {
1269 * Thread is not done yet; lose a key press
1270 * and let the user retry... this way the GUI
1271 * remains interactive while logging deep paths
1272 * with few commits in history.
1281 static const struct got_error *
1282 scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1283 struct commit_queue_entry **last_displayed_entry,
1284 struct commit_queue *commits, int *log_complete, int *commits_needed,
1285 pthread_cond_t *need_commits)
1287 const struct got_error *err = NULL;
1288 struct commit_queue_entry *pentry;
1291 if (*last_displayed_entry == NULL)
1294 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1295 if (pentry == NULL && !*log_complete) {
1296 (*commits_needed) += maxscroll;
1297 err = trigger_log_thread(0, commits_needed, log_complete,
1304 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1308 *last_displayed_entry = pentry;
1310 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1313 *first_displayed_entry = pentry;
1314 } while (++nscrolled < maxscroll);
1319 static const struct got_error *
1320 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1321 struct got_commit_object *commit, struct got_object_id *commit_id,
1322 struct tog_view *log_view, struct got_reflist_head *refs,
1323 struct got_repository *repo)
1325 const struct got_error *err;
1326 struct got_object_qid *parent_id;
1327 struct tog_view *diff_view;
1329 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1330 if (diff_view == NULL)
1331 return got_error_from_errno();
1333 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1334 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1335 commit_id, log_view, refs, repo);
1337 *new_view = diff_view;
1341 static const struct got_error *
1342 browse_commit(struct tog_view **new_view, int begin_x,
1343 struct commit_queue_entry *entry, struct got_reflist_head *refs,
1344 struct got_repository *repo)
1346 const struct got_error *err = NULL;
1347 struct got_tree_object *tree;
1348 struct tog_view *tree_view;
1350 err = got_object_open_as_tree(&tree, repo,
1351 got_object_commit_get_tree_id(entry->commit));
1355 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1356 if (tree_view == NULL)
1357 return got_error_from_errno();
1359 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1361 got_object_tree_close(tree);
1363 *new_view = tree_view;
1368 log_thread(void *arg)
1370 const struct got_error *err = NULL;
1372 struct tog_log_thread_args *a = arg;
1375 err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1379 while (!done && !err) {
1380 err = queue_commits(a->graph, a->commits, 1, a->repo,
1383 if (err->code != GOT_ERR_ITER_COMPLETED)
1387 } else if (a->commits_needed > 0)
1388 a->commits_needed--;
1390 errcode = pthread_mutex_lock(&tog_mutex);
1392 return (void *)got_error_set_errno(errcode);
1395 a->log_complete = 1;
1396 else if (*a->quit) {
1398 a->log_complete = 1;
1399 } else if (*a->first_displayed_entry == NULL) {
1400 *a->first_displayed_entry =
1401 TAILQ_FIRST(&a->commits->head);
1402 *a->selected_entry = *a->first_displayed_entry;
1406 a->commits_needed = 0;
1407 else if (a->commits_needed == 0) {
1408 errcode = pthread_cond_wait(&a->need_commits,
1411 err = got_error_set_errno(errcode);
1414 errcode = pthread_mutex_unlock(&tog_mutex);
1415 if (errcode && err == NULL)
1416 err = got_error_set_errno(errcode);
1421 static const struct got_error *
1422 stop_log_thread(struct tog_log_view_state *s)
1424 const struct got_error *err = NULL;
1429 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1431 return got_error_set_errno(errcode);
1432 errcode = pthread_mutex_unlock(&tog_mutex);
1434 return got_error_set_errno(errcode);
1435 errcode = pthread_join(s->thread, (void **)&err);
1437 return got_error_set_errno(errcode);
1438 errcode = pthread_mutex_lock(&tog_mutex);
1440 return got_error_set_errno(errcode);
1444 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1445 if (errcode && err == NULL)
1446 err = got_error_set_errno(errcode);
1448 if (s->thread_args.repo) {
1449 got_repo_close(s->thread_args.repo);
1450 s->thread_args.repo = NULL;
1453 if (s->thread_args.graph) {
1454 got_commit_graph_close(s->thread_args.graph);
1455 s->thread_args.graph = NULL;
1461 static const struct got_error *
1462 close_log_view(struct tog_view *view)
1464 const struct got_error *err = NULL;
1465 struct tog_log_view_state *s = &view->state.log;
1467 err = stop_log_thread(s);
1468 free_commits(&s->commits);
1469 free(s->in_repo_path);
1470 s->in_repo_path = NULL;
1476 static const struct got_error *
1477 open_log_view(struct tog_view *view, struct got_object_id *start_id,
1478 struct got_reflist_head *refs, struct got_repository *repo,
1479 const char *path, int check_disk)
1481 const struct got_error *err = NULL;
1482 struct tog_log_view_state *s = &view->state.log;
1483 struct got_repository *thread_repo = NULL;
1484 struct got_commit_graph *thread_graph = NULL;
1487 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1491 /* The commit queue only contains commits being displayed. */
1492 TAILQ_INIT(&s->commits.head);
1493 s->commits.ncommits = 0;
1497 s->start_id = got_object_id_dup(start_id);
1498 if (s->start_id == NULL) {
1499 err = got_error_from_errno();
1503 view->show = show_log_view;
1504 view->input = input_log_view;
1505 view->close = close_log_view;
1507 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1510 err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1515 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1517 err = got_error_set_errno(errcode);
1521 s->thread_args.commits_needed = view->nlines;
1522 s->thread_args.graph = thread_graph;
1523 s->thread_args.commits = &s->commits;
1524 s->thread_args.in_repo_path = s->in_repo_path;
1525 s->thread_args.start_id = s->start_id;
1526 s->thread_args.repo = thread_repo;
1527 s->thread_args.log_complete = 0;
1528 s->thread_args.quit = &s->quit;
1529 s->thread_args.view = view;
1530 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1531 s->thread_args.selected_entry = &s->selected_entry;
1534 close_log_view(view);
1538 static const struct got_error *
1539 show_log_view(struct tog_view *view)
1541 struct tog_log_view_state *s = &view->state.log;
1543 if (s->thread == NULL) {
1544 int errcode = pthread_create(&s->thread, NULL, log_thread,
1547 return got_error_set_errno(errcode);
1550 return draw_commits(view, &s->last_displayed_entry,
1551 &s->selected_entry, s->first_displayed_entry,
1552 &s->commits, s->selected, view->nlines, s->refs,
1553 s->in_repo_path, s->thread_args.commits_needed);
1556 static const struct got_error *
1557 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1558 struct tog_view **focus_view, struct tog_view *view, int ch)
1560 const struct got_error *err = NULL;
1561 struct tog_log_view_state *s = &view->state.log;
1563 struct tog_view *diff_view = NULL, *tree_view = NULL;
1574 if (s->first_displayed_entry == NULL)
1576 if (s->selected > 0)
1578 if (s->selected > 0)
1580 scroll_up(&s->first_displayed_entry, 1,
1584 if (s->first_displayed_entry == NULL)
1586 if (TAILQ_FIRST(&s->commits.head) ==
1587 s->first_displayed_entry) {
1591 scroll_up(&s->first_displayed_entry,
1592 view->nlines, &s->commits);
1598 if (s->first_displayed_entry == NULL)
1600 if (s->selected < MIN(view->nlines - 2,
1601 s->commits.ncommits - 1)) {
1605 err = scroll_down(&s->first_displayed_entry, 1,
1606 &s->last_displayed_entry, &s->commits,
1607 &s->thread_args.log_complete,
1608 &s->thread_args.commits_needed,
1609 &s->thread_args.need_commits);
1612 struct commit_queue_entry *first;
1613 first = s->first_displayed_entry;
1616 err = scroll_down(&s->first_displayed_entry,
1617 view->nlines, &s->last_displayed_entry,
1618 &s->commits, &s->thread_args.log_complete,
1619 &s->thread_args.commits_needed,
1620 &s->thread_args.need_commits);
1621 if (first == s->first_displayed_entry &&
1622 s->selected < MIN(view->nlines - 2,
1623 s->commits.ncommits - 1)) {
1624 /* can't scroll further down */
1625 s->selected = MIN(view->nlines - 2,
1626 s->commits.ncommits - 1);
1632 if (s->selected > view->nlines - 2)
1633 s->selected = view->nlines - 2;
1634 if (s->selected > s->commits.ncommits - 1)
1635 s->selected = s->commits.ncommits - 1;
1639 if (s->selected_entry == NULL)
1641 if (view_is_parent_view(view))
1642 begin_x = view_split_begin_x(view->begin_x);
1643 err = open_diff_view_for_commit(&diff_view, begin_x,
1644 s->selected_entry->commit, s->selected_entry->id,
1645 view, s->refs, s->repo);
1648 if (view_is_parent_view(view)) {
1649 err = view_close_child(view);
1652 err = view_set_child(view, diff_view);
1654 view_close(diff_view);
1657 *focus_view = diff_view;
1658 view->child_focussed = 1;
1660 *new_view = diff_view;
1663 if (s->selected_entry == NULL)
1665 if (view_is_parent_view(view))
1666 begin_x = view_split_begin_x(view->begin_x);
1667 err = browse_commit(&tree_view, begin_x,
1668 s->selected_entry, s->refs, s->repo);
1671 if (view_is_parent_view(view)) {
1672 err = view_close_child(view);
1675 err = view_set_child(view, tree_view);
1677 view_close(tree_view);
1680 *focus_view = tree_view;
1681 view->child_focussed = 1;
1683 *new_view = tree_view;
1686 if (strcmp(s->in_repo_path, "/") == 0)
1688 parent_path = dirname(s->in_repo_path);
1689 if (parent_path && strcmp(parent_path, ".") != 0) {
1690 struct tog_view *lv;
1691 err = stop_log_thread(s);
1694 lv = view_open(view->nlines, view->ncols,
1695 view->begin_y, view->begin_x, TOG_VIEW_LOG);
1697 return got_error_from_errno();
1698 err = open_log_view(lv, s->start_id, s->refs,
1699 s->repo, parent_path, 0);
1702 if (view_is_parent_view(view))
1705 view_set_child(view->parent, lv);
1718 static const struct got_error *
1719 apply_unveil(const char *repo_path, const char *worktree_path)
1721 const struct got_error *error;
1723 if (repo_path && unveil(repo_path, "r") != 0)
1724 return got_error_from_errno();
1726 if (worktree_path && unveil(worktree_path, "rwc") != 0)
1727 return got_error_from_errno();
1729 if (unveil("/tmp", "rwc") != 0)
1730 return got_error_from_errno();
1732 error = got_privsep_unveil_exec_helpers();
1736 if (unveil(NULL, NULL) != 0)
1737 return got_error_from_errno();
1747 halfdelay(1); /* Do fast refresh while initial view is loading. */
1750 intrflush(stdscr, FALSE);
1751 keypad(stdscr, TRUE);
1753 signal(SIGWINCH, tog_sigwinch);
1756 static const struct got_error *
1757 cmd_log(int argc, char *argv[])
1759 const struct got_error *error;
1760 struct got_repository *repo = NULL;
1761 struct got_reflist_head refs;
1762 struct got_object_id *start_id = NULL;
1763 char *path = NULL, *repo_path = NULL, *cwd = NULL;
1764 char *start_commit = NULL;
1766 struct tog_view *view;
1769 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1774 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1777 start_commit = optarg;
1780 repo_path = realpath(optarg, NULL);
1781 if (repo_path == NULL)
1782 err(1, "-r option");
1796 path = strdup(argv[0]);
1800 return got_error_from_errno();
1802 cwd = getcwd(NULL, 0);
1804 error = got_error_from_errno();
1807 if (repo_path == NULL) {
1808 struct got_worktree *worktree;
1809 error = got_worktree_open(&worktree, cwd);
1810 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1814 strdup(got_worktree_get_repo_path(worktree));
1815 got_worktree_close(worktree);
1817 repo_path = strdup(cwd);
1818 if (repo_path == NULL) {
1819 error = got_error_from_errno();
1826 error = apply_unveil(repo_path, NULL);
1830 error = got_repo_open(&repo, repo_path);
1834 if (start_commit == NULL)
1835 error = get_head_commit_id(&start_id, repo);
1837 error = got_object_resolve_id_str(&start_id, repo,
1842 SIMPLEQ_INIT(&refs);
1843 error = got_ref_list(&refs, repo);
1847 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1849 error = got_error_from_errno();
1852 error = open_log_view(view, start_id, &refs, repo, path, 1);
1855 error = view_loop(view);
1862 got_repo_close(repo);
1870 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1876 parse_next_line(FILE *f, size_t *len)
1881 const char delim[3] = { '\0', '\0', '\0'};
1883 line = fparseln(f, &linelen, &lineno, delim, 0);
1889 static const struct got_error *
1890 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1891 int *last_displayed_line, int *eof, int max_lines,
1894 const struct got_error *err;
1895 int nlines = 0, nprinted = 0;
1902 werase(view->window);
1905 err = format_line(&wline, &width, header, view->ncols);
1910 if (view_needs_focus_indication(view))
1911 wstandout(view->window);
1912 waddwstr(view->window, wline);
1913 if (view_needs_focus_indication(view))
1914 wstandend(view->window);
1915 if (width < view->ncols)
1916 waddch(view->window, '\n');
1924 while (nprinted < max_lines) {
1925 line = parse_next_line(f, &len);
1930 if (++nlines < *first_displayed_line) {
1935 err = format_line(&wline, &width, line, view->ncols);
1940 waddwstr(view->window, wline);
1941 if (width < view->ncols)
1942 waddch(view->window, '\n');
1943 if (++nprinted == 1)
1944 *first_displayed_line = nlines;
1949 *last_displayed_line = nlines;
1957 get_datestr(time_t *time, char *datebuf)
1959 char *p, *s = ctime_r(time, datebuf);
1960 p = strchr(s, '\n');
1966 static const struct got_error *
1967 write_commit_info(struct got_object_id *commit_id,
1968 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
1970 const struct got_error *err = NULL;
1972 struct got_commit_object *commit;
1973 char *id_str = NULL;
1974 time_t committer_time;
1975 const char *author, *committer;
1976 char *refs_str = NULL;
1979 err = build_refs_str(&refs_str, refs, commit_id);
1984 err = got_object_open_as_commit(&commit, repo, commit_id);
1988 err = got_object_id_str(&id_str, commit_id);
1990 err = got_error_from_errno();
1994 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1995 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
1996 err = got_error_from_errno();
1999 if (fprintf(outfile, "from: %s\n",
2000 got_object_commit_get_author(commit)) < 0) {
2001 err = got_error_from_errno();
2004 committer_time = got_object_commit_get_committer_time(commit);
2005 if (fprintf(outfile, "date: %s UTC\n",
2006 get_datestr(&committer_time, datebuf)) < 0) {
2007 err = got_error_from_errno();
2010 author = got_object_commit_get_author(commit);
2011 committer = got_object_commit_get_committer(commit);
2012 if (strcmp(author, committer) != 0 &&
2013 fprintf(outfile, "via: %s\n", committer) < 0) {
2014 err = got_error_from_errno();
2017 if (fprintf(outfile, "%s\n",
2018 got_object_commit_get_logmsg(commit)) < 0) {
2019 err = got_error_from_errno();
2025 got_object_commit_close(commit);
2029 static const struct got_error *
2030 create_diff(struct tog_diff_view_state *s)
2032 const struct got_error *err = NULL;
2038 err = got_error_from_errno();
2041 if (s->f && fclose(s->f) != 0) {
2042 err = got_error_from_errno();
2048 err = got_object_get_type(&obj_type, s->repo, s->id1);
2050 err = got_object_get_type(&obj_type, s->repo, s->id2);
2055 case GOT_OBJ_TYPE_BLOB:
2056 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2057 s->diff_context, s->repo, f);
2059 case GOT_OBJ_TYPE_TREE:
2060 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2061 s->diff_context, s->repo, f);
2063 case GOT_OBJ_TYPE_COMMIT: {
2064 const struct got_object_id_queue *parent_ids;
2065 struct got_object_qid *pid;
2066 struct got_commit_object *commit2;
2068 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2071 /* Show commit info if we're diffing to a parent/root commit. */
2073 write_commit_info(s->id2, s->refs, s->repo, f);
2075 parent_ids = got_object_commit_get_parent_ids(commit2);
2076 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2077 if (got_object_id_cmp(s->id1, pid->id) == 0) {
2078 write_commit_info(s->id2, s->refs,
2084 got_object_commit_close(commit2);
2086 err = got_diff_objects_as_commits(s->id1, s->id2,
2087 s->diff_context, s->repo, f);
2091 err = got_error(GOT_ERR_OBJ_TYPE);
2095 if (f && fflush(f) != 0 && err == NULL)
2096 err = got_error_from_errno();
2100 static const struct got_error *
2101 open_diff_view(struct tog_view *view, struct got_object_id *id1,
2102 struct got_object_id *id2, struct tog_view *log_view,
2103 struct got_reflist_head *refs, struct got_repository *repo)
2105 const struct got_error *err;
2107 if (id1 != NULL && id2 != NULL) {
2109 err = got_object_get_type(&type1, repo, id1);
2112 err = got_object_get_type(&type2, repo, id2);
2117 return got_error(GOT_ERR_OBJ_TYPE);
2121 view->state.diff.id1 = got_object_id_dup(id1);
2122 if (view->state.diff.id1 == NULL)
2123 return got_error_from_errno();
2125 view->state.diff.id1 = NULL;
2127 view->state.diff.id2 = got_object_id_dup(id2);
2128 if (view->state.diff.id2 == NULL) {
2129 free(view->state.diff.id1);
2130 view->state.diff.id1 = NULL;
2131 return got_error_from_errno();
2133 view->state.diff.f = NULL;
2134 view->state.diff.first_displayed_line = 1;
2135 view->state.diff.last_displayed_line = view->nlines;
2136 view->state.diff.diff_context = 3;
2137 view->state.diff.log_view = log_view;
2138 view->state.diff.repo = repo;
2139 view->state.diff.refs = refs;
2141 err = create_diff(&view->state.diff);
2143 free(view->state.diff.id1);
2144 view->state.diff.id1 = NULL;
2145 free(view->state.diff.id2);
2146 view->state.diff.id2 = NULL;
2150 view->show = show_diff_view;
2151 view->input = input_diff_view;
2152 view->close = close_diff_view;
2157 static const struct got_error *
2158 close_diff_view(struct tog_view *view)
2160 const struct got_error *err = NULL;
2162 free(view->state.diff.id1);
2163 view->state.diff.id1 = NULL;
2164 free(view->state.diff.id2);
2165 view->state.diff.id2 = NULL;
2166 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2167 err = got_error_from_errno();
2171 static const struct got_error *
2172 show_diff_view(struct tog_view *view)
2174 const struct got_error *err;
2175 struct tog_diff_view_state *s = &view->state.diff;
2176 char *id_str1 = NULL, *id_str2, *header;
2179 err = got_object_id_str(&id_str1, s->id1);
2183 err = got_object_id_str(&id_str2, s->id2);
2187 if (asprintf(&header, "diff %s %s",
2188 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2189 err = got_error_from_errno();
2197 return draw_file(view, s->f, &s->first_displayed_line,
2198 &s->last_displayed_line, &s->eof, view->nlines,
2202 static const struct got_error *
2203 set_selected_commit(struct tog_diff_view_state *s,
2204 struct commit_queue_entry *entry)
2206 const struct got_error *err;
2207 const struct got_object_id_queue *parent_ids;
2208 struct got_commit_object *selected_commit;
2209 struct got_object_qid *pid;
2212 s->id2 = got_object_id_dup(entry->id);
2214 return got_error_from_errno();
2216 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2219 parent_ids = got_object_commit_get_parent_ids(selected_commit);
2221 pid = SIMPLEQ_FIRST(parent_ids);
2222 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2223 got_object_commit_close(selected_commit);
2227 static const struct got_error *
2228 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2229 struct tog_view **focus_view, struct tog_view *view, int ch)
2231 const struct got_error *err = NULL;
2232 struct tog_diff_view_state *s = &view->state.diff;
2233 struct tog_log_view_state *ls;
2234 struct commit_queue_entry *entry;
2240 if (s->first_displayed_line > 1)
2241 s->first_displayed_line--;
2245 while (i++ < view->nlines - 1 &&
2246 s->first_displayed_line > 1)
2247 s->first_displayed_line--;
2252 s->first_displayed_line++;
2257 while (!s->eof && i++ < view->nlines - 1) {
2259 line = parse_next_line(s->f, NULL);
2260 s->first_displayed_line++;
2266 if (s->diff_context > 0) {
2268 err = create_diff(s);
2272 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2274 err = create_diff(s);
2279 if (s->log_view == NULL)
2281 ls = &s->log_view->state.log;
2282 entry = TAILQ_PREV(ls->selected_entry,
2283 commit_queue_head, entry);
2287 err = input_log_view(NULL, NULL, NULL, s->log_view,
2292 err = set_selected_commit(s, entry);
2296 s->first_displayed_line = 1;
2297 s->last_displayed_line = view->nlines;
2299 err = create_diff(s);
2303 if (s->log_view == NULL)
2305 ls = &s->log_view->state.log;
2307 if (ls->thread_args.commits_needed == 0) {
2308 ls->thread_args.commits_needed++;
2310 /* Display "loading..." in log view. */
2311 show_log_view(s->log_view);
2315 err = trigger_log_thread(1 /* load_all */,
2316 &ls->thread_args.commits_needed,
2317 &ls->thread_args.log_complete,
2318 &ls->thread_args.need_commits);
2322 err = input_log_view(NULL, NULL, NULL, s->log_view,
2327 entry = TAILQ_NEXT(ls->selected_entry, entry);
2331 err = set_selected_commit(s, entry);
2335 s->first_displayed_line = 1;
2336 s->last_displayed_line = view->nlines;
2338 err = create_diff(s);
2347 static const struct got_error *
2348 cmd_diff(int argc, char *argv[])
2350 const struct got_error *error = NULL;
2351 struct got_repository *repo = NULL;
2352 struct got_reflist_head refs;
2353 struct got_object_id *id1 = NULL, *id2 = NULL;
2354 char *repo_path = NULL;
2355 char *id_str1 = NULL, *id_str2 = NULL;
2357 struct tog_view *view;
2360 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2365 while ((ch = getopt(argc, argv, "")) != -1) {
2377 usage_diff(); /* TODO show local worktree changes */
2378 } else if (argc == 2) {
2379 repo_path = getcwd(NULL, 0);
2380 if (repo_path == NULL)
2381 return got_error_from_errno();
2384 } else if (argc == 3) {
2385 repo_path = realpath(argv[0], NULL);
2386 if (repo_path == NULL)
2387 return got_error_from_errno();
2395 error = apply_unveil(repo_path, NULL);
2399 error = got_repo_open(&repo, repo_path);
2404 error = got_object_resolve_id_str(&id1, repo, id_str1);
2408 error = got_object_resolve_id_str(&id2, repo, id_str2);
2412 SIMPLEQ_INIT(&refs);
2413 error = got_ref_list(&refs, repo);
2417 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2419 error = got_error_from_errno();
2422 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2425 error = view_loop(view);
2427 got_repo_close(repo);
2435 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2440 struct tog_blame_line {
2442 struct got_object_id *id;
2445 static const struct got_error *
2446 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2447 const char *path, struct tog_blame_line *lines, int nlines,
2448 int blame_complete, int selected_line, int *first_displayed_line,
2449 int *last_displayed_line, int *eof, int max_lines)
2451 const struct got_error *err;
2452 int lineno = 0, nprinted = 0;
2457 struct tog_blame_line *blame_line;
2458 struct got_object_id *prev_id = NULL;
2461 err = got_object_id_str(&id_str, id);
2466 werase(view->window);
2468 if (asprintf(&line, "commit %s", id_str) == -1) {
2469 err = got_error_from_errno();
2474 err = format_line(&wline, &width, line, view->ncols);
2477 if (view_needs_focus_indication(view))
2478 wstandout(view->window);
2479 waddwstr(view->window, wline);
2480 if (view_needs_focus_indication(view))
2481 wstandend(view->window);
2484 if (width < view->ncols)
2485 waddch(view->window, '\n');
2487 if (asprintf(&line, "[%d/%d] %s%s",
2488 *first_displayed_line - 1 + selected_line, nlines,
2489 blame_complete ? "" : "annotating... ", path) == -1) {
2491 return got_error_from_errno();
2494 err = format_line(&wline, &width, line, view->ncols);
2499 waddwstr(view->window, wline);
2502 if (width < view->ncols)
2503 waddch(view->window, '\n');
2506 while (nprinted < max_lines - 2) {
2507 line = parse_next_line(f, &len);
2512 if (++lineno < *first_displayed_line) {
2517 wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2518 err = format_line(&wline, &width, line, wlimit);
2524 if (view->focussed && nprinted == selected_line - 1)
2525 wstandout(view->window);
2527 blame_line = &lines[lineno - 1];
2528 if (blame_line->annotated && prev_id &&
2529 got_object_id_cmp(prev_id, blame_line->id) == 0)
2530 waddstr(view->window, " ");
2531 else if (blame_line->annotated) {
2533 err = got_object_id_str(&id_str, blame_line->id);
2539 wprintw(view->window, "%.8s ", id_str);
2541 prev_id = blame_line->id;
2543 waddstr(view->window, "........ ");
2547 waddwstr(view->window, wline);
2548 while (width < wlimit) {
2549 waddch(view->window, ' ');
2552 if (view->focussed && nprinted == selected_line - 1)
2553 wstandend(view->window);
2554 if (++nprinted == 1)
2555 *first_displayed_line = lineno;
2560 *last_displayed_line = lineno;
2567 static const struct got_error *
2568 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2570 const struct got_error *err = NULL;
2571 struct tog_blame_cb_args *a = arg;
2572 struct tog_blame_line *line;
2575 if (nlines != a->nlines ||
2576 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2577 return got_error(GOT_ERR_RANGE);
2579 errcode = pthread_mutex_lock(&tog_mutex);
2581 return got_error_set_errno(errcode);
2583 if (*a->quit) { /* user has quit the blame view */
2584 err = got_error(GOT_ERR_ITER_COMPLETED);
2589 goto done; /* no change in this commit */
2591 line = &a->lines[lineno - 1];
2592 if (line->annotated)
2595 line->id = got_object_id_dup(id);
2596 if (line->id == NULL) {
2597 err = got_error_from_errno();
2600 line->annotated = 1;
2602 errcode = pthread_mutex_unlock(&tog_mutex);
2604 err = got_error_set_errno(errcode);
2609 blame_thread(void *arg)
2611 const struct got_error *err;
2612 struct tog_blame_thread_args *ta = arg;
2613 struct tog_blame_cb_args *a = ta->cb_args;
2616 err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2617 blame_cb, ta->cb_args);
2619 errcode = pthread_mutex_lock(&tog_mutex);
2621 return (void *)got_error_set_errno(errcode);
2623 got_repo_close(ta->repo);
2627 errcode = pthread_mutex_unlock(&tog_mutex);
2628 if (errcode && err == NULL)
2629 err = got_error_set_errno(errcode);
2634 static struct got_object_id *
2635 get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2638 struct tog_blame_line *line;
2640 line = &lines[first_displayed_line - 1 + selected_line - 1];
2641 if (!line->annotated)
2647 static const struct got_error *
2648 stop_blame(struct tog_blame *blame)
2650 const struct got_error *err = NULL;
2653 if (blame->thread) {
2655 errcode = pthread_mutex_unlock(&tog_mutex);
2657 return got_error_set_errno(errcode);
2658 errcode = pthread_join(blame->thread, (void **)&err);
2660 return got_error_set_errno(errcode);
2661 errcode = pthread_mutex_lock(&tog_mutex);
2663 return got_error_set_errno(errcode);
2664 if (err && err->code == GOT_ERR_ITER_COMPLETED)
2666 blame->thread = NULL;
2668 if (blame->thread_args.repo) {
2669 got_repo_close(blame->thread_args.repo);
2670 blame->thread_args.repo = NULL;
2673 if (fclose(blame->f) != 0 && err == NULL)
2674 err = got_error_from_errno();
2678 for (i = 0; i < blame->nlines; i++)
2679 free(blame->lines[i].id);
2681 blame->lines = NULL;
2683 free(blame->cb_args.commit_id);
2684 blame->cb_args.commit_id = NULL;
2689 static const struct got_error *
2690 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2691 int *first_displayed_line, int *last_displayed_line, int *selected_line,
2692 int *done, int *eof, const char *path, struct got_object_id *commit_id,
2693 struct got_repository *repo)
2695 const struct got_error *err = NULL;
2696 struct got_blob_object *blob = NULL;
2697 struct got_repository *thread_repo = NULL;
2698 struct got_object_id *obj_id = NULL;
2701 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2705 return got_error(GOT_ERR_NO_OBJ);
2707 err = got_object_get_type(&obj_type, repo, obj_id);
2711 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2712 err = got_error(GOT_ERR_OBJ_TYPE);
2716 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2719 blame->f = got_opentemp();
2720 if (blame->f == NULL) {
2721 err = got_error_from_errno();
2724 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2729 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2730 if (blame->lines == NULL) {
2731 err = got_error_from_errno();
2735 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2739 blame->cb_args.view = view;
2740 blame->cb_args.lines = blame->lines;
2741 blame->cb_args.nlines = blame->nlines;
2742 blame->cb_args.commit_id = got_object_id_dup(commit_id);
2743 if (blame->cb_args.commit_id == NULL) {
2744 err = got_error_from_errno();
2747 blame->cb_args.quit = done;
2749 blame->thread_args.path = path;
2750 blame->thread_args.repo = thread_repo;
2751 blame->thread_args.cb_args = &blame->cb_args;
2752 blame->thread_args.complete = blame_complete;
2753 *blame_complete = 0;
2757 got_object_blob_close(blob);
2764 static const struct got_error *
2765 open_blame_view(struct tog_view *view, char *path,
2766 struct got_object_id *commit_id, struct got_reflist_head *refs,
2767 struct got_repository *repo)
2769 const struct got_error *err = NULL;
2770 struct tog_blame_view_state *s = &view->state.blame;
2772 SIMPLEQ_INIT(&s->blamed_commits);
2774 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2778 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2779 s->first_displayed_line = 1;
2780 s->last_displayed_line = view->nlines;
2781 s->selected_line = 1;
2782 s->blame_complete = 0;
2784 if (s->path == NULL)
2785 return got_error_from_errno();
2788 s->commit_id = commit_id;
2789 memset(&s->blame, 0, sizeof(s->blame));
2791 view->show = show_blame_view;
2792 view->input = input_blame_view;
2793 view->close = close_blame_view;
2795 return run_blame(&s->blame, view, &s->blame_complete,
2796 &s->first_displayed_line, &s->last_displayed_line,
2797 &s->selected_line, &s->done, &s->eof, s->path,
2798 s->blamed_commit->id, s->repo);
2801 static const struct got_error *
2802 close_blame_view(struct tog_view *view)
2804 const struct got_error *err = NULL;
2805 struct tog_blame_view_state *s = &view->state.blame;
2807 if (s->blame.thread)
2808 err = stop_blame(&s->blame);
2810 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2811 struct got_object_qid *blamed_commit;
2812 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2813 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2814 got_object_qid_free(blamed_commit);
2822 static const struct got_error *
2823 show_blame_view(struct tog_view *view)
2825 const struct got_error *err = NULL;
2826 struct tog_blame_view_state *s = &view->state.blame;
2829 if (s->blame.thread == NULL) {
2830 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2831 &s->blame.thread_args);
2833 return got_error_set_errno(errcode);
2836 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2837 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2838 s->selected_line, &s->first_displayed_line,
2839 &s->last_displayed_line, &s->eof, view->nlines);
2845 static const struct got_error *
2846 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2847 struct tog_view **focus_view, struct tog_view *view, int ch)
2849 const struct got_error *err = NULL, *thread_err = NULL;
2850 struct tog_view *diff_view;
2851 struct tog_blame_view_state *s = &view->state.blame;
2860 if (s->selected_line > 1)
2862 else if (s->selected_line == 1 &&
2863 s->first_displayed_line > 1)
2864 s->first_displayed_line--;
2867 if (s->first_displayed_line == 1) {
2868 s->selected_line = 1;
2871 if (s->first_displayed_line > view->nlines - 2)
2872 s->first_displayed_line -=
2875 s->first_displayed_line = 1;
2879 if (s->selected_line < view->nlines - 2 &&
2880 s->first_displayed_line +
2881 s->selected_line <= s->blame.nlines)
2883 else if (s->last_displayed_line <
2885 s->first_displayed_line++;
2889 struct got_object_id *id = NULL;
2890 id = get_selected_commit_id(s->blame.lines,
2891 s->first_displayed_line, s->selected_line);
2895 struct got_commit_object *commit;
2896 struct got_object_qid *pid;
2897 struct got_object_id *blob_id = NULL;
2899 err = got_object_open_as_commit(&commit,
2903 pid = SIMPLEQ_FIRST(
2904 got_object_commit_get_parent_ids(commit));
2906 got_object_commit_close(commit);
2909 /* Check if path history ends here. */
2910 err = got_object_id_by_path(&blob_id, s->repo,
2913 if (err->code == GOT_ERR_NO_TREE_ENTRY)
2915 got_object_commit_close(commit);
2918 err = got_object_get_type(&obj_type, s->repo,
2921 /* Can't blame non-blob type objects. */
2922 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2923 got_object_commit_close(commit);
2926 err = got_object_qid_alloc(&s->blamed_commit,
2928 got_object_commit_close(commit);
2930 if (got_object_id_cmp(id,
2931 s->blamed_commit->id) == 0)
2933 err = got_object_qid_alloc(&s->blamed_commit,
2939 thread_err = stop_blame(&s->blame);
2943 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2944 s->blamed_commit, entry);
2945 err = run_blame(&s->blame, view, &s->blame_complete,
2946 &s->first_displayed_line, &s->last_displayed_line,
2947 &s->selected_line, &s->done, &s->eof,
2948 s->path, s->blamed_commit->id, s->repo);
2954 struct got_object_qid *first;
2955 first = SIMPLEQ_FIRST(&s->blamed_commits);
2956 if (!got_object_id_cmp(first->id, s->commit_id))
2959 thread_err = stop_blame(&s->blame);
2963 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2964 got_object_qid_free(s->blamed_commit);
2966 SIMPLEQ_FIRST(&s->blamed_commits);
2967 err = run_blame(&s->blame, view, &s->blame_complete,
2968 &s->first_displayed_line, &s->last_displayed_line,
2969 &s->selected_line, &s->done, &s->eof, s->path,
2970 s->blamed_commit->id, s->repo);
2977 struct got_object_id *id = NULL;
2978 struct got_object_qid *pid;
2979 struct got_commit_object *commit = NULL;
2980 id = get_selected_commit_id(s->blame.lines,
2981 s->first_displayed_line, s->selected_line);
2984 err = got_object_open_as_commit(&commit, s->repo, id);
2987 pid = SIMPLEQ_FIRST(
2988 got_object_commit_get_parent_ids(commit));
2989 if (view_is_parent_view(view))
2990 begin_x = view_split_begin_x(view->begin_x);
2991 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
2992 if (diff_view == NULL) {
2993 got_object_commit_close(commit);
2994 err = got_error_from_errno();
2997 err = open_diff_view(diff_view, pid ? pid->id : NULL,
2998 id, NULL, s->refs, s->repo);
2999 got_object_commit_close(commit);
3001 view_close(diff_view);
3004 if (view_is_parent_view(view)) {
3005 err = view_close_child(view);
3008 err = view_set_child(view, diff_view);
3010 view_close(diff_view);
3013 *focus_view = diff_view;
3014 view->child_focussed = 1;
3016 *new_view = diff_view;
3023 if (s->last_displayed_line >= s->blame.nlines &&
3024 s->selected_line < view->nlines - 2) {
3025 s->selected_line = MIN(s->blame.nlines,
3029 if (s->last_displayed_line + view->nlines - 2
3031 s->first_displayed_line +=
3034 s->first_displayed_line =
3039 if (s->selected_line > view->nlines - 2) {
3040 s->selected_line = MIN(s->blame.nlines,
3047 return thread_err ? thread_err : err;
3050 static const struct got_error *
3051 cmd_blame(int argc, char *argv[])
3053 const struct got_error *error;
3054 struct got_repository *repo = NULL;
3055 struct got_reflist_head refs;
3056 struct got_worktree *worktree = NULL;
3057 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3058 struct got_object_id *commit_id = NULL;
3059 char *commit_id_str = NULL;
3061 struct tog_view *view;
3064 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3069 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3072 commit_id_str = optarg;
3075 repo_path = realpath(optarg, NULL);
3076 if (repo_path == NULL)
3077 err(1, "-r option");
3093 cwd = getcwd(NULL, 0);
3095 error = got_error_from_errno();
3098 if (repo_path == NULL) {
3099 error = got_worktree_open(&worktree, cwd);
3100 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3106 strdup(got_worktree_get_repo_path(worktree));
3107 if (repo_path == NULL)
3108 error = got_error_from_errno();
3112 repo_path = strdup(cwd);
3113 if (repo_path == NULL) {
3114 error = got_error_from_errno();
3122 error = apply_unveil(repo_path, NULL);
3126 error = got_repo_open(&repo, repo_path);
3131 const char *prefix = got_worktree_get_path_prefix(worktree);
3132 char *p, *worktree_subdir = cwd +
3133 strlen(got_worktree_get_root_path(worktree));
3134 if (asprintf(&p, "%s%s%s%s%s",
3135 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3136 worktree_subdir, worktree_subdir[0] ? "/" : "",
3138 error = got_error_from_errno();
3141 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3144 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3149 if (commit_id_str == NULL) {
3150 struct got_reference *head_ref;
3151 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
3154 error = got_ref_resolve(&commit_id, repo, head_ref);
3155 got_ref_close(head_ref);
3157 error = got_object_resolve_id_str(&commit_id, repo,
3163 SIMPLEQ_INIT(&refs);
3164 error = got_ref_list(&refs, repo);
3168 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3170 error = got_error_from_errno();
3173 error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3176 error = view_loop(view);
3182 got_worktree_close(worktree);
3184 got_repo_close(repo);
3188 static const struct got_error *
3189 draw_tree_entries(struct tog_view *view,
3190 struct got_tree_entry **first_displayed_entry,
3191 struct got_tree_entry **last_displayed_entry,
3192 struct got_tree_entry **selected_entry, int *ndisplayed,
3193 const char *label, int show_ids, const char *parent_path,
3194 const struct got_tree_entries *entries, int selected, int limit, int isroot)
3196 const struct got_error *err = NULL;
3197 struct got_tree_entry *te;
3203 werase(view->window);
3208 err = format_line(&wline, &width, label, view->ncols);
3211 if (view_needs_focus_indication(view))
3212 wstandout(view->window);
3213 waddwstr(view->window, wline);
3214 if (view_needs_focus_indication(view))
3215 wstandend(view->window);
3218 if (width < view->ncols)
3219 waddch(view->window, '\n');
3222 err = format_line(&wline, &width, parent_path, view->ncols);
3225 waddwstr(view->window, wline);
3228 if (width < view->ncols)
3229 waddch(view->window, '\n');
3232 waddch(view->window, '\n');
3236 te = SIMPLEQ_FIRST(&entries->head);
3237 if (*first_displayed_entry == NULL) {
3238 if (selected == 0) {
3240 wstandout(view->window);
3241 *selected_entry = NULL;
3243 waddstr(view->window, " ..\n"); /* parent directory */
3244 if (selected == 0 && view->focussed)
3245 wstandend(view->window);
3252 while (te != *first_displayed_entry)
3253 te = SIMPLEQ_NEXT(te, entry);
3257 char *line = NULL, *id_str = NULL;
3260 err = got_object_id_str(&id_str, te->id);
3262 return got_error_from_errno();
3264 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3265 te->name, S_ISDIR(te->mode) ? "/" :
3266 ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3268 return got_error_from_errno();
3271 err = format_line(&wline, &width, line, view->ncols);
3276 if (n == selected) {
3278 wstandout(view->window);
3279 *selected_entry = te;
3281 waddwstr(view->window, wline);
3282 if (width < view->ncols)
3283 waddch(view->window, '\n');
3284 if (n == selected && view->focussed)
3285 wstandend(view->window);
3291 *last_displayed_entry = te;
3294 te = SIMPLEQ_NEXT(te, entry);
3301 tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
3302 const struct got_tree_entries *entries, int isroot)
3304 struct got_tree_entry *te, *prev;
3307 if (*first_displayed_entry == NULL)
3310 te = SIMPLEQ_FIRST(&entries->head);
3311 if (*first_displayed_entry == te) {
3313 *first_displayed_entry = NULL;
3317 /* XXX this is stupid... switch to TAILQ? */
3318 for (i = 0; i < maxscroll; i++) {
3319 while (te != *first_displayed_entry) {
3321 te = SIMPLEQ_NEXT(te, entry);
3323 *first_displayed_entry = prev;
3324 te = SIMPLEQ_FIRST(&entries->head);
3326 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3327 *first_displayed_entry = NULL;
3331 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3332 struct got_tree_entry *last_displayed_entry,
3333 const struct got_tree_entries *entries)
3335 struct got_tree_entry *next, *last;
3338 if (*first_displayed_entry)
3339 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3341 next = SIMPLEQ_FIRST(&entries->head);
3342 last = last_displayed_entry;
3343 while (next && last && n++ < maxscroll) {
3344 last = SIMPLEQ_NEXT(last, entry);
3346 *first_displayed_entry = next;
3347 next = SIMPLEQ_NEXT(next, entry);
3353 static const struct got_error *
3354 tree_entry_path(char **path, struct tog_parent_trees *parents,
3355 struct got_tree_entry *te)
3357 const struct got_error *err = NULL;
3358 struct tog_parent_tree *pt;
3359 size_t len = 2; /* for leading slash and NUL */
3361 TAILQ_FOREACH(pt, parents, entry)
3362 len += strlen(pt->selected_entry->name) + 1 /* slash */;
3364 len += strlen(te->name);
3366 *path = calloc(1, len);
3368 return got_error_from_errno();
3371 pt = TAILQ_LAST(parents, tog_parent_trees);
3373 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3374 err = got_error(GOT_ERR_NO_SPACE);
3377 if (strlcat(*path, "/", len) >= len) {
3378 err = got_error(GOT_ERR_NO_SPACE);
3381 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3384 if (strlcat(*path, te->name, len) >= len) {
3385 err = got_error(GOT_ERR_NO_SPACE);
3397 static const struct got_error *
3398 blame_tree_entry(struct tog_view **new_view, int begin_x,
3399 struct got_tree_entry *te, struct tog_parent_trees *parents,
3400 struct got_object_id *commit_id, struct got_reflist_head *refs,
3401 struct got_repository *repo)
3403 const struct got_error *err = NULL;
3405 struct tog_view *blame_view;
3407 err = tree_entry_path(&path, parents, te);
3411 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3412 if (blame_view == NULL)
3413 return got_error_from_errno();
3415 err = open_blame_view(blame_view, path, commit_id, refs, repo);
3417 view_close(blame_view);
3420 *new_view = blame_view;
3424 static const struct got_error *
3425 log_tree_entry(struct tog_view **new_view, int begin_x,
3426 struct got_tree_entry *te, struct tog_parent_trees *parents,
3427 struct got_object_id *commit_id, struct got_reflist_head *refs,
3428 struct got_repository *repo)
3430 struct tog_view *log_view;
3431 const struct got_error *err = NULL;
3434 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3435 if (log_view == NULL)
3436 return got_error_from_errno();
3438 err = tree_entry_path(&path, parents, te);
3442 err = open_log_view(log_view, commit_id, refs, repo, path, 0);
3444 view_close(log_view);
3446 *new_view = log_view;
3451 static const struct got_error *
3452 open_tree_view(struct tog_view *view, struct got_tree_object *root,
3453 struct got_object_id *commit_id, struct got_reflist_head *refs,
3454 struct got_repository *repo)
3456 const struct got_error *err = NULL;
3457 char *commit_id_str = NULL;
3458 struct tog_tree_view_state *s = &view->state.tree;
3460 TAILQ_INIT(&s->parents);
3462 err = got_object_id_str(&commit_id_str, commit_id);
3466 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3467 err = got_error_from_errno();
3471 s->root = s->tree = root;
3472 s->entries = got_object_tree_get_entries(root);
3473 s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3474 s->commit_id = got_object_id_dup(commit_id);
3475 if (s->commit_id == NULL) {
3476 err = got_error_from_errno();
3482 view->show = show_tree_view;
3483 view->input = input_tree_view;
3484 view->close = close_tree_view;
3486 free(commit_id_str);
3488 free(s->tree_label);
3489 s->tree_label = NULL;
3494 static const struct got_error *
3495 close_tree_view(struct tog_view *view)
3497 struct tog_tree_view_state *s = &view->state.tree;
3499 free(s->tree_label);
3500 s->tree_label = NULL;
3502 s->commit_id = NULL;
3503 while (!TAILQ_EMPTY(&s->parents)) {
3504 struct tog_parent_tree *parent;
3505 parent = TAILQ_FIRST(&s->parents);
3506 TAILQ_REMOVE(&s->parents, parent, entry);
3510 if (s->tree != s->root)
3511 got_object_tree_close(s->tree);
3512 got_object_tree_close(s->root);
3517 static const struct got_error *
3518 show_tree_view(struct tog_view *view)
3520 const struct got_error *err = NULL;
3521 struct tog_tree_view_state *s = &view->state.tree;
3524 err = tree_entry_path(&parent_path, &s->parents, NULL);
3528 err = draw_tree_entries(view, &s->first_displayed_entry,
3529 &s->last_displayed_entry, &s->selected_entry,
3530 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3531 s->entries, s->selected, view->nlines, s->tree == s->root);
3538 static const struct got_error *
3539 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3540 struct tog_view **focus_view, struct tog_view *view, int ch)
3542 const struct got_error *err = NULL;
3543 struct tog_tree_view_state *s = &view->state.tree;
3544 struct tog_view *log_view;
3545 int begin_x = 0, nscrolled;
3549 s->show_ids = !s->show_ids;
3552 if (!s->selected_entry)
3554 if (view_is_parent_view(view))
3555 begin_x = view_split_begin_x(view->begin_x);
3556 err = log_tree_entry(&log_view, begin_x,
3557 s->selected_entry, &s->parents,
3558 s->commit_id, s->refs, s->repo);
3559 if (view_is_parent_view(view)) {
3560 err = view_close_child(view);
3563 err = view_set_child(view, log_view);
3565 view_close(log_view);
3568 *focus_view = log_view;
3569 view->child_focussed = 1;
3571 *new_view = log_view;
3575 if (s->selected > 0) {
3577 if (s->selected == 0)
3580 if (s->selected > 0)
3582 tree_scroll_up(&s->first_displayed_entry, 1,
3583 s->entries, s->tree == s->root);
3586 tree_scroll_up(&s->first_displayed_entry,
3587 MAX(0, view->nlines - 4 - s->selected), s->entries,
3588 s->tree == s->root);
3590 if (SIMPLEQ_FIRST(&s->entries->head) ==
3591 s->first_displayed_entry && s->tree != s->root)
3592 s->first_displayed_entry = NULL;
3596 if (s->selected < s->ndisplayed - 1) {
3600 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3602 /* can't scroll any further */
3605 tree_scroll_down(&s->first_displayed_entry, 1,
3606 s->last_displayed_entry, s->entries);
3609 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3611 /* can't scroll any further; move cursor down */
3612 if (s->selected < s->ndisplayed - 1)
3613 s->selected = s->ndisplayed - 1;
3616 nscrolled = tree_scroll_down(&s->first_displayed_entry,
3617 view->nlines, s->last_displayed_entry, s->entries);
3618 if (nscrolled < view->nlines) {
3620 struct got_tree_entry *te;
3621 te = s->first_displayed_entry;
3624 te = SIMPLEQ_NEXT(te, entry);
3626 s->selected = ndisplayed - 1;
3631 if (s->selected_entry == NULL) {
3632 struct tog_parent_tree *parent;
3634 /* user selected '..' */
3635 if (s->tree == s->root)
3637 parent = TAILQ_FIRST(&s->parents);
3638 TAILQ_REMOVE(&s->parents, parent,
3640 got_object_tree_close(s->tree);
3641 s->tree = parent->tree;
3643 got_object_tree_get_entries(s->tree);
3644 s->first_displayed_entry =
3645 parent->first_displayed_entry;
3647 parent->selected_entry;
3648 s->selected = parent->selected;
3650 } else if (S_ISDIR(s->selected_entry->mode)) {
3651 struct tog_parent_tree *parent;
3652 struct got_tree_object *child;
3653 err = got_object_open_as_tree(&child,
3654 s->repo, s->selected_entry->id);
3657 parent = calloc(1, sizeof(*parent));
3658 if (parent == NULL) {
3659 err = got_error_from_errno();
3662 parent->tree = s->tree;
3663 parent->first_displayed_entry =
3664 s->first_displayed_entry;
3665 parent->selected_entry = s->selected_entry;
3666 parent->selected = s->selected;
3667 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3670 got_object_tree_get_entries(s->tree);
3672 s->first_displayed_entry = NULL;
3673 } else if (S_ISREG(s->selected_entry->mode)) {
3674 struct tog_view *blame_view;
3675 int begin_x = view_is_parent_view(view) ?
3676 view_split_begin_x(view->begin_x) : 0;
3678 err = blame_tree_entry(&blame_view, begin_x,
3679 s->selected_entry, &s->parents,
3680 s->commit_id, s->refs, s->repo);
3683 if (view_is_parent_view(view)) {
3684 err = view_close_child(view);
3687 err = view_set_child(view, blame_view);
3689 view_close(blame_view);
3692 *focus_view = blame_view;
3693 view->child_focussed = 1;
3695 *new_view = blame_view;
3699 if (s->selected > view->nlines)
3700 s->selected = s->ndisplayed - 1;
3713 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3718 static const struct got_error *
3719 cmd_tree(int argc, char *argv[])
3721 const struct got_error *error;
3722 struct got_repository *repo = NULL;
3723 struct got_reflist_head refs;
3724 char *repo_path = NULL;
3725 struct got_object_id *commit_id = NULL;
3726 char *commit_id_arg = NULL;
3727 struct got_commit_object *commit = NULL;
3728 struct got_tree_object *tree = NULL;
3730 struct tog_view *view;
3733 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3738 while ((ch = getopt(argc, argv, "c:")) != -1) {
3741 commit_id_arg = optarg;
3753 struct got_worktree *worktree;
3754 char *cwd = getcwd(NULL, 0);
3756 return got_error_from_errno();
3757 error = got_worktree_open(&worktree, cwd);
3758 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3763 strdup(got_worktree_get_repo_path(worktree));
3764 got_worktree_close(worktree);
3767 if (repo_path == NULL) {
3768 error = got_error_from_errno();
3771 } else if (argc == 1) {
3772 repo_path = realpath(argv[0], NULL);
3773 if (repo_path == NULL)
3774 return got_error_from_errno();
3780 error = apply_unveil(repo_path, NULL);
3784 error = got_repo_open(&repo, repo_path);
3788 if (commit_id_arg == NULL)
3789 error = get_head_commit_id(&commit_id, repo);
3791 error = got_object_resolve_id_str(&commit_id, repo,
3796 error = got_object_open_as_commit(&commit, repo, commit_id);
3800 error = got_object_open_as_tree(&tree, repo,
3801 got_object_commit_get_tree_id(commit));
3805 SIMPLEQ_INIT(&refs);
3806 error = got_ref_list(&refs, repo);
3810 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3812 error = got_error_from_errno();
3815 error = open_tree_view(view, tree, commit_id, &refs, repo);
3818 error = view_loop(view);
3823 got_object_commit_close(commit);
3825 got_object_tree_close(tree);
3827 got_repo_close(repo);
3836 fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3837 "Available commands:\n", getprogname());
3838 for (i = 0; i < nitems(tog_commands); i++) {
3839 struct tog_cmd *cmd = &tog_commands[i];
3840 fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3846 make_argv(const char *arg0, const char *arg1)
3849 int argc = (arg1 == NULL ? 1 : 2);
3851 argv = calloc(argc, sizeof(char *));
3854 argv[0] = strdup(arg0);
3855 if (argv[0] == NULL)
3858 argv[1] = strdup(arg1);
3859 if (argv[1] == NULL)
3867 main(int argc, char *argv[])
3869 const struct got_error *error = NULL;
3870 struct tog_cmd *cmd = NULL;
3872 char **cmd_argv = NULL;
3874 setlocale(LC_CTYPE, "");
3876 while ((ch = getopt(argc, argv, "h")) != -1) {
3895 /* Build an argument vector which runs a default command. */
3896 cmd = &tog_commands[0];
3897 cmd_argv = make_argv(cmd->name, NULL);
3902 /* Did the user specific a command? */
3903 for (i = 0; i < nitems(tog_commands); i++) {
3904 if (strncmp(tog_commands[i].name, argv[0],
3905 strlen(argv[0])) == 0) {
3906 cmd = &tog_commands[i];
3908 tog_commands[i].cmd_usage();
3913 /* Did the user specify a repository? */
3914 char *repo_path = realpath(argv[0], NULL);
3916 struct got_repository *repo;
3917 error = got_repo_open(&repo, repo_path);
3919 got_repo_close(repo);
3921 error = got_error_from_errno();
3924 fprintf(stderr, "%s: '%s' is not a "
3925 "known command\n", getprogname(),
3929 fprintf(stderr, "%s: '%s' is neither a known "
3930 "command nor a path to a repository\n",
3931 getprogname(), argv[0]);
3935 cmd = &tog_commands[0];
3936 cmd_argv = make_argv(cmd->name, repo_path);
3942 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3949 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);