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 tog_diff_view_state {
102 struct got_object_id *id1, *id2;
104 int first_displayed_line;
105 int last_displayed_line;
108 struct got_repository *repo;
111 struct commit_queue_entry {
112 TAILQ_ENTRY(commit_queue_entry) entry;
113 struct got_object_id *id;
114 struct got_commit_object *commit;
117 TAILQ_HEAD(commit_queue_head, commit_queue_entry);
118 struct commit_queue {
120 struct commit_queue_head head;
123 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
125 struct tog_log_thread_args {
126 pthread_cond_t need_commits;
128 struct got_commit_graph *graph;
129 struct commit_queue *commits;
130 const char *in_repo_path;
131 struct got_object_id *start_id;
132 struct got_repository *repo;
135 struct tog_view *view;
136 struct commit_queue_entry **first_displayed_entry;
137 struct commit_queue_entry **selected_entry;
140 struct tog_log_view_state {
141 struct commit_queue commits;
142 struct commit_queue_entry *first_displayed_entry;
143 struct commit_queue_entry *last_displayed_entry;
144 struct commit_queue_entry *selected_entry;
147 struct got_repository *repo;
148 struct got_object_id *start_id;
151 struct tog_log_thread_args thread_args;
154 struct tog_blame_cb_args {
155 struct tog_blame_line *lines; /* one per line */
158 struct tog_view *view;
159 struct got_object_id *commit_id;
163 struct tog_blame_thread_args {
165 struct got_repository *repo;
166 struct tog_blame_cb_args *cb_args;
173 struct tog_blame_line *lines;
176 struct tog_blame_thread_args thread_args;
177 struct tog_blame_cb_args cb_args;
181 struct tog_blame_view_state {
182 int first_displayed_line;
183 int last_displayed_line;
188 struct got_object_id_queue blamed_commits;
189 struct got_object_qid *blamed_commit;
191 struct got_repository *repo;
192 struct got_object_id *commit_id;
193 struct tog_blame blame;
196 struct tog_parent_tree {
197 TAILQ_ENTRY(tog_parent_tree) entry;
198 struct got_tree_object *tree;
199 struct got_tree_entry *first_displayed_entry;
200 struct got_tree_entry *selected_entry;
204 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
206 struct tog_tree_view_state {
208 struct got_tree_object *root;
209 struct got_tree_object *tree;
210 const struct got_tree_entries *entries;
211 struct got_tree_entry *first_displayed_entry;
212 struct got_tree_entry *last_displayed_entry;
213 struct got_tree_entry *selected_entry;
214 int ndisplayed, selected, show_ids;
215 struct tog_parent_trees parents;
216 struct got_object_id *commit_id;
217 struct got_repository *repo;
221 * We implement two types of views: parent views and child views.
223 * The 'Tab' key switches between a parent view and its child view.
224 * Child views are shown side-by-side to their parent view, provided
225 * there is enough screen estate.
227 * When a new view is opened from within a parent view, this new view
228 * becomes a child view of the parent view, replacing any existing child.
230 * When a new view is opened from within a child view, this new view
231 * becomes a parent view which will obscure the views below until the
232 * user quits the new parent view by typing 'q'.
234 * This list of views contains parent views only.
235 * Child views are only pointed to by their parent view.
237 TAILQ_HEAD(tog_view_list_head, tog_view);
240 TAILQ_ENTRY(tog_view) entry;
243 int nlines, ncols, begin_y, begin_x;
244 int lines, cols; /* copies of LINES and COLS */
246 struct tog_view *parent;
247 struct tog_view *child;
250 /* type-specific state */
251 enum tog_view_type type;
253 struct tog_diff_view_state diff;
254 struct tog_log_view_state log;
255 struct tog_blame_view_state blame;
256 struct tog_tree_view_state tree;
259 const struct got_error *(*show)(struct tog_view *);
260 const struct got_error *(*input)(struct tog_view **,
261 struct tog_view **, struct tog_view**, struct tog_view *, int);
262 const struct got_error *(*close)(struct tog_view *);
265 static const struct got_error *open_diff_view(struct tog_view *,
266 struct got_object_id *, struct got_object_id *, struct got_repository *);
267 static const struct got_error *show_diff_view(struct tog_view *);
268 static const struct got_error *input_diff_view(struct tog_view **,
269 struct tog_view **, struct tog_view **, struct tog_view *, int);
270 static const struct got_error* close_diff_view(struct tog_view *);
272 static const struct got_error *open_log_view(struct tog_view *,
273 struct got_object_id *, struct got_repository *, const char *, int);
274 static const struct got_error * show_log_view(struct tog_view *);
275 static const struct got_error *input_log_view(struct tog_view **,
276 struct tog_view **, struct tog_view **, struct tog_view *, int);
277 static const struct got_error *close_log_view(struct tog_view *);
279 static const struct got_error *open_blame_view(struct tog_view *, char *,
280 struct got_object_id *, struct got_repository *);
281 static const struct got_error *show_blame_view(struct tog_view *);
282 static const struct got_error *input_blame_view(struct tog_view **,
283 struct tog_view **, struct tog_view **, struct tog_view *, int);
284 static const struct got_error *close_blame_view(struct tog_view *);
286 static const struct got_error *open_tree_view(struct tog_view *,
287 struct got_tree_object *, struct got_object_id *, struct got_repository *);
288 static const struct got_error *show_tree_view(struct tog_view *);
289 static const struct got_error *input_tree_view(struct tog_view **,
290 struct tog_view **, struct tog_view **, struct tog_view *, int);
291 static const struct got_error *close_tree_view(struct tog_view *);
293 static volatile sig_atomic_t tog_sigwinch_received;
296 tog_sigwinch(int signo)
298 tog_sigwinch_received = 1;
301 static const struct got_error *
302 view_close(struct tog_view *view)
304 const struct got_error *err = NULL;
307 view_close(view->child);
311 err = view->close(view);
313 del_panel(view->panel);
315 delwin(view->window);
320 static struct tog_view *
321 view_open(int nlines, int ncols, int begin_y, int begin_x,
322 enum tog_view_type type)
324 struct tog_view *view = calloc(1, sizeof(*view));
332 view->nlines = nlines ? nlines : LINES - begin_y;
333 view->ncols = ncols ? ncols : COLS - begin_x;
334 view->begin_y = begin_y;
335 view->begin_x = begin_x;
336 view->window = newwin(nlines, ncols, begin_y, begin_x);
337 if (view->window == NULL) {
341 view->panel = new_panel(view->window);
342 if (view->panel == NULL ||
343 set_panel_userptr(view->panel, view) != OK) {
348 keypad(view->window, TRUE);
353 view_split_begin_x(int begin_x)
355 if (begin_x > 0 || COLS < 120)
357 return (COLS - MAX(COLS / 2, 80));
360 static const struct got_error *view_resize(struct tog_view *);
362 static const struct got_error *
363 view_splitscreen(struct tog_view *view)
365 const struct got_error *err = NULL;
368 view->begin_x = view_split_begin_x(0);
369 view->nlines = LINES;
370 view->ncols = COLS - view->begin_x;
373 err = view_resize(view);
377 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
378 return got_error_from_errno();
383 static const struct got_error *
384 view_fullscreen(struct tog_view *view)
386 const struct got_error *err = NULL;
390 view->nlines = LINES;
394 err = view_resize(view);
398 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
399 return got_error_from_errno();
405 view_is_parent_view(struct tog_view *view)
407 return view->parent == NULL;
410 static const struct got_error *
411 view_resize(struct tog_view *view)
415 if (view->lines > LINES)
416 nlines = view->nlines - (view->lines - LINES);
418 nlines = view->nlines + (LINES - view->lines);
420 if (view->cols > COLS)
421 ncols = view->ncols - (view->cols - COLS);
423 ncols = view->ncols + (COLS - view->cols);
425 if (wresize(view->window, nlines, ncols) == ERR)
426 return got_error_from_errno();
427 if (replace_panel(view->panel, view->window) == ERR)
428 return got_error_from_errno();
429 wclear(view->window);
431 view->nlines = nlines;
437 view->child->begin_x = view_split_begin_x(view->begin_x);
438 if (view->child->begin_x == 0) {
439 view_fullscreen(view->child);
440 if (view->child->focussed)
441 show_panel(view->child->panel);
443 show_panel(view->panel);
445 view_splitscreen(view->child);
446 show_panel(view->child->panel);
453 static const struct got_error *
454 view_close_child(struct tog_view *view)
456 const struct got_error *err = NULL;
458 if (view->child == NULL)
461 err = view_close(view->child);
466 static const struct got_error *
467 view_set_child(struct tog_view *view, struct tog_view *child)
469 const struct got_error *err = NULL;
472 child->parent = view;
477 view_is_splitscreen(struct tog_view *view)
479 return !view_is_parent_view(view) && view->begin_x > 0;
488 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
489 cols = 80; /* Default */
495 resize_term(lines, cols);
498 static const struct got_error *
499 view_input(struct tog_view **new, struct tog_view **dead,
500 struct tog_view **focus, int *done, struct tog_view *view,
501 struct tog_view_list_head *views)
503 const struct got_error *err = NULL;
511 nodelay(stdscr, FALSE);
512 /* Allow threads to make progress while we are waiting for input. */
513 errcode = pthread_mutex_unlock(&tog_mutex);
515 return got_error_set_errno(errcode);
516 ch = wgetch(view->window);
517 errcode = pthread_mutex_lock(&tog_mutex);
519 return got_error_set_errno(errcode);
520 nodelay(stdscr, TRUE);
522 if (tog_sigwinch_received) {
524 tog_sigwinch_received = 0;
525 TAILQ_FOREACH(v, views, entry) {
526 err = view_resize(v);
529 err = v->input(new, dead, focus, v, KEY_RESIZE);
540 *focus = view->child;
541 view->child_focussed = 1;
542 } else if (view->parent) {
543 *focus = view->parent;
544 view->parent->child_focussed = 0;
548 err = view->input(new, dead, focus, view, ch);
555 if (view_is_parent_view(view)) {
556 if (view->child == NULL)
558 if (view_is_splitscreen(view->child)) {
559 *focus = view->child;
560 view->child_focussed = 1;
561 err = view_fullscreen(view->child);
563 err = view_splitscreen(view->child);
566 err = view->child->input(new, dead, focus,
567 view->child, KEY_RESIZE);
569 if (view_is_splitscreen(view)) {
571 view->parent->child_focussed = 1;
572 err = view_fullscreen(view);
574 err = view_splitscreen(view);
578 err = view->input(new, dead, focus, view,
585 err = view->input(new, dead, focus, view, ch);
593 view_vborder(struct tog_view *view)
596 struct tog_view *view_above;
599 return view_vborder(view->parent);
601 panel = panel_above(view->panel);
605 view_above = panel_userptr(panel);
606 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
607 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
611 view_needs_focus_indication(struct tog_view *view)
613 if (view_is_parent_view(view)) {
614 if (view->child == NULL || view->child_focussed)
616 if (!view_is_splitscreen(view->child))
618 } else if (!view_is_splitscreen(view))
621 return view->focussed;
624 static const struct got_error *
625 view_loop(struct tog_view *view)
627 const struct got_error *err = NULL;
628 struct tog_view_list_head views;
629 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
630 int fast_refresh = 10;
631 int done = 0, errcode;
633 errcode = pthread_mutex_lock(&tog_mutex);
635 return got_error_set_errno(errcode);
638 TAILQ_INSERT_HEAD(&views, view, entry);
642 err = view->show(view);
647 while (!TAILQ_EMPTY(&views) && !done) {
648 /* Refresh fast during initialization, then become slower. */
649 if (fast_refresh && fast_refresh-- == 0)
650 halfdelay(10); /* switch to once per second */
652 err = view_input(&new_view, &dead_view, &focus_view, &done,
657 struct tog_view *prev = NULL;
659 if (view_is_parent_view(dead_view))
660 prev = TAILQ_PREV(dead_view,
661 tog_view_list_head, entry);
662 else if (view->parent != dead_view)
665 if (dead_view->parent)
666 dead_view->parent->child = NULL;
668 TAILQ_REMOVE(&views, dead_view, entry);
670 err = view_close(dead_view);
671 if (err || dead_view == main_view)
674 if (view == dead_view) {
679 else if (!TAILQ_EMPTY(&views))
680 view = TAILQ_LAST(&views,
685 if (view->child && view->child_focussed)
686 focus_view = view->child;
693 struct tog_view *v, *t;
694 /* Only allow one parent view per type. */
695 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
696 if (v->type != new_view->type)
698 TAILQ_REMOVE(&views, v, entry);
704 TAILQ_INSERT_TAIL(&views, new_view, entry);
706 if (focus_view == NULL)
707 focus_view = new_view;
710 show_panel(focus_view->panel);
713 focus_view->focussed = 1;
716 show_panel(new_view->panel);
717 if (view->child && view_is_splitscreen(view->child))
718 show_panel(view->child->panel);
721 if (focus_view == NULL) {
723 show_panel(view->panel);
724 if (view->child && view_is_splitscreen(view->child))
725 show_panel(view->child->panel);
729 err = view->parent->show(view->parent);
733 err = view->show(view);
737 err = view->child->show(view->child);
746 while (!TAILQ_EMPTY(&views)) {
747 view = TAILQ_FIRST(&views);
748 TAILQ_REMOVE(&views, view, entry);
752 errcode = pthread_mutex_unlock(&tog_mutex);
754 return got_error_set_errno(errcode);
764 "usage: %s log [-c commit] [-r repository-path] [path]\n",
769 /* Create newly allocated wide-character string equivalent to a byte string. */
770 static const struct got_error *
771 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
774 const struct got_error *err = NULL;
777 *wlen = mbstowcs(NULL, s, 0);
778 if (*wlen == (size_t)-1) {
781 return got_error_from_errno();
783 /* byte string invalid in current encoding; try to "fix" it */
784 err = got_mbsavis(&vis, &vislen, s);
787 *wlen = mbstowcs(NULL, vis, 0);
788 if (*wlen == (size_t)-1) {
789 err = got_error_from_errno(); /* give up */
794 *ws = calloc(*wlen + 1, sizeof(*ws));
796 err = got_error_from_errno();
800 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
801 err = got_error_from_errno();
812 /* Format a line for display, ensuring that it won't overflow a width limit. */
813 static const struct got_error *
814 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
816 const struct got_error *err = NULL;
818 wchar_t *wline = NULL;
825 err = mbs2ws(&wline, &wlen, line);
830 while (i < wlen && cols < wlimit) {
831 int width = wcwidth(wline[i]);
838 if (cols + width <= wlimit)
843 if (wline[i] == L'\t')
844 cols += TABSIZE - ((cols + 1) % TABSIZE);
848 err = got_error_from_errno();
863 static const struct got_error *
864 draw_commit(struct tog_view *view, struct got_commit_object *commit,
865 struct got_object_id *id)
867 const struct got_error *err = NULL;
868 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
869 char *logmsg0 = NULL, *logmsg = NULL;
870 char *author0 = NULL, *author = NULL;
871 wchar_t *wlogmsg = NULL, *wauthor = NULL;
872 int author_width, logmsg_width;
873 char *newline, *smallerthan;
876 static const size_t date_display_cols = 9;
877 static const size_t author_display_cols = 16;
878 const int avail = view->ncols;
880 time_t committer_time;
882 committer_time = got_object_commit_get_committer_time(commit);
883 if (localtime_r(&committer_time, &tm) == NULL)
884 return got_error_from_errno();
885 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
887 return got_error(GOT_ERR_NO_SPACE);
889 if (avail < date_display_cols)
890 limit = MIN(sizeof(datebuf) - 1, avail);
892 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
893 waddnstr(view->window, datebuf, limit);
898 author0 = strdup(got_object_commit_get_author(commit));
899 if (author0 == NULL) {
900 err = got_error_from_errno();
904 smallerthan = strchr(author, '<');
908 char *at = strchr(author, '@');
913 err = format_line(&wauthor, &author_width, author, limit);
916 waddwstr(view->window, wauthor);
918 while (col <= avail && author_width < author_display_cols + 1) {
919 waddch(view->window, ' ');
926 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
927 if (logmsg0 == NULL) {
928 err = got_error_from_errno();
932 while (*logmsg == '\n')
934 newline = strchr(logmsg, '\n');
938 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
941 waddwstr(view->window, wlogmsg);
943 while (col <= avail) {
944 waddch(view->window, ' ');
956 static struct commit_queue_entry *
957 alloc_commit_queue_entry(struct got_commit_object *commit,
958 struct got_object_id *id)
960 struct commit_queue_entry *entry;
962 entry = calloc(1, sizeof(*entry));
967 entry->commit = commit;
972 pop_commit(struct commit_queue *commits)
974 struct commit_queue_entry *entry;
976 entry = TAILQ_FIRST(&commits->head);
977 TAILQ_REMOVE(&commits->head, entry, entry);
978 got_object_commit_close(entry->commit);
980 /* Don't free entry->id! It is owned by the commit graph. */
985 free_commits(struct commit_queue *commits)
987 while (!TAILQ_EMPTY(&commits->head))
991 static const struct got_error *
992 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
993 int minqueue, struct got_repository *repo, const char *path)
995 const struct got_error *err = NULL;
999 * We keep all commits open throughout the lifetime of the log
1000 * view in order to avoid having to re-fetch commits from disk
1001 * while updating the display.
1003 while (nqueued < minqueue) {
1004 struct got_object_id *id;
1005 struct got_commit_object *commit;
1006 struct commit_queue_entry *entry;
1009 err = got_commit_graph_iter_next(&id, graph);
1011 if (err->code != GOT_ERR_ITER_NEED_MORE)
1013 err = got_commit_graph_fetch_commits(graph,
1023 err = got_object_open_as_commit(&commit, repo, id);
1026 entry = alloc_commit_queue_entry(commit, id);
1027 if (entry == NULL) {
1028 err = got_error_from_errno();
1032 errcode = pthread_mutex_lock(&tog_mutex);
1034 err = got_error_set_errno(errcode);
1038 entry->idx = commits->ncommits;
1039 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1041 commits->ncommits++;
1043 errcode = pthread_mutex_unlock(&tog_mutex);
1044 if (errcode && err == NULL)
1045 err = got_error_set_errno(errcode);
1051 static const struct got_error *
1052 get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1054 const struct got_error *err = NULL;
1055 struct got_reference *head_ref;
1059 err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1063 err = got_ref_resolve(head_id, repo, head_ref);
1064 got_ref_close(head_ref);
1073 static const struct got_error *
1074 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1075 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1076 struct commit_queue *commits, int selected_idx, int limit,
1077 const char *path, int commits_needed)
1079 const struct got_error *err = NULL;
1080 struct commit_queue_entry *entry;
1081 int ncommits, width;
1082 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1088 if (ncommits == selected_idx) {
1092 entry = TAILQ_NEXT(entry, entry);
1097 err = got_object_id_str(&id_str, (*selected)->id);
1102 if (asprintf(&ncommits_str, " [%d/%d]%s ",
1103 entry ? entry->idx + 1 : 0, commits->ncommits,
1104 commits_needed == 0 ? "" : " loading...") == -1)
1105 return got_error_from_errno();
1107 if (path && strcmp(path, "/") != 0) {
1108 if (asprintf(&header, "commit %s %s%s",
1109 id_str ? id_str : "........................................",
1110 path, ncommits_str) == -1) {
1111 err = got_error_from_errno();
1115 } else if (asprintf(&header, "commit %s%s",
1116 id_str ? id_str : "........................................",
1117 ncommits_str) == -1) {
1118 err = got_error_from_errno();
1122 err = format_line(&wline, &width, header, view->ncols);
1126 werase(view->window);
1128 if (view_needs_focus_indication(view))
1129 wstandout(view->window);
1130 waddwstr(view->window, wline);
1131 while (width < view->ncols) {
1132 waddch(view->window, ' ');
1135 if (view_needs_focus_indication(view))
1136 wstandend(view->window);
1145 if (ncommits >= limit - 1)
1147 if (view->focussed && ncommits == selected_idx)
1148 wstandout(view->window);
1149 err = draw_commit(view, entry->commit, entry->id);
1150 if (view->focussed && ncommits == selected_idx)
1151 wstandend(view->window);
1156 entry = TAILQ_NEXT(entry, entry);
1168 scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1169 struct commit_queue *commits)
1171 struct commit_queue_entry *entry;
1174 entry = TAILQ_FIRST(&commits->head);
1175 if (*first_displayed_entry == entry)
1178 entry = *first_displayed_entry;
1179 while (entry && nscrolled < maxscroll) {
1180 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1182 *first_displayed_entry = entry;
1188 static const struct got_error *
1189 scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1190 struct commit_queue_entry **last_displayed_entry,
1191 struct commit_queue *commits, int *log_complete, int *commits_needed,
1192 pthread_cond_t *need_commits)
1194 const struct got_error *err = NULL;
1195 struct commit_queue_entry *pentry;
1198 if (*last_displayed_entry == NULL)
1202 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1203 if (pentry == NULL) {
1207 *commits_needed = maxscroll + 20;
1208 errcode = pthread_cond_signal(need_commits);
1210 return got_error_set_errno(errcode);
1213 *last_displayed_entry = pentry;
1215 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1218 *first_displayed_entry = pentry;
1219 } while (++nscrolled < maxscroll);
1224 static const struct got_error *
1225 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1226 struct got_object_id *commit_id, struct got_commit_object *commit,
1227 struct got_repository *repo)
1229 const struct got_error *err;
1230 struct got_object_qid *parent_id;
1231 struct tog_view *diff_view;
1233 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1234 if (diff_view == NULL)
1235 return got_error_from_errno();
1237 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1238 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1241 *new_view = diff_view;
1245 static const struct got_error *
1246 browse_commit(struct tog_view **new_view, int begin_x,
1247 struct commit_queue_entry *entry, struct got_repository *repo)
1249 const struct got_error *err = NULL;
1250 struct got_tree_object *tree;
1251 struct tog_view *tree_view;
1253 err = got_object_open_as_tree(&tree, repo,
1254 got_object_commit_get_tree_id(entry->commit));
1258 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1259 if (tree_view == NULL)
1260 return got_error_from_errno();
1262 err = open_tree_view(tree_view, tree, entry->id, repo);
1264 got_object_tree_close(tree);
1266 *new_view = tree_view;
1271 log_thread(void *arg)
1273 const struct got_error *err = NULL;
1275 struct tog_log_thread_args *a = arg;
1278 err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1282 while (!done && !err) {
1283 err = queue_commits(a->graph, a->commits, 1, a->repo,
1286 if (err->code != GOT_ERR_ITER_COMPLETED)
1290 } else if (a->commits_needed > 0)
1291 a->commits_needed--;
1293 errcode = pthread_mutex_lock(&tog_mutex);
1295 return (void *)got_error_set_errno(errcode);
1298 a->log_complete = 1;
1299 else if (*a->quit) {
1301 a->log_complete = 1;
1302 } else if (*a->first_displayed_entry == NULL) {
1303 *a->first_displayed_entry =
1304 TAILQ_FIRST(&a->commits->head);
1305 *a->selected_entry = *a->first_displayed_entry;
1309 a->commits_needed = 0;
1310 else if (a->commits_needed == 0) {
1311 errcode = pthread_cond_wait(&a->need_commits,
1314 err = got_error_set_errno(errcode);
1317 errcode = pthread_mutex_unlock(&tog_mutex);
1318 if (errcode && err == NULL)
1319 err = got_error_set_errno(errcode);
1324 static const struct got_error *
1325 stop_log_thread(struct tog_log_view_state *s)
1327 const struct got_error *err = NULL;
1332 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1334 return got_error_set_errno(errcode);
1335 errcode = pthread_mutex_unlock(&tog_mutex);
1337 return got_error_set_errno(errcode);
1338 errcode = pthread_join(s->thread, (void **)&err);
1340 return got_error_set_errno(errcode);
1341 errcode = pthread_mutex_lock(&tog_mutex);
1343 return got_error_set_errno(errcode);
1347 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1348 if (errcode && err == NULL)
1349 err = got_error_set_errno(errcode);
1351 if (s->thread_args.repo) {
1352 got_repo_close(s->thread_args.repo);
1353 s->thread_args.repo = NULL;
1356 if (s->thread_args.graph) {
1357 got_commit_graph_close(s->thread_args.graph);
1358 s->thread_args.graph = NULL;
1364 static const struct got_error *
1365 close_log_view(struct tog_view *view)
1367 const struct got_error *err = NULL;
1368 struct tog_log_view_state *s = &view->state.log;
1370 err = stop_log_thread(s);
1371 free_commits(&s->commits);
1372 free(s->in_repo_path);
1373 s->in_repo_path = NULL;
1379 static const struct got_error *
1380 open_log_view(struct tog_view *view, struct got_object_id *start_id,
1381 struct got_repository *repo, const char *path, int check_disk)
1383 const struct got_error *err = NULL;
1384 struct tog_log_view_state *s = &view->state.log;
1385 struct got_repository *thread_repo = NULL;
1386 struct got_commit_graph *thread_graph = NULL;
1389 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1393 /* The commit queue only contains commits being displayed. */
1394 TAILQ_INIT(&s->commits.head);
1395 s->commits.ncommits = 0;
1398 s->start_id = got_object_id_dup(start_id);
1399 if (s->start_id == NULL) {
1400 err = got_error_from_errno();
1404 view->show = show_log_view;
1405 view->input = input_log_view;
1406 view->close = close_log_view;
1408 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1411 err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1416 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1418 err = got_error_set_errno(errcode);
1422 s->thread_args.commits_needed = view->nlines;
1423 s->thread_args.graph = thread_graph;
1424 s->thread_args.commits = &s->commits;
1425 s->thread_args.in_repo_path = s->in_repo_path;
1426 s->thread_args.start_id = s->start_id;
1427 s->thread_args.repo = thread_repo;
1428 s->thread_args.log_complete = 0;
1429 s->thread_args.quit = &s->quit;
1430 s->thread_args.view = view;
1431 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1432 s->thread_args.selected_entry = &s->selected_entry;
1435 close_log_view(view);
1439 static const struct got_error *
1440 show_log_view(struct tog_view *view)
1442 struct tog_log_view_state *s = &view->state.log;
1444 if (s->thread == NULL) {
1445 int errcode = pthread_create(&s->thread, NULL, log_thread,
1448 return got_error_set_errno(errcode);
1451 return draw_commits(view, &s->last_displayed_entry,
1452 &s->selected_entry, s->first_displayed_entry,
1453 &s->commits, s->selected, view->nlines,
1454 s->in_repo_path, s->thread_args.commits_needed);
1457 static const struct got_error *
1458 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1459 struct tog_view **focus_view, struct tog_view *view, int ch)
1461 const struct got_error *err = NULL;
1462 struct tog_log_view_state *s = &view->state.log;
1464 struct tog_view *diff_view = NULL, *tree_view = NULL;
1473 if (s->first_displayed_entry == NULL)
1475 if (s->selected > 0)
1477 if (s->selected > 0)
1479 scroll_up(&s->first_displayed_entry, 1,
1483 if (s->first_displayed_entry == NULL)
1485 if (TAILQ_FIRST(&s->commits.head) ==
1486 s->first_displayed_entry) {
1490 scroll_up(&s->first_displayed_entry,
1491 view->nlines, &s->commits);
1495 if (s->first_displayed_entry == NULL)
1497 if (s->selected < MIN(view->nlines - 2,
1498 s->commits.ncommits - 1)) {
1502 err = scroll_down(&s->first_displayed_entry, 1,
1503 &s->last_displayed_entry, &s->commits,
1504 &s->thread_args.log_complete,
1505 &s->thread_args.commits_needed,
1506 &s->thread_args.need_commits);
1509 struct commit_queue_entry *first;
1510 first = s->first_displayed_entry;
1513 err = scroll_down(&s->first_displayed_entry,
1514 view->nlines, &s->last_displayed_entry,
1515 &s->commits, &s->thread_args.log_complete,
1516 &s->thread_args.commits_needed,
1517 &s->thread_args.need_commits);
1518 if (first == s->first_displayed_entry &&
1519 s->selected < MIN(view->nlines - 2,
1520 s->commits.ncommits - 1)) {
1521 /* can't scroll further down */
1522 s->selected = MIN(view->nlines - 2,
1523 s->commits.ncommits - 1);
1529 if (s->selected > view->nlines - 2)
1530 s->selected = view->nlines - 2;
1531 if (s->selected > s->commits.ncommits - 1)
1532 s->selected = s->commits.ncommits - 1;
1536 if (s->selected_entry == NULL)
1538 if (view_is_parent_view(view))
1539 begin_x = view_split_begin_x(view->begin_x);
1540 err = open_diff_view_for_commit(&diff_view, begin_x,
1541 s->selected_entry->id, s->selected_entry->commit,
1545 if (view_is_parent_view(view)) {
1546 err = view_close_child(view);
1549 err = view_set_child(view, diff_view);
1551 view_close(diff_view);
1554 *focus_view = diff_view;
1555 view->child_focussed = 1;
1557 *new_view = diff_view;
1560 if (s->selected_entry == NULL)
1562 if (view_is_parent_view(view))
1563 begin_x = view_split_begin_x(view->begin_x);
1564 err = browse_commit(&tree_view, begin_x,
1565 s->selected_entry, s->repo);
1568 if (view_is_parent_view(view)) {
1569 err = view_close_child(view);
1572 err = view_set_child(view, tree_view);
1574 view_close(tree_view);
1577 *focus_view = tree_view;
1578 view->child_focussed = 1;
1580 *new_view = tree_view;
1583 if (strcmp(s->in_repo_path, "/") == 0)
1585 parent_path = dirname(s->in_repo_path);
1586 if (parent_path && strcmp(parent_path, ".") != 0) {
1587 struct tog_view *lv;
1588 err = stop_log_thread(s);
1591 lv = view_open(view->nlines, view->ncols,
1592 view->begin_y, view->begin_x, TOG_VIEW_LOG);
1594 return got_error_from_errno();
1595 err = open_log_view(lv, s->start_id, s->repo,
1599 if (view_is_parent_view(view))
1602 view_set_child(view->parent, lv);
1615 static const struct got_error *
1616 apply_unveil(const char *repo_path, const char *worktree_path)
1618 const struct got_error *error;
1620 if (repo_path && unveil(repo_path, "r") != 0)
1621 return got_error_from_errno();
1623 if (worktree_path && unveil(worktree_path, "rwc") != 0)
1624 return got_error_from_errno();
1626 if (unveil("/tmp", "rwc") != 0)
1627 return got_error_from_errno();
1629 error = got_privsep_unveil_exec_helpers();
1633 if (unveil(NULL, NULL) != 0)
1634 return got_error_from_errno();
1639 static const struct got_error *
1640 cmd_log(int argc, char *argv[])
1642 const struct got_error *error;
1643 struct got_repository *repo = NULL;
1644 struct got_object_id *start_id = NULL;
1645 char *path = NULL, *repo_path = NULL, *cwd = NULL;
1646 char *start_commit = NULL;
1648 struct tog_view *view;
1651 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1656 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1659 start_commit = optarg;
1662 repo_path = realpath(optarg, NULL);
1663 if (repo_path == NULL)
1664 err(1, "-r option");
1678 path = strdup(argv[0]);
1682 return got_error_from_errno();
1684 cwd = getcwd(NULL, 0);
1686 error = got_error_from_errno();
1689 if (repo_path == NULL) {
1690 struct got_worktree *worktree;
1691 error = got_worktree_open(&worktree, cwd);
1692 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1696 strdup(got_worktree_get_repo_path(worktree));
1697 got_worktree_close(worktree);
1699 repo_path = strdup(cwd);
1700 if (repo_path == NULL) {
1701 error = got_error_from_errno();
1706 error = apply_unveil(repo_path, NULL);
1710 error = got_repo_open(&repo, repo_path);
1714 if (start_commit == NULL)
1715 error = get_head_commit_id(&start_id, repo);
1717 error = got_object_resolve_id_str(&start_id, repo,
1722 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1724 error = got_error_from_errno();
1727 error = open_log_view(view, start_id, repo, path, 1);
1730 error = view_loop(view);
1737 got_repo_close(repo);
1745 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1751 parse_next_line(FILE *f, size_t *len)
1756 const char delim[3] = { '\0', '\0', '\0'};
1758 line = fparseln(f, &linelen, &lineno, delim, 0);
1764 static const struct got_error *
1765 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1766 int *last_displayed_line, int *eof, int max_lines,
1769 const struct got_error *err;
1770 int nlines = 0, nprinted = 0;
1777 werase(view->window);
1780 err = format_line(&wline, &width, header, view->ncols);
1785 if (view_needs_focus_indication(view))
1786 wstandout(view->window);
1787 waddwstr(view->window, wline);
1788 if (view_needs_focus_indication(view))
1789 wstandend(view->window);
1790 if (width < view->ncols)
1791 waddch(view->window, '\n');
1799 while (nprinted < max_lines) {
1800 line = parse_next_line(f, &len);
1805 if (++nlines < *first_displayed_line) {
1810 err = format_line(&wline, &width, line, view->ncols);
1815 waddwstr(view->window, wline);
1816 if (width < view->ncols)
1817 waddch(view->window, '\n');
1818 if (++nprinted == 1)
1819 *first_displayed_line = nlines;
1824 *last_displayed_line = nlines;
1832 get_datestr(time_t *time, char *datebuf)
1834 char *p, *s = ctime_r(time, datebuf);
1835 p = strchr(s, '\n');
1841 static const struct got_error *
1842 write_commit_info(struct got_object_id *commit_id, struct got_repository *repo,
1845 const struct got_error *err = NULL;
1847 struct got_commit_object *commit;
1848 char *id_str = NULL;
1849 time_t committer_time;
1850 const char *author, *committer;
1852 err = got_object_open_as_commit(&commit, repo, commit_id);
1856 err = got_object_id_str(&id_str, commit_id);
1858 err = got_error_from_errno();
1862 if (fprintf(outfile, "commit %s\n", id_str) < 0) {
1863 err = got_error_from_errno();
1866 if (fprintf(outfile, "from: %s\n",
1867 got_object_commit_get_author(commit)) < 0) {
1868 err = got_error_from_errno();
1871 committer_time = got_object_commit_get_committer_time(commit);
1872 if (fprintf(outfile, "date: %s UTC\n",
1873 get_datestr(&committer_time, datebuf)) < 0) {
1874 err = got_error_from_errno();
1877 author = got_object_commit_get_author(commit);
1878 committer = got_object_commit_get_committer(commit);
1879 if (strcmp(author, committer) != 0 &&
1880 fprintf(outfile, "via: %s\n", committer) < 0) {
1881 err = got_error_from_errno();
1884 if (fprintf(outfile, "%s\n",
1885 got_object_commit_get_logmsg(commit)) < 0) {
1886 err = got_error_from_errno();
1891 got_object_commit_close(commit);
1895 static const struct got_error *
1896 create_diff(struct tog_diff_view_state *s)
1898 const struct got_error *err = NULL;
1904 err = got_error_from_errno();
1912 err = got_object_get_type(&obj_type, s->repo, s->id1);
1914 err = got_object_get_type(&obj_type, s->repo, s->id2);
1919 case GOT_OBJ_TYPE_BLOB:
1920 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
1921 s->diff_context, s->repo, f);
1923 case GOT_OBJ_TYPE_TREE:
1924 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
1925 s->diff_context, s->repo, f);
1927 case GOT_OBJ_TYPE_COMMIT: {
1928 const struct got_object_id_queue *parent_ids;
1929 struct got_object_qid *pid;
1930 struct got_commit_object *commit2;
1932 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
1935 /* Show commit info if we're diffing to a parent commit. */
1936 parent_ids = got_object_commit_get_parent_ids(commit2);
1937 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
1938 if (got_object_id_cmp(s->id1, pid->id) == 0) {
1939 write_commit_info(s->id2, s->repo, f);
1943 got_object_commit_close(commit2);
1945 err = got_diff_objects_as_commits(s->id1, s->id2,
1946 s->diff_context, s->repo, f);
1950 err = got_error(GOT_ERR_OBJ_TYPE);
1959 static const struct got_error *
1960 open_diff_view(struct tog_view *view, struct got_object_id *id1,
1961 struct got_object_id *id2, struct got_repository *repo)
1963 const struct got_error *err;
1965 if (id1 != NULL && id2 != NULL) {
1967 err = got_object_get_type(&type1, repo, id1);
1970 err = got_object_get_type(&type2, repo, id2);
1975 return got_error(GOT_ERR_OBJ_TYPE);
1979 view->state.diff.id1 = got_object_id_dup(id1);
1980 if (view->state.diff.id1 == NULL)
1981 return got_error_from_errno();
1983 view->state.diff.id1 = NULL;
1985 view->state.diff.id2 = got_object_id_dup(id2);
1986 if (view->state.diff.id2 == NULL) {
1987 free(view->state.diff.id1);
1988 view->state.diff.id1 = NULL;
1989 return got_error_from_errno();
1991 view->state.diff.f = NULL;
1992 view->state.diff.first_displayed_line = 1;
1993 view->state.diff.last_displayed_line = view->nlines;
1994 view->state.diff.diff_context = 3;
1995 view->state.diff.repo = repo;
1997 err = create_diff(&view->state.diff);
1999 free(view->state.diff.id1);
2000 view->state.diff.id1 = NULL;
2001 free(view->state.diff.id2);
2002 view->state.diff.id2 = NULL;
2006 view->show = show_diff_view;
2007 view->input = input_diff_view;
2008 view->close = close_diff_view;
2013 static const struct got_error *
2014 close_diff_view(struct tog_view *view)
2016 const struct got_error *err = NULL;
2018 free(view->state.diff.id1);
2019 view->state.diff.id1 = NULL;
2020 free(view->state.diff.id2);
2021 view->state.diff.id2 = NULL;
2022 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2023 err = got_error_from_errno();
2027 static const struct got_error *
2028 show_diff_view(struct tog_view *view)
2030 const struct got_error *err;
2031 struct tog_diff_view_state *s = &view->state.diff;
2032 char *id_str1 = NULL, *id_str2, *header;
2035 err = got_object_id_str(&id_str1, s->id1);
2039 err = got_object_id_str(&id_str2, s->id2);
2043 if (asprintf(&header, "diff %s %s",
2044 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2045 err = got_error_from_errno();
2053 return draw_file(view, s->f, &s->first_displayed_line,
2054 &s->last_displayed_line, &s->eof, view->nlines,
2058 static const struct got_error *
2059 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2060 struct tog_view **focus_view, struct tog_view *view, int ch)
2062 const struct got_error *err = NULL;
2063 struct tog_diff_view_state *s = &view->state.diff;
2069 if (s->first_displayed_line > 1)
2070 s->first_displayed_line--;
2074 while (i++ < view->nlines - 1 &&
2075 s->first_displayed_line > 1)
2076 s->first_displayed_line--;
2081 s->first_displayed_line++;
2086 while (!s->eof && i++ < view->nlines - 1) {
2088 line = parse_next_line(s->f, NULL);
2089 s->first_displayed_line++;
2095 if (s->diff_context > 0) {
2097 err = create_diff(s);
2101 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2103 err = create_diff(s);
2113 static const struct got_error *
2114 cmd_diff(int argc, char *argv[])
2116 const struct got_error *error = NULL;
2117 struct got_repository *repo = NULL;
2118 struct got_object_id *id1 = NULL, *id2 = NULL;
2119 char *repo_path = NULL;
2120 char *id_str1 = NULL, *id_str2 = NULL;
2122 struct tog_view *view;
2125 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2130 while ((ch = getopt(argc, argv, "")) != -1) {
2142 usage_diff(); /* TODO show local worktree changes */
2143 } else if (argc == 2) {
2144 repo_path = getcwd(NULL, 0);
2145 if (repo_path == NULL)
2146 return got_error_from_errno();
2149 } else if (argc == 3) {
2150 repo_path = realpath(argv[0], NULL);
2151 if (repo_path == NULL)
2152 return got_error_from_errno();
2158 error = apply_unveil(repo_path, NULL);
2162 error = got_repo_open(&repo, repo_path);
2167 error = got_object_resolve_id_str(&id1, repo, id_str1);
2171 error = got_object_resolve_id_str(&id2, repo, id_str2);
2175 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2177 error = got_error_from_errno();
2180 error = open_diff_view(view, id1, id2, repo);
2183 error = view_loop(view);
2185 got_repo_close(repo);
2193 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2198 struct tog_blame_line {
2200 struct got_object_id *id;
2203 static const struct got_error *
2204 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2205 const char *path, struct tog_blame_line *lines, int nlines,
2206 int blame_complete, int selected_line, int *first_displayed_line,
2207 int *last_displayed_line, int *eof, int max_lines)
2209 const struct got_error *err;
2210 int lineno = 0, nprinted = 0;
2215 struct tog_blame_line *blame_line;
2216 struct got_object_id *prev_id = NULL;
2219 err = got_object_id_str(&id_str, id);
2224 werase(view->window);
2226 if (asprintf(&line, "commit %s", id_str) == -1) {
2227 err = got_error_from_errno();
2232 err = format_line(&wline, &width, line, view->ncols);
2235 if (view_needs_focus_indication(view))
2236 wstandout(view->window);
2237 waddwstr(view->window, wline);
2238 if (view_needs_focus_indication(view))
2239 wstandend(view->window);
2242 if (width < view->ncols)
2243 waddch(view->window, '\n');
2245 if (asprintf(&line, "[%d/%d] %s%s",
2246 *first_displayed_line - 1 + selected_line, nlines,
2247 blame_complete ? "" : "annotating ", path) == -1) {
2249 return got_error_from_errno();
2252 err = format_line(&wline, &width, line, view->ncols);
2257 waddwstr(view->window, wline);
2260 if (width < view->ncols)
2261 waddch(view->window, '\n');
2264 while (nprinted < max_lines - 2) {
2265 line = parse_next_line(f, &len);
2270 if (++lineno < *first_displayed_line) {
2275 wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2276 err = format_line(&wline, &width, line, wlimit);
2282 if (view->focussed && nprinted == selected_line - 1)
2283 wstandout(view->window);
2285 blame_line = &lines[lineno - 1];
2286 if (blame_line->annotated && prev_id &&
2287 got_object_id_cmp(prev_id, blame_line->id) == 0)
2288 waddstr(view->window, " ");
2289 else if (blame_line->annotated) {
2291 err = got_object_id_str(&id_str, blame_line->id);
2297 wprintw(view->window, "%.8s ", id_str);
2299 prev_id = blame_line->id;
2301 waddstr(view->window, "........ ");
2305 waddwstr(view->window, wline);
2306 while (width < wlimit) {
2307 waddch(view->window, ' ');
2310 if (view->focussed && nprinted == selected_line - 1)
2311 wstandend(view->window);
2312 if (++nprinted == 1)
2313 *first_displayed_line = lineno;
2318 *last_displayed_line = lineno;
2325 static const struct got_error *
2326 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2328 const struct got_error *err = NULL;
2329 struct tog_blame_cb_args *a = arg;
2330 struct tog_blame_line *line;
2333 if (nlines != a->nlines ||
2334 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2335 return got_error(GOT_ERR_RANGE);
2337 errcode = pthread_mutex_lock(&tog_mutex);
2339 return got_error_set_errno(errcode);
2341 if (*a->quit) { /* user has quit the blame view */
2342 err = got_error(GOT_ERR_ITER_COMPLETED);
2347 goto done; /* no change in this commit */
2349 line = &a->lines[lineno - 1];
2350 if (line->annotated)
2353 line->id = got_object_id_dup(id);
2354 if (line->id == NULL) {
2355 err = got_error_from_errno();
2358 line->annotated = 1;
2360 errcode = pthread_mutex_unlock(&tog_mutex);
2362 err = got_error_set_errno(errcode);
2367 blame_thread(void *arg)
2369 const struct got_error *err;
2370 struct tog_blame_thread_args *ta = arg;
2371 struct tog_blame_cb_args *a = ta->cb_args;
2374 err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2375 blame_cb, ta->cb_args);
2377 errcode = pthread_mutex_lock(&tog_mutex);
2379 return (void *)got_error_set_errno(errcode);
2381 got_repo_close(ta->repo);
2385 errcode = pthread_mutex_unlock(&tog_mutex);
2386 if (errcode && err == NULL)
2387 err = got_error_set_errno(errcode);
2392 static struct got_object_id *
2393 get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2396 struct tog_blame_line *line;
2398 line = &lines[first_displayed_line - 1 + selected_line - 1];
2399 if (!line->annotated)
2405 static const struct got_error *
2406 stop_blame(struct tog_blame *blame)
2408 const struct got_error *err = NULL;
2411 if (blame->thread) {
2413 errcode = pthread_mutex_unlock(&tog_mutex);
2415 return got_error_set_errno(errcode);
2416 errcode = pthread_join(blame->thread, (void **)&err);
2418 return got_error_set_errno(errcode);
2419 errcode = pthread_mutex_lock(&tog_mutex);
2421 return got_error_set_errno(errcode);
2422 if (err && err->code == GOT_ERR_ITER_COMPLETED)
2424 blame->thread = NULL;
2426 if (blame->thread_args.repo) {
2427 got_repo_close(blame->thread_args.repo);
2428 blame->thread_args.repo = NULL;
2435 for (i = 0; i < blame->nlines; i++)
2436 free(blame->lines[i].id);
2438 blame->lines = NULL;
2440 free(blame->cb_args.commit_id);
2441 blame->cb_args.commit_id = NULL;
2446 static const struct got_error *
2447 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2448 int *first_displayed_line, int *last_displayed_line, int *selected_line,
2449 int *done, int *eof, const char *path, struct got_object_id *commit_id,
2450 struct got_repository *repo)
2452 const struct got_error *err = NULL;
2453 struct got_blob_object *blob = NULL;
2454 struct got_repository *thread_repo = NULL;
2455 struct got_object_id *obj_id = NULL;
2458 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2462 return got_error(GOT_ERR_NO_OBJ);
2464 err = got_object_get_type(&obj_type, repo, obj_id);
2468 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2469 err = got_error(GOT_ERR_OBJ_TYPE);
2473 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2476 blame->f = got_opentemp();
2477 if (blame->f == NULL) {
2478 err = got_error_from_errno();
2481 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2486 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2487 if (blame->lines == NULL) {
2488 err = got_error_from_errno();
2492 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2496 blame->cb_args.view = view;
2497 blame->cb_args.lines = blame->lines;
2498 blame->cb_args.nlines = blame->nlines;
2499 blame->cb_args.commit_id = got_object_id_dup(commit_id);
2500 if (blame->cb_args.commit_id == NULL) {
2501 err = got_error_from_errno();
2504 blame->cb_args.quit = done;
2506 blame->thread_args.path = path;
2507 blame->thread_args.repo = thread_repo;
2508 blame->thread_args.cb_args = &blame->cb_args;
2509 blame->thread_args.complete = blame_complete;
2510 *blame_complete = 0;
2514 got_object_blob_close(blob);
2521 static const struct got_error *
2522 open_blame_view(struct tog_view *view, char *path,
2523 struct got_object_id *commit_id, struct got_repository *repo)
2525 const struct got_error *err = NULL;
2526 struct tog_blame_view_state *s = &view->state.blame;
2528 SIMPLEQ_INIT(&s->blamed_commits);
2530 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2534 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2535 s->first_displayed_line = 1;
2536 s->last_displayed_line = view->nlines;
2537 s->selected_line = 1;
2538 s->blame_complete = 0;
2540 if (s->path == NULL)
2541 return got_error_from_errno();
2543 s->commit_id = commit_id;
2544 memset(&s->blame, 0, sizeof(s->blame));
2546 view->show = show_blame_view;
2547 view->input = input_blame_view;
2548 view->close = close_blame_view;
2550 return run_blame(&s->blame, view, &s->blame_complete,
2551 &s->first_displayed_line, &s->last_displayed_line,
2552 &s->selected_line, &s->done, &s->eof, s->path,
2553 s->blamed_commit->id, s->repo);
2556 static const struct got_error *
2557 close_blame_view(struct tog_view *view)
2559 const struct got_error *err = NULL;
2560 struct tog_blame_view_state *s = &view->state.blame;
2562 if (s->blame.thread)
2563 err = stop_blame(&s->blame);
2565 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2566 struct got_object_qid *blamed_commit;
2567 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2568 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2569 got_object_qid_free(blamed_commit);
2577 static const struct got_error *
2578 show_blame_view(struct tog_view *view)
2580 const struct got_error *err = NULL;
2581 struct tog_blame_view_state *s = &view->state.blame;
2584 if (s->blame.thread == NULL) {
2585 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2586 &s->blame.thread_args);
2588 return got_error_set_errno(errcode);
2591 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2592 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2593 s->selected_line, &s->first_displayed_line,
2594 &s->last_displayed_line, &s->eof, view->nlines);
2600 static const struct got_error *
2601 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2602 struct tog_view **focus_view, struct tog_view *view, int ch)
2604 const struct got_error *err = NULL, *thread_err = NULL;
2605 struct tog_view *diff_view;
2606 struct tog_blame_view_state *s = &view->state.blame;
2615 if (s->selected_line > 1)
2617 else if (s->selected_line == 1 &&
2618 s->first_displayed_line > 1)
2619 s->first_displayed_line--;
2622 if (s->first_displayed_line == 1) {
2623 s->selected_line = 1;
2626 if (s->first_displayed_line > view->nlines - 2)
2627 s->first_displayed_line -=
2630 s->first_displayed_line = 1;
2634 if (s->selected_line < view->nlines - 2 &&
2635 s->first_displayed_line +
2636 s->selected_line <= s->blame.nlines)
2638 else if (s->last_displayed_line <
2640 s->first_displayed_line++;
2644 struct got_object_id *id = NULL;
2645 id = get_selected_commit_id(s->blame.lines,
2646 s->first_displayed_line, s->selected_line);
2650 struct got_commit_object *commit;
2651 struct got_object_qid *pid;
2652 struct got_object_id *blob_id = NULL;
2654 err = got_object_open_as_commit(&commit,
2658 pid = SIMPLEQ_FIRST(
2659 got_object_commit_get_parent_ids(commit));
2661 got_object_commit_close(commit);
2664 /* Check if path history ends here. */
2665 err = got_object_id_by_path(&blob_id, s->repo,
2668 if (err->code == GOT_ERR_NO_TREE_ENTRY)
2670 got_object_commit_close(commit);
2673 err = got_object_get_type(&obj_type, s->repo,
2676 /* Can't blame non-blob type objects. */
2677 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2678 got_object_commit_close(commit);
2681 err = got_object_qid_alloc(&s->blamed_commit,
2683 got_object_commit_close(commit);
2685 if (got_object_id_cmp(id,
2686 s->blamed_commit->id) == 0)
2688 err = got_object_qid_alloc(&s->blamed_commit,
2694 thread_err = stop_blame(&s->blame);
2698 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2699 s->blamed_commit, entry);
2700 err = run_blame(&s->blame, view, &s->blame_complete,
2701 &s->first_displayed_line, &s->last_displayed_line,
2702 &s->selected_line, &s->done, &s->eof,
2703 s->path, s->blamed_commit->id, s->repo);
2709 struct got_object_qid *first;
2710 first = SIMPLEQ_FIRST(&s->blamed_commits);
2711 if (!got_object_id_cmp(first->id, s->commit_id))
2714 thread_err = stop_blame(&s->blame);
2718 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2719 got_object_qid_free(s->blamed_commit);
2721 SIMPLEQ_FIRST(&s->blamed_commits);
2722 err = run_blame(&s->blame, view, &s->blame_complete,
2723 &s->first_displayed_line, &s->last_displayed_line,
2724 &s->selected_line, &s->done, &s->eof, s->path,
2725 s->blamed_commit->id, s->repo);
2732 struct got_object_id *id = NULL;
2733 struct got_object_qid *pid;
2734 struct got_commit_object *commit = NULL;
2735 id = get_selected_commit_id(s->blame.lines,
2736 s->first_displayed_line, s->selected_line);
2739 err = got_object_open_as_commit(&commit, s->repo, id);
2742 pid = SIMPLEQ_FIRST(
2743 got_object_commit_get_parent_ids(commit));
2744 if (view_is_parent_view(view))
2745 begin_x = view_split_begin_x(view->begin_x);
2746 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
2747 if (diff_view == NULL) {
2748 got_object_commit_close(commit);
2749 err = got_error_from_errno();
2752 err = open_diff_view(diff_view, pid ? pid->id : NULL,
2754 got_object_commit_close(commit);
2756 view_close(diff_view);
2759 if (view_is_parent_view(view)) {
2760 err = view_close_child(view);
2763 err = view_set_child(view, diff_view);
2765 view_close(diff_view);
2768 *focus_view = diff_view;
2769 view->child_focussed = 1;
2771 *new_view = diff_view;
2778 if (s->last_displayed_line >= s->blame.nlines &&
2779 s->selected_line < view->nlines - 2) {
2780 s->selected_line = MIN(s->blame.nlines,
2784 if (s->last_displayed_line + view->nlines - 2
2786 s->first_displayed_line +=
2789 s->first_displayed_line =
2794 if (s->selected_line > view->nlines - 2) {
2795 s->selected_line = MIN(s->blame.nlines,
2802 return thread_err ? thread_err : err;
2805 static const struct got_error *
2806 cmd_blame(int argc, char *argv[])
2808 const struct got_error *error;
2809 struct got_repository *repo = NULL;
2810 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2811 struct got_object_id *commit_id = NULL;
2812 char *commit_id_str = NULL;
2814 struct tog_view *view;
2817 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2822 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2825 commit_id_str = optarg;
2828 repo_path = realpath(optarg, NULL);
2829 if (repo_path == NULL)
2830 err(1, "-r option");
2846 cwd = getcwd(NULL, 0);
2848 error = got_error_from_errno();
2851 if (repo_path == NULL) {
2852 repo_path = strdup(cwd);
2853 if (repo_path == NULL) {
2854 error = got_error_from_errno();
2859 error = apply_unveil(repo_path, NULL);
2863 error = got_repo_open(&repo, repo_path);
2867 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2871 if (commit_id_str == NULL) {
2872 struct got_reference *head_ref;
2873 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
2876 error = got_ref_resolve(&commit_id, repo, head_ref);
2877 got_ref_close(head_ref);
2879 error = got_object_resolve_id_str(&commit_id, repo,
2885 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
2887 error = got_error_from_errno();
2890 error = open_blame_view(view, in_repo_path, commit_id, repo);
2893 error = view_loop(view);
2899 got_repo_close(repo);
2903 static const struct got_error *
2904 draw_tree_entries(struct tog_view *view,
2905 struct got_tree_entry **first_displayed_entry,
2906 struct got_tree_entry **last_displayed_entry,
2907 struct got_tree_entry **selected_entry, int *ndisplayed,
2908 const char *label, int show_ids, const char *parent_path,
2909 const struct got_tree_entries *entries, int selected, int limit, int isroot)
2911 const struct got_error *err = NULL;
2912 struct got_tree_entry *te;
2918 werase(view->window);
2923 err = format_line(&wline, &width, label, view->ncols);
2926 if (view_needs_focus_indication(view))
2927 wstandout(view->window);
2928 waddwstr(view->window, wline);
2929 if (view_needs_focus_indication(view))
2930 wstandend(view->window);
2933 if (width < view->ncols)
2934 waddch(view->window, '\n');
2937 err = format_line(&wline, &width, parent_path, view->ncols);
2940 waddwstr(view->window, wline);
2943 if (width < view->ncols)
2944 waddch(view->window, '\n');
2947 waddch(view->window, '\n');
2951 te = SIMPLEQ_FIRST(&entries->head);
2952 if (*first_displayed_entry == NULL) {
2953 if (selected == 0) {
2955 wstandout(view->window);
2956 *selected_entry = NULL;
2958 waddstr(view->window, " ..\n"); /* parent directory */
2959 if (selected == 0 && view->focussed)
2960 wstandend(view->window);
2967 while (te != *first_displayed_entry)
2968 te = SIMPLEQ_NEXT(te, entry);
2972 char *line = NULL, *id_str = NULL;
2975 err = got_object_id_str(&id_str, te->id);
2977 return got_error_from_errno();
2979 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
2980 te->name, S_ISDIR(te->mode) ? "/" : "") == -1) {
2982 return got_error_from_errno();
2985 err = format_line(&wline, &width, line, view->ncols);
2990 if (n == selected) {
2992 wstandout(view->window);
2993 *selected_entry = te;
2995 waddwstr(view->window, wline);
2996 if (width < view->ncols)
2997 waddch(view->window, '\n');
2998 if (n == selected && view->focussed)
2999 wstandend(view->window);
3005 *last_displayed_entry = te;
3008 te = SIMPLEQ_NEXT(te, entry);
3015 tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
3016 const struct got_tree_entries *entries, int isroot)
3018 struct got_tree_entry *te, *prev;
3021 if (*first_displayed_entry == NULL)
3024 te = SIMPLEQ_FIRST(&entries->head);
3025 if (*first_displayed_entry == te) {
3027 *first_displayed_entry = NULL;
3031 /* XXX this is stupid... switch to TAILQ? */
3032 for (i = 0; i < maxscroll; i++) {
3033 while (te != *first_displayed_entry) {
3035 te = SIMPLEQ_NEXT(te, entry);
3037 *first_displayed_entry = prev;
3038 te = SIMPLEQ_FIRST(&entries->head);
3040 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3041 *first_displayed_entry = NULL;
3045 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3046 struct got_tree_entry *last_displayed_entry,
3047 const struct got_tree_entries *entries)
3049 struct got_tree_entry *next, *last;
3052 if (*first_displayed_entry)
3053 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3055 next = SIMPLEQ_FIRST(&entries->head);
3056 last = last_displayed_entry;
3057 while (next && last && n++ < maxscroll) {
3058 last = SIMPLEQ_NEXT(last, entry);
3060 *first_displayed_entry = next;
3061 next = SIMPLEQ_NEXT(next, entry);
3067 static const struct got_error *
3068 tree_entry_path(char **path, struct tog_parent_trees *parents,
3069 struct got_tree_entry *te)
3071 const struct got_error *err = NULL;
3072 struct tog_parent_tree *pt;
3073 size_t len = 2; /* for leading slash and NUL */
3075 TAILQ_FOREACH(pt, parents, entry)
3076 len += strlen(pt->selected_entry->name) + 1 /* slash */;
3078 len += strlen(te->name);
3080 *path = calloc(1, len);
3082 return got_error_from_errno();
3085 pt = TAILQ_LAST(parents, tog_parent_trees);
3087 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3088 err = got_error(GOT_ERR_NO_SPACE);
3091 if (strlcat(*path, "/", len) >= len) {
3092 err = got_error(GOT_ERR_NO_SPACE);
3095 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3098 if (strlcat(*path, te->name, len) >= len) {
3099 err = got_error(GOT_ERR_NO_SPACE);
3111 static const struct got_error *
3112 blame_tree_entry(struct tog_view **new_view, int begin_x,
3113 struct got_tree_entry *te, struct tog_parent_trees *parents,
3114 struct got_object_id *commit_id, struct got_repository *repo)
3116 const struct got_error *err = NULL;
3118 struct tog_view *blame_view;
3120 err = tree_entry_path(&path, parents, te);
3124 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3125 if (blame_view == NULL)
3126 return got_error_from_errno();
3128 err = open_blame_view(blame_view, path, commit_id, repo);
3130 view_close(blame_view);
3133 *new_view = blame_view;
3137 static const struct got_error *
3138 log_tree_entry(struct tog_view **new_view, int begin_x,
3139 struct got_tree_entry *te, struct tog_parent_trees *parents,
3140 struct got_object_id *commit_id, struct got_repository *repo)
3142 struct tog_view *log_view;
3143 const struct got_error *err = NULL;
3146 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3147 if (log_view == NULL)
3148 return got_error_from_errno();
3150 err = tree_entry_path(&path, parents, te);
3154 err = open_log_view(log_view, commit_id, repo, path, 0);
3156 view_close(log_view);
3158 *new_view = log_view;
3163 static const struct got_error *
3164 open_tree_view(struct tog_view *view, struct got_tree_object *root,
3165 struct got_object_id *commit_id, struct got_repository *repo)
3167 const struct got_error *err = NULL;
3168 char *commit_id_str = NULL;
3169 struct tog_tree_view_state *s = &view->state.tree;
3171 TAILQ_INIT(&s->parents);
3173 err = got_object_id_str(&commit_id_str, commit_id);
3177 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3178 err = got_error_from_errno();
3182 s->root = s->tree = root;
3183 s->entries = got_object_tree_get_entries(root);
3184 s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3185 s->commit_id = got_object_id_dup(commit_id);
3186 if (s->commit_id == NULL) {
3187 err = got_error_from_errno();
3192 view->show = show_tree_view;
3193 view->input = input_tree_view;
3194 view->close = close_tree_view;
3196 free(commit_id_str);
3198 free(s->tree_label);
3199 s->tree_label = NULL;
3204 static const struct got_error *
3205 close_tree_view(struct tog_view *view)
3207 struct tog_tree_view_state *s = &view->state.tree;
3209 free(s->tree_label);
3210 s->tree_label = NULL;
3212 s->commit_id = NULL;
3213 while (!TAILQ_EMPTY(&s->parents)) {
3214 struct tog_parent_tree *parent;
3215 parent = TAILQ_FIRST(&s->parents);
3216 TAILQ_REMOVE(&s->parents, parent, entry);
3220 if (s->tree != s->root)
3221 got_object_tree_close(s->tree);
3222 got_object_tree_close(s->root);
3227 static const struct got_error *
3228 show_tree_view(struct tog_view *view)
3230 const struct got_error *err = NULL;
3231 struct tog_tree_view_state *s = &view->state.tree;
3234 err = tree_entry_path(&parent_path, &s->parents, NULL);
3238 err = draw_tree_entries(view, &s->first_displayed_entry,
3239 &s->last_displayed_entry, &s->selected_entry,
3240 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3241 s->entries, s->selected, view->nlines, s->tree == s->root);
3248 static const struct got_error *
3249 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3250 struct tog_view **focus_view, struct tog_view *view, int ch)
3252 const struct got_error *err = NULL;
3253 struct tog_tree_view_state *s = &view->state.tree;
3254 struct tog_view *log_view;
3255 int begin_x = 0, nscrolled;
3259 s->show_ids = !s->show_ids;
3262 if (!s->selected_entry)
3264 if (view_is_parent_view(view))
3265 begin_x = view_split_begin_x(view->begin_x);
3266 err = log_tree_entry(&log_view, begin_x,
3267 s->selected_entry, &s->parents,
3268 s->commit_id, s->repo);
3269 if (view_is_parent_view(view)) {
3270 err = view_close_child(view);
3273 err = view_set_child(view, log_view);
3275 view_close(log_view);
3278 *focus_view = log_view;
3279 view->child_focussed = 1;
3281 *new_view = log_view;
3285 if (s->selected > 0) {
3287 if (s->selected == 0)
3290 if (s->selected > 0)
3292 tree_scroll_up(&s->first_displayed_entry, 1,
3293 s->entries, s->tree == s->root);
3296 tree_scroll_up(&s->first_displayed_entry,
3297 MAX(0, view->nlines - 4 - s->selected), s->entries,
3298 s->tree == s->root);
3300 if (SIMPLEQ_FIRST(&s->entries->head) ==
3301 s->first_displayed_entry && s->tree != s->root)
3302 s->first_displayed_entry = NULL;
3306 if (s->selected < s->ndisplayed - 1) {
3310 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3312 /* can't scroll any further */
3315 tree_scroll_down(&s->first_displayed_entry, 1,
3316 s->last_displayed_entry, s->entries);
3319 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3321 /* can't scroll any further; move cursor down */
3322 if (s->selected < s->ndisplayed - 1)
3323 s->selected = s->ndisplayed - 1;
3326 nscrolled = tree_scroll_down(&s->first_displayed_entry,
3327 view->nlines, s->last_displayed_entry, s->entries);
3328 if (nscrolled < view->nlines) {
3330 struct got_tree_entry *te;
3331 te = s->first_displayed_entry;
3334 te = SIMPLEQ_NEXT(te, entry);
3336 s->selected = ndisplayed - 1;
3341 if (s->selected_entry == NULL) {
3342 struct tog_parent_tree *parent;
3344 /* user selected '..' */
3345 if (s->tree == s->root)
3347 parent = TAILQ_FIRST(&s->parents);
3348 TAILQ_REMOVE(&s->parents, parent,
3350 got_object_tree_close(s->tree);
3351 s->tree = parent->tree;
3353 got_object_tree_get_entries(s->tree);
3354 s->first_displayed_entry =
3355 parent->first_displayed_entry;
3357 parent->selected_entry;
3358 s->selected = parent->selected;
3360 } else if (S_ISDIR(s->selected_entry->mode)) {
3361 struct tog_parent_tree *parent;
3362 struct got_tree_object *child;
3363 err = got_object_open_as_tree(&child,
3364 s->repo, s->selected_entry->id);
3367 parent = calloc(1, sizeof(*parent));
3368 if (parent == NULL) {
3369 err = got_error_from_errno();
3372 parent->tree = s->tree;
3373 parent->first_displayed_entry =
3374 s->first_displayed_entry;
3375 parent->selected_entry = s->selected_entry;
3376 parent->selected = s->selected;
3377 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3380 got_object_tree_get_entries(s->tree);
3382 s->first_displayed_entry = NULL;
3383 } else if (S_ISREG(s->selected_entry->mode)) {
3384 struct tog_view *blame_view;
3385 int begin_x = view_is_parent_view(view) ?
3386 view_split_begin_x(view->begin_x) : 0;
3388 err = blame_tree_entry(&blame_view, begin_x,
3389 s->selected_entry, &s->parents, s->commit_id,
3393 if (view_is_parent_view(view)) {
3394 err = view_close_child(view);
3397 err = view_set_child(view, blame_view);
3399 view_close(blame_view);
3402 *focus_view = blame_view;
3403 view->child_focussed = 1;
3405 *new_view = blame_view;
3409 if (s->selected > view->nlines)
3410 s->selected = s->ndisplayed - 1;
3423 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3428 static const struct got_error *
3429 cmd_tree(int argc, char *argv[])
3431 const struct got_error *error;
3432 struct got_repository *repo = NULL;
3433 char *repo_path = NULL;
3434 struct got_object_id *commit_id = NULL;
3435 char *commit_id_arg = NULL;
3436 struct got_commit_object *commit = NULL;
3437 struct got_tree_object *tree = NULL;
3439 struct tog_view *view;
3442 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3447 while ((ch = getopt(argc, argv, "c:")) != -1) {
3450 commit_id_arg = optarg;
3462 struct got_worktree *worktree;
3463 char *cwd = getcwd(NULL, 0);
3465 return got_error_from_errno();
3466 error = got_worktree_open(&worktree, cwd);
3467 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3472 strdup(got_worktree_get_repo_path(worktree));
3473 got_worktree_close(worktree);
3476 if (repo_path == NULL) {
3477 error = got_error_from_errno();
3480 } else if (argc == 1) {
3481 repo_path = realpath(argv[0], NULL);
3482 if (repo_path == NULL)
3483 return got_error_from_errno();
3487 error = apply_unveil(repo_path, NULL);
3491 error = got_repo_open(&repo, repo_path);
3495 if (commit_id_arg == NULL)
3496 error = get_head_commit_id(&commit_id, repo);
3498 error = got_object_resolve_id_str(&commit_id, repo,
3503 error = got_object_open_as_commit(&commit, repo, commit_id);
3507 error = got_object_open_as_tree(&tree, repo,
3508 got_object_commit_get_tree_id(commit));
3512 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3514 error = got_error_from_errno();
3517 error = open_tree_view(view, tree, commit_id, repo);
3520 error = view_loop(view);
3525 got_object_commit_close(commit);
3527 got_object_tree_close(tree);
3529 got_repo_close(repo);
3538 halfdelay(1); /* Do fast refresh while initial view is loading. */
3541 intrflush(stdscr, FALSE);
3542 keypad(stdscr, TRUE);
3544 signal(SIGWINCH, tog_sigwinch);
3552 fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3553 "Available commands:\n", getprogname());
3554 for (i = 0; i < nitems(tog_commands); i++) {
3555 struct tog_cmd *cmd = &tog_commands[i];
3556 fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3562 make_argv(const char *arg0, const char *arg1)
3565 int argc = (arg1 == NULL ? 1 : 2);
3567 argv = calloc(argc, sizeof(char *));
3570 argv[0] = strdup(arg0);
3571 if (argv[0] == NULL)
3574 argv[1] = strdup(arg1);
3575 if (argv[1] == NULL)
3583 main(int argc, char *argv[])
3585 const struct got_error *error = NULL;
3586 struct tog_cmd *cmd = NULL;
3588 char **cmd_argv = NULL;
3590 setlocale(LC_CTYPE, "");
3592 while ((ch = getopt(argc, argv, "h")) != -1) {
3611 /* Build an argument vector which runs a default command. */
3612 cmd = &tog_commands[0];
3613 cmd_argv = make_argv(cmd->name, NULL);
3618 /* Did the user specific a command? */
3619 for (i = 0; i < nitems(tog_commands); i++) {
3620 if (strncmp(tog_commands[i].name, argv[0],
3621 strlen(argv[0])) == 0) {
3622 cmd = &tog_commands[i];
3624 tog_commands[i].cmd_usage();
3629 /* Did the user specify a repository? */
3630 char *repo_path = realpath(argv[0], NULL);
3632 struct got_repository *repo;
3633 error = got_repo_open(&repo, repo_path);
3635 got_repo_close(repo);
3637 error = got_error_from_errno();
3640 fprintf(stderr, "%s: '%s' is not a "
3641 "known command\n", getprogname(),
3645 fprintf(stderr, "%s: '%s' is neither a known "
3646 "command nor a path to a repository\n",
3647 getprogname(), argv[0]);
3651 cmd = &tog_commands[0];
3652 cmd_argv = make_argv(cmd->name, repo_path);
3660 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3667 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);