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
41 #include "got_version.h"
42 #include "got_error.h"
43 #include "got_object.h"
44 #include "got_reference.h"
45 #include "got_repository.h"
47 #include "got_opentemp.h"
49 #include "got_cancel.h"
50 #include "got_commit_graph.h"
51 #include "got_blame.h"
52 #include "got_privsep.h"
54 #include "got_worktree.h"
57 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
61 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
64 #define CTRL(x) ((x) & 0x1f)
67 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
72 const struct got_error *(*cmd_main)(int, char *[]);
73 void (*cmd_usage)(void);
76 __dead static void usage(int);
77 __dead static void usage_log(void);
78 __dead static void usage_diff(void);
79 __dead static void usage_blame(void);
80 __dead static void usage_tree(void);
82 static const struct got_error* cmd_log(int, char *[]);
83 static const struct got_error* cmd_diff(int, char *[]);
84 static const struct got_error* cmd_blame(int, char *[]);
85 static const struct got_error* cmd_tree(int, char *[]);
87 static struct tog_cmd tog_commands[] = {
88 { "log", cmd_log, usage_log },
89 { "diff", cmd_diff, usage_diff },
90 { "blame", cmd_blame, usage_blame },
91 { "tree", cmd_tree, usage_tree },
101 #define TOG_EOF_STRING "(END)"
103 struct commit_queue_entry {
104 TAILQ_ENTRY(commit_queue_entry) entry;
105 struct got_object_id *id;
106 struct got_commit_object *commit;
109 TAILQ_HEAD(commit_queue_head, commit_queue_entry);
110 struct commit_queue {
112 struct commit_queue_head head;
115 struct tog_diff_view_state {
116 struct got_object_id *id1, *id2;
118 int first_displayed_line;
119 int last_displayed_line;
122 struct got_repository *repo;
123 struct got_reflist_head *refs;
125 /* passed from log view; may be NULL */
126 struct tog_view *log_view;
129 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
131 struct tog_log_thread_args {
132 pthread_cond_t need_commits;
134 struct got_commit_graph *graph;
135 struct commit_queue *commits;
136 const char *in_repo_path;
137 struct got_object_id *start_id;
138 struct got_repository *repo;
141 struct commit_queue_entry **first_displayed_entry;
142 struct commit_queue_entry **selected_entry;
144 int *search_next_done;
148 struct tog_log_view_state {
149 struct commit_queue commits;
150 struct commit_queue_entry *first_displayed_entry;
151 struct commit_queue_entry *last_displayed_entry;
152 struct commit_queue_entry *selected_entry;
155 const char *head_ref_name;
156 struct got_repository *repo;
157 struct got_reflist_head *refs;
158 struct got_object_id *start_id;
161 struct tog_log_thread_args thread_args;
162 struct commit_queue_entry *matched_entry;
163 struct commit_queue_entry *search_entry;
166 struct tog_blame_cb_args {
167 struct tog_blame_line *lines; /* one per line */
170 struct tog_view *view;
171 struct got_object_id *commit_id;
175 struct tog_blame_thread_args {
177 struct got_repository *repo;
178 struct tog_blame_cb_args *cb_args;
180 got_cancel_cb cancel_cb;
187 struct tog_blame_line *lines;
191 struct tog_blame_thread_args thread_args;
192 struct tog_blame_cb_args cb_args;
196 struct tog_blame_view_state {
197 int first_displayed_line;
198 int last_displayed_line;
203 struct got_object_id_queue blamed_commits;
204 struct got_object_qid *blamed_commit;
206 struct got_repository *repo;
207 struct got_reflist_head *refs;
208 struct got_object_id *commit_id;
209 struct tog_blame blame;
213 struct tog_parent_tree {
214 TAILQ_ENTRY(tog_parent_tree) entry;
215 struct got_tree_object *tree;
216 struct got_tree_entry *first_displayed_entry;
217 struct got_tree_entry *selected_entry;
221 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
223 struct tog_tree_view_state {
225 struct got_tree_object *root;
226 struct got_tree_object *tree;
227 const struct got_tree_entries *entries;
228 struct got_tree_entry *first_displayed_entry;
229 struct got_tree_entry *last_displayed_entry;
230 struct got_tree_entry *selected_entry;
231 int ndisplayed, selected, show_ids;
232 struct tog_parent_trees parents;
233 struct got_object_id *commit_id;
234 struct got_repository *repo;
235 struct got_reflist_head *refs;
236 struct got_tree_entry *matched_entry;
240 * We implement two types of views: parent views and child views.
242 * The 'Tab' key switches between a parent view and its child view.
243 * Child views are shown side-by-side to their parent view, provided
244 * there is enough screen estate.
246 * When a new view is opened from within a parent view, this new view
247 * becomes a child view of the parent view, replacing any existing child.
249 * When a new view is opened from within a child view, this new view
250 * becomes a parent view which will obscure the views below until the
251 * user quits the new parent view by typing 'q'.
253 * This list of views contains parent views only.
254 * Child views are only pointed to by their parent view.
256 TAILQ_HEAD(tog_view_list_head, tog_view);
259 TAILQ_ENTRY(tog_view) entry;
262 int nlines, ncols, begin_y, begin_x;
263 int lines, cols; /* copies of LINES and COLS */
265 struct tog_view *parent;
266 struct tog_view *child;
269 /* type-specific state */
270 enum tog_view_type type;
272 struct tog_diff_view_state diff;
273 struct tog_log_view_state log;
274 struct tog_blame_view_state blame;
275 struct tog_tree_view_state tree;
278 const struct got_error *(*show)(struct tog_view *);
279 const struct got_error *(*input)(struct tog_view **,
280 struct tog_view **, struct tog_view**, struct tog_view *, int);
281 const struct got_error *(*close)(struct tog_view *);
283 const struct got_error *(*search_start)(struct tog_view *);
284 const struct got_error *(*search_next)(struct tog_view *);
286 #define TOG_SEARCH_FORWARD 1
287 #define TOG_SEARCH_BACKWARD 2
288 int search_next_done;
292 static const struct got_error *open_diff_view(struct tog_view *,
293 struct got_object_id *, struct got_object_id *, struct tog_view *,
294 struct got_reflist_head *, struct got_repository *);
295 static const struct got_error *show_diff_view(struct tog_view *);
296 static const struct got_error *input_diff_view(struct tog_view **,
297 struct tog_view **, struct tog_view **, struct tog_view *, int);
298 static const struct got_error* close_diff_view(struct tog_view *);
300 static const struct got_error *open_log_view(struct tog_view *,
301 struct got_object_id *, struct got_reflist_head *,
302 struct got_repository *, const char *, const char *, int);
303 static const struct got_error * show_log_view(struct tog_view *);
304 static const struct got_error *input_log_view(struct tog_view **,
305 struct tog_view **, struct tog_view **, struct tog_view *, int);
306 static const struct got_error *close_log_view(struct tog_view *);
307 static const struct got_error *search_start_log_view(struct tog_view *);
308 static const struct got_error *search_next_log_view(struct tog_view *);
310 static const struct got_error *open_blame_view(struct tog_view *, char *,
311 struct got_object_id *, struct got_reflist_head *, struct got_repository *);
312 static const struct got_error *show_blame_view(struct tog_view *);
313 static const struct got_error *input_blame_view(struct tog_view **,
314 struct tog_view **, struct tog_view **, struct tog_view *, int);
315 static const struct got_error *close_blame_view(struct tog_view *);
316 static const struct got_error *search_start_blame_view(struct tog_view *);
317 static const struct got_error *search_next_blame_view(struct tog_view *);
319 static const struct got_error *open_tree_view(struct tog_view *,
320 struct got_tree_object *, struct got_object_id *,
321 struct got_reflist_head *, struct got_repository *);
322 static const struct got_error *show_tree_view(struct tog_view *);
323 static const struct got_error *input_tree_view(struct tog_view **,
324 struct tog_view **, struct tog_view **, struct tog_view *, int);
325 static const struct got_error *close_tree_view(struct tog_view *);
326 static const struct got_error *search_start_tree_view(struct tog_view *);
327 static const struct got_error *search_next_tree_view(struct tog_view *);
329 static volatile sig_atomic_t tog_sigwinch_received;
330 static volatile sig_atomic_t tog_sigpipe_received;
333 tog_sigwinch(int signo)
335 tog_sigwinch_received = 1;
339 tog_sigpipe(int signo)
341 tog_sigpipe_received = 1;
344 static const struct got_error *
345 view_close(struct tog_view *view)
347 const struct got_error *err = NULL;
350 view_close(view->child);
354 err = view->close(view);
356 del_panel(view->panel);
358 delwin(view->window);
363 static struct tog_view *
364 view_open(int nlines, int ncols, int begin_y, int begin_x,
365 enum tog_view_type type)
367 struct tog_view *view = calloc(1, sizeof(*view));
375 view->nlines = nlines ? nlines : LINES - begin_y;
376 view->ncols = ncols ? ncols : COLS - begin_x;
377 view->begin_y = begin_y;
378 view->begin_x = begin_x;
379 view->window = newwin(nlines, ncols, begin_y, begin_x);
380 if (view->window == NULL) {
384 view->panel = new_panel(view->window);
385 if (view->panel == NULL ||
386 set_panel_userptr(view->panel, view) != OK) {
391 keypad(view->window, TRUE);
396 view_split_begin_x(int begin_x)
398 if (begin_x > 0 || COLS < 120)
400 return (COLS - MAX(COLS / 2, 80));
403 static const struct got_error *view_resize(struct tog_view *);
405 static const struct got_error *
406 view_splitscreen(struct tog_view *view)
408 const struct got_error *err = NULL;
411 view->begin_x = view_split_begin_x(0);
412 view->nlines = LINES;
413 view->ncols = COLS - view->begin_x;
416 err = view_resize(view);
420 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
421 return got_error_from_errno("mvwin");
426 static const struct got_error *
427 view_fullscreen(struct tog_view *view)
429 const struct got_error *err = NULL;
433 view->nlines = LINES;
437 err = view_resize(view);
441 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
442 return got_error_from_errno("mvwin");
448 view_is_parent_view(struct tog_view *view)
450 return view->parent == NULL;
453 static const struct got_error *
454 view_resize(struct tog_view *view)
458 if (view->lines > LINES)
459 nlines = view->nlines - (view->lines - LINES);
461 nlines = view->nlines + (LINES - view->lines);
463 if (view->cols > COLS)
464 ncols = view->ncols - (view->cols - COLS);
466 ncols = view->ncols + (COLS - view->cols);
468 if (wresize(view->window, nlines, ncols) == ERR)
469 return got_error_from_errno("wresize");
470 if (replace_panel(view->panel, view->window) == ERR)
471 return got_error_from_errno("replace_panel");
472 wclear(view->window);
474 view->nlines = nlines;
480 view->child->begin_x = view_split_begin_x(view->begin_x);
481 if (view->child->begin_x == 0) {
482 view_fullscreen(view->child);
483 if (view->child->focussed)
484 show_panel(view->child->panel);
486 show_panel(view->panel);
488 view_splitscreen(view->child);
489 show_panel(view->child->panel);
496 static const struct got_error *
497 view_close_child(struct tog_view *view)
499 const struct got_error *err = NULL;
501 if (view->child == NULL)
504 err = view_close(view->child);
509 static const struct got_error *
510 view_set_child(struct tog_view *view, struct tog_view *child)
512 const struct got_error *err = NULL;
515 child->parent = view;
520 view_is_splitscreen(struct tog_view *view)
522 return view->begin_x > 0;
531 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
532 cols = 80; /* Default */
538 resize_term(lines, cols);
541 static const struct got_error *
542 view_search_start(struct tog_view *view)
544 const struct got_error *err = NULL;
549 if (view->nlines < 1)
552 if (!view_is_parent_view(view))
553 begin_x = view_split_begin_x(view->begin_x);
554 mvwaddstr(view->window, view->begin_y + view->nlines - 1,
556 wclrtoeol(view->window);
560 ret = wgetnstr(view->window, pattern, sizeof(pattern));
566 if (view->searching) {
567 regfree(&view->regex);
571 if (regcomp(&view->regex, pattern,
572 REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
573 err = view->search_start(view);
575 regfree(&view->regex);
578 view->searching = TOG_SEARCH_FORWARD;
579 view->search_next_done = 0;
580 view->search_next(view);
586 static const struct got_error *
587 view_input(struct tog_view **new, struct tog_view **dead,
588 struct tog_view **focus, int *done, struct tog_view *view,
589 struct tog_view_list_head *views)
591 const struct got_error *err = NULL;
599 if (view->searching && !view->search_next_done) {
600 errcode = pthread_mutex_unlock(&tog_mutex);
602 return got_error_set_errno(errcode,
603 "pthread_mutex_unlock");
605 errcode = pthread_mutex_lock(&tog_mutex);
607 return got_error_set_errno(errcode,
608 "pthread_mutex_lock");
609 view->search_next(view);
613 nodelay(stdscr, FALSE);
614 /* Allow threads to make progress while we are waiting for input. */
615 errcode = pthread_mutex_unlock(&tog_mutex);
617 return got_error_set_errno(errcode, "pthread_mutex_unlock");
618 ch = wgetch(view->window);
619 errcode = pthread_mutex_lock(&tog_mutex);
621 return got_error_set_errno(errcode, "pthread_mutex_lock");
622 nodelay(stdscr, TRUE);
624 if (tog_sigwinch_received) {
626 tog_sigwinch_received = 0;
627 TAILQ_FOREACH(v, views, entry) {
628 err = view_resize(v);
631 err = v->input(new, dead, focus, v, KEY_RESIZE);
642 *focus = view->child;
643 view->child_focussed = 1;
644 } else if (view->parent) {
645 *focus = view->parent;
646 view->parent->child_focussed = 0;
650 err = view->input(new, dead, focus, view, ch);
657 if (view_is_parent_view(view)) {
658 if (view->child == NULL)
660 if (view_is_splitscreen(view->child)) {
661 *focus = view->child;
662 view->child_focussed = 1;
663 err = view_fullscreen(view->child);
665 err = view_splitscreen(view->child);
668 err = view->child->input(new, dead, focus,
669 view->child, KEY_RESIZE);
671 if (view_is_splitscreen(view)) {
673 view->parent->child_focussed = 1;
674 err = view_fullscreen(view);
676 err = view_splitscreen(view);
680 err = view->input(new, dead, focus, view,
687 if (view->search_start)
688 view_search_start(view);
690 err = view->input(new, dead, focus, view, ch);
694 if (view->search_next && view->searching) {
695 view->searching = (ch == 'n' ?
696 TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
697 view->search_next_done = 0;
698 view->search_next(view);
700 err = view->input(new, dead, focus, view, ch);
703 err = view->input(new, dead, focus, view, ch);
711 view_vborder(struct tog_view *view)
714 struct tog_view *view_above;
717 return view_vborder(view->parent);
719 panel = panel_above(view->panel);
723 view_above = panel_userptr(panel);
724 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
725 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
729 view_needs_focus_indication(struct tog_view *view)
731 if (view_is_parent_view(view)) {
732 if (view->child == NULL || view->child_focussed)
734 if (!view_is_splitscreen(view->child))
736 } else if (!view_is_splitscreen(view))
739 return view->focussed;
742 static const struct got_error *
743 view_loop(struct tog_view *view)
745 const struct got_error *err = NULL;
746 struct tog_view_list_head views;
747 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
748 int fast_refresh = 10;
749 int done = 0, errcode;
751 errcode = pthread_mutex_lock(&tog_mutex);
753 return got_error_set_errno(errcode, "pthread_mutex_lock");
756 TAILQ_INSERT_HEAD(&views, view, entry);
760 err = view->show(view);
765 while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
766 /* Refresh fast during initialization, then become slower. */
767 if (fast_refresh && fast_refresh-- == 0)
768 halfdelay(10); /* switch to once per second */
770 err = view_input(&new_view, &dead_view, &focus_view, &done,
775 struct tog_view *prev = NULL;
777 if (view_is_parent_view(dead_view))
778 prev = TAILQ_PREV(dead_view,
779 tog_view_list_head, entry);
780 else if (view->parent != dead_view)
783 if (dead_view->parent)
784 dead_view->parent->child = NULL;
786 TAILQ_REMOVE(&views, dead_view, entry);
788 err = view_close(dead_view);
789 if (err || (dead_view == main_view && new_view == NULL))
792 if (view == dead_view) {
797 else if (!TAILQ_EMPTY(&views))
798 view = TAILQ_LAST(&views,
803 if (view->child && view->child_focussed)
804 focus_view = view->child;
811 struct tog_view *v, *t;
812 /* Only allow one parent view per type. */
813 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
814 if (v->type != new_view->type)
816 TAILQ_REMOVE(&views, v, entry);
822 TAILQ_INSERT_TAIL(&views, new_view, entry);
824 if (focus_view == NULL)
825 focus_view = new_view;
828 show_panel(focus_view->panel);
831 focus_view->focussed = 1;
834 show_panel(new_view->panel);
835 if (view->child && view_is_splitscreen(view->child))
836 show_panel(view->child->panel);
839 if (focus_view == NULL) {
841 show_panel(view->panel);
842 if (view->child && view_is_splitscreen(view->child))
843 show_panel(view->child->panel);
847 err = view->parent->show(view->parent);
851 err = view->show(view);
855 err = view->child->show(view->child);
864 while (!TAILQ_EMPTY(&views)) {
865 view = TAILQ_FIRST(&views);
866 TAILQ_REMOVE(&views, view, entry);
870 errcode = pthread_mutex_unlock(&tog_mutex);
871 if (errcode && err == NULL)
872 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
882 "usage: %s log [-c commit] [-r repository-path] [path]\n",
887 /* Create newly allocated wide-character string equivalent to a byte string. */
888 static const struct got_error *
889 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
892 const struct got_error *err = NULL;
895 *wlen = mbstowcs(NULL, s, 0);
896 if (*wlen == (size_t)-1) {
899 return got_error_from_errno("mbstowcs");
901 /* byte string invalid in current encoding; try to "fix" it */
902 err = got_mbsavis(&vis, &vislen, s);
905 *wlen = mbstowcs(NULL, vis, 0);
906 if (*wlen == (size_t)-1) {
907 err = got_error_from_errno("mbstowcs"); /* give up */
912 *ws = calloc(*wlen + 1, sizeof(**ws));
914 err = got_error_from_errno("calloc");
918 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
919 err = got_error_from_errno("mbstowcs");
930 /* Format a line for display, ensuring that it won't overflow a width limit. */
931 static const struct got_error *
932 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
935 const struct got_error *err = NULL;
937 wchar_t *wline = NULL;
944 err = mbs2ws(&wline, &wlen, line);
950 int width = wcwidth(wline[i]);
957 if (width == 1 || width == 2) {
958 if (cols + width > wlimit)
962 } else if (width == -1) {
963 if (wline[i] == L'\t') {
965 ((cols + col_tab_align) % TABSIZE);
966 if (cols + width > wlimit)
972 err = got_error_from_errno("wcwidth");
987 static const struct got_error*
988 build_refs_str(char **refs_str, struct got_reflist_head *refs,
989 struct got_object_id *id, struct got_repository *repo)
991 static const struct got_error *err = NULL;
992 struct got_reflist_entry *re;
998 SIMPLEQ_FOREACH(re, refs, entry) {
999 struct got_tag_object *tag = NULL;
1002 name = got_ref_get_name(re->ref);
1003 if (strcmp(name, GOT_REF_HEAD) == 0)
1005 if (strncmp(name, "refs/", 5) == 0)
1007 if (strncmp(name, "got/", 4) == 0)
1009 if (strncmp(name, "heads/", 6) == 0)
1011 if (strncmp(name, "remotes/", 8) == 0)
1013 if (strncmp(name, "tags/", 5) == 0) {
1014 err = got_object_open_as_tag(&tag, repo, re->id);
1016 if (err->code != GOT_ERR_OBJ_TYPE)
1018 /* Ref points at something other than a tag. */
1023 cmp = got_object_id_cmp(tag ?
1024 got_object_tag_get_object_id(tag) : re->id, id);
1026 got_object_tag_close(tag);
1030 if (asprintf(refs_str, "%s%s%s", s ? s : "",
1031 s ? ", " : "", name) == -1) {
1032 err = got_error_from_errno("asprintf");
1043 static const struct got_error *
1044 format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1047 char *smallerthan, *at;
1049 smallerthan = strchr(author, '<');
1050 if (smallerthan && smallerthan[1] != '\0')
1051 author = smallerthan + 1;
1052 at = strchr(author, '@');
1055 return format_line(wauthor, author_width, author, limit, col_tab_align);
1058 static const struct got_error *
1059 draw_commit(struct tog_view *view, struct got_commit_object *commit,
1060 struct got_object_id *id, struct got_reflist_head *refs,
1061 const size_t date_display_cols, int author_display_cols)
1063 const struct got_error *err = NULL;
1064 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
1065 char *logmsg0 = NULL, *logmsg = NULL;
1066 char *author = NULL;
1067 wchar_t *wlogmsg = NULL, *wauthor = NULL;
1068 int author_width, logmsg_width;
1069 char *newline, *line = NULL;
1071 const int avail = view->ncols;
1073 time_t committer_time;
1075 committer_time = got_object_commit_get_committer_time(commit);
1076 if (localtime_r(&committer_time, &tm) == NULL)
1077 return got_error_from_errno("localtime_r");
1078 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
1080 return got_error(GOT_ERR_NO_SPACE);
1082 if (avail <= date_display_cols)
1083 limit = MIN(sizeof(datebuf) - 1, avail);
1085 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1086 waddnstr(view->window, datebuf, limit);
1091 author = strdup(got_object_commit_get_author(commit));
1092 if (author == NULL) {
1093 err = got_error_from_errno("strdup");
1096 err = format_author(&wauthor, &author_width, author, avail - col, col);
1099 waddwstr(view->window, wauthor);
1100 col += author_width;
1101 while (col < avail && author_width < author_display_cols + 2) {
1102 waddch(view->window, ' ');
1109 err = got_object_commit_get_logmsg(&logmsg0, commit);
1113 while (*logmsg == '\n')
1115 newline = strchr(logmsg, '\n');
1118 limit = avail - col;
1119 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, 0);
1122 waddwstr(view->window, wlogmsg);
1123 col += logmsg_width;
1124 while (col < avail) {
1125 waddch(view->window, ' ');
1137 static struct commit_queue_entry *
1138 alloc_commit_queue_entry(struct got_commit_object *commit,
1139 struct got_object_id *id)
1141 struct commit_queue_entry *entry;
1143 entry = calloc(1, sizeof(*entry));
1148 entry->commit = commit;
1153 pop_commit(struct commit_queue *commits)
1155 struct commit_queue_entry *entry;
1157 entry = TAILQ_FIRST(&commits->head);
1158 TAILQ_REMOVE(&commits->head, entry, entry);
1159 got_object_commit_close(entry->commit);
1160 commits->ncommits--;
1161 /* Don't free entry->id! It is owned by the commit graph. */
1166 free_commits(struct commit_queue *commits)
1168 while (!TAILQ_EMPTY(&commits->head))
1169 pop_commit(commits);
1172 static const struct got_error *
1173 match_commit(int *have_match, struct got_object_id *id,
1174 struct got_commit_object *commit, regex_t *regex)
1176 const struct got_error *err = NULL;
1177 regmatch_t regmatch;
1178 char *id_str = NULL, *logmsg = NULL;
1182 err = got_object_id_str(&id_str, id);
1186 err = got_object_commit_get_logmsg(&logmsg, commit);
1190 if (regexec(regex, got_object_commit_get_author(commit), 1,
1191 ®match, 0) == 0 ||
1192 regexec(regex, got_object_commit_get_committer(commit), 1,
1193 ®match, 0) == 0 ||
1194 regexec(regex, id_str, 1, ®match, 0) == 0 ||
1195 regexec(regex, logmsg, 1, ®match, 0) == 0)
1203 static const struct got_error *
1204 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1205 int minqueue, struct got_repository *repo, const char *path,
1206 int *searching, int *search_next_done, regex_t *regex)
1208 const struct got_error *err = NULL;
1209 int nqueued = 0, have_match = 0;
1212 * We keep all commits open throughout the lifetime of the log
1213 * view in order to avoid having to re-fetch commits from disk
1214 * while updating the display.
1216 while (nqueued < minqueue ||
1217 (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1218 struct got_object_id *id;
1219 struct got_commit_object *commit;
1220 struct commit_queue_entry *entry;
1223 err = got_commit_graph_iter_next(&id, graph);
1225 if (err->code != GOT_ERR_ITER_NEED_MORE)
1227 err = got_commit_graph_fetch_commits(graph,
1228 minqueue, repo, NULL, NULL);
1237 err = got_object_open_as_commit(&commit, repo, id);
1240 entry = alloc_commit_queue_entry(commit, id);
1241 if (entry == NULL) {
1242 err = got_error_from_errno("alloc_commit_queue_entry");
1246 errcode = pthread_mutex_lock(&tog_mutex);
1248 err = got_error_set_errno(errcode,
1249 "pthread_mutex_lock");
1253 entry->idx = commits->ncommits;
1254 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1256 commits->ncommits++;
1258 if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1259 err = match_commit(&have_match, id, commit, regex);
1261 pthread_mutex_lock(&tog_mutex);
1266 errcode = pthread_mutex_unlock(&tog_mutex);
1267 if (errcode && err == NULL)
1268 err = got_error_set_errno(errcode,
1269 "pthread_mutex_unlock");
1278 static const struct got_error *
1279 get_head_commit_id(struct got_object_id **head_id, const char *branch_name,
1280 struct got_repository *repo)
1282 const struct got_error *err = NULL;
1283 struct got_reference *head_ref;
1287 err = got_ref_open(&head_ref, repo, branch_name, 0);
1291 err = got_ref_resolve(head_id, repo, head_ref);
1292 got_ref_close(head_ref);
1301 static const struct got_error *
1302 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1303 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1304 struct commit_queue *commits, int selected_idx, int limit,
1305 struct got_reflist_head *refs, const char *path, int commits_needed)
1307 const struct got_error *err = NULL;
1308 struct tog_log_view_state *s = &view->state.log;
1309 struct commit_queue_entry *entry;
1311 int ncommits, author_cols = 10;
1312 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1313 char *refs_str = NULL;
1315 static const size_t date_display_cols = 9;
1320 if (ncommits == selected_idx) {
1324 entry = TAILQ_NEXT(entry, entry);
1328 if (*selected && !(view->searching && view->search_next_done == 0)) {
1329 err = got_object_id_str(&id_str, (*selected)->id);
1333 err = build_refs_str(&refs_str, refs, (*selected)->id,
1340 if (commits_needed == 0)
1341 halfdelay(10); /* disable fast refresh */
1343 if (asprintf(&ncommits_str, " [%d/%d] %s",
1344 entry ? entry->idx + 1 : 0, commits->ncommits,
1345 commits_needed > 0 ?
1346 (view->searching && view->search_next_done == 0
1347 ? "searching..." : "loading... ") :
1348 (refs_str ? refs_str : "")) == -1) {
1349 err = got_error_from_errno("asprintf");
1353 if (path && strcmp(path, "/") != 0) {
1354 if (asprintf(&header, "commit %s %s%s",
1355 id_str ? id_str : "........................................",
1356 path, ncommits_str) == -1) {
1357 err = got_error_from_errno("asprintf");
1361 } else if (asprintf(&header, "commit %s%s",
1362 id_str ? id_str : "........................................",
1363 ncommits_str) == -1) {
1364 err = got_error_from_errno("asprintf");
1368 err = format_line(&wline, &width, header, view->ncols, 0);
1372 werase(view->window);
1374 if (view_needs_focus_indication(view))
1375 wstandout(view->window);
1376 waddwstr(view->window, wline);
1377 while (width < view->ncols) {
1378 waddch(view->window, ' ');
1381 if (view_needs_focus_indication(view))
1382 wstandend(view->window);
1387 /* Grow author column size if necessary. */
1394 if (ncommits >= limit - 1)
1396 author = strdup(got_object_commit_get_author(entry->commit));
1397 if (author == NULL) {
1398 err = got_error_from_errno("strdup");
1401 err = format_author(&wauthor, &width, author, COLS,
1403 if (author_cols < width)
1404 author_cols = width;
1408 entry = TAILQ_NEXT(entry, entry);
1415 if (ncommits >= limit - 1)
1417 if (ncommits == selected_idx)
1418 wstandout(view->window);
1419 err = draw_commit(view, entry->commit, entry->id, refs,
1420 date_display_cols, author_cols);
1421 if (ncommits == selected_idx)
1422 wstandend(view->window);
1427 entry = TAILQ_NEXT(entry, entry);
1440 scroll_up(struct tog_view *view,
1441 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1442 struct commit_queue *commits)
1444 struct commit_queue_entry *entry;
1447 entry = TAILQ_FIRST(&commits->head);
1448 if (*first_displayed_entry == entry)
1451 entry = *first_displayed_entry;
1452 while (entry && nscrolled < maxscroll) {
1453 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1455 *first_displayed_entry = entry;
1461 static const struct got_error *
1462 trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1463 pthread_cond_t *need_commits)
1468 halfdelay(1); /* fast refresh while loading commits */
1470 while (*commits_needed > 0) {
1474 /* Wake the log thread. */
1475 errcode = pthread_cond_signal(need_commits);
1477 return got_error_set_errno(errcode,
1478 "pthread_cond_signal");
1479 errcode = pthread_mutex_unlock(&tog_mutex);
1481 return got_error_set_errno(errcode,
1482 "pthread_mutex_unlock");
1484 errcode = pthread_mutex_lock(&tog_mutex);
1486 return got_error_set_errno(errcode,
1487 "pthread_mutex_lock");
1489 if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1491 * Thread is not done yet; lose a key press
1492 * and let the user retry... this way the GUI
1493 * remains interactive while logging deep paths
1494 * with few commits in history.
1503 static const struct got_error *
1504 scroll_down(struct tog_view *view,
1505 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1506 struct commit_queue_entry **last_displayed_entry,
1507 struct commit_queue *commits, int *log_complete, int *commits_needed,
1508 pthread_cond_t *need_commits)
1510 const struct got_error *err = NULL;
1511 struct commit_queue_entry *pentry;
1514 if (*last_displayed_entry == NULL)
1517 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1518 if (pentry == NULL && !*log_complete) {
1520 * Ask the log thread for required amount of commits
1521 * plus some amount of pre-fetching.
1523 (*commits_needed) += maxscroll + 20;
1524 err = trigger_log_thread(0, commits_needed, log_complete,
1531 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1535 *last_displayed_entry = pentry;
1537 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1540 *first_displayed_entry = pentry;
1541 } while (++nscrolled < maxscroll);
1546 static const struct got_error *
1547 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1548 struct got_commit_object *commit, struct got_object_id *commit_id,
1549 struct tog_view *log_view, struct got_reflist_head *refs,
1550 struct got_repository *repo)
1552 const struct got_error *err;
1553 struct got_object_qid *parent_id;
1554 struct tog_view *diff_view;
1556 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1557 if (diff_view == NULL)
1558 return got_error_from_errno("view_open");
1560 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1561 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1562 commit_id, log_view, refs, repo);
1564 *new_view = diff_view;
1568 static const struct got_error *
1569 tree_view_visit_subtree(struct got_tree_object *subtree,
1570 struct tog_tree_view_state *s)
1572 struct tog_parent_tree *parent;
1574 parent = calloc(1, sizeof(*parent));
1576 return got_error_from_errno("calloc");
1578 parent->tree = s->tree;
1579 parent->first_displayed_entry = s->first_displayed_entry;
1580 parent->selected_entry = s->selected_entry;
1581 parent->selected = s->selected;
1582 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1584 s->entries = got_object_tree_get_entries(s->tree);
1586 s->first_displayed_entry = NULL;
1591 static const struct got_error *
1592 browse_commit_tree(struct tog_view **new_view, int begin_x,
1593 struct commit_queue_entry *entry, const char *path,
1594 struct got_reflist_head *refs, struct got_repository *repo)
1596 const struct got_error *err = NULL;
1597 struct got_tree_object *tree;
1598 struct got_tree_entry *te;
1599 struct tog_tree_view_state *s;
1600 struct tog_view *tree_view;
1601 char *slash, *subpath = NULL;
1604 err = got_object_open_as_tree(&tree, repo,
1605 got_object_commit_get_tree_id(entry->commit));
1609 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1610 if (tree_view == NULL)
1611 return got_error_from_errno("view_open");
1613 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1615 got_object_tree_close(tree);
1618 s = &tree_view->state.tree;
1620 *new_view = tree_view;
1622 /* Walk the path and open corresponding tree objects. */
1627 struct got_object_id *tree_id;
1629 /* Ensure the correct subtree entry is selected. */
1630 slash = strchr(p, '/');
1632 slash = strchr(p, '\0');
1633 SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
1634 if (strncmp(p, te->name, slash - p) == 0) {
1635 s->selected_entry = te;
1640 if (s->selected_entry == NULL) {
1641 err = got_error(GOT_ERR_NO_TREE_ENTRY);
1644 if (s->tree != s->root)
1645 s->selected++; /* skip '..' */
1647 if (!S_ISDIR(s->selected_entry->mode)) {
1648 /* Jump to this file's entry. */
1649 s->first_displayed_entry = s->selected_entry;
1654 slash = strchr(p, '/');
1656 subpath = strndup(path, slash - path);
1658 subpath = strdup(path);
1659 if (subpath == NULL) {
1660 err = got_error_from_errno("strdup");
1664 err = got_object_id_by_path(&tree_id, repo, entry->id,
1669 err = got_object_open_as_tree(&tree, repo, tree_id);
1674 err = tree_view_visit_subtree(tree, s);
1676 got_object_tree_close(tree);
1691 log_thread(void *arg)
1693 const struct got_error *err = NULL;
1695 struct tog_log_thread_args *a = arg;
1698 err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo,
1703 while (!done && !err && !tog_sigpipe_received) {
1704 err = queue_commits(a->graph, a->commits, 1, a->repo,
1705 a->in_repo_path, a->searching, a->search_next_done,
1708 if (err->code != GOT_ERR_ITER_COMPLETED)
1712 } else if (a->commits_needed > 0)
1713 a->commits_needed--;
1715 errcode = pthread_mutex_lock(&tog_mutex);
1717 err = got_error_set_errno(errcode,
1718 "pthread_mutex_lock");
1720 } else if (*a->quit)
1722 else if (*a->first_displayed_entry == NULL) {
1723 *a->first_displayed_entry =
1724 TAILQ_FIRST(&a->commits->head);
1725 *a->selected_entry = *a->first_displayed_entry;
1729 a->commits_needed = 0;
1730 else if (a->commits_needed == 0) {
1731 errcode = pthread_cond_wait(&a->need_commits,
1734 err = got_error_set_errno(errcode,
1735 "pthread_cond_wait");
1738 errcode = pthread_mutex_unlock(&tog_mutex);
1739 if (errcode && err == NULL)
1740 err = got_error_set_errno(errcode,
1741 "pthread_mutex_unlock");
1743 a->log_complete = 1;
1747 static const struct got_error *
1748 stop_log_thread(struct tog_log_view_state *s)
1750 const struct got_error *err = NULL;
1755 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1757 return got_error_set_errno(errcode,
1758 "pthread_cond_signal");
1759 errcode = pthread_mutex_unlock(&tog_mutex);
1761 return got_error_set_errno(errcode,
1762 "pthread_mutex_unlock");
1763 errcode = pthread_join(s->thread, (void **)&err);
1765 return got_error_set_errno(errcode, "pthread_join");
1766 errcode = pthread_mutex_lock(&tog_mutex);
1768 return got_error_set_errno(errcode,
1769 "pthread_mutex_lock");
1773 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1774 if (errcode && err == NULL)
1775 err = got_error_set_errno(errcode, "pthread_cond_destroy");
1777 if (s->thread_args.repo) {
1778 got_repo_close(s->thread_args.repo);
1779 s->thread_args.repo = NULL;
1782 if (s->thread_args.graph) {
1783 got_commit_graph_close(s->thread_args.graph);
1784 s->thread_args.graph = NULL;
1790 static const struct got_error *
1791 close_log_view(struct tog_view *view)
1793 const struct got_error *err = NULL;
1794 struct tog_log_view_state *s = &view->state.log;
1796 err = stop_log_thread(s);
1797 free_commits(&s->commits);
1798 free(s->in_repo_path);
1799 s->in_repo_path = NULL;
1805 static const struct got_error *
1806 search_start_log_view(struct tog_view *view)
1808 struct tog_log_view_state *s = &view->state.log;
1810 s->matched_entry = NULL;
1811 s->search_entry = NULL;
1815 static const struct got_error *
1816 search_next_log_view(struct tog_view *view)
1818 const struct got_error *err = NULL;
1819 struct tog_log_view_state *s = &view->state.log;
1820 struct commit_queue_entry *entry;
1822 if (!view->searching) {
1823 view->search_next_done = 1;
1827 if (s->search_entry) {
1829 errcode = pthread_mutex_unlock(&tog_mutex);
1831 return got_error_set_errno(errcode,
1832 "pthread_mutex_unlock");
1833 ch = wgetch(view->window);
1834 errcode = pthread_mutex_lock(&tog_mutex);
1836 return got_error_set_errno(errcode,
1837 "pthread_mutex_lock");
1838 if (ch == KEY_BACKSPACE) {
1839 view->search_next_done = 1;
1842 if (view->searching == TOG_SEARCH_FORWARD)
1843 entry = TAILQ_NEXT(s->search_entry, entry);
1845 entry = TAILQ_PREV(s->search_entry,
1846 commit_queue_head, entry);
1847 } else if (s->matched_entry) {
1848 if (view->searching == TOG_SEARCH_FORWARD)
1849 entry = TAILQ_NEXT(s->selected_entry, entry);
1851 entry = TAILQ_PREV(s->selected_entry,
1852 commit_queue_head, entry);
1854 if (view->searching == TOG_SEARCH_FORWARD)
1855 entry = TAILQ_FIRST(&s->commits.head);
1857 entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
1863 if (entry == NULL) {
1864 if (s->thread_args.log_complete ||
1865 view->searching == TOG_SEARCH_BACKWARD) {
1866 view->search_next_done = 1;
1870 * Poke the log thread for more commits and return,
1871 * allowing the main loop to make progress. Search
1872 * will resume at s->search_entry once we come back.
1874 s->thread_args.commits_needed++;
1875 return trigger_log_thread(1,
1876 &s->thread_args.commits_needed,
1877 &s->thread_args.log_complete,
1878 &s->thread_args.need_commits);
1881 err = match_commit(&have_match, entry->id, entry->commit,
1886 view->search_next_done = 1;
1887 s->matched_entry = entry;
1891 s->search_entry = entry;
1892 if (view->searching == TOG_SEARCH_FORWARD)
1893 entry = TAILQ_NEXT(entry, entry);
1895 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1898 if (s->matched_entry) {
1899 int cur = s->selected_entry->idx;
1900 while (cur < s->matched_entry->idx) {
1901 err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
1906 while (cur > s->matched_entry->idx) {
1907 err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
1914 s->search_entry = NULL;
1919 static const struct got_error *
1920 open_log_view(struct tog_view *view, struct got_object_id *start_id,
1921 struct got_reflist_head *refs, struct got_repository *repo,
1922 const char *head_ref_name, const char *path, int check_disk)
1924 const struct got_error *err = NULL;
1925 struct tog_log_view_state *s = &view->state.log;
1926 struct got_repository *thread_repo = NULL;
1927 struct got_commit_graph *thread_graph = NULL;
1930 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1934 /* The commit queue only contains commits being displayed. */
1935 TAILQ_INIT(&s->commits.head);
1936 s->commits.ncommits = 0;
1940 s->head_ref_name = head_ref_name;
1941 s->start_id = got_object_id_dup(start_id);
1942 if (s->start_id == NULL) {
1943 err = got_error_from_errno("got_object_id_dup");
1947 view->show = show_log_view;
1948 view->input = input_log_view;
1949 view->close = close_log_view;
1950 view->search_start = search_start_log_view;
1951 view->search_next = search_next_log_view;
1953 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
1956 err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1961 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1963 err = got_error_set_errno(errcode, "pthread_cond_init");
1967 s->thread_args.commits_needed = view->nlines;
1968 s->thread_args.graph = thread_graph;
1969 s->thread_args.commits = &s->commits;
1970 s->thread_args.in_repo_path = s->in_repo_path;
1971 s->thread_args.start_id = s->start_id;
1972 s->thread_args.repo = thread_repo;
1973 s->thread_args.log_complete = 0;
1974 s->thread_args.quit = &s->quit;
1975 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1976 s->thread_args.selected_entry = &s->selected_entry;
1977 s->thread_args.searching = &view->searching;
1978 s->thread_args.search_next_done = &view->search_next_done;
1979 s->thread_args.regex = &view->regex;
1982 close_log_view(view);
1986 static const struct got_error *
1987 show_log_view(struct tog_view *view)
1989 struct tog_log_view_state *s = &view->state.log;
1991 if (s->thread == NULL) {
1992 int errcode = pthread_create(&s->thread, NULL, log_thread,
1995 return got_error_set_errno(errcode, "pthread_create");
1998 return draw_commits(view, &s->last_displayed_entry,
1999 &s->selected_entry, s->first_displayed_entry,
2000 &s->commits, s->selected, view->nlines, s->refs,
2001 s->in_repo_path, s->thread_args.commits_needed);
2004 static const struct got_error *
2005 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2006 struct tog_view **focus_view, struct tog_view *view, int ch)
2008 const struct got_error *err = NULL;
2009 struct tog_log_view_state *s = &view->state.log;
2010 char *parent_path, *in_repo_path = NULL;
2011 struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2013 struct got_object_id *start_id;
2023 if (s->first_displayed_entry == NULL)
2025 if (s->selected > 0)
2028 scroll_up(view, &s->first_displayed_entry, 1,
2033 if (s->first_displayed_entry == NULL)
2035 if (TAILQ_FIRST(&s->commits.head) ==
2036 s->first_displayed_entry) {
2040 scroll_up(view, &s->first_displayed_entry,
2041 view->nlines, &s->commits);
2047 if (s->first_displayed_entry == NULL)
2049 if (s->selected < MIN(view->nlines - 2,
2050 s->commits.ncommits - 1)) {
2054 err = scroll_down(view, &s->first_displayed_entry, 1,
2055 &s->last_displayed_entry, &s->commits,
2056 &s->thread_args.log_complete,
2057 &s->thread_args.commits_needed,
2058 &s->thread_args.need_commits);
2062 struct commit_queue_entry *first;
2063 first = s->first_displayed_entry;
2066 err = scroll_down(view, &s->first_displayed_entry,
2067 view->nlines, &s->last_displayed_entry,
2068 &s->commits, &s->thread_args.log_complete,
2069 &s->thread_args.commits_needed,
2070 &s->thread_args.need_commits);
2073 if (first == s->first_displayed_entry &&
2074 s->selected < MIN(view->nlines - 2,
2075 s->commits.ncommits - 1)) {
2076 /* can't scroll further down */
2077 s->selected = MIN(view->nlines - 2,
2078 s->commits.ncommits - 1);
2084 if (s->selected > view->nlines - 2)
2085 s->selected = view->nlines - 2;
2086 if (s->selected > s->commits.ncommits - 1)
2087 s->selected = s->commits.ncommits - 1;
2092 if (s->selected_entry == NULL)
2094 if (view_is_parent_view(view))
2095 begin_x = view_split_begin_x(view->begin_x);
2096 err = open_diff_view_for_commit(&diff_view, begin_x,
2097 s->selected_entry->commit, s->selected_entry->id,
2098 view, s->refs, s->repo);
2101 if (view_is_parent_view(view)) {
2102 err = view_close_child(view);
2105 err = view_set_child(view, diff_view);
2107 view_close(diff_view);
2110 *focus_view = diff_view;
2111 view->child_focussed = 1;
2113 *new_view = diff_view;
2116 if (s->selected_entry == NULL)
2118 if (view_is_parent_view(view))
2119 begin_x = view_split_begin_x(view->begin_x);
2120 err = browse_commit_tree(&tree_view, begin_x,
2121 s->selected_entry, s->in_repo_path, s->refs, s->repo);
2124 if (view_is_parent_view(view)) {
2125 err = view_close_child(view);
2128 err = view_set_child(view, tree_view);
2130 view_close(tree_view);
2133 *focus_view = tree_view;
2134 view->child_focussed = 1;
2136 *new_view = tree_view;
2139 if (strcmp(s->in_repo_path, "/") == 0)
2141 parent_path = dirname(s->in_repo_path);
2142 if (parent_path && strcmp(parent_path, ".") != 0) {
2143 err = stop_log_thread(s);
2146 lv = view_open(view->nlines, view->ncols,
2147 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2149 return got_error_from_errno(
2151 err = open_log_view(lv, s->start_id, s->refs,
2152 s->repo, s->head_ref_name, parent_path, 0);
2155 if (view_is_parent_view(view))
2158 view_set_child(view->parent, lv);
2165 err = stop_log_thread(s);
2168 lv = view_open(view->nlines, view->ncols,
2169 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2171 return got_error_from_errno("view_open");
2172 err = get_head_commit_id(&start_id, s->head_ref_name ?
2173 s->head_ref_name : GOT_REF_HEAD, s->repo);
2178 in_repo_path = strdup(s->in_repo_path);
2179 if (in_repo_path == NULL) {
2182 return got_error_from_errno("strdup");
2184 got_ref_list_free(s->refs);
2185 err = got_ref_list(s->refs, s->repo, NULL,
2186 got_ref_cmp_by_name, NULL);
2192 err = open_log_view(lv, start_id, s->refs, s->repo,
2193 s->head_ref_name, in_repo_path, 0);
2209 static const struct got_error *
2210 apply_unveil(const char *repo_path, const char *worktree_path)
2212 const struct got_error *error;
2215 if (unveil("gmon.out", "rwc") != 0)
2216 return got_error_from_errno2("unveil", "gmon.out");
2218 if (repo_path && unveil(repo_path, "r") != 0)
2219 return got_error_from_errno2("unveil", repo_path);
2221 if (worktree_path && unveil(worktree_path, "rwc") != 0)
2222 return got_error_from_errno2("unveil", worktree_path);
2224 if (unveil("/tmp", "rwc") != 0)
2225 return got_error_from_errno2("unveil", "/tmp");
2227 error = got_privsep_unveil_exec_helpers();
2231 if (unveil(NULL, NULL) != 0)
2232 return got_error_from_errno("unveil");
2242 halfdelay(1); /* Do fast refresh while initial view is loading. */
2245 intrflush(stdscr, FALSE);
2246 keypad(stdscr, TRUE);
2248 signal(SIGWINCH, tog_sigwinch);
2249 signal(SIGPIPE, tog_sigpipe);
2252 static const struct got_error *
2253 cmd_log(int argc, char *argv[])
2255 const struct got_error *error;
2256 struct got_repository *repo = NULL;
2257 struct got_worktree *worktree = NULL;
2258 struct got_reflist_head refs;
2259 struct got_object_id *start_id = NULL;
2260 char *path = NULL, *repo_path = NULL, *cwd = NULL;
2261 char *start_commit = NULL, *head_ref_name = NULL;
2263 struct tog_view *view;
2265 SIMPLEQ_INIT(&refs);
2268 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2273 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2276 start_commit = optarg;
2279 repo_path = realpath(optarg, NULL);
2280 if (repo_path == NULL)
2281 return got_error_from_errno2("realpath",
2293 cwd = getcwd(NULL, 0);
2295 error = got_error_from_errno("getcwd");
2298 error = got_worktree_open(&worktree, cwd);
2299 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2306 error = got_error_from_errno("strdup");
2309 } else if (argc == 1) {
2311 error = got_worktree_resolve_path(&path, worktree,
2316 path = strdup(argv[0]);
2318 error = got_error_from_errno("strdup");
2325 if (repo_path == NULL) {
2328 got_worktree_get_repo_path(worktree));
2330 repo_path = strdup(cwd);
2332 if (repo_path == NULL) {
2333 error = got_error_from_errno("strdup");
2339 error = got_repo_open(&repo, repo_path, NULL);
2343 error = apply_unveil(got_repo_get_path(repo),
2344 worktree ? got_worktree_get_root_path(worktree) : NULL);
2348 if (start_commit == NULL)
2349 error = get_head_commit_id(&start_id, worktree ?
2350 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2353 error = get_head_commit_id(&start_id, start_commit, repo);
2355 if (error->code != GOT_ERR_NOT_REF)
2357 error = got_repo_match_object_id_prefix(&start_id,
2358 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2364 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2368 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2370 error = got_error_from_errno("view_open");
2374 head_ref_name = strdup(
2375 got_worktree_get_head_ref_name(worktree));
2376 if (head_ref_name == NULL) {
2377 error = got_error_from_errno("strdup");
2381 error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2386 /* Release work tree lock. */
2387 got_worktree_close(worktree);
2390 error = view_loop(view);
2396 free(head_ref_name);
2398 got_repo_close(repo);
2400 got_worktree_close(worktree);
2401 got_ref_list_free(&refs);
2409 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
2415 parse_next_line(FILE *f, size_t *len)
2420 const char delim[3] = { '\0', '\0', '\0'};
2422 line = fparseln(f, &linelen, &lineno, delim, 0);
2428 static const struct got_error *
2429 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
2430 int *last_displayed_line, int *eof, int max_lines,
2433 const struct got_error *err;
2434 int nlines = 0, nprinted = 0;
2441 werase(view->window);
2444 err = format_line(&wline, &width, header, view->ncols, 0);
2449 if (view_needs_focus_indication(view))
2450 wstandout(view->window);
2451 waddwstr(view->window, wline);
2452 if (view_needs_focus_indication(view))
2453 wstandend(view->window);
2454 if (width <= view->ncols - 1)
2455 waddch(view->window, '\n');
2463 while (nprinted < max_lines) {
2464 line = parse_next_line(f, &len);
2469 if (++nlines < *first_displayed_line) {
2474 err = format_line(&wline, &width, line, view->ncols, 0);
2479 waddwstr(view->window, wline);
2480 if (width <= view->ncols - 1)
2481 waddch(view->window, '\n');
2482 if (++nprinted == 1)
2483 *first_displayed_line = nlines;
2488 *last_displayed_line = nlines;
2493 while (nprinted < view->nlines) {
2494 waddch(view->window, '\n');
2498 err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2503 wstandout(view->window);
2504 waddwstr(view->window, wline);
2505 wstandend(view->window);
2512 get_datestr(time_t *time, char *datebuf)
2514 struct tm mytm, *tm;
2517 tm = gmtime_r(time, &mytm);
2520 s = asctime_r(tm, datebuf);
2523 p = strchr(s, '\n');
2529 static const struct got_error *
2530 write_commit_info(struct got_object_id *commit_id,
2531 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2533 const struct got_error *err = NULL;
2534 char datebuf[26], *datestr;
2535 struct got_commit_object *commit;
2536 char *id_str = NULL, *logmsg = NULL;
2537 time_t committer_time;
2538 const char *author, *committer;
2539 char *refs_str = NULL;
2542 err = build_refs_str(&refs_str, refs, commit_id, repo);
2547 err = got_object_open_as_commit(&commit, repo, commit_id);
2551 err = got_object_id_str(&id_str, commit_id);
2553 err = got_error_from_errno("got_object_id_str");
2557 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2558 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2559 err = got_error_from_errno("fprintf");
2562 if (fprintf(outfile, "from: %s\n",
2563 got_object_commit_get_author(commit)) < 0) {
2564 err = got_error_from_errno("fprintf");
2567 committer_time = got_object_commit_get_committer_time(commit);
2568 datestr = get_datestr(&committer_time, datebuf);
2569 if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2570 err = got_error_from_errno("fprintf");
2573 author = got_object_commit_get_author(commit);
2574 committer = got_object_commit_get_committer(commit);
2575 if (strcmp(author, committer) != 0 &&
2576 fprintf(outfile, "via: %s\n", committer) < 0) {
2577 err = got_error_from_errno("fprintf");
2580 err = got_object_commit_get_logmsg(&logmsg, commit);
2583 if (fprintf(outfile, "%s\n", logmsg) < 0) {
2584 err = got_error_from_errno("fprintf");
2591 got_object_commit_close(commit);
2595 static const struct got_error *
2596 create_diff(struct tog_diff_view_state *s)
2598 const struct got_error *err = NULL;
2604 err = got_error_from_errno("got_opentemp");
2607 if (s->f && fclose(s->f) != 0) {
2608 err = got_error_from_errno("fclose");
2614 err = got_object_get_type(&obj_type, s->repo, s->id1);
2616 err = got_object_get_type(&obj_type, s->repo, s->id2);
2621 case GOT_OBJ_TYPE_BLOB:
2622 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2623 s->diff_context, 0, s->repo, f);
2625 case GOT_OBJ_TYPE_TREE:
2626 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2627 s->diff_context, 0, s->repo, f);
2629 case GOT_OBJ_TYPE_COMMIT: {
2630 const struct got_object_id_queue *parent_ids;
2631 struct got_object_qid *pid;
2632 struct got_commit_object *commit2;
2634 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2637 /* Show commit info if we're diffing to a parent/root commit. */
2639 write_commit_info(s->id2, s->refs, s->repo, f);
2641 parent_ids = got_object_commit_get_parent_ids(commit2);
2642 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2643 if (got_object_id_cmp(s->id1, pid->id) == 0) {
2644 write_commit_info(s->id2, s->refs,
2650 got_object_commit_close(commit2);
2652 err = got_diff_objects_as_commits(s->id1, s->id2,
2653 s->diff_context, 0, s->repo, f);
2657 err = got_error(GOT_ERR_OBJ_TYPE);
2661 if (f && fflush(f) != 0 && err == NULL)
2662 err = got_error_from_errno("fflush");
2667 diff_view_indicate_progress(struct tog_view *view)
2669 mvwaddstr(view->window, 0, 0, "diffing...");
2674 static const struct got_error *
2675 open_diff_view(struct tog_view *view, struct got_object_id *id1,
2676 struct got_object_id *id2, struct tog_view *log_view,
2677 struct got_reflist_head *refs, struct got_repository *repo)
2679 const struct got_error *err;
2681 if (id1 != NULL && id2 != NULL) {
2683 err = got_object_get_type(&type1, repo, id1);
2686 err = got_object_get_type(&type2, repo, id2);
2691 return got_error(GOT_ERR_OBJ_TYPE);
2695 view->state.diff.id1 = got_object_id_dup(id1);
2696 if (view->state.diff.id1 == NULL)
2697 return got_error_from_errno("got_object_id_dup");
2699 view->state.diff.id1 = NULL;
2701 view->state.diff.id2 = got_object_id_dup(id2);
2702 if (view->state.diff.id2 == NULL) {
2703 free(view->state.diff.id1);
2704 view->state.diff.id1 = NULL;
2705 return got_error_from_errno("got_object_id_dup");
2707 view->state.diff.f = NULL;
2708 view->state.diff.first_displayed_line = 1;
2709 view->state.diff.last_displayed_line = view->nlines;
2710 view->state.diff.diff_context = 3;
2711 view->state.diff.log_view = log_view;
2712 view->state.diff.repo = repo;
2713 view->state.diff.refs = refs;
2715 if (log_view && view_is_splitscreen(view))
2716 show_log_view(log_view); /* draw vborder */
2717 diff_view_indicate_progress(view);
2719 err = create_diff(&view->state.diff);
2721 free(view->state.diff.id1);
2722 view->state.diff.id1 = NULL;
2723 free(view->state.diff.id2);
2724 view->state.diff.id2 = NULL;
2728 view->show = show_diff_view;
2729 view->input = input_diff_view;
2730 view->close = close_diff_view;
2735 static const struct got_error *
2736 close_diff_view(struct tog_view *view)
2738 const struct got_error *err = NULL;
2740 free(view->state.diff.id1);
2741 view->state.diff.id1 = NULL;
2742 free(view->state.diff.id2);
2743 view->state.diff.id2 = NULL;
2744 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2745 err = got_error_from_errno("fclose");
2749 static const struct got_error *
2750 show_diff_view(struct tog_view *view)
2752 const struct got_error *err;
2753 struct tog_diff_view_state *s = &view->state.diff;
2754 char *id_str1 = NULL, *id_str2, *header;
2757 err = got_object_id_str(&id_str1, s->id1);
2761 err = got_object_id_str(&id_str2, s->id2);
2765 if (asprintf(&header, "diff %s %s",
2766 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2767 err = got_error_from_errno("asprintf");
2775 return draw_file(view, s->f, &s->first_displayed_line,
2776 &s->last_displayed_line, &s->eof, view->nlines,
2780 static const struct got_error *
2781 set_selected_commit(struct tog_diff_view_state *s,
2782 struct commit_queue_entry *entry)
2784 const struct got_error *err;
2785 const struct got_object_id_queue *parent_ids;
2786 struct got_commit_object *selected_commit;
2787 struct got_object_qid *pid;
2790 s->id2 = got_object_id_dup(entry->id);
2792 return got_error_from_errno("got_object_id_dup");
2794 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2797 parent_ids = got_object_commit_get_parent_ids(selected_commit);
2799 pid = SIMPLEQ_FIRST(parent_ids);
2800 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2801 got_object_commit_close(selected_commit);
2805 static const struct got_error *
2806 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2807 struct tog_view **focus_view, struct tog_view *view, int ch)
2809 const struct got_error *err = NULL;
2810 struct tog_diff_view_state *s = &view->state.diff;
2811 struct tog_log_view_state *ls;
2812 struct commit_queue_entry *entry;
2818 if (s->first_displayed_line > 1)
2819 s->first_displayed_line--;
2823 if (s->first_displayed_line == 1)
2826 while (i++ < view->nlines - 1 &&
2827 s->first_displayed_line > 1)
2828 s->first_displayed_line--;
2833 s->first_displayed_line++;
2841 while (!s->eof && i++ < view->nlines - 1) {
2843 line = parse_next_line(s->f, NULL);
2844 s->first_displayed_line++;
2850 if (s->diff_context > 0) {
2852 diff_view_indicate_progress(view);
2853 err = create_diff(s);
2857 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2859 diff_view_indicate_progress(view);
2860 err = create_diff(s);
2865 if (s->log_view == NULL)
2867 ls = &s->log_view->state.log;
2868 entry = TAILQ_PREV(ls->selected_entry,
2869 commit_queue_head, entry);
2873 err = input_log_view(NULL, NULL, NULL, s->log_view,
2878 err = set_selected_commit(s, entry);
2882 s->first_displayed_line = 1;
2883 s->last_displayed_line = view->nlines;
2885 diff_view_indicate_progress(view);
2886 err = create_diff(s);
2890 if (s->log_view == NULL)
2892 ls = &s->log_view->state.log;
2894 if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2895 ls->thread_args.commits_needed++;
2897 /* Display "loading..." in log view. */
2898 show_log_view(s->log_view);
2902 err = trigger_log_thread(1 /* load_all */,
2903 &ls->thread_args.commits_needed,
2904 &ls->thread_args.log_complete,
2905 &ls->thread_args.need_commits);
2909 err = input_log_view(NULL, NULL, NULL, s->log_view,
2914 entry = TAILQ_NEXT(ls->selected_entry, entry);
2918 err = set_selected_commit(s, entry);
2922 s->first_displayed_line = 1;
2923 s->last_displayed_line = view->nlines;
2925 diff_view_indicate_progress(view);
2926 err = create_diff(s);
2935 static const struct got_error *
2936 cmd_diff(int argc, char *argv[])
2938 const struct got_error *error = NULL;
2939 struct got_repository *repo = NULL;
2940 struct got_reflist_head refs;
2941 struct got_object_id *id1 = NULL, *id2 = NULL;
2942 char *repo_path = NULL;
2943 char *id_str1 = NULL, *id_str2 = NULL;
2945 struct tog_view *view;
2947 SIMPLEQ_INIT(&refs);
2950 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2955 while ((ch = getopt(argc, argv, "")) != -1) {
2967 usage_diff(); /* TODO show local worktree changes */
2968 } else if (argc == 2) {
2969 repo_path = getcwd(NULL, 0);
2970 if (repo_path == NULL)
2971 return got_error_from_errno("getcwd");
2974 } else if (argc == 3) {
2975 repo_path = realpath(argv[0], NULL);
2976 if (repo_path == NULL)
2977 return got_error_from_errno2("realpath", argv[0]);
2985 error = got_repo_open(&repo, repo_path, NULL);
2989 error = apply_unveil(got_repo_get_path(repo), NULL);
2993 error = got_repo_match_object_id_prefix(&id1, id_str1,
2994 GOT_OBJ_TYPE_ANY, repo);
2998 error = got_repo_match_object_id_prefix(&id2, id_str2,
2999 GOT_OBJ_TYPE_ANY, repo);
3003 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3007 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3009 error = got_error_from_errno("view_open");
3012 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3015 error = view_loop(view);
3019 got_repo_close(repo);
3020 got_ref_list_free(&refs);
3028 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3033 struct tog_blame_line {
3035 struct got_object_id *id;
3038 static const struct got_error *
3039 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3040 const char *path, struct tog_blame_line *lines, int nlines,
3041 int blame_complete, int selected_line, int *first_displayed_line,
3042 int *last_displayed_line, int *eof, int max_lines)
3044 const struct got_error *err;
3045 int lineno = 0, nprinted = 0;
3050 struct tog_blame_line *blame_line;
3051 struct got_object_id *prev_id = NULL;
3054 err = got_object_id_str(&id_str, id);
3059 werase(view->window);
3061 if (asprintf(&line, "commit %s", id_str) == -1) {
3062 err = got_error_from_errno("asprintf");
3067 err = format_line(&wline, &width, line, view->ncols, 0);
3072 if (view_needs_focus_indication(view))
3073 wstandout(view->window);
3074 waddwstr(view->window, wline);
3075 if (view_needs_focus_indication(view))
3076 wstandend(view->window);
3079 if (width < view->ncols - 1)
3080 waddch(view->window, '\n');
3082 if (asprintf(&line, "[%d/%d] %s%s",
3083 *first_displayed_line - 1 + selected_line, nlines,
3084 blame_complete ? "" : "annotating... ", path) == -1) {
3086 return got_error_from_errno("asprintf");
3089 err = format_line(&wline, &width, line, view->ncols, 0);
3094 waddwstr(view->window, wline);
3097 if (width < view->ncols - 1)
3098 waddch(view->window, '\n');
3101 while (nprinted < max_lines - 2) {
3102 line = parse_next_line(f, &len);
3107 if (++lineno < *first_displayed_line) {
3112 if (view->ncols <= 9) {
3114 wline = wcsdup(L"");
3116 err = got_error_from_errno("wcsdup");
3118 err = format_line(&wline, &width, line,
3119 view->ncols - 9, 9);
3127 if (view->focussed && nprinted == selected_line - 1)
3128 wstandout(view->window);
3131 blame_line = &lines[lineno - 1];
3132 if (blame_line->annotated && prev_id &&
3133 got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3135 nprinted == selected_line - 1)) {
3136 waddstr(view->window, " ");
3137 } else if (blame_line->annotated) {
3139 err = got_object_id_str(&id_str, blame_line->id);
3145 wprintw(view->window, "%.8s", id_str);
3147 prev_id = blame_line->id;
3149 waddstr(view->window, "........");
3153 waddstr(view->window, "........");
3157 if (view->focussed && nprinted == selected_line - 1)
3158 wstandend(view->window);
3159 waddstr(view->window, " ");
3161 waddwstr(view->window, wline);
3162 if (width <= view->ncols - 1)
3163 waddch(view->window, '\n');
3164 if (++nprinted == 1)
3165 *first_displayed_line = lineno;
3170 *last_displayed_line = lineno;
3177 static const struct got_error *
3178 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3180 const struct got_error *err = NULL;
3181 struct tog_blame_cb_args *a = arg;
3182 struct tog_blame_line *line;
3185 if (nlines != a->nlines ||
3186 (lineno != -1 && lineno < 1) || lineno > a->nlines)
3187 return got_error(GOT_ERR_RANGE);
3189 errcode = pthread_mutex_lock(&tog_mutex);
3191 return got_error_set_errno(errcode, "pthread_mutex_lock");
3193 if (*a->quit) { /* user has quit the blame view */
3194 err = got_error(GOT_ERR_ITER_COMPLETED);
3199 goto done; /* no change in this commit */
3201 line = &a->lines[lineno - 1];
3202 if (line->annotated)
3205 line->id = got_object_id_dup(id);
3206 if (line->id == NULL) {
3207 err = got_error_from_errno("got_object_id_dup");
3210 line->annotated = 1;
3212 errcode = pthread_mutex_unlock(&tog_mutex);
3214 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3219 blame_thread(void *arg)
3221 const struct got_error *err;
3222 struct tog_blame_thread_args *ta = arg;
3223 struct tog_blame_cb_args *a = ta->cb_args;
3226 err = got_blame(ta->path, a->commit_id, ta->repo,
3227 blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3228 if (err && err->code == GOT_ERR_CANCELLED)
3231 errcode = pthread_mutex_lock(&tog_mutex);
3233 return (void *)got_error_set_errno(errcode,
3234 "pthread_mutex_lock");
3236 got_repo_close(ta->repo);
3240 errcode = pthread_mutex_unlock(&tog_mutex);
3241 if (errcode && err == NULL)
3242 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3247 static struct got_object_id *
3248 get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3249 int first_displayed_line, int selected_line)
3251 struct tog_blame_line *line;
3256 line = &lines[first_displayed_line - 1 + selected_line - 1];
3257 if (!line->annotated)
3263 static const struct got_error *
3264 stop_blame(struct tog_blame *blame)
3266 const struct got_error *err = NULL;
3269 if (blame->thread) {
3271 errcode = pthread_mutex_unlock(&tog_mutex);
3273 return got_error_set_errno(errcode,
3274 "pthread_mutex_unlock");
3275 errcode = pthread_join(blame->thread, (void **)&err);
3277 return got_error_set_errno(errcode, "pthread_join");
3278 errcode = pthread_mutex_lock(&tog_mutex);
3280 return got_error_set_errno(errcode,
3281 "pthread_mutex_lock");
3282 if (err && err->code == GOT_ERR_ITER_COMPLETED)
3284 blame->thread = NULL;
3286 if (blame->thread_args.repo) {
3287 got_repo_close(blame->thread_args.repo);
3288 blame->thread_args.repo = NULL;
3291 if (fclose(blame->f) != 0 && err == NULL)
3292 err = got_error_from_errno("fclose");
3296 for (i = 0; i < blame->nlines; i++)
3297 free(blame->lines[i].id);
3299 blame->lines = NULL;
3301 free(blame->cb_args.commit_id);
3302 blame->cb_args.commit_id = NULL;
3307 static const struct got_error *
3308 cancel_blame_view(void *arg)
3310 const struct got_error *err = NULL;
3314 errcode = pthread_mutex_lock(&tog_mutex);
3316 return got_error_set_errno(errcode,
3317 "pthread_mutex_unlock");
3320 err = got_error(GOT_ERR_CANCELLED);
3322 errcode = pthread_mutex_unlock(&tog_mutex);
3324 return got_error_set_errno(errcode,
3325 "pthread_mutex_lock");
3330 static const struct got_error *
3331 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3332 int *first_displayed_line, int *last_displayed_line, int *selected_line,
3333 int *done, int *eof, const char *path, struct got_object_id *commit_id,
3334 struct got_repository *repo)
3336 const struct got_error *err = NULL;
3337 struct got_blob_object *blob = NULL;
3338 struct got_repository *thread_repo = NULL;
3339 struct got_object_id *obj_id = NULL;
3342 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3346 return got_error(GOT_ERR_NO_OBJ);
3348 err = got_object_get_type(&obj_type, repo, obj_id);
3352 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3353 err = got_error(GOT_ERR_OBJ_TYPE);
3357 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3360 blame->f = got_opentemp();
3361 if (blame->f == NULL) {
3362 err = got_error_from_errno("got_opentemp");
3365 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3366 &blame->line_offsets, blame->f, blob);
3367 if (err || blame->nlines == 0)
3370 /* Don't include \n at EOF in the blame line count. */
3371 if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
3374 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
3375 if (blame->lines == NULL) {
3376 err = got_error_from_errno("calloc");
3380 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
3384 blame->cb_args.view = view;
3385 blame->cb_args.lines = blame->lines;
3386 blame->cb_args.nlines = blame->nlines;
3387 blame->cb_args.commit_id = got_object_id_dup(commit_id);
3388 if (blame->cb_args.commit_id == NULL) {
3389 err = got_error_from_errno("got_object_id_dup");
3392 blame->cb_args.quit = done;
3394 blame->thread_args.path = path;
3395 blame->thread_args.repo = thread_repo;
3396 blame->thread_args.cb_args = &blame->cb_args;
3397 blame->thread_args.complete = blame_complete;
3398 blame->thread_args.cancel_cb = cancel_blame_view;
3399 blame->thread_args.cancel_arg = done;
3400 *blame_complete = 0;
3404 got_object_blob_close(blob);
3411 static const struct got_error *
3412 open_blame_view(struct tog_view *view, char *path,
3413 struct got_object_id *commit_id, struct got_reflist_head *refs,
3414 struct got_repository *repo)
3416 const struct got_error *err = NULL;
3417 struct tog_blame_view_state *s = &view->state.blame;
3419 SIMPLEQ_INIT(&s->blamed_commits);
3421 s->path = strdup(path);
3422 if (s->path == NULL)
3423 return got_error_from_errno("strdup");
3425 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
3431 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
3432 s->first_displayed_line = 1;
3433 s->last_displayed_line = view->nlines;
3434 s->selected_line = 1;
3435 s->blame_complete = 0;
3438 s->commit_id = commit_id;
3439 memset(&s->blame, 0, sizeof(s->blame));
3441 view->show = show_blame_view;
3442 view->input = input_blame_view;
3443 view->close = close_blame_view;
3444 view->search_start = search_start_blame_view;
3445 view->search_next = search_next_blame_view;
3447 return run_blame(&s->blame, view, &s->blame_complete,
3448 &s->first_displayed_line, &s->last_displayed_line,
3449 &s->selected_line, &s->done, &s->eof, s->path,
3450 s->blamed_commit->id, s->repo);
3453 static const struct got_error *
3454 close_blame_view(struct tog_view *view)
3456 const struct got_error *err = NULL;
3457 struct tog_blame_view_state *s = &view->state.blame;
3459 if (s->blame.thread)
3460 err = stop_blame(&s->blame);
3462 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
3463 struct got_object_qid *blamed_commit;
3464 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
3465 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3466 got_object_qid_free(blamed_commit);
3474 static const struct got_error *
3475 search_start_blame_view(struct tog_view *view)
3477 struct tog_blame_view_state *s = &view->state.blame;
3479 s->matched_line = 0;
3484 match_line(const char *line, regex_t *regex)
3486 regmatch_t regmatch;
3488 return regexec(regex, line, 1, ®match, 0) == 0;
3492 static const struct got_error *
3493 search_next_blame_view(struct tog_view *view)
3495 struct tog_blame_view_state *s = &view->state.blame;
3498 if (!view->searching) {
3499 view->search_next_done = 1;
3503 if (s->matched_line) {
3504 if (view->searching == TOG_SEARCH_FORWARD)
3505 lineno = s->matched_line + 1;
3507 lineno = s->matched_line - 1;
3509 if (view->searching == TOG_SEARCH_FORWARD)
3512 lineno = s->blame.nlines;
3520 if (lineno <= 0 || lineno > s->blame.nlines) {
3521 if (s->matched_line == 0) {
3522 view->search_next_done = 1;
3527 if (view->searching == TOG_SEARCH_FORWARD)
3530 lineno = s->blame.nlines;
3533 offset = s->blame.line_offsets[lineno - 1];
3534 if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
3536 return got_error_from_errno("fseeko");
3539 line = parse_next_line(s->blame.f, &len);
3540 if (line && match_line(line, &view->regex)) {
3541 view->search_next_done = 1;
3542 s->matched_line = lineno;
3547 if (view->searching == TOG_SEARCH_FORWARD)
3553 if (s->matched_line) {
3554 s->first_displayed_line = s->matched_line;
3555 s->selected_line = 1;
3561 static const struct got_error *
3562 show_blame_view(struct tog_view *view)
3564 const struct got_error *err = NULL;
3565 struct tog_blame_view_state *s = &view->state.blame;
3568 if (s->blame.thread == NULL) {
3569 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
3570 &s->blame.thread_args);
3572 return got_error_set_errno(errcode, "pthread_create");
3574 halfdelay(1); /* fast refresh while annotating */
3577 if (s->blame_complete)
3578 halfdelay(10); /* disable fast refresh */
3580 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
3581 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
3582 s->selected_line, &s->first_displayed_line,
3583 &s->last_displayed_line, &s->eof, view->nlines);
3589 static const struct got_error *
3590 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
3591 struct tog_view **focus_view, struct tog_view *view, int ch)
3593 const struct got_error *err = NULL, *thread_err = NULL;
3594 struct tog_view *diff_view;
3595 struct tog_blame_view_state *s = &view->state.blame;
3604 if (s->selected_line > 1)
3606 else if (s->selected_line == 1 &&
3607 s->first_displayed_line > 1)
3608 s->first_displayed_line--;
3611 if (s->first_displayed_line == 1) {
3612 s->selected_line = 1;
3615 if (s->first_displayed_line > view->nlines - 2)
3616 s->first_displayed_line -=
3619 s->first_displayed_line = 1;
3623 if (s->selected_line < view->nlines - 2 &&
3624 s->first_displayed_line +
3625 s->selected_line <= s->blame.nlines)
3627 else if (s->last_displayed_line <
3629 s->first_displayed_line++;
3633 struct got_object_id *id = NULL;
3634 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
3635 s->first_displayed_line, s->selected_line);
3639 struct got_commit_object *commit;
3640 struct got_object_qid *pid;
3641 struct got_object_id *blob_id = NULL;
3643 err = got_object_open_as_commit(&commit,
3647 pid = SIMPLEQ_FIRST(
3648 got_object_commit_get_parent_ids(commit));
3650 got_object_commit_close(commit);
3653 /* Check if path history ends here. */
3654 err = got_object_id_by_path(&blob_id, s->repo,
3657 if (err->code == GOT_ERR_NO_TREE_ENTRY)
3659 got_object_commit_close(commit);
3662 err = got_object_get_type(&obj_type, s->repo,
3665 /* Can't blame non-blob type objects. */
3666 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3667 got_object_commit_close(commit);
3670 err = got_object_qid_alloc(&s->blamed_commit,
3672 got_object_commit_close(commit);
3674 if (got_object_id_cmp(id,
3675 s->blamed_commit->id) == 0)
3677 err = got_object_qid_alloc(&s->blamed_commit,
3683 thread_err = stop_blame(&s->blame);
3687 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3688 s->blamed_commit, entry);
3689 err = run_blame(&s->blame, view, &s->blame_complete,
3690 &s->first_displayed_line, &s->last_displayed_line,
3691 &s->selected_line, &s->done, &s->eof,
3692 s->path, s->blamed_commit->id, s->repo);
3698 struct got_object_qid *first;
3699 first = SIMPLEQ_FIRST(&s->blamed_commits);
3700 if (!got_object_id_cmp(first->id, s->commit_id))
3703 thread_err = stop_blame(&s->blame);
3707 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3708 got_object_qid_free(s->blamed_commit);
3710 SIMPLEQ_FIRST(&s->blamed_commits);
3711 err = run_blame(&s->blame, view, &s->blame_complete,
3712 &s->first_displayed_line, &s->last_displayed_line,
3713 &s->selected_line, &s->done, &s->eof, s->path,
3714 s->blamed_commit->id, s->repo);
3721 struct got_object_id *id = NULL;
3722 struct got_object_qid *pid;
3723 struct got_commit_object *commit = NULL;
3724 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
3725 s->first_displayed_line, s->selected_line);
3728 err = got_object_open_as_commit(&commit, s->repo, id);
3731 pid = SIMPLEQ_FIRST(
3732 got_object_commit_get_parent_ids(commit));
3733 if (view_is_parent_view(view))
3734 begin_x = view_split_begin_x(view->begin_x);
3735 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3736 if (diff_view == NULL) {
3737 got_object_commit_close(commit);
3738 err = got_error_from_errno("view_open");
3741 err = open_diff_view(diff_view, pid ? pid->id : NULL,
3742 id, NULL, s->refs, s->repo);
3743 got_object_commit_close(commit);
3745 view_close(diff_view);
3748 if (view_is_parent_view(view)) {
3749 err = view_close_child(view);
3752 err = view_set_child(view, diff_view);
3754 view_close(diff_view);
3757 *focus_view = diff_view;
3758 view->child_focussed = 1;
3760 *new_view = diff_view;
3767 if (s->last_displayed_line >= s->blame.nlines &&
3768 s->selected_line >= MIN(s->blame.nlines,
3769 view->nlines - 2)) {
3772 if (s->last_displayed_line >= s->blame.nlines &&
3773 s->selected_line < view->nlines - 2) {
3774 s->selected_line = MIN(s->blame.nlines,
3778 if (s->last_displayed_line + view->nlines - 2
3780 s->first_displayed_line +=
3783 s->first_displayed_line =
3788 if (s->selected_line > view->nlines - 2) {
3789 s->selected_line = MIN(s->blame.nlines,
3796 return thread_err ? thread_err : err;
3799 static const struct got_error *
3800 cmd_blame(int argc, char *argv[])
3802 const struct got_error *error;
3803 struct got_repository *repo = NULL;
3804 struct got_reflist_head refs;
3805 struct got_worktree *worktree = NULL;
3806 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3807 struct got_object_id *commit_id = NULL;
3808 char *commit_id_str = NULL;
3810 struct tog_view *view;
3812 SIMPLEQ_INIT(&refs);
3815 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3820 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3823 commit_id_str = optarg;
3826 repo_path = realpath(optarg, NULL);
3827 if (repo_path == NULL)
3828 return got_error_from_errno2("realpath",
3845 cwd = getcwd(NULL, 0);
3847 error = got_error_from_errno("getcwd");
3850 if (repo_path == NULL) {
3851 error = got_worktree_open(&worktree, cwd);
3852 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3858 strdup(got_worktree_get_repo_path(worktree));
3859 if (repo_path == NULL)
3860 error = got_error_from_errno("strdup");
3864 repo_path = strdup(cwd);
3865 if (repo_path == NULL) {
3866 error = got_error_from_errno("strdup");
3874 error = got_repo_open(&repo, repo_path, NULL);
3878 error = apply_unveil(got_repo_get_path(repo), NULL);
3883 const char *prefix = got_worktree_get_path_prefix(worktree);
3884 char *p, *worktree_subdir = cwd +
3885 strlen(got_worktree_get_root_path(worktree));
3886 if (asprintf(&p, "%s%s%s%s%s",
3887 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3888 worktree_subdir, worktree_subdir[0] ? "/" : "",
3890 error = got_error_from_errno("asprintf");
3893 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3896 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3901 if (commit_id_str == NULL) {
3902 struct got_reference *head_ref;
3903 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3906 error = got_ref_resolve(&commit_id, repo, head_ref);
3907 got_ref_close(head_ref);
3909 error = get_head_commit_id(&commit_id, commit_id_str, repo);
3911 if (error->code != GOT_ERR_NOT_REF)
3913 error = got_repo_match_object_id_prefix(&commit_id,
3914 commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
3920 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3924 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3926 error = got_error_from_errno("view_open");
3929 error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3933 /* Release work tree lock. */
3934 got_worktree_close(worktree);
3937 error = view_loop(view);
3943 got_worktree_close(worktree);
3945 got_repo_close(repo);
3946 got_ref_list_free(&refs);
3950 static const struct got_error *
3951 draw_tree_entries(struct tog_view *view,
3952 struct got_tree_entry **first_displayed_entry,
3953 struct got_tree_entry **last_displayed_entry,
3954 struct got_tree_entry **selected_entry, int *ndisplayed,
3955 const char *label, int show_ids, const char *parent_path,
3956 const struct got_tree_entries *entries, int selected, int limit, int isroot)
3958 const struct got_error *err = NULL;
3959 struct got_tree_entry *te;
3965 werase(view->window);
3970 err = format_line(&wline, &width, label, view->ncols, 0);
3973 if (view_needs_focus_indication(view))
3974 wstandout(view->window);
3975 waddwstr(view->window, wline);
3976 if (view_needs_focus_indication(view))
3977 wstandend(view->window);
3980 if (width < view->ncols - 1)
3981 waddch(view->window, '\n');
3984 err = format_line(&wline, &width, parent_path, view->ncols, 0);
3987 waddwstr(view->window, wline);
3990 if (width < view->ncols - 1)
3991 waddch(view->window, '\n');
3994 waddch(view->window, '\n');
3998 te = SIMPLEQ_FIRST(&entries->head);
3999 if (*first_displayed_entry == NULL) {
4000 if (selected == 0) {
4002 wstandout(view->window);
4003 *selected_entry = NULL;
4005 waddstr(view->window, " ..\n"); /* parent directory */
4006 if (selected == 0 && view->focussed)
4007 wstandend(view->window);
4014 while (te != *first_displayed_entry)
4015 te = SIMPLEQ_NEXT(te, entry);
4019 char *line = NULL, *id_str = NULL;
4020 const char *modestr = "";
4023 err = got_object_id_str(&id_str, te->id);
4025 return got_error_from_errno(
4026 "got_object_id_str");
4028 if (got_object_tree_entry_is_submodule(te))
4030 else if (S_ISLNK(te->mode))
4032 else if (S_ISDIR(te->mode))
4034 else if (te->mode & S_IXUSR)
4036 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
4037 te->name, modestr) == -1) {
4039 return got_error_from_errno("asprintf");
4042 err = format_line(&wline, &width, line, view->ncols, 0);
4047 if (n == selected) {
4049 wstandout(view->window);
4050 *selected_entry = te;
4052 waddwstr(view->window, wline);
4053 if (width < view->ncols - 1)
4054 waddch(view->window, '\n');
4055 if (n == selected && view->focussed)
4056 wstandend(view->window);
4062 *last_displayed_entry = te;
4065 te = SIMPLEQ_NEXT(te, entry);
4072 tree_scroll_up(struct tog_view *view,
4073 struct got_tree_entry **first_displayed_entry, int maxscroll,
4074 const struct got_tree_entries *entries, int isroot)
4076 struct got_tree_entry *te, *prev;
4079 if (*first_displayed_entry == NULL)
4082 te = SIMPLEQ_FIRST(&entries->head);
4083 if (*first_displayed_entry == te) {
4085 *first_displayed_entry = NULL;
4089 /* XXX this is stupid... switch to TAILQ? */
4090 for (i = 0; i < maxscroll; i++) {
4091 while (te != *first_displayed_entry) {
4093 te = SIMPLEQ_NEXT(te, entry);
4095 *first_displayed_entry = prev;
4096 te = SIMPLEQ_FIRST(&entries->head);
4098 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
4099 *first_displayed_entry = NULL;
4103 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4104 struct got_tree_entry *last_displayed_entry,
4105 const struct got_tree_entries *entries)
4107 struct got_tree_entry *next, *last;
4110 if (*first_displayed_entry)
4111 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
4113 next = SIMPLEQ_FIRST(&entries->head);
4114 last = last_displayed_entry;
4115 while (next && last && n++ < maxscroll) {
4116 last = SIMPLEQ_NEXT(last, entry);
4118 *first_displayed_entry = next;
4119 next = SIMPLEQ_NEXT(next, entry);
4125 static const struct got_error *
4126 tree_entry_path(char **path, struct tog_parent_trees *parents,
4127 struct got_tree_entry *te)
4129 const struct got_error *err = NULL;
4130 struct tog_parent_tree *pt;
4131 size_t len = 2; /* for leading slash and NUL */
4133 TAILQ_FOREACH(pt, parents, entry)
4134 len += strlen(pt->selected_entry->name) + 1 /* slash */;
4136 len += strlen(te->name);
4138 *path = calloc(1, len);
4140 return got_error_from_errno("calloc");
4143 pt = TAILQ_LAST(parents, tog_parent_trees);
4145 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
4146 err = got_error(GOT_ERR_NO_SPACE);
4149 if (strlcat(*path, "/", len) >= len) {
4150 err = got_error(GOT_ERR_NO_SPACE);
4153 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4156 if (strlcat(*path, te->name, len) >= len) {
4157 err = got_error(GOT_ERR_NO_SPACE);
4169 static const struct got_error *
4170 blame_tree_entry(struct tog_view **new_view, int begin_x,
4171 struct got_tree_entry *te, struct tog_parent_trees *parents,
4172 struct got_object_id *commit_id, struct got_reflist_head *refs,
4173 struct got_repository *repo)
4175 const struct got_error *err = NULL;
4177 struct tog_view *blame_view;
4181 err = tree_entry_path(&path, parents, te);
4185 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4186 if (blame_view == NULL) {
4187 err = got_error_from_errno("view_open");
4191 err = open_blame_view(blame_view, path, commit_id, refs, repo);
4193 if (err->code == GOT_ERR_CANCELLED)
4195 view_close(blame_view);
4197 *new_view = blame_view;
4203 static const struct got_error *
4204 log_tree_entry(struct tog_view **new_view, int begin_x,
4205 struct got_tree_entry *te, struct tog_parent_trees *parents,
4206 struct got_object_id *commit_id, struct got_reflist_head *refs,
4207 struct got_repository *repo)
4209 struct tog_view *log_view;
4210 const struct got_error *err = NULL;
4215 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4216 if (log_view == NULL)
4217 return got_error_from_errno("view_open");
4219 err = tree_entry_path(&path, parents, te);
4223 err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4225 view_close(log_view);
4227 *new_view = log_view;
4232 static const struct got_error *
4233 open_tree_view(struct tog_view *view, struct got_tree_object *root,
4234 struct got_object_id *commit_id, struct got_reflist_head *refs,
4235 struct got_repository *repo)
4237 const struct got_error *err = NULL;
4238 char *commit_id_str = NULL;
4239 struct tog_tree_view_state *s = &view->state.tree;
4241 TAILQ_INIT(&s->parents);
4243 err = got_object_id_str(&commit_id_str, commit_id);
4247 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4248 err = got_error_from_errno("asprintf");
4252 s->root = s->tree = root;
4253 s->entries = got_object_tree_get_entries(root);
4254 s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
4255 s->selected_entry = SIMPLEQ_FIRST(&s->entries->head);
4256 s->commit_id = got_object_id_dup(commit_id);
4257 if (s->commit_id == NULL) {
4258 err = got_error_from_errno("got_object_id_dup");
4264 view->show = show_tree_view;
4265 view->input = input_tree_view;
4266 view->close = close_tree_view;
4267 view->search_start = search_start_tree_view;
4268 view->search_next = search_next_tree_view;
4270 free(commit_id_str);
4272 free(s->tree_label);
4273 s->tree_label = NULL;
4278 static const struct got_error *
4279 close_tree_view(struct tog_view *view)
4281 struct tog_tree_view_state *s = &view->state.tree;
4283 free(s->tree_label);
4284 s->tree_label = NULL;
4286 s->commit_id = NULL;
4287 while (!TAILQ_EMPTY(&s->parents)) {
4288 struct tog_parent_tree *parent;
4289 parent = TAILQ_FIRST(&s->parents);
4290 TAILQ_REMOVE(&s->parents, parent, entry);
4294 if (s->tree != s->root)
4295 got_object_tree_close(s->tree);
4296 got_object_tree_close(s->root);
4301 static const struct got_error *
4302 search_start_tree_view(struct tog_view *view)
4304 struct tog_tree_view_state *s = &view->state.tree;
4306 s->matched_entry = NULL;
4311 match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4313 regmatch_t regmatch;
4315 return regexec(regex, te->name, 1, ®match, 0) == 0;
4318 static const struct got_error *
4319 search_next_tree_view(struct tog_view *view)
4321 struct tog_tree_view_state *s = &view->state.tree;
4322 struct got_tree_entry *entry = NULL, *te;
4324 if (!view->searching) {
4325 view->search_next_done = 1;
4329 if (s->matched_entry) {
4330 if (view->searching == TOG_SEARCH_FORWARD) {
4331 if (s->selected_entry)
4332 entry = SIMPLEQ_NEXT(s->selected_entry, entry);
4334 entry = SIMPLEQ_FIRST(&s->entries->head);
4337 if (s->selected_entry == NULL) {
4338 SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4341 SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4343 if (SIMPLEQ_NEXT(te, entry) ==
4350 if (view->searching == TOG_SEARCH_FORWARD)
4351 entry = SIMPLEQ_FIRST(&s->entries->head);
4353 SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4359 if (entry == NULL) {
4360 if (s->matched_entry == NULL) {
4361 view->search_next_done = 1;
4364 if (view->searching == TOG_SEARCH_FORWARD)
4365 entry = SIMPLEQ_FIRST(&s->entries->head);
4367 SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4372 if (match_tree_entry(entry, &view->regex)) {
4373 view->search_next_done = 1;
4374 s->matched_entry = entry;
4378 if (view->searching == TOG_SEARCH_FORWARD)
4379 entry = SIMPLEQ_NEXT(entry, entry);
4381 if (SIMPLEQ_FIRST(&s->entries->head) == entry)
4384 SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4385 if (SIMPLEQ_NEXT(te, entry) == entry) {
4394 if (s->matched_entry) {
4395 s->first_displayed_entry = s->matched_entry;
4402 static const struct got_error *
4403 show_tree_view(struct tog_view *view)
4405 const struct got_error *err = NULL;
4406 struct tog_tree_view_state *s = &view->state.tree;
4409 err = tree_entry_path(&parent_path, &s->parents, NULL);
4413 err = draw_tree_entries(view, &s->first_displayed_entry,
4414 &s->last_displayed_entry, &s->selected_entry,
4415 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
4416 s->entries, s->selected, view->nlines, s->tree == s->root);
4423 static const struct got_error *
4424 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
4425 struct tog_view **focus_view, struct tog_view *view, int ch)
4427 const struct got_error *err = NULL;
4428 struct tog_tree_view_state *s = &view->state.tree;
4429 struct tog_view *log_view;
4430 int begin_x = 0, nscrolled;
4434 s->show_ids = !s->show_ids;
4437 if (!s->selected_entry)
4439 if (view_is_parent_view(view))
4440 begin_x = view_split_begin_x(view->begin_x);
4441 err = log_tree_entry(&log_view, begin_x,
4442 s->selected_entry, &s->parents,
4443 s->commit_id, s->refs, s->repo);
4444 if (view_is_parent_view(view)) {
4445 err = view_close_child(view);
4448 err = view_set_child(view, log_view);
4450 view_close(log_view);
4453 *focus_view = log_view;
4454 view->child_focussed = 1;
4456 *new_view = log_view;
4460 if (s->selected > 0) {
4462 if (s->selected == 0)
4465 if (s->selected > 0)
4467 tree_scroll_up(view, &s->first_displayed_entry, 1,
4468 s->entries, s->tree == s->root);
4471 tree_scroll_up(view, &s->first_displayed_entry,
4472 MAX(0, view->nlines - 4 - s->selected), s->entries,
4473 s->tree == s->root);
4475 if (SIMPLEQ_FIRST(&s->entries->head) ==
4476 s->first_displayed_entry && s->tree != s->root)
4477 s->first_displayed_entry = NULL;
4481 if (s->selected < s->ndisplayed - 1) {
4485 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry) == NULL)
4486 /* can't scroll any further */
4488 tree_scroll_down(&s->first_displayed_entry, 1,
4489 s->last_displayed_entry, s->entries);
4492 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
4494 /* can't scroll any further; move cursor down */
4495 if (s->selected < s->ndisplayed - 1)
4496 s->selected = s->ndisplayed - 1;
4499 nscrolled = tree_scroll_down(&s->first_displayed_entry,
4500 view->nlines, s->last_displayed_entry, s->entries);
4501 if (nscrolled < view->nlines) {
4503 struct got_tree_entry *te;
4504 te = s->first_displayed_entry;
4507 te = SIMPLEQ_NEXT(te, entry);
4509 s->selected = ndisplayed - 1;
4515 if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
4516 struct tog_parent_tree *parent;
4517 /* user selected '..' */
4518 if (s->tree == s->root)
4520 parent = TAILQ_FIRST(&s->parents);
4521 TAILQ_REMOVE(&s->parents, parent,
4523 got_object_tree_close(s->tree);
4524 s->tree = parent->tree;
4526 got_object_tree_get_entries(s->tree);
4527 s->first_displayed_entry =
4528 parent->first_displayed_entry;
4530 parent->selected_entry;
4531 s->selected = parent->selected;
4533 } else if (S_ISDIR(s->selected_entry->mode)) {
4534 struct got_tree_object *subtree;
4535 err = got_object_open_as_tree(&subtree,
4536 s->repo, s->selected_entry->id);
4539 err = tree_view_visit_subtree(subtree, s);
4541 got_object_tree_close(subtree);
4544 } else if (S_ISREG(s->selected_entry->mode)) {
4545 struct tog_view *blame_view;
4546 int begin_x = view_is_parent_view(view) ?
4547 view_split_begin_x(view->begin_x) : 0;
4549 err = blame_tree_entry(&blame_view, begin_x,
4550 s->selected_entry, &s->parents,
4551 s->commit_id, s->refs, s->repo);
4554 if (view_is_parent_view(view)) {
4555 err = view_close_child(view);
4558 err = view_set_child(view, blame_view);
4560 view_close(blame_view);
4563 *focus_view = blame_view;
4564 view->child_focussed = 1;
4566 *new_view = blame_view;
4570 if (s->selected > view->nlines)
4571 s->selected = s->ndisplayed - 1;
4584 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
4589 static const struct got_error *
4590 cmd_tree(int argc, char *argv[])
4592 const struct got_error *error;
4593 struct got_repository *repo = NULL;
4594 struct got_reflist_head refs;
4595 char *repo_path = NULL;
4596 struct got_object_id *commit_id = NULL;
4597 char *commit_id_arg = NULL;
4598 struct got_commit_object *commit = NULL;
4599 struct got_tree_object *tree = NULL;
4601 struct tog_view *view;
4603 SIMPLEQ_INIT(&refs);
4606 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4611 while ((ch = getopt(argc, argv, "c:")) != -1) {
4614 commit_id_arg = optarg;
4626 struct got_worktree *worktree;
4627 char *cwd = getcwd(NULL, 0);
4629 return got_error_from_errno("getcwd");
4630 error = got_worktree_open(&worktree, cwd);
4631 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4636 strdup(got_worktree_get_repo_path(worktree));
4637 got_worktree_close(worktree);
4640 if (repo_path == NULL) {
4641 error = got_error_from_errno("strdup");
4644 } else if (argc == 1) {
4645 repo_path = realpath(argv[0], NULL);
4646 if (repo_path == NULL)
4647 return got_error_from_errno2("realpath", argv[0]);
4653 error = got_repo_open(&repo, repo_path, NULL);
4657 error = apply_unveil(got_repo_get_path(repo), NULL);
4661 if (commit_id_arg == NULL)
4662 error = get_head_commit_id(&commit_id, GOT_REF_HEAD, repo);
4664 error = get_head_commit_id(&commit_id, commit_id_arg, repo);
4666 if (error->code != GOT_ERR_NOT_REF)
4668 error = got_repo_match_object_id_prefix(&commit_id,
4669 commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
4675 error = got_object_open_as_commit(&commit, repo, commit_id);
4679 error = got_object_open_as_tree(&tree, repo,
4680 got_object_commit_get_tree_id(commit));
4684 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4688 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
4690 error = got_error_from_errno("view_open");
4693 error = open_tree_view(view, tree, commit_id, &refs, repo);
4696 error = view_loop(view);
4701 got_object_commit_close(commit);
4703 got_object_tree_close(tree);
4705 got_repo_close(repo);
4706 got_ref_list_free(&refs);
4715 fprintf(stderr, "commands:");
4716 for (i = 0; i < nitems(tog_commands); i++) {
4717 struct tog_cmd *cmd = &tog_commands[i];
4718 fprintf(stderr, " %s", cmd->name);
4720 fputc('\n', stderr);
4726 fprintf(stderr, "usage: %s [-h] [-V] [command] [arg ...]\n",
4734 make_argv(const char *arg0, const char *arg1)
4737 int argc = (arg1 == NULL ? 1 : 2);
4739 argv = calloc(argc, sizeof(char *));
4742 argv[0] = strdup(arg0);
4743 if (argv[0] == NULL)
4746 argv[1] = strdup(arg1);
4747 if (argv[1] == NULL)
4755 main(int argc, char *argv[])
4757 const struct got_error *error = NULL;
4758 struct tog_cmd *cmd = NULL;
4759 int ch, hflag = 0, Vflag = 0;
4760 char **cmd_argv = NULL;
4762 setlocale(LC_CTYPE, "");
4764 while ((ch = getopt(argc, argv, "hV")) != -1) {
4784 got_version_print_str();
4791 /* Build an argument vector which runs a default command. */
4792 cmd = &tog_commands[0];
4793 cmd_argv = make_argv(cmd->name, NULL);
4798 /* Did the user specific a command? */
4799 for (i = 0; i < nitems(tog_commands); i++) {
4800 if (strncmp(tog_commands[i].name, argv[0],
4801 strlen(argv[0])) == 0) {
4802 cmd = &tog_commands[i];
4808 fprintf(stderr, "%s: unknown command '%s'\n",
4809 getprogname(), argv[0]);
4818 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4822 if (error && error->code != GOT_ERR_CANCELLED)
4823 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);