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->begin_x > 0;
493 * Erase all content of the view. Can be used to "flash" the view because
494 * the view loop will redraw it quickly, providing a more subtle visual
495 * effect than curs_flash(3) would provide.
498 view_flash(struct tog_view *view)
500 werase(view->window);
511 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
512 cols = 80; /* Default */
518 resize_term(lines, cols);
521 static const struct got_error *
522 view_input(struct tog_view **new, struct tog_view **dead,
523 struct tog_view **focus, int *done, struct tog_view *view,
524 struct tog_view_list_head *views)
526 const struct got_error *err = NULL;
534 nodelay(stdscr, FALSE);
535 /* Allow threads to make progress while we are waiting for input. */
536 errcode = pthread_mutex_unlock(&tog_mutex);
538 return got_error_set_errno(errcode);
539 ch = wgetch(view->window);
540 errcode = pthread_mutex_lock(&tog_mutex);
542 return got_error_set_errno(errcode);
543 nodelay(stdscr, TRUE);
545 if (tog_sigwinch_received) {
547 tog_sigwinch_received = 0;
548 TAILQ_FOREACH(v, views, entry) {
549 err = view_resize(v);
552 err = v->input(new, dead, focus, v, KEY_RESIZE);
563 *focus = view->child;
564 view->child_focussed = 1;
565 } else if (view->parent) {
566 *focus = view->parent;
567 view->parent->child_focussed = 0;
571 err = view->input(new, dead, focus, view, ch);
578 if (view_is_parent_view(view)) {
579 if (view->child == NULL)
581 if (view_is_splitscreen(view->child)) {
582 *focus = view->child;
583 view->child_focussed = 1;
584 err = view_fullscreen(view->child);
586 err = view_splitscreen(view->child);
589 err = view->child->input(new, dead, focus,
590 view->child, KEY_RESIZE);
592 if (view_is_splitscreen(view)) {
594 view->parent->child_focussed = 1;
595 err = view_fullscreen(view);
597 err = view_splitscreen(view);
601 err = view->input(new, dead, focus, view,
608 err = view->input(new, dead, focus, view, ch);
616 view_vborder(struct tog_view *view)
619 struct tog_view *view_above;
622 return view_vborder(view->parent);
624 panel = panel_above(view->panel);
628 view_above = panel_userptr(panel);
629 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
630 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
634 view_needs_focus_indication(struct tog_view *view)
636 if (view_is_parent_view(view)) {
637 if (view->child == NULL || view->child_focussed)
639 if (!view_is_splitscreen(view->child))
641 } else if (!view_is_splitscreen(view))
644 return view->focussed;
647 static const struct got_error *
648 view_loop(struct tog_view *view)
650 const struct got_error *err = NULL;
651 struct tog_view_list_head views;
652 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
653 int fast_refresh = 10;
654 int done = 0, errcode;
656 errcode = pthread_mutex_lock(&tog_mutex);
658 return got_error_set_errno(errcode);
661 TAILQ_INSERT_HEAD(&views, view, entry);
665 err = view->show(view);
670 while (!TAILQ_EMPTY(&views) && !done) {
671 /* Refresh fast during initialization, then become slower. */
672 if (fast_refresh && fast_refresh-- == 0)
673 halfdelay(10); /* switch to once per second */
675 err = view_input(&new_view, &dead_view, &focus_view, &done,
680 struct tog_view *prev = NULL;
682 if (view_is_parent_view(dead_view))
683 prev = TAILQ_PREV(dead_view,
684 tog_view_list_head, entry);
685 else if (view->parent != dead_view)
688 if (dead_view->parent)
689 dead_view->parent->child = NULL;
691 TAILQ_REMOVE(&views, dead_view, entry);
693 err = view_close(dead_view);
694 if (err || dead_view == main_view)
697 if (view == dead_view) {
702 else if (!TAILQ_EMPTY(&views))
703 view = TAILQ_LAST(&views,
708 if (view->child && view->child_focussed)
709 focus_view = view->child;
716 struct tog_view *v, *t;
717 /* Only allow one parent view per type. */
718 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
719 if (v->type != new_view->type)
721 TAILQ_REMOVE(&views, v, entry);
727 TAILQ_INSERT_TAIL(&views, new_view, entry);
729 if (focus_view == NULL)
730 focus_view = new_view;
733 show_panel(focus_view->panel);
736 focus_view->focussed = 1;
739 show_panel(new_view->panel);
740 if (view->child && view_is_splitscreen(view->child))
741 show_panel(view->child->panel);
744 if (focus_view == NULL) {
746 show_panel(view->panel);
747 if (view->child && view_is_splitscreen(view->child))
748 show_panel(view->child->panel);
752 err = view->parent->show(view->parent);
756 err = view->show(view);
760 err = view->child->show(view->child);
769 while (!TAILQ_EMPTY(&views)) {
770 view = TAILQ_FIRST(&views);
771 TAILQ_REMOVE(&views, view, entry);
775 errcode = pthread_mutex_unlock(&tog_mutex);
777 return got_error_set_errno(errcode);
787 "usage: %s log [-c commit] [-r repository-path] [path]\n",
792 /* Create newly allocated wide-character string equivalent to a byte string. */
793 static const struct got_error *
794 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
797 const struct got_error *err = NULL;
800 *wlen = mbstowcs(NULL, s, 0);
801 if (*wlen == (size_t)-1) {
804 return got_error_from_errno();
806 /* byte string invalid in current encoding; try to "fix" it */
807 err = got_mbsavis(&vis, &vislen, s);
810 *wlen = mbstowcs(NULL, vis, 0);
811 if (*wlen == (size_t)-1) {
812 err = got_error_from_errno(); /* give up */
817 *ws = calloc(*wlen + 1, sizeof(*ws));
819 err = got_error_from_errno();
823 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
824 err = got_error_from_errno();
835 /* Format a line for display, ensuring that it won't overflow a width limit. */
836 static const struct got_error *
837 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
839 const struct got_error *err = NULL;
841 wchar_t *wline = NULL;
848 err = mbs2ws(&wline, &wlen, line);
853 while (i < wlen && cols < wlimit) {
854 int width = wcwidth(wline[i]);
861 if (cols + width <= wlimit)
866 if (wline[i] == L'\t')
867 cols += TABSIZE - ((cols + 1) % TABSIZE);
871 err = got_error_from_errno();
886 static const struct got_error*
887 build_refs_str(char **refs_str, struct got_reflist_head *refs,
888 struct got_object_id *id)
890 static const struct got_error *err = NULL;
891 struct got_reflist_entry *re;
897 SIMPLEQ_FOREACH(re, refs, entry) {
898 if (got_object_id_cmp(re->id, id) != 0)
900 name = got_ref_get_name(re->ref);
901 if (strcmp(name, GOT_REF_HEAD) == 0)
903 if (strncmp(name, "refs/", 5) == 0)
905 if (strncmp(name, "got/", 4) == 0)
907 if (strncmp(name, "heads/", 6) == 0)
909 if (strncmp(name, "remotes/", 8) == 0)
912 if (asprintf(refs_str, "%s%s%s", s ? s : "",
913 s ? ", " : "", name) == -1) {
914 err = got_error_from_errno();
925 static const struct got_error *
926 format_author(wchar_t **wauthor, int *author_width, char *author, int limit)
928 char *smallerthan, *at;
930 smallerthan = strchr(author, '<');
931 if (smallerthan && smallerthan[1] != '\0')
932 author = smallerthan + 1;
933 at = strchr(author, '@');
936 return format_line(wauthor, author_width, author, limit);
939 static const struct got_error *
940 draw_commit(struct tog_view *view, struct got_commit_object *commit,
941 struct got_object_id *id, struct got_reflist_head *refs,
942 int author_display_cols)
944 const struct got_error *err = NULL;
945 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
946 char *logmsg0 = NULL, *logmsg = NULL;
948 wchar_t *wlogmsg = NULL, *wauthor = NULL;
949 int author_width, logmsg_width;
950 char *newline, *line = NULL;
952 static const size_t date_display_cols = 9;
953 const int avail = view->ncols;
955 time_t committer_time;
957 committer_time = got_object_commit_get_committer_time(commit);
958 if (localtime_r(&committer_time, &tm) == NULL)
959 return got_error_from_errno();
960 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
962 return got_error(GOT_ERR_NO_SPACE);
964 if (avail < date_display_cols)
965 limit = MIN(sizeof(datebuf) - 1, avail);
967 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
968 waddnstr(view->window, datebuf, limit);
973 author = strdup(got_object_commit_get_author(commit));
974 if (author == NULL) {
975 err = got_error_from_errno();
978 err = format_author(&wauthor, &author_width, author, avail - col);
981 waddwstr(view->window, wauthor);
983 while (col <= avail && author_width < author_display_cols + 2) {
984 waddch(view->window, ' ');
991 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
992 if (logmsg0 == NULL) {
993 err = got_error_from_errno();
997 while (*logmsg == '\n')
999 newline = strchr(logmsg, '\n');
1002 limit = avail - col;
1003 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
1006 waddwstr(view->window, wlogmsg);
1007 col += logmsg_width;
1008 while (col <= avail) {
1009 waddch(view->window, ' ');
1021 static struct commit_queue_entry *
1022 alloc_commit_queue_entry(struct got_commit_object *commit,
1023 struct got_object_id *id)
1025 struct commit_queue_entry *entry;
1027 entry = calloc(1, sizeof(*entry));
1032 entry->commit = commit;
1037 pop_commit(struct commit_queue *commits)
1039 struct commit_queue_entry *entry;
1041 entry = TAILQ_FIRST(&commits->head);
1042 TAILQ_REMOVE(&commits->head, entry, entry);
1043 got_object_commit_close(entry->commit);
1044 commits->ncommits--;
1045 /* Don't free entry->id! It is owned by the commit graph. */
1050 free_commits(struct commit_queue *commits)
1052 while (!TAILQ_EMPTY(&commits->head))
1053 pop_commit(commits);
1056 static const struct got_error *
1057 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1058 int minqueue, struct got_repository *repo, const char *path)
1060 const struct got_error *err = NULL;
1064 * We keep all commits open throughout the lifetime of the log
1065 * view in order to avoid having to re-fetch commits from disk
1066 * while updating the display.
1068 while (nqueued < minqueue) {
1069 struct got_object_id *id;
1070 struct got_commit_object *commit;
1071 struct commit_queue_entry *entry;
1074 err = got_commit_graph_iter_next(&id, graph);
1076 if (err->code != GOT_ERR_ITER_NEED_MORE)
1078 err = got_commit_graph_fetch_commits(graph,
1088 err = got_object_open_as_commit(&commit, repo, id);
1091 entry = alloc_commit_queue_entry(commit, id);
1092 if (entry == NULL) {
1093 err = got_error_from_errno();
1097 errcode = pthread_mutex_lock(&tog_mutex);
1099 err = got_error_set_errno(errcode);
1103 entry->idx = commits->ncommits;
1104 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1106 commits->ncommits++;
1108 errcode = pthread_mutex_unlock(&tog_mutex);
1109 if (errcode && err == NULL)
1110 err = got_error_set_errno(errcode);
1116 static const struct got_error *
1117 get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1119 const struct got_error *err = NULL;
1120 struct got_reference *head_ref;
1124 err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1128 err = got_ref_resolve(head_id, repo, head_ref);
1129 got_ref_close(head_ref);
1138 static const struct got_error *
1139 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1140 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1141 struct commit_queue *commits, int selected_idx, int limit,
1142 struct got_reflist_head *refs, const char *path, int commits_needed)
1144 const struct got_error *err = NULL;
1145 struct commit_queue_entry *entry;
1146 int ncommits, width;
1147 int author_cols = 10;
1148 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1149 char *refs_str = NULL;
1155 if (ncommits == selected_idx) {
1159 entry = TAILQ_NEXT(entry, entry);
1164 err = got_object_id_str(&id_str, (*selected)->id);
1168 err = build_refs_str(&refs_str, refs, (*selected)->id);
1174 if (commits_needed == 0)
1175 halfdelay(10); /* disable fast refresh */
1177 if (asprintf(&ncommits_str, " [%d/%d] %s",
1178 entry ? entry->idx + 1 : 0, commits->ncommits,
1179 commits_needed > 0 ? "loading... " :
1180 (refs_str ? refs_str : "")) == -1) {
1181 err = got_error_from_errno();
1185 if (path && strcmp(path, "/") != 0) {
1186 if (asprintf(&header, "commit %s %s%s",
1187 id_str ? id_str : "........................................",
1188 path, ncommits_str) == -1) {
1189 err = got_error_from_errno();
1193 } else if (asprintf(&header, "commit %s%s",
1194 id_str ? id_str : "........................................",
1195 ncommits_str) == -1) {
1196 err = got_error_from_errno();
1200 err = format_line(&wline, &width, header, view->ncols);
1204 werase(view->window);
1206 if (view_needs_focus_indication(view))
1207 wstandout(view->window);
1208 waddwstr(view->window, wline);
1209 while (width < view->ncols) {
1210 waddch(view->window, ' ');
1213 if (view_needs_focus_indication(view))
1214 wstandend(view->window);
1219 /* Grow author column size if necessary. */
1226 if (ncommits >= limit - 1)
1228 author = strdup(got_object_commit_get_author(entry->commit));
1229 if (author == NULL) {
1230 err = got_error_from_errno();
1233 err = format_author(&wauthor, &width, author, COLS);
1234 if (author_cols < width)
1235 author_cols = width;
1238 entry = TAILQ_NEXT(entry, entry);
1245 if (ncommits >= limit - 1)
1247 if (ncommits == selected_idx)
1248 wstandout(view->window);
1249 err = draw_commit(view, entry->commit, entry->id, refs,
1251 if (ncommits == selected_idx)
1252 wstandend(view->window);
1257 entry = TAILQ_NEXT(entry, entry);
1270 scroll_up(struct tog_view *view,
1271 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1272 struct commit_queue *commits)
1274 struct commit_queue_entry *entry;
1277 entry = TAILQ_FIRST(&commits->head);
1278 if (*first_displayed_entry == entry) {
1283 entry = *first_displayed_entry;
1284 while (entry && nscrolled < maxscroll) {
1285 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1287 *first_displayed_entry = entry;
1293 static const struct got_error *
1294 trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1295 pthread_cond_t *need_commits)
1300 halfdelay(1); /* fast refresh while loading commits */
1302 while (*commits_needed > 0) {
1306 /* Wake the log thread. */
1307 errcode = pthread_cond_signal(need_commits);
1309 return got_error_set_errno(errcode);
1310 errcode = pthread_mutex_unlock(&tog_mutex);
1312 return got_error_set_errno(errcode);
1314 errcode = pthread_mutex_lock(&tog_mutex);
1316 return got_error_set_errno(errcode);
1318 if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1320 * Thread is not done yet; lose a key press
1321 * and let the user retry... this way the GUI
1322 * remains interactive while logging deep paths
1323 * with few commits in history.
1332 static const struct got_error *
1333 scroll_down(struct tog_view *view,
1334 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1335 struct commit_queue_entry **last_displayed_entry,
1336 struct commit_queue *commits, int *log_complete, int *commits_needed,
1337 pthread_cond_t *need_commits)
1339 const struct got_error *err = NULL;
1340 struct commit_queue_entry *pentry;
1343 if (*last_displayed_entry == NULL)
1346 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1347 if (pentry == NULL && !*log_complete) {
1349 * Ask the log thread for required amount of commits
1350 * plus some amount of pre-fetching.
1352 (*commits_needed) += maxscroll + 20;
1353 err = trigger_log_thread(0, commits_needed, log_complete,
1360 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1361 if (pentry == NULL) {
1367 *last_displayed_entry = pentry;
1369 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1372 *first_displayed_entry = pentry;
1373 } while (++nscrolled < maxscroll);
1378 static const struct got_error *
1379 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1380 struct got_commit_object *commit, struct got_object_id *commit_id,
1381 struct tog_view *log_view, struct got_reflist_head *refs,
1382 struct got_repository *repo)
1384 const struct got_error *err;
1385 struct got_object_qid *parent_id;
1386 struct tog_view *diff_view;
1388 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1389 if (diff_view == NULL)
1390 return got_error_from_errno();
1392 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1393 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1394 commit_id, log_view, refs, repo);
1396 *new_view = diff_view;
1400 static const struct got_error *
1401 browse_commit(struct tog_view **new_view, int begin_x,
1402 struct commit_queue_entry *entry, struct got_reflist_head *refs,
1403 struct got_repository *repo)
1405 const struct got_error *err = NULL;
1406 struct got_tree_object *tree;
1407 struct tog_view *tree_view;
1409 err = got_object_open_as_tree(&tree, repo,
1410 got_object_commit_get_tree_id(entry->commit));
1414 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1415 if (tree_view == NULL)
1416 return got_error_from_errno();
1418 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1420 got_object_tree_close(tree);
1422 *new_view = tree_view;
1427 log_thread(void *arg)
1429 const struct got_error *err = NULL;
1431 struct tog_log_thread_args *a = arg;
1434 err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1438 while (!done && !err) {
1439 err = queue_commits(a->graph, a->commits, 1, a->repo,
1442 if (err->code != GOT_ERR_ITER_COMPLETED)
1446 } else if (a->commits_needed > 0)
1447 a->commits_needed--;
1449 errcode = pthread_mutex_lock(&tog_mutex);
1451 err = got_error_set_errno(errcode);
1453 } else if (*a->quit)
1455 else if (*a->first_displayed_entry == NULL) {
1456 *a->first_displayed_entry =
1457 TAILQ_FIRST(&a->commits->head);
1458 *a->selected_entry = *a->first_displayed_entry;
1462 a->commits_needed = 0;
1463 else if (a->commits_needed == 0) {
1464 errcode = pthread_cond_wait(&a->need_commits,
1467 err = got_error_set_errno(errcode);
1470 errcode = pthread_mutex_unlock(&tog_mutex);
1471 if (errcode && err == NULL)
1472 err = got_error_set_errno(errcode);
1474 a->log_complete = 1;
1478 static const struct got_error *
1479 stop_log_thread(struct tog_log_view_state *s)
1481 const struct got_error *err = NULL;
1486 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1488 return got_error_set_errno(errcode);
1489 errcode = pthread_mutex_unlock(&tog_mutex);
1491 return got_error_set_errno(errcode);
1492 errcode = pthread_join(s->thread, (void **)&err);
1494 return got_error_set_errno(errcode);
1495 errcode = pthread_mutex_lock(&tog_mutex);
1497 return got_error_set_errno(errcode);
1501 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1502 if (errcode && err == NULL)
1503 err = got_error_set_errno(errcode);
1505 if (s->thread_args.repo) {
1506 got_repo_close(s->thread_args.repo);
1507 s->thread_args.repo = NULL;
1510 if (s->thread_args.graph) {
1511 got_commit_graph_close(s->thread_args.graph);
1512 s->thread_args.graph = NULL;
1518 static const struct got_error *
1519 close_log_view(struct tog_view *view)
1521 const struct got_error *err = NULL;
1522 struct tog_log_view_state *s = &view->state.log;
1524 err = stop_log_thread(s);
1525 free_commits(&s->commits);
1526 free(s->in_repo_path);
1527 s->in_repo_path = NULL;
1533 static const struct got_error *
1534 open_log_view(struct tog_view *view, struct got_object_id *start_id,
1535 struct got_reflist_head *refs, struct got_repository *repo,
1536 const char *path, int check_disk)
1538 const struct got_error *err = NULL;
1539 struct tog_log_view_state *s = &view->state.log;
1540 struct got_repository *thread_repo = NULL;
1541 struct got_commit_graph *thread_graph = NULL;
1544 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1548 /* The commit queue only contains commits being displayed. */
1549 TAILQ_INIT(&s->commits.head);
1550 s->commits.ncommits = 0;
1554 s->start_id = got_object_id_dup(start_id);
1555 if (s->start_id == NULL) {
1556 err = got_error_from_errno();
1560 view->show = show_log_view;
1561 view->input = input_log_view;
1562 view->close = close_log_view;
1564 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1567 err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1572 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1574 err = got_error_set_errno(errcode);
1578 s->thread_args.commits_needed = view->nlines;
1579 s->thread_args.graph = thread_graph;
1580 s->thread_args.commits = &s->commits;
1581 s->thread_args.in_repo_path = s->in_repo_path;
1582 s->thread_args.start_id = s->start_id;
1583 s->thread_args.repo = thread_repo;
1584 s->thread_args.log_complete = 0;
1585 s->thread_args.quit = &s->quit;
1586 s->thread_args.view = view;
1587 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1588 s->thread_args.selected_entry = &s->selected_entry;
1591 close_log_view(view);
1595 static const struct got_error *
1596 show_log_view(struct tog_view *view)
1598 struct tog_log_view_state *s = &view->state.log;
1600 if (s->thread == NULL) {
1601 int errcode = pthread_create(&s->thread, NULL, log_thread,
1604 return got_error_set_errno(errcode);
1607 return draw_commits(view, &s->last_displayed_entry,
1608 &s->selected_entry, s->first_displayed_entry,
1609 &s->commits, s->selected, view->nlines, s->refs,
1610 s->in_repo_path, s->thread_args.commits_needed);
1613 static const struct got_error *
1614 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1615 struct tog_view **focus_view, struct tog_view *view, int ch)
1617 const struct got_error *err = NULL;
1618 struct tog_log_view_state *s = &view->state.log;
1620 struct tog_view *diff_view = NULL, *tree_view = NULL;
1631 if (s->first_displayed_entry == NULL)
1633 if (s->selected > 0)
1635 if (s->selected > 0)
1637 scroll_up(view, &s->first_displayed_entry, 1,
1641 if (s->first_displayed_entry == NULL)
1643 if (TAILQ_FIRST(&s->commits.head) ==
1644 s->first_displayed_entry) {
1645 if (s->selected == 0) {
1652 scroll_up(view, &s->first_displayed_entry,
1653 view->nlines, &s->commits);
1659 if (s->first_displayed_entry == NULL)
1661 if (s->selected < MIN(view->nlines - 2,
1662 s->commits.ncommits - 1)) {
1666 err = scroll_down(view, &s->first_displayed_entry, 1,
1667 &s->last_displayed_entry, &s->commits,
1668 &s->thread_args.log_complete,
1669 &s->thread_args.commits_needed,
1670 &s->thread_args.need_commits);
1673 struct commit_queue_entry *first;
1674 first = s->first_displayed_entry;
1677 err = scroll_down(view, &s->first_displayed_entry,
1678 view->nlines, &s->last_displayed_entry,
1679 &s->commits, &s->thread_args.log_complete,
1680 &s->thread_args.commits_needed,
1681 &s->thread_args.need_commits);
1682 if (first == s->first_displayed_entry &&
1683 s->selected < MIN(view->nlines - 2,
1684 s->commits.ncommits - 1)) {
1685 /* can't scroll further down */
1686 s->selected = MIN(view->nlines - 2,
1687 s->commits.ncommits - 1);
1693 if (s->selected > view->nlines - 2)
1694 s->selected = view->nlines - 2;
1695 if (s->selected > s->commits.ncommits - 1)
1696 s->selected = s->commits.ncommits - 1;
1700 if (s->selected_entry == NULL)
1702 if (view_is_parent_view(view))
1703 begin_x = view_split_begin_x(view->begin_x);
1704 err = open_diff_view_for_commit(&diff_view, begin_x,
1705 s->selected_entry->commit, s->selected_entry->id,
1706 view, s->refs, s->repo);
1709 if (view_is_parent_view(view)) {
1710 err = view_close_child(view);
1713 err = view_set_child(view, diff_view);
1715 view_close(diff_view);
1718 *focus_view = diff_view;
1719 view->child_focussed = 1;
1721 *new_view = diff_view;
1724 if (s->selected_entry == NULL)
1726 if (view_is_parent_view(view))
1727 begin_x = view_split_begin_x(view->begin_x);
1728 err = browse_commit(&tree_view, begin_x,
1729 s->selected_entry, s->refs, s->repo);
1732 if (view_is_parent_view(view)) {
1733 err = view_close_child(view);
1736 err = view_set_child(view, tree_view);
1738 view_close(tree_view);
1741 *focus_view = tree_view;
1742 view->child_focussed = 1;
1744 *new_view = tree_view;
1747 if (strcmp(s->in_repo_path, "/") == 0)
1749 parent_path = dirname(s->in_repo_path);
1750 if (parent_path && strcmp(parent_path, ".") != 0) {
1751 struct tog_view *lv;
1752 err = stop_log_thread(s);
1755 lv = view_open(view->nlines, view->ncols,
1756 view->begin_y, view->begin_x, TOG_VIEW_LOG);
1758 return got_error_from_errno();
1759 err = open_log_view(lv, s->start_id, s->refs,
1760 s->repo, parent_path, 0);
1763 if (view_is_parent_view(view))
1766 view_set_child(view->parent, lv);
1779 static const struct got_error *
1780 apply_unveil(const char *repo_path, const char *worktree_path)
1782 const struct got_error *error;
1784 if (repo_path && unveil(repo_path, "r") != 0)
1785 return got_error_from_errno();
1787 if (worktree_path && unveil(worktree_path, "rwc") != 0)
1788 return got_error_from_errno();
1790 if (unveil("/tmp", "rwc") != 0)
1791 return got_error_from_errno();
1793 error = got_privsep_unveil_exec_helpers();
1797 if (unveil(NULL, NULL) != 0)
1798 return got_error_from_errno();
1808 halfdelay(1); /* Do fast refresh while initial view is loading. */
1811 intrflush(stdscr, FALSE);
1812 keypad(stdscr, TRUE);
1814 signal(SIGWINCH, tog_sigwinch);
1817 static const struct got_error *
1818 cmd_log(int argc, char *argv[])
1820 const struct got_error *error;
1821 struct got_repository *repo = NULL;
1822 struct got_worktree *worktree = NULL;
1823 struct got_reflist_head refs;
1824 struct got_object_id *start_id = NULL;
1825 char *path = NULL, *repo_path = NULL, *cwd = NULL;
1826 char *start_commit = NULL;
1828 struct tog_view *view;
1830 SIMPLEQ_INIT(&refs);
1833 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1838 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1841 start_commit = optarg;
1844 repo_path = realpath(optarg, NULL);
1845 if (repo_path == NULL)
1846 err(1, "-r option");
1857 cwd = getcwd(NULL, 0);
1859 error = got_error_from_errno();
1862 error = got_worktree_open(&worktree, cwd);
1863 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1870 error = got_error_from_errno();
1873 } else if (argc == 1) {
1875 error = got_worktree_resolve_path(&path, worktree,
1880 path = strdup(argv[0]);
1882 error = got_error_from_errno();
1889 repo_path = worktree ?
1890 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1891 if (repo_path == NULL) {
1892 error = got_error_from_errno();
1898 error = got_repo_open(&repo, repo_path);
1902 error = apply_unveil(got_repo_get_path(repo),
1903 worktree ? got_worktree_get_root_path(worktree) : NULL);
1907 if (start_commit == NULL)
1908 error = get_head_commit_id(&start_id, repo);
1910 error = got_object_resolve_id_str(&start_id, repo,
1915 error = got_ref_list(&refs, repo);
1919 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1921 error = got_error_from_errno();
1924 error = open_log_view(view, start_id, &refs, repo, path, 1);
1927 error = view_loop(view);
1934 got_repo_close(repo);
1936 got_worktree_close(worktree);
1937 got_ref_list_free(&refs);
1945 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1951 parse_next_line(FILE *f, size_t *len)
1956 const char delim[3] = { '\0', '\0', '\0'};
1958 line = fparseln(f, &linelen, &lineno, delim, 0);
1964 static const struct got_error *
1965 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1966 int *last_displayed_line, int *eof, int max_lines,
1969 const struct got_error *err;
1970 int nlines = 0, nprinted = 0;
1977 werase(view->window);
1980 err = format_line(&wline, &width, header, view->ncols);
1985 if (view_needs_focus_indication(view))
1986 wstandout(view->window);
1987 waddwstr(view->window, wline);
1988 if (view_needs_focus_indication(view))
1989 wstandend(view->window);
1990 if (width < view->ncols)
1991 waddch(view->window, '\n');
1999 while (nprinted < max_lines) {
2000 line = parse_next_line(f, &len);
2005 if (++nlines < *first_displayed_line) {
2010 err = format_line(&wline, &width, line, view->ncols);
2015 waddwstr(view->window, wline);
2016 if (width < view->ncols)
2017 waddch(view->window, '\n');
2018 if (++nprinted == 1)
2019 *first_displayed_line = nlines;
2024 *last_displayed_line = nlines;
2032 get_datestr(time_t *time, char *datebuf)
2034 char *p, *s = ctime_r(time, datebuf);
2035 p = strchr(s, '\n');
2041 static const struct got_error *
2042 write_commit_info(struct got_object_id *commit_id,
2043 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2045 const struct got_error *err = NULL;
2047 struct got_commit_object *commit;
2048 char *id_str = NULL;
2049 time_t committer_time;
2050 const char *author, *committer;
2051 char *refs_str = NULL;
2054 err = build_refs_str(&refs_str, refs, commit_id);
2059 err = got_object_open_as_commit(&commit, repo, commit_id);
2063 err = got_object_id_str(&id_str, commit_id);
2065 err = got_error_from_errno();
2069 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2070 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2071 err = got_error_from_errno();
2074 if (fprintf(outfile, "from: %s\n",
2075 got_object_commit_get_author(commit)) < 0) {
2076 err = got_error_from_errno();
2079 committer_time = got_object_commit_get_committer_time(commit);
2080 if (fprintf(outfile, "date: %s UTC\n",
2081 get_datestr(&committer_time, datebuf)) < 0) {
2082 err = got_error_from_errno();
2085 author = got_object_commit_get_author(commit);
2086 committer = got_object_commit_get_committer(commit);
2087 if (strcmp(author, committer) != 0 &&
2088 fprintf(outfile, "via: %s\n", committer) < 0) {
2089 err = got_error_from_errno();
2092 if (fprintf(outfile, "%s\n",
2093 got_object_commit_get_logmsg(commit)) < 0) {
2094 err = got_error_from_errno();
2100 got_object_commit_close(commit);
2104 static const struct got_error *
2105 create_diff(struct tog_diff_view_state *s)
2107 const struct got_error *err = NULL;
2113 err = got_error_from_errno();
2116 if (s->f && fclose(s->f) != 0) {
2117 err = got_error_from_errno();
2123 err = got_object_get_type(&obj_type, s->repo, s->id1);
2125 err = got_object_get_type(&obj_type, s->repo, s->id2);
2130 case GOT_OBJ_TYPE_BLOB:
2131 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2132 s->diff_context, s->repo, f);
2134 case GOT_OBJ_TYPE_TREE:
2135 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2136 s->diff_context, s->repo, f);
2138 case GOT_OBJ_TYPE_COMMIT: {
2139 const struct got_object_id_queue *parent_ids;
2140 struct got_object_qid *pid;
2141 struct got_commit_object *commit2;
2143 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2146 /* Show commit info if we're diffing to a parent/root commit. */
2148 write_commit_info(s->id2, s->refs, s->repo, f);
2150 parent_ids = got_object_commit_get_parent_ids(commit2);
2151 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2152 if (got_object_id_cmp(s->id1, pid->id) == 0) {
2153 write_commit_info(s->id2, s->refs,
2159 got_object_commit_close(commit2);
2161 err = got_diff_objects_as_commits(s->id1, s->id2,
2162 s->diff_context, s->repo, f);
2166 err = got_error(GOT_ERR_OBJ_TYPE);
2170 if (f && fflush(f) != 0 && err == NULL)
2171 err = got_error_from_errno();
2176 diff_view_indicate_progress(struct tog_view *view)
2178 werase(view->window);
2179 waddstr(view->window, "diffing...");
2184 static const struct got_error *
2185 open_diff_view(struct tog_view *view, struct got_object_id *id1,
2186 struct got_object_id *id2, struct tog_view *log_view,
2187 struct got_reflist_head *refs, struct got_repository *repo)
2189 const struct got_error *err;
2191 if (id1 != NULL && id2 != NULL) {
2193 err = got_object_get_type(&type1, repo, id1);
2196 err = got_object_get_type(&type2, repo, id2);
2201 return got_error(GOT_ERR_OBJ_TYPE);
2205 view->state.diff.id1 = got_object_id_dup(id1);
2206 if (view->state.diff.id1 == NULL)
2207 return got_error_from_errno();
2209 view->state.diff.id1 = NULL;
2211 view->state.diff.id2 = got_object_id_dup(id2);
2212 if (view->state.diff.id2 == NULL) {
2213 free(view->state.diff.id1);
2214 view->state.diff.id1 = NULL;
2215 return got_error_from_errno();
2217 view->state.diff.f = NULL;
2218 view->state.diff.first_displayed_line = 1;
2219 view->state.diff.last_displayed_line = view->nlines;
2220 view->state.diff.diff_context = 3;
2221 view->state.diff.log_view = log_view;
2222 view->state.diff.repo = repo;
2223 view->state.diff.refs = refs;
2225 if (log_view && view_is_splitscreen(view))
2226 show_log_view(log_view); /* draw vborder */
2227 diff_view_indicate_progress(view);
2229 err = create_diff(&view->state.diff);
2231 free(view->state.diff.id1);
2232 view->state.diff.id1 = NULL;
2233 free(view->state.diff.id2);
2234 view->state.diff.id2 = NULL;
2238 view->show = show_diff_view;
2239 view->input = input_diff_view;
2240 view->close = close_diff_view;
2245 static const struct got_error *
2246 close_diff_view(struct tog_view *view)
2248 const struct got_error *err = NULL;
2250 free(view->state.diff.id1);
2251 view->state.diff.id1 = NULL;
2252 free(view->state.diff.id2);
2253 view->state.diff.id2 = NULL;
2254 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2255 err = got_error_from_errno();
2259 static const struct got_error *
2260 show_diff_view(struct tog_view *view)
2262 const struct got_error *err;
2263 struct tog_diff_view_state *s = &view->state.diff;
2264 char *id_str1 = NULL, *id_str2, *header;
2267 err = got_object_id_str(&id_str1, s->id1);
2271 err = got_object_id_str(&id_str2, s->id2);
2275 if (asprintf(&header, "diff %s %s",
2276 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2277 err = got_error_from_errno();
2285 return draw_file(view, s->f, &s->first_displayed_line,
2286 &s->last_displayed_line, &s->eof, view->nlines,
2290 static const struct got_error *
2291 set_selected_commit(struct tog_diff_view_state *s,
2292 struct commit_queue_entry *entry)
2294 const struct got_error *err;
2295 const struct got_object_id_queue *parent_ids;
2296 struct got_commit_object *selected_commit;
2297 struct got_object_qid *pid;
2300 s->id2 = got_object_id_dup(entry->id);
2302 return got_error_from_errno();
2304 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2307 parent_ids = got_object_commit_get_parent_ids(selected_commit);
2309 pid = SIMPLEQ_FIRST(parent_ids);
2310 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2311 got_object_commit_close(selected_commit);
2315 static const struct got_error *
2316 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2317 struct tog_view **focus_view, struct tog_view *view, int ch)
2319 const struct got_error *err = NULL;
2320 struct tog_diff_view_state *s = &view->state.diff;
2321 struct tog_log_view_state *ls;
2322 struct commit_queue_entry *entry;
2328 if (s->first_displayed_line > 1)
2329 s->first_displayed_line--;
2334 if (s->first_displayed_line == 1) {
2339 while (i++ < view->nlines - 1 &&
2340 s->first_displayed_line > 1)
2341 s->first_displayed_line--;
2346 s->first_displayed_line++;
2357 while (!s->eof && i++ < view->nlines - 1) {
2359 line = parse_next_line(s->f, NULL);
2360 s->first_displayed_line++;
2366 if (s->diff_context > 0) {
2368 diff_view_indicate_progress(view);
2369 err = create_diff(s);
2373 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2375 diff_view_indicate_progress(view);
2376 err = create_diff(s);
2381 if (s->log_view == NULL)
2383 ls = &s->log_view->state.log;
2384 entry = TAILQ_PREV(ls->selected_entry,
2385 commit_queue_head, entry);
2389 err = input_log_view(NULL, NULL, NULL, s->log_view,
2394 err = set_selected_commit(s, entry);
2398 s->first_displayed_line = 1;
2399 s->last_displayed_line = view->nlines;
2401 diff_view_indicate_progress(view);
2402 err = create_diff(s);
2406 if (s->log_view == NULL)
2408 ls = &s->log_view->state.log;
2410 if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2411 ls->thread_args.commits_needed++;
2413 /* Display "loading..." in log view. */
2414 show_log_view(s->log_view);
2418 err = trigger_log_thread(1 /* load_all */,
2419 &ls->thread_args.commits_needed,
2420 &ls->thread_args.log_complete,
2421 &ls->thread_args.need_commits);
2425 err = input_log_view(NULL, NULL, NULL, s->log_view,
2430 entry = TAILQ_NEXT(ls->selected_entry, entry);
2434 err = set_selected_commit(s, entry);
2438 s->first_displayed_line = 1;
2439 s->last_displayed_line = view->nlines;
2441 diff_view_indicate_progress(view);
2442 err = create_diff(s);
2451 static const struct got_error *
2452 cmd_diff(int argc, char *argv[])
2454 const struct got_error *error = NULL;
2455 struct got_repository *repo = NULL;
2456 struct got_reflist_head refs;
2457 struct got_object_id *id1 = NULL, *id2 = NULL;
2458 char *repo_path = NULL;
2459 char *id_str1 = NULL, *id_str2 = NULL;
2461 struct tog_view *view;
2463 SIMPLEQ_INIT(&refs);
2466 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2471 while ((ch = getopt(argc, argv, "")) != -1) {
2483 usage_diff(); /* TODO show local worktree changes */
2484 } else if (argc == 2) {
2485 repo_path = getcwd(NULL, 0);
2486 if (repo_path == NULL)
2487 return got_error_from_errno();
2490 } else if (argc == 3) {
2491 repo_path = realpath(argv[0], NULL);
2492 if (repo_path == NULL)
2493 return got_error_from_errno();
2501 error = got_repo_open(&repo, repo_path);
2505 error = apply_unveil(got_repo_get_path(repo), NULL);
2509 error = got_object_resolve_id_str(&id1, repo, id_str1);
2513 error = got_object_resolve_id_str(&id2, repo, id_str2);
2517 error = got_ref_list(&refs, repo);
2521 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2523 error = got_error_from_errno();
2526 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2529 error = view_loop(view);
2532 got_repo_close(repo);
2533 got_ref_list_free(&refs);
2541 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2546 struct tog_blame_line {
2548 struct got_object_id *id;
2551 static const struct got_error *
2552 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2553 const char *path, struct tog_blame_line *lines, int nlines,
2554 int blame_complete, int selected_line, int *first_displayed_line,
2555 int *last_displayed_line, int *eof, int max_lines)
2557 const struct got_error *err;
2558 int lineno = 0, nprinted = 0;
2563 struct tog_blame_line *blame_line;
2564 struct got_object_id *prev_id = NULL;
2567 err = got_object_id_str(&id_str, id);
2572 werase(view->window);
2574 if (asprintf(&line, "commit %s", id_str) == -1) {
2575 err = got_error_from_errno();
2580 err = format_line(&wline, &width, line, view->ncols);
2583 if (view_needs_focus_indication(view))
2584 wstandout(view->window);
2585 waddwstr(view->window, wline);
2586 if (view_needs_focus_indication(view))
2587 wstandend(view->window);
2590 if (width < view->ncols)
2591 waddch(view->window, '\n');
2593 if (asprintf(&line, "[%d/%d] %s%s",
2594 *first_displayed_line - 1 + selected_line, nlines,
2595 blame_complete ? "" : "annotating... ", path) == -1) {
2597 return got_error_from_errno();
2600 err = format_line(&wline, &width, line, view->ncols);
2605 waddwstr(view->window, wline);
2608 if (width < view->ncols)
2609 waddch(view->window, '\n');
2612 while (nprinted < max_lines - 2) {
2613 line = parse_next_line(f, &len);
2618 if (++lineno < *first_displayed_line) {
2623 wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2624 err = format_line(&wline, &width, line, wlimit);
2630 if (view->focussed && nprinted == selected_line - 1)
2631 wstandout(view->window);
2633 blame_line = &lines[lineno - 1];
2634 if (blame_line->annotated && prev_id &&
2635 got_object_id_cmp(prev_id, blame_line->id) == 0)
2636 waddstr(view->window, " ");
2637 else if (blame_line->annotated) {
2639 err = got_object_id_str(&id_str, blame_line->id);
2645 wprintw(view->window, "%.8s ", id_str);
2647 prev_id = blame_line->id;
2649 waddstr(view->window, "........ ");
2653 waddwstr(view->window, wline);
2654 while (width < wlimit) {
2655 waddch(view->window, ' ');
2658 if (view->focussed && nprinted == selected_line - 1)
2659 wstandend(view->window);
2660 if (++nprinted == 1)
2661 *first_displayed_line = lineno;
2666 *last_displayed_line = lineno;
2673 static const struct got_error *
2674 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2676 const struct got_error *err = NULL;
2677 struct tog_blame_cb_args *a = arg;
2678 struct tog_blame_line *line;
2681 if (nlines != a->nlines ||
2682 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2683 return got_error(GOT_ERR_RANGE);
2685 errcode = pthread_mutex_lock(&tog_mutex);
2687 return got_error_set_errno(errcode);
2689 if (*a->quit) { /* user has quit the blame view */
2690 err = got_error(GOT_ERR_ITER_COMPLETED);
2695 goto done; /* no change in this commit */
2697 line = &a->lines[lineno - 1];
2698 if (line->annotated)
2701 line->id = got_object_id_dup(id);
2702 if (line->id == NULL) {
2703 err = got_error_from_errno();
2706 line->annotated = 1;
2708 errcode = pthread_mutex_unlock(&tog_mutex);
2710 err = got_error_set_errno(errcode);
2715 blame_thread(void *arg)
2717 const struct got_error *err;
2718 struct tog_blame_thread_args *ta = arg;
2719 struct tog_blame_cb_args *a = ta->cb_args;
2722 err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2723 blame_cb, ta->cb_args);
2725 errcode = pthread_mutex_lock(&tog_mutex);
2727 return (void *)got_error_set_errno(errcode);
2729 got_repo_close(ta->repo);
2733 errcode = pthread_mutex_unlock(&tog_mutex);
2734 if (errcode && err == NULL)
2735 err = got_error_set_errno(errcode);
2740 static struct got_object_id *
2741 get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2744 struct tog_blame_line *line;
2746 line = &lines[first_displayed_line - 1 + selected_line - 1];
2747 if (!line->annotated)
2753 static const struct got_error *
2754 stop_blame(struct tog_blame *blame)
2756 const struct got_error *err = NULL;
2759 if (blame->thread) {
2761 errcode = pthread_mutex_unlock(&tog_mutex);
2763 return got_error_set_errno(errcode);
2764 errcode = pthread_join(blame->thread, (void **)&err);
2766 return got_error_set_errno(errcode);
2767 errcode = pthread_mutex_lock(&tog_mutex);
2769 return got_error_set_errno(errcode);
2770 if (err && err->code == GOT_ERR_ITER_COMPLETED)
2772 blame->thread = NULL;
2774 if (blame->thread_args.repo) {
2775 got_repo_close(blame->thread_args.repo);
2776 blame->thread_args.repo = NULL;
2779 if (fclose(blame->f) != 0 && err == NULL)
2780 err = got_error_from_errno();
2784 for (i = 0; i < blame->nlines; i++)
2785 free(blame->lines[i].id);
2787 blame->lines = NULL;
2789 free(blame->cb_args.commit_id);
2790 blame->cb_args.commit_id = NULL;
2795 static const struct got_error *
2796 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2797 int *first_displayed_line, int *last_displayed_line, int *selected_line,
2798 int *done, int *eof, const char *path, struct got_object_id *commit_id,
2799 struct got_repository *repo)
2801 const struct got_error *err = NULL;
2802 struct got_blob_object *blob = NULL;
2803 struct got_repository *thread_repo = NULL;
2804 struct got_object_id *obj_id = NULL;
2807 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2811 return got_error(GOT_ERR_NO_OBJ);
2813 err = got_object_get_type(&obj_type, repo, obj_id);
2817 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2818 err = got_error(GOT_ERR_OBJ_TYPE);
2822 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2825 blame->f = got_opentemp();
2826 if (blame->f == NULL) {
2827 err = got_error_from_errno();
2830 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2835 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2836 if (blame->lines == NULL) {
2837 err = got_error_from_errno();
2841 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2845 blame->cb_args.view = view;
2846 blame->cb_args.lines = blame->lines;
2847 blame->cb_args.nlines = blame->nlines;
2848 blame->cb_args.commit_id = got_object_id_dup(commit_id);
2849 if (blame->cb_args.commit_id == NULL) {
2850 err = got_error_from_errno();
2853 blame->cb_args.quit = done;
2855 blame->thread_args.path = path;
2856 blame->thread_args.repo = thread_repo;
2857 blame->thread_args.cb_args = &blame->cb_args;
2858 blame->thread_args.complete = blame_complete;
2859 *blame_complete = 0;
2863 got_object_blob_close(blob);
2870 static const struct got_error *
2871 open_blame_view(struct tog_view *view, char *path,
2872 struct got_object_id *commit_id, struct got_reflist_head *refs,
2873 struct got_repository *repo)
2875 const struct got_error *err = NULL;
2876 struct tog_blame_view_state *s = &view->state.blame;
2878 SIMPLEQ_INIT(&s->blamed_commits);
2880 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2884 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2885 s->first_displayed_line = 1;
2886 s->last_displayed_line = view->nlines;
2887 s->selected_line = 1;
2888 s->blame_complete = 0;
2890 if (s->path == NULL)
2891 return got_error_from_errno();
2894 s->commit_id = commit_id;
2895 memset(&s->blame, 0, sizeof(s->blame));
2897 view->show = show_blame_view;
2898 view->input = input_blame_view;
2899 view->close = close_blame_view;
2901 return run_blame(&s->blame, view, &s->blame_complete,
2902 &s->first_displayed_line, &s->last_displayed_line,
2903 &s->selected_line, &s->done, &s->eof, s->path,
2904 s->blamed_commit->id, s->repo);
2907 static const struct got_error *
2908 close_blame_view(struct tog_view *view)
2910 const struct got_error *err = NULL;
2911 struct tog_blame_view_state *s = &view->state.blame;
2913 if (s->blame.thread)
2914 err = stop_blame(&s->blame);
2916 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2917 struct got_object_qid *blamed_commit;
2918 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2919 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2920 got_object_qid_free(blamed_commit);
2928 static const struct got_error *
2929 show_blame_view(struct tog_view *view)
2931 const struct got_error *err = NULL;
2932 struct tog_blame_view_state *s = &view->state.blame;
2935 if (s->blame.thread == NULL) {
2936 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2937 &s->blame.thread_args);
2939 return got_error_set_errno(errcode);
2942 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2943 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2944 s->selected_line, &s->first_displayed_line,
2945 &s->last_displayed_line, &s->eof, view->nlines);
2951 static const struct got_error *
2952 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2953 struct tog_view **focus_view, struct tog_view *view, int ch)
2955 const struct got_error *err = NULL, *thread_err = NULL;
2956 struct tog_view *diff_view;
2957 struct tog_blame_view_state *s = &view->state.blame;
2966 if (s->selected_line > 1)
2968 else if (s->selected_line == 1 &&
2969 s->first_displayed_line > 1)
2970 s->first_displayed_line--;
2975 if (s->first_displayed_line == 1) {
2976 if (s->selected_line == 1) {
2980 s->selected_line = 1;
2983 if (s->first_displayed_line > view->nlines - 2)
2984 s->first_displayed_line -=
2987 s->first_displayed_line = 1;
2991 if (s->selected_line < view->nlines - 2 &&
2992 s->first_displayed_line +
2993 s->selected_line <= s->blame.nlines)
2995 else if (s->last_displayed_line <
2997 s->first_displayed_line++;
3003 struct got_object_id *id = NULL;
3004 id = get_selected_commit_id(s->blame.lines,
3005 s->first_displayed_line, s->selected_line);
3009 struct got_commit_object *commit;
3010 struct got_object_qid *pid;
3011 struct got_object_id *blob_id = NULL;
3013 err = got_object_open_as_commit(&commit,
3017 pid = SIMPLEQ_FIRST(
3018 got_object_commit_get_parent_ids(commit));
3020 got_object_commit_close(commit);
3023 /* Check if path history ends here. */
3024 err = got_object_id_by_path(&blob_id, s->repo,
3027 if (err->code == GOT_ERR_NO_TREE_ENTRY)
3029 got_object_commit_close(commit);
3032 err = got_object_get_type(&obj_type, s->repo,
3035 /* Can't blame non-blob type objects. */
3036 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3037 got_object_commit_close(commit);
3040 err = got_object_qid_alloc(&s->blamed_commit,
3042 got_object_commit_close(commit);
3044 if (got_object_id_cmp(id,
3045 s->blamed_commit->id) == 0)
3047 err = got_object_qid_alloc(&s->blamed_commit,
3053 thread_err = stop_blame(&s->blame);
3057 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3058 s->blamed_commit, entry);
3059 err = run_blame(&s->blame, view, &s->blame_complete,
3060 &s->first_displayed_line, &s->last_displayed_line,
3061 &s->selected_line, &s->done, &s->eof,
3062 s->path, s->blamed_commit->id, s->repo);
3068 struct got_object_qid *first;
3069 first = SIMPLEQ_FIRST(&s->blamed_commits);
3070 if (!got_object_id_cmp(first->id, s->commit_id))
3073 thread_err = stop_blame(&s->blame);
3077 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3078 got_object_qid_free(s->blamed_commit);
3080 SIMPLEQ_FIRST(&s->blamed_commits);
3081 err = run_blame(&s->blame, view, &s->blame_complete,
3082 &s->first_displayed_line, &s->last_displayed_line,
3083 &s->selected_line, &s->done, &s->eof, s->path,
3084 s->blamed_commit->id, s->repo);
3091 struct got_object_id *id = NULL;
3092 struct got_object_qid *pid;
3093 struct got_commit_object *commit = NULL;
3094 id = get_selected_commit_id(s->blame.lines,
3095 s->first_displayed_line, s->selected_line);
3098 err = got_object_open_as_commit(&commit, s->repo, id);
3101 pid = SIMPLEQ_FIRST(
3102 got_object_commit_get_parent_ids(commit));
3103 if (view_is_parent_view(view))
3104 begin_x = view_split_begin_x(view->begin_x);
3105 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3106 if (diff_view == NULL) {
3107 got_object_commit_close(commit);
3108 err = got_error_from_errno();
3111 err = open_diff_view(diff_view, pid ? pid->id : NULL,
3112 id, NULL, s->refs, s->repo);
3113 got_object_commit_close(commit);
3115 view_close(diff_view);
3118 if (view_is_parent_view(view)) {
3119 err = view_close_child(view);
3122 err = view_set_child(view, diff_view);
3124 view_close(diff_view);
3127 *focus_view = diff_view;
3128 view->child_focussed = 1;
3130 *new_view = diff_view;
3137 if (s->last_displayed_line >= s->blame.nlines &&
3138 s->selected_line >= MIN(s->blame.nlines,
3139 view->nlines - 2)) {
3143 if (s->last_displayed_line >= s->blame.nlines &&
3144 s->selected_line < view->nlines - 2) {
3145 s->selected_line = MIN(s->blame.nlines,
3149 if (s->last_displayed_line + view->nlines - 2
3151 s->first_displayed_line +=
3154 s->first_displayed_line =
3159 if (s->selected_line > view->nlines - 2) {
3160 s->selected_line = MIN(s->blame.nlines,
3167 return thread_err ? thread_err : err;
3170 static const struct got_error *
3171 cmd_blame(int argc, char *argv[])
3173 const struct got_error *error;
3174 struct got_repository *repo = NULL;
3175 struct got_reflist_head refs;
3176 struct got_worktree *worktree = NULL;
3177 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3178 struct got_object_id *commit_id = NULL;
3179 char *commit_id_str = NULL;
3181 struct tog_view *view;
3183 SIMPLEQ_INIT(&refs);
3186 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3191 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3194 commit_id_str = optarg;
3197 repo_path = realpath(optarg, NULL);
3198 if (repo_path == NULL)
3199 err(1, "-r option");
3215 cwd = getcwd(NULL, 0);
3217 error = got_error_from_errno();
3220 if (repo_path == NULL) {
3221 error = got_worktree_open(&worktree, cwd);
3222 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3228 strdup(got_worktree_get_repo_path(worktree));
3229 if (repo_path == NULL)
3230 error = got_error_from_errno();
3234 repo_path = strdup(cwd);
3235 if (repo_path == NULL) {
3236 error = got_error_from_errno();
3244 error = got_repo_open(&repo, repo_path);
3248 error = apply_unveil(got_repo_get_path(repo), NULL);
3253 const char *prefix = got_worktree_get_path_prefix(worktree);
3254 char *p, *worktree_subdir = cwd +
3255 strlen(got_worktree_get_root_path(worktree));
3256 if (asprintf(&p, "%s%s%s%s%s",
3257 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3258 worktree_subdir, worktree_subdir[0] ? "/" : "",
3260 error = got_error_from_errno();
3263 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3266 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3271 if (commit_id_str == NULL) {
3272 struct got_reference *head_ref;
3273 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
3276 error = got_ref_resolve(&commit_id, repo, head_ref);
3277 got_ref_close(head_ref);
3279 error = got_object_resolve_id_str(&commit_id, repo,
3285 error = got_ref_list(&refs, repo);
3289 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3291 error = got_error_from_errno();
3294 error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3297 error = view_loop(view);
3303 got_worktree_close(worktree);
3305 got_repo_close(repo);
3306 got_ref_list_free(&refs);
3310 static const struct got_error *
3311 draw_tree_entries(struct tog_view *view,
3312 struct got_tree_entry **first_displayed_entry,
3313 struct got_tree_entry **last_displayed_entry,
3314 struct got_tree_entry **selected_entry, int *ndisplayed,
3315 const char *label, int show_ids, const char *parent_path,
3316 const struct got_tree_entries *entries, int selected, int limit, int isroot)
3318 const struct got_error *err = NULL;
3319 struct got_tree_entry *te;
3325 werase(view->window);
3330 err = format_line(&wline, &width, label, view->ncols);
3333 if (view_needs_focus_indication(view))
3334 wstandout(view->window);
3335 waddwstr(view->window, wline);
3336 if (view_needs_focus_indication(view))
3337 wstandend(view->window);
3340 if (width < view->ncols)
3341 waddch(view->window, '\n');
3344 err = format_line(&wline, &width, parent_path, view->ncols);
3347 waddwstr(view->window, wline);
3350 if (width < view->ncols)
3351 waddch(view->window, '\n');
3354 waddch(view->window, '\n');
3358 te = SIMPLEQ_FIRST(&entries->head);
3359 if (*first_displayed_entry == NULL) {
3360 if (selected == 0) {
3362 wstandout(view->window);
3363 *selected_entry = NULL;
3365 waddstr(view->window, " ..\n"); /* parent directory */
3366 if (selected == 0 && view->focussed)
3367 wstandend(view->window);
3374 while (te != *first_displayed_entry)
3375 te = SIMPLEQ_NEXT(te, entry);
3379 char *line = NULL, *id_str = NULL;
3382 err = got_object_id_str(&id_str, te->id);
3384 return got_error_from_errno();
3386 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3387 te->name, S_ISDIR(te->mode) ? "/" :
3388 ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3390 return got_error_from_errno();
3393 err = format_line(&wline, &width, line, view->ncols);
3398 if (n == selected) {
3400 wstandout(view->window);
3401 *selected_entry = te;
3403 waddwstr(view->window, wline);
3404 if (width < view->ncols)
3405 waddch(view->window, '\n');
3406 if (n == selected && view->focussed)
3407 wstandend(view->window);
3413 *last_displayed_entry = te;
3416 te = SIMPLEQ_NEXT(te, entry);
3423 tree_scroll_up(struct tog_view *view,
3424 struct got_tree_entry **first_displayed_entry, int maxscroll,
3425 const struct got_tree_entries *entries, int isroot)
3427 struct got_tree_entry *te, *prev;
3430 if (*first_displayed_entry == NULL) {
3435 te = SIMPLEQ_FIRST(&entries->head);
3436 if (*first_displayed_entry == te) {
3439 *first_displayed_entry = NULL;
3443 /* XXX this is stupid... switch to TAILQ? */
3444 for (i = 0; i < maxscroll; i++) {
3445 while (te != *first_displayed_entry) {
3447 te = SIMPLEQ_NEXT(te, entry);
3449 *first_displayed_entry = prev;
3450 te = SIMPLEQ_FIRST(&entries->head);
3452 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3453 *first_displayed_entry = NULL;
3457 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3458 struct got_tree_entry *last_displayed_entry,
3459 const struct got_tree_entries *entries)
3461 struct got_tree_entry *next, *last;
3464 if (*first_displayed_entry)
3465 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3467 next = SIMPLEQ_FIRST(&entries->head);
3468 last = last_displayed_entry;
3469 while (next && last && n++ < maxscroll) {
3470 last = SIMPLEQ_NEXT(last, entry);
3472 *first_displayed_entry = next;
3473 next = SIMPLEQ_NEXT(next, entry);
3479 static const struct got_error *
3480 tree_entry_path(char **path, struct tog_parent_trees *parents,
3481 struct got_tree_entry *te)
3483 const struct got_error *err = NULL;
3484 struct tog_parent_tree *pt;
3485 size_t len = 2; /* for leading slash and NUL */
3487 TAILQ_FOREACH(pt, parents, entry)
3488 len += strlen(pt->selected_entry->name) + 1 /* slash */;
3490 len += strlen(te->name);
3492 *path = calloc(1, len);
3494 return got_error_from_errno();
3497 pt = TAILQ_LAST(parents, tog_parent_trees);
3499 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3500 err = got_error(GOT_ERR_NO_SPACE);
3503 if (strlcat(*path, "/", len) >= len) {
3504 err = got_error(GOT_ERR_NO_SPACE);
3507 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3510 if (strlcat(*path, te->name, len) >= len) {
3511 err = got_error(GOT_ERR_NO_SPACE);
3523 static const struct got_error *
3524 blame_tree_entry(struct tog_view **new_view, int begin_x,
3525 struct got_tree_entry *te, struct tog_parent_trees *parents,
3526 struct got_object_id *commit_id, struct got_reflist_head *refs,
3527 struct got_repository *repo)
3529 const struct got_error *err = NULL;
3531 struct tog_view *blame_view;
3533 err = tree_entry_path(&path, parents, te);
3537 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3538 if (blame_view == NULL)
3539 return got_error_from_errno();
3541 err = open_blame_view(blame_view, path, commit_id, refs, repo);
3543 view_close(blame_view);
3546 *new_view = blame_view;
3550 static const struct got_error *
3551 log_tree_entry(struct tog_view **new_view, int begin_x,
3552 struct got_tree_entry *te, struct tog_parent_trees *parents,
3553 struct got_object_id *commit_id, struct got_reflist_head *refs,
3554 struct got_repository *repo)
3556 struct tog_view *log_view;
3557 const struct got_error *err = NULL;
3560 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3561 if (log_view == NULL)
3562 return got_error_from_errno();
3564 err = tree_entry_path(&path, parents, te);
3568 err = open_log_view(log_view, commit_id, refs, repo, path, 0);
3570 view_close(log_view);
3572 *new_view = log_view;
3577 static const struct got_error *
3578 open_tree_view(struct tog_view *view, struct got_tree_object *root,
3579 struct got_object_id *commit_id, struct got_reflist_head *refs,
3580 struct got_repository *repo)
3582 const struct got_error *err = NULL;
3583 char *commit_id_str = NULL;
3584 struct tog_tree_view_state *s = &view->state.tree;
3586 TAILQ_INIT(&s->parents);
3588 err = got_object_id_str(&commit_id_str, commit_id);
3592 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3593 err = got_error_from_errno();
3597 s->root = s->tree = root;
3598 s->entries = got_object_tree_get_entries(root);
3599 s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3600 s->commit_id = got_object_id_dup(commit_id);
3601 if (s->commit_id == NULL) {
3602 err = got_error_from_errno();
3608 view->show = show_tree_view;
3609 view->input = input_tree_view;
3610 view->close = close_tree_view;
3612 free(commit_id_str);
3614 free(s->tree_label);
3615 s->tree_label = NULL;
3620 static const struct got_error *
3621 close_tree_view(struct tog_view *view)
3623 struct tog_tree_view_state *s = &view->state.tree;
3625 free(s->tree_label);
3626 s->tree_label = NULL;
3628 s->commit_id = NULL;
3629 while (!TAILQ_EMPTY(&s->parents)) {
3630 struct tog_parent_tree *parent;
3631 parent = TAILQ_FIRST(&s->parents);
3632 TAILQ_REMOVE(&s->parents, parent, entry);
3636 if (s->tree != s->root)
3637 got_object_tree_close(s->tree);
3638 got_object_tree_close(s->root);
3643 static const struct got_error *
3644 show_tree_view(struct tog_view *view)
3646 const struct got_error *err = NULL;
3647 struct tog_tree_view_state *s = &view->state.tree;
3650 err = tree_entry_path(&parent_path, &s->parents, NULL);
3654 err = draw_tree_entries(view, &s->first_displayed_entry,
3655 &s->last_displayed_entry, &s->selected_entry,
3656 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3657 s->entries, s->selected, view->nlines, s->tree == s->root);
3664 static const struct got_error *
3665 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3666 struct tog_view **focus_view, struct tog_view *view, int ch)
3668 const struct got_error *err = NULL;
3669 struct tog_tree_view_state *s = &view->state.tree;
3670 struct tog_view *log_view;
3671 int begin_x = 0, nscrolled;
3675 s->show_ids = !s->show_ids;
3678 if (!s->selected_entry)
3680 if (view_is_parent_view(view))
3681 begin_x = view_split_begin_x(view->begin_x);
3682 err = log_tree_entry(&log_view, begin_x,
3683 s->selected_entry, &s->parents,
3684 s->commit_id, s->refs, s->repo);
3685 if (view_is_parent_view(view)) {
3686 err = view_close_child(view);
3689 err = view_set_child(view, log_view);
3691 view_close(log_view);
3694 *focus_view = log_view;
3695 view->child_focussed = 1;
3697 *new_view = log_view;
3701 if (s->selected > 0) {
3703 if (s->selected == 0)
3706 if (s->selected > 0)
3708 tree_scroll_up(view, &s->first_displayed_entry, 1,
3709 s->entries, s->tree == s->root);
3712 tree_scroll_up(view, &s->first_displayed_entry,
3713 MAX(0, view->nlines - 4 - s->selected), s->entries,
3714 s->tree == s->root);
3716 if (SIMPLEQ_FIRST(&s->entries->head) ==
3717 s->first_displayed_entry && s->tree != s->root)
3718 s->first_displayed_entry = NULL;
3722 if (s->selected < s->ndisplayed - 1) {
3726 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3728 /* can't scroll any further */
3732 tree_scroll_down(&s->first_displayed_entry, 1,
3733 s->last_displayed_entry, s->entries);
3736 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3738 /* can't scroll any further; move cursor down */
3739 if (s->selected < s->ndisplayed - 1)
3740 s->selected = s->ndisplayed - 1;
3745 nscrolled = tree_scroll_down(&s->first_displayed_entry,
3746 view->nlines, s->last_displayed_entry, s->entries);
3747 if (nscrolled < view->nlines) {
3749 struct got_tree_entry *te;
3750 te = s->first_displayed_entry;
3753 te = SIMPLEQ_NEXT(te, entry);
3755 s->selected = ndisplayed - 1;
3760 if (s->selected_entry == NULL) {
3761 struct tog_parent_tree *parent;
3763 /* user selected '..' */
3764 if (s->tree == s->root)
3766 parent = TAILQ_FIRST(&s->parents);
3767 TAILQ_REMOVE(&s->parents, parent,
3769 got_object_tree_close(s->tree);
3770 s->tree = parent->tree;
3772 got_object_tree_get_entries(s->tree);
3773 s->first_displayed_entry =
3774 parent->first_displayed_entry;
3776 parent->selected_entry;
3777 s->selected = parent->selected;
3779 } else if (S_ISDIR(s->selected_entry->mode)) {
3780 struct tog_parent_tree *parent;
3781 struct got_tree_object *child;
3782 err = got_object_open_as_tree(&child,
3783 s->repo, s->selected_entry->id);
3786 parent = calloc(1, sizeof(*parent));
3787 if (parent == NULL) {
3788 err = got_error_from_errno();
3791 parent->tree = s->tree;
3792 parent->first_displayed_entry =
3793 s->first_displayed_entry;
3794 parent->selected_entry = s->selected_entry;
3795 parent->selected = s->selected;
3796 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3799 got_object_tree_get_entries(s->tree);
3801 s->first_displayed_entry = NULL;
3802 } else if (S_ISREG(s->selected_entry->mode)) {
3803 struct tog_view *blame_view;
3804 int begin_x = view_is_parent_view(view) ?
3805 view_split_begin_x(view->begin_x) : 0;
3807 err = blame_tree_entry(&blame_view, begin_x,
3808 s->selected_entry, &s->parents,
3809 s->commit_id, s->refs, s->repo);
3812 if (view_is_parent_view(view)) {
3813 err = view_close_child(view);
3816 err = view_set_child(view, blame_view);
3818 view_close(blame_view);
3821 *focus_view = blame_view;
3822 view->child_focussed = 1;
3824 *new_view = blame_view;
3828 if (s->selected > view->nlines)
3829 s->selected = s->ndisplayed - 1;
3842 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3847 static const struct got_error *
3848 cmd_tree(int argc, char *argv[])
3850 const struct got_error *error;
3851 struct got_repository *repo = NULL;
3852 struct got_reflist_head refs;
3853 char *repo_path = NULL;
3854 struct got_object_id *commit_id = NULL;
3855 char *commit_id_arg = NULL;
3856 struct got_commit_object *commit = NULL;
3857 struct got_tree_object *tree = NULL;
3859 struct tog_view *view;
3861 SIMPLEQ_INIT(&refs);
3864 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3869 while ((ch = getopt(argc, argv, "c:")) != -1) {
3872 commit_id_arg = optarg;
3884 struct got_worktree *worktree;
3885 char *cwd = getcwd(NULL, 0);
3887 return got_error_from_errno();
3888 error = got_worktree_open(&worktree, cwd);
3889 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3894 strdup(got_worktree_get_repo_path(worktree));
3895 got_worktree_close(worktree);
3898 if (repo_path == NULL) {
3899 error = got_error_from_errno();
3902 } else if (argc == 1) {
3903 repo_path = realpath(argv[0], NULL);
3904 if (repo_path == NULL)
3905 return got_error_from_errno();
3911 error = got_repo_open(&repo, repo_path);
3915 error = apply_unveil(got_repo_get_path(repo), NULL);
3919 if (commit_id_arg == NULL)
3920 error = get_head_commit_id(&commit_id, repo);
3922 error = got_object_resolve_id_str(&commit_id, repo,
3927 error = got_object_open_as_commit(&commit, repo, commit_id);
3931 error = got_object_open_as_tree(&tree, repo,
3932 got_object_commit_get_tree_id(commit));
3936 error = got_ref_list(&refs, repo);
3940 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3942 error = got_error_from_errno();
3945 error = open_tree_view(view, tree, commit_id, &refs, repo);
3948 error = view_loop(view);
3953 got_object_commit_close(commit);
3955 got_object_tree_close(tree);
3957 got_repo_close(repo);
3958 got_ref_list_free(&refs);
3967 fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3968 "Available commands:\n", getprogname());
3969 for (i = 0; i < nitems(tog_commands); i++) {
3970 struct tog_cmd *cmd = &tog_commands[i];
3971 fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3977 make_argv(const char *arg0, const char *arg1)
3980 int argc = (arg1 == NULL ? 1 : 2);
3982 argv = calloc(argc, sizeof(char *));
3985 argv[0] = strdup(arg0);
3986 if (argv[0] == NULL)
3989 argv[1] = strdup(arg1);
3990 if (argv[1] == NULL)
3998 main(int argc, char *argv[])
4000 const struct got_error *error = NULL;
4001 struct tog_cmd *cmd = NULL;
4003 char **cmd_argv = NULL;
4005 setlocale(LC_CTYPE, "");
4007 while ((ch = getopt(argc, argv, "h")) != -1) {
4026 /* Build an argument vector which runs a default command. */
4027 cmd = &tog_commands[0];
4028 cmd_argv = make_argv(cmd->name, NULL);
4033 /* Did the user specific a command? */
4034 for (i = 0; i < nitems(tog_commands); i++) {
4035 if (strncmp(tog_commands[i].name, argv[0],
4036 strlen(argv[0])) == 0) {
4037 cmd = &tog_commands[i];
4039 tog_commands[i].cmd_usage();
4044 /* Did the user specify a repository? */
4045 char *repo_path = realpath(argv[0], NULL);
4047 struct got_repository *repo;
4048 error = got_repo_open(&repo, repo_path);
4050 got_repo_close(repo);
4052 error = got_error_from_errno();
4055 fprintf(stderr, "%s: '%s' is not a "
4056 "known command\n", getprogname(),
4060 fprintf(stderr, "%s: '%s' is neither a known "
4061 "command nor a path to a repository\n",
4062 getprogname(), argv[0]);
4066 cmd = &tog_commands[0];
4067 cmd_argv = make_argv(cmd->name, repo_path);
4073 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4080 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);