2 * Copyright (c) 2018, 2019, 2020 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
42 #include "got_version.h"
43 #include "got_error.h"
44 #include "got_object.h"
45 #include "got_reference.h"
46 #include "got_repository.h"
48 #include "got_opentemp.h"
50 #include "got_cancel.h"
51 #include "got_commit_graph.h"
52 #include "got_blame.h"
53 #include "got_privsep.h"
55 #include "got_worktree.h"
58 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
62 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
65 #define CTRL(x) ((x) & 0x1f)
68 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
73 const struct got_error *(*cmd_main)(int, char *[]);
74 void (*cmd_usage)(void);
77 __dead static void usage(int);
78 __dead static void usage_log(void);
79 __dead static void usage_diff(void);
80 __dead static void usage_blame(void);
81 __dead static void usage_tree(void);
83 static const struct got_error* cmd_log(int, char *[]);
84 static const struct got_error* cmd_diff(int, char *[]);
85 static const struct got_error* cmd_blame(int, char *[]);
86 static const struct got_error* cmd_tree(int, char *[]);
88 static struct tog_cmd tog_commands[] = {
89 { "log", cmd_log, usage_log },
90 { "diff", cmd_diff, usage_diff },
91 { "blame", cmd_blame, usage_blame },
92 { "tree", cmd_tree, usage_tree },
102 #define TOG_EOF_STRING "(END)"
104 struct commit_queue_entry {
105 TAILQ_ENTRY(commit_queue_entry) entry;
106 struct got_object_id *id;
107 struct got_commit_object *commit;
110 TAILQ_HEAD(commit_queue_head, commit_queue_entry);
111 struct commit_queue {
113 struct commit_queue_head head;
117 SIMPLEQ_ENTRY(tog_color) entry;
121 SIMPLEQ_HEAD(tog_colors, tog_color);
123 static const struct got_error *
124 add_color(struct tog_colors *colors, const char *pattern,
125 int idx, short color)
127 const struct got_error *err = NULL;
128 struct tog_color *tc;
131 if (idx < 1 || idx > COLOR_PAIRS - 1)
134 init_pair(idx, color, -1);
136 tc = calloc(1, sizeof(*tc));
138 return got_error_from_errno("calloc");
139 regerr = regcomp(&tc->regex, pattern,
140 REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
142 static char regerr_msg[512];
143 static char err_msg[512];
144 regerror(regerr, &tc->regex, regerr_msg,
146 snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
148 err = got_error_msg(GOT_ERR_REGEX, err_msg);
153 SIMPLEQ_INSERT_HEAD(colors, tc, entry);
158 free_colors(struct tog_colors *colors)
160 struct tog_color *tc;
162 while (!SIMPLEQ_EMPTY(colors)) {
163 tc = SIMPLEQ_FIRST(colors);
164 SIMPLEQ_REMOVE_HEAD(colors, entry);
171 get_color(struct tog_colors *colors, int colorpair)
173 struct tog_color *tc = NULL;
175 SIMPLEQ_FOREACH(tc, colors, entry) {
176 if (tc->colorpair == colorpair)
184 default_color_value(const char *envvar)
186 if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
187 return COLOR_MAGENTA;
188 if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
190 if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
192 if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
194 if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
195 return COLOR_MAGENTA;
196 if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
198 if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
200 if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
202 if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
204 if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
206 if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
213 get_color_value(const char *envvar)
215 const char *val = getenv(envvar);
218 return default_color_value(envvar);
220 if (strcasecmp(val, "black") == 0)
222 if (strcasecmp(val, "red") == 0)
224 if (strcasecmp(val, "green") == 0)
226 if (strcasecmp(val, "yellow") == 0)
228 if (strcasecmp(val, "blue") == 0)
230 if (strcasecmp(val, "magenta") == 0)
231 return COLOR_MAGENTA;
232 if (strcasecmp(val, "cyan") == 0)
234 if (strcasecmp(val, "white") == 0)
236 if (strcasecmp(val, "default") == 0)
239 return default_color_value(envvar);
243 struct tog_diff_view_state {
244 struct got_object_id *id1, *id2;
246 int first_displayed_line;
247 int last_displayed_line;
250 struct got_repository *repo;
251 struct got_reflist_head *refs;
252 struct tog_colors colors;
254 /* passed from log view; may be NULL */
255 struct tog_view *log_view;
258 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
260 struct tog_log_thread_args {
261 pthread_cond_t need_commits;
263 struct got_commit_graph *graph;
264 struct commit_queue *commits;
265 const char *in_repo_path;
266 struct got_object_id *start_id;
267 struct got_repository *repo;
270 struct commit_queue_entry **first_displayed_entry;
271 struct commit_queue_entry **selected_entry;
273 int *search_next_done;
277 struct tog_log_view_state {
278 struct commit_queue commits;
279 struct commit_queue_entry *first_displayed_entry;
280 struct commit_queue_entry *last_displayed_entry;
281 struct commit_queue_entry *selected_entry;
284 const char *head_ref_name;
285 struct got_repository *repo;
286 struct got_reflist_head *refs;
287 struct got_object_id *start_id;
290 struct tog_log_thread_args thread_args;
291 struct commit_queue_entry *matched_entry;
292 struct commit_queue_entry *search_entry;
293 struct tog_colors colors;
296 #define TOG_COLOR_DIFF_MINUS 1
297 #define TOG_COLOR_DIFF_PLUS 2
298 #define TOG_COLOR_DIFF_CHUNK_HEADER 3
299 #define TOG_COLOR_DIFF_META 4
300 #define TOG_COLOR_TREE_SUBMODULE 5
301 #define TOG_COLOR_TREE_SYMLINK 6
302 #define TOG_COLOR_TREE_DIRECTORY 7
303 #define TOG_COLOR_TREE_EXECUTABLE 8
304 #define TOG_COLOR_COMMIT 9
305 #define TOG_COLOR_AUTHOR 10
306 #define TOG_COLOR_DATE 11
308 struct tog_blame_cb_args {
309 struct tog_blame_line *lines; /* one per line */
312 struct tog_view *view;
313 struct got_object_id *commit_id;
317 struct tog_blame_thread_args {
319 struct got_repository *repo;
320 struct tog_blame_cb_args *cb_args;
322 got_cancel_cb cancel_cb;
329 struct tog_blame_line *lines;
333 struct tog_blame_thread_args thread_args;
334 struct tog_blame_cb_args cb_args;
338 struct tog_blame_view_state {
339 int first_displayed_line;
340 int last_displayed_line;
345 struct got_object_id_queue blamed_commits;
346 struct got_object_qid *blamed_commit;
348 struct got_repository *repo;
349 struct got_reflist_head *refs;
350 struct got_object_id *commit_id;
351 struct tog_blame blame;
353 struct tog_colors colors;
356 struct tog_parent_tree {
357 TAILQ_ENTRY(tog_parent_tree) entry;
358 struct got_tree_object *tree;
359 struct got_tree_entry *first_displayed_entry;
360 struct got_tree_entry *selected_entry;
364 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
366 struct tog_tree_view_state {
368 struct got_tree_object *root;
369 struct got_tree_object *tree;
370 struct got_tree_entry *first_displayed_entry;
371 struct got_tree_entry *last_displayed_entry;
372 struct got_tree_entry *selected_entry;
373 int ndisplayed, selected, show_ids;
374 struct tog_parent_trees parents;
375 struct got_object_id *commit_id;
376 struct got_repository *repo;
377 struct got_reflist_head *refs;
378 struct got_tree_entry *matched_entry;
379 struct tog_colors colors;
383 * We implement two types of views: parent views and child views.
385 * The 'Tab' key switches between a parent view and its child view.
386 * Child views are shown side-by-side to their parent view, provided
387 * there is enough screen estate.
389 * When a new view is opened from within a parent view, this new view
390 * becomes a child view of the parent view, replacing any existing child.
392 * When a new view is opened from within a child view, this new view
393 * becomes a parent view which will obscure the views below until the
394 * user quits the new parent view by typing 'q'.
396 * This list of views contains parent views only.
397 * Child views are only pointed to by their parent view.
399 TAILQ_HEAD(tog_view_list_head, tog_view);
402 TAILQ_ENTRY(tog_view) entry;
405 int nlines, ncols, begin_y, begin_x;
406 int lines, cols; /* copies of LINES and COLS */
408 struct tog_view *parent;
409 struct tog_view *child;
412 /* type-specific state */
413 enum tog_view_type type;
415 struct tog_diff_view_state diff;
416 struct tog_log_view_state log;
417 struct tog_blame_view_state blame;
418 struct tog_tree_view_state tree;
421 const struct got_error *(*show)(struct tog_view *);
422 const struct got_error *(*input)(struct tog_view **,
423 struct tog_view **, struct tog_view**, struct tog_view *, int);
424 const struct got_error *(*close)(struct tog_view *);
426 const struct got_error *(*search_start)(struct tog_view *);
427 const struct got_error *(*search_next)(struct tog_view *);
429 #define TOG_SEARCH_FORWARD 1
430 #define TOG_SEARCH_BACKWARD 2
431 int search_next_done;
435 static const struct got_error *open_diff_view(struct tog_view *,
436 struct got_object_id *, struct got_object_id *, struct tog_view *,
437 struct got_reflist_head *, struct got_repository *);
438 static const struct got_error *show_diff_view(struct tog_view *);
439 static const struct got_error *input_diff_view(struct tog_view **,
440 struct tog_view **, struct tog_view **, struct tog_view *, int);
441 static const struct got_error* close_diff_view(struct tog_view *);
443 static const struct got_error *open_log_view(struct tog_view *,
444 struct got_object_id *, struct got_reflist_head *,
445 struct got_repository *, const char *, const char *, int);
446 static const struct got_error * show_log_view(struct tog_view *);
447 static const struct got_error *input_log_view(struct tog_view **,
448 struct tog_view **, struct tog_view **, struct tog_view *, int);
449 static const struct got_error *close_log_view(struct tog_view *);
450 static const struct got_error *search_start_log_view(struct tog_view *);
451 static const struct got_error *search_next_log_view(struct tog_view *);
453 static const struct got_error *open_blame_view(struct tog_view *, char *,
454 struct got_object_id *, struct got_reflist_head *, struct got_repository *);
455 static const struct got_error *show_blame_view(struct tog_view *);
456 static const struct got_error *input_blame_view(struct tog_view **,
457 struct tog_view **, struct tog_view **, struct tog_view *, int);
458 static const struct got_error *close_blame_view(struct tog_view *);
459 static const struct got_error *search_start_blame_view(struct tog_view *);
460 static const struct got_error *search_next_blame_view(struct tog_view *);
462 static const struct got_error *open_tree_view(struct tog_view *,
463 struct got_tree_object *, struct got_object_id *,
464 struct got_reflist_head *, struct got_repository *);
465 static const struct got_error *show_tree_view(struct tog_view *);
466 static const struct got_error *input_tree_view(struct tog_view **,
467 struct tog_view **, struct tog_view **, struct tog_view *, int);
468 static const struct got_error *close_tree_view(struct tog_view *);
469 static const struct got_error *search_start_tree_view(struct tog_view *);
470 static const struct got_error *search_next_tree_view(struct tog_view *);
472 static volatile sig_atomic_t tog_sigwinch_received;
473 static volatile sig_atomic_t tog_sigpipe_received;
474 static volatile sig_atomic_t tog_sigcont_received;
477 tog_sigwinch(int signo)
479 tog_sigwinch_received = 1;
483 tog_sigpipe(int signo)
485 tog_sigpipe_received = 1;
489 tog_sigcont(int signo)
491 tog_sigcont_received = 1;
494 static const struct got_error *
495 view_close(struct tog_view *view)
497 const struct got_error *err = NULL;
500 view_close(view->child);
504 err = view->close(view);
506 del_panel(view->panel);
508 delwin(view->window);
513 static struct tog_view *
514 view_open(int nlines, int ncols, int begin_y, int begin_x,
515 enum tog_view_type type)
517 struct tog_view *view = calloc(1, sizeof(*view));
525 view->nlines = nlines ? nlines : LINES - begin_y;
526 view->ncols = ncols ? ncols : COLS - begin_x;
527 view->begin_y = begin_y;
528 view->begin_x = begin_x;
529 view->window = newwin(nlines, ncols, begin_y, begin_x);
530 if (view->window == NULL) {
534 view->panel = new_panel(view->window);
535 if (view->panel == NULL ||
536 set_panel_userptr(view->panel, view) != OK) {
541 keypad(view->window, TRUE);
546 view_split_begin_x(int begin_x)
548 if (begin_x > 0 || COLS < 120)
550 return (COLS - MAX(COLS / 2, 80));
553 static const struct got_error *view_resize(struct tog_view *);
555 static const struct got_error *
556 view_splitscreen(struct tog_view *view)
558 const struct got_error *err = NULL;
561 view->begin_x = view_split_begin_x(0);
562 view->nlines = LINES;
563 view->ncols = COLS - view->begin_x;
566 err = view_resize(view);
570 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
571 return got_error_from_errno("mvwin");
576 static const struct got_error *
577 view_fullscreen(struct tog_view *view)
579 const struct got_error *err = NULL;
583 view->nlines = LINES;
587 err = view_resize(view);
591 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
592 return got_error_from_errno("mvwin");
598 view_is_parent_view(struct tog_view *view)
600 return view->parent == NULL;
603 static const struct got_error *
604 view_resize(struct tog_view *view)
608 if (view->lines > LINES)
609 nlines = view->nlines - (view->lines - LINES);
611 nlines = view->nlines + (LINES - view->lines);
613 if (view->cols > COLS)
614 ncols = view->ncols - (view->cols - COLS);
616 ncols = view->ncols + (COLS - view->cols);
618 if (wresize(view->window, nlines, ncols) == ERR)
619 return got_error_from_errno("wresize");
620 if (replace_panel(view->panel, view->window) == ERR)
621 return got_error_from_errno("replace_panel");
622 wclear(view->window);
624 view->nlines = nlines;
630 view->child->begin_x = view_split_begin_x(view->begin_x);
631 if (view->child->begin_x == 0) {
632 view_fullscreen(view->child);
633 if (view->child->focussed)
634 show_panel(view->child->panel);
636 show_panel(view->panel);
638 view_splitscreen(view->child);
639 show_panel(view->child->panel);
646 static const struct got_error *
647 view_close_child(struct tog_view *view)
649 const struct got_error *err = NULL;
651 if (view->child == NULL)
654 err = view_close(view->child);
659 static const struct got_error *
660 view_set_child(struct tog_view *view, struct tog_view *child)
662 const struct got_error *err = NULL;
665 child->parent = view;
670 view_is_splitscreen(struct tog_view *view)
672 return view->begin_x > 0;
681 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
682 cols = 80; /* Default */
688 resize_term(lines, cols);
691 static const struct got_error *
692 view_search_start(struct tog_view *view)
694 const struct got_error *err = NULL;
699 if (view->nlines < 1)
702 if (!view_is_parent_view(view))
703 begin_x = view_split_begin_x(view->begin_x);
704 mvwaddstr(view->window, view->begin_y + view->nlines - 1,
706 wclrtoeol(view->window);
710 ret = wgetnstr(view->window, pattern, sizeof(pattern));
716 if (view->searching) {
717 regfree(&view->regex);
721 if (regcomp(&view->regex, pattern,
722 REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
723 err = view->search_start(view);
725 regfree(&view->regex);
728 view->searching = TOG_SEARCH_FORWARD;
729 view->search_next_done = 0;
730 view->search_next(view);
736 static const struct got_error *
737 view_input(struct tog_view **new, struct tog_view **dead,
738 struct tog_view **focus, int *done, struct tog_view *view,
739 struct tog_view_list_head *views)
741 const struct got_error *err = NULL;
749 if (view->searching && !view->search_next_done) {
750 errcode = pthread_mutex_unlock(&tog_mutex);
752 return got_error_set_errno(errcode,
753 "pthread_mutex_unlock");
755 errcode = pthread_mutex_lock(&tog_mutex);
757 return got_error_set_errno(errcode,
758 "pthread_mutex_lock");
759 view->search_next(view);
763 nodelay(stdscr, FALSE);
764 /* Allow threads to make progress while we are waiting for input. */
765 errcode = pthread_mutex_unlock(&tog_mutex);
767 return got_error_set_errno(errcode, "pthread_mutex_unlock");
768 ch = wgetch(view->window);
769 errcode = pthread_mutex_lock(&tog_mutex);
771 return got_error_set_errno(errcode, "pthread_mutex_lock");
772 nodelay(stdscr, TRUE);
774 if (tog_sigwinch_received || tog_sigcont_received) {
776 tog_sigwinch_received = 0;
777 tog_sigcont_received = 0;
778 TAILQ_FOREACH(v, views, entry) {
779 err = view_resize(v);
782 err = v->input(new, dead, focus, v, KEY_RESIZE);
793 *focus = view->child;
794 view->child_focussed = 1;
795 } else if (view->parent) {
796 *focus = view->parent;
797 view->parent->child_focussed = 0;
801 err = view->input(new, dead, focus, view, ch);
808 if (view_is_parent_view(view)) {
809 if (view->child == NULL)
811 if (view_is_splitscreen(view->child)) {
812 *focus = view->child;
813 view->child_focussed = 1;
814 err = view_fullscreen(view->child);
816 err = view_splitscreen(view->child);
819 err = view->child->input(new, dead, focus,
820 view->child, KEY_RESIZE);
822 if (view_is_splitscreen(view)) {
824 view->parent->child_focussed = 1;
825 err = view_fullscreen(view);
827 err = view_splitscreen(view);
831 err = view->input(new, dead, focus, view,
838 if (view->search_start)
839 view_search_start(view);
841 err = view->input(new, dead, focus, view, ch);
845 if (view->search_next && view->searching) {
846 view->searching = (ch == 'n' ?
847 TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
848 view->search_next_done = 0;
849 view->search_next(view);
851 err = view->input(new, dead, focus, view, ch);
854 err = view->input(new, dead, focus, view, ch);
862 view_vborder(struct tog_view *view)
865 struct tog_view *view_above;
868 return view_vborder(view->parent);
870 panel = panel_above(view->panel);
874 view_above = panel_userptr(panel);
875 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
876 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
880 view_needs_focus_indication(struct tog_view *view)
882 if (view_is_parent_view(view)) {
883 if (view->child == NULL || view->child_focussed)
885 if (!view_is_splitscreen(view->child))
887 } else if (!view_is_splitscreen(view))
890 return view->focussed;
893 static const struct got_error *
894 view_loop(struct tog_view *view)
896 const struct got_error *err = NULL;
897 struct tog_view_list_head views;
898 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
899 int fast_refresh = 10;
900 int done = 0, errcode;
902 errcode = pthread_mutex_lock(&tog_mutex);
904 return got_error_set_errno(errcode, "pthread_mutex_lock");
907 TAILQ_INSERT_HEAD(&views, view, entry);
911 err = view->show(view);
916 while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
917 /* Refresh fast during initialization, then become slower. */
918 if (fast_refresh && fast_refresh-- == 0)
919 halfdelay(10); /* switch to once per second */
921 err = view_input(&new_view, &dead_view, &focus_view, &done,
926 struct tog_view *prev = NULL;
928 if (view_is_parent_view(dead_view))
929 prev = TAILQ_PREV(dead_view,
930 tog_view_list_head, entry);
931 else if (view->parent != dead_view)
934 if (dead_view->parent)
935 dead_view->parent->child = NULL;
937 TAILQ_REMOVE(&views, dead_view, entry);
939 err = view_close(dead_view);
940 if (err || (dead_view == main_view && new_view == NULL))
943 if (view == dead_view) {
948 else if (!TAILQ_EMPTY(&views))
949 view = TAILQ_LAST(&views,
954 if (view->child && view->child_focussed)
955 focus_view = view->child;
962 struct tog_view *v, *t;
963 /* Only allow one parent view per type. */
964 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
965 if (v->type != new_view->type)
967 TAILQ_REMOVE(&views, v, entry);
973 TAILQ_INSERT_TAIL(&views, new_view, entry);
975 if (focus_view == NULL)
976 focus_view = new_view;
979 show_panel(focus_view->panel);
982 focus_view->focussed = 1;
985 show_panel(new_view->panel);
986 if (view->child && view_is_splitscreen(view->child))
987 show_panel(view->child->panel);
990 if (focus_view == NULL) {
992 show_panel(view->panel);
993 if (view->child && view_is_splitscreen(view->child))
994 show_panel(view->child->panel);
998 err = view->parent->show(view->parent);
1002 err = view->show(view);
1006 err = view->child->show(view->child);
1015 while (!TAILQ_EMPTY(&views)) {
1016 view = TAILQ_FIRST(&views);
1017 TAILQ_REMOVE(&views, view, entry);
1021 errcode = pthread_mutex_unlock(&tog_mutex);
1022 if (errcode && err == NULL)
1023 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1033 "usage: %s log [-c commit] [-r repository-path] [path]\n",
1038 /* Create newly allocated wide-character string equivalent to a byte string. */
1039 static const struct got_error *
1040 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1043 const struct got_error *err = NULL;
1046 *wlen = mbstowcs(NULL, s, 0);
1047 if (*wlen == (size_t)-1) {
1049 if (errno != EILSEQ)
1050 return got_error_from_errno("mbstowcs");
1052 /* byte string invalid in current encoding; try to "fix" it */
1053 err = got_mbsavis(&vis, &vislen, s);
1056 *wlen = mbstowcs(NULL, vis, 0);
1057 if (*wlen == (size_t)-1) {
1058 err = got_error_from_errno("mbstowcs"); /* give up */
1063 *ws = calloc(*wlen + 1, sizeof(**ws));
1065 err = got_error_from_errno("calloc");
1069 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1070 err = got_error_from_errno("mbstowcs");
1081 /* Format a line for display, ensuring that it won't overflow a width limit. */
1082 static const struct got_error *
1083 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1086 const struct got_error *err = NULL;
1088 wchar_t *wline = NULL;
1095 err = mbs2ws(&wline, &wlen, line);
1101 int width = wcwidth(wline[i]);
1108 if (width == 1 || width == 2) {
1109 if (cols + width > wlimit)
1113 } else if (width == -1) {
1114 if (wline[i] == L'\t') {
1116 ((cols + col_tab_align) % TABSIZE);
1117 if (cols + width > wlimit)
1123 err = got_error_from_errno("wcwidth");
1138 static const struct got_error*
1139 build_refs_str(char **refs_str, struct got_reflist_head *refs,
1140 struct got_object_id *id, struct got_repository *repo)
1142 static const struct got_error *err = NULL;
1143 struct got_reflist_entry *re;
1149 SIMPLEQ_FOREACH(re, refs, entry) {
1150 struct got_tag_object *tag = NULL;
1153 name = got_ref_get_name(re->ref);
1154 if (strcmp(name, GOT_REF_HEAD) == 0)
1156 if (strncmp(name, "refs/", 5) == 0)
1158 if (strncmp(name, "got/", 4) == 0)
1160 if (strncmp(name, "heads/", 6) == 0)
1162 if (strncmp(name, "remotes/", 8) == 0)
1164 if (strncmp(name, "tags/", 5) == 0) {
1165 err = got_object_open_as_tag(&tag, repo, re->id);
1167 if (err->code != GOT_ERR_OBJ_TYPE)
1169 /* Ref points at something other than a tag. */
1174 cmp = got_object_id_cmp(tag ?
1175 got_object_tag_get_object_id(tag) : re->id, id);
1177 got_object_tag_close(tag);
1181 if (asprintf(refs_str, "%s%s%s", s ? s : "",
1182 s ? ", " : "", name) == -1) {
1183 err = got_error_from_errno("asprintf");
1194 static const struct got_error *
1195 format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1198 char *smallerthan, *at;
1200 smallerthan = strchr(author, '<');
1201 if (smallerthan && smallerthan[1] != '\0')
1202 author = smallerthan + 1;
1203 at = strchr(author, '@');
1206 return format_line(wauthor, author_width, author, limit, col_tab_align);
1209 static const struct got_error *
1210 draw_commit(struct tog_view *view, struct got_commit_object *commit,
1211 struct got_object_id *id, struct got_reflist_head *refs,
1212 const size_t date_display_cols, int author_display_cols,
1213 struct tog_colors *colors)
1215 const struct got_error *err = NULL;
1216 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1217 char *logmsg0 = NULL, *logmsg = NULL;
1218 char *author = NULL;
1219 wchar_t *wlogmsg = NULL, *wauthor = NULL;
1220 int author_width, logmsg_width;
1221 char *newline, *line = NULL;
1223 const int avail = view->ncols;
1225 time_t committer_time;
1226 struct tog_color *tc;
1228 committer_time = got_object_commit_get_committer_time(commit);
1229 if (localtime_r(&committer_time, &tm) == NULL)
1230 return got_error_from_errno("localtime_r");
1231 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1233 return got_error(GOT_ERR_NO_SPACE);
1235 if (avail <= date_display_cols)
1236 limit = MIN(sizeof(datebuf) - 1, avail);
1238 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1239 tc = get_color(colors, TOG_COLOR_DATE);
1241 wattr_on(view->window,
1242 COLOR_PAIR(tc->colorpair), NULL);
1243 waddnstr(view->window, datebuf, limit);
1245 wattr_off(view->window,
1246 COLOR_PAIR(tc->colorpair), NULL);
1253 err = got_object_id_str(&id_str, id);
1256 tc = get_color(colors, TOG_COLOR_COMMIT);
1258 wattr_on(view->window,
1259 COLOR_PAIR(tc->colorpair), NULL);
1260 wprintw(view->window, "%.8s ", id_str);
1262 wattr_off(view->window,
1263 COLOR_PAIR(tc->colorpair), NULL);
1270 author = strdup(got_object_commit_get_author(commit));
1271 if (author == NULL) {
1272 err = got_error_from_errno("strdup");
1275 err = format_author(&wauthor, &author_width, author, avail - col, col);
1278 tc = get_color(colors, TOG_COLOR_AUTHOR);
1280 wattr_on(view->window,
1281 COLOR_PAIR(tc->colorpair), NULL);
1282 waddwstr(view->window, wauthor);
1284 wattr_off(view->window,
1285 COLOR_PAIR(tc->colorpair), NULL);
1286 col += author_width;
1287 while (col < avail && author_width < author_display_cols + 2) {
1288 waddch(view->window, ' ');
1295 err = got_object_commit_get_logmsg(&logmsg0, commit);
1299 while (*logmsg == '\n')
1301 newline = strchr(logmsg, '\n');
1304 limit = avail - col;
1305 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1308 waddwstr(view->window, wlogmsg);
1309 col += logmsg_width;
1310 while (col < avail) {
1311 waddch(view->window, ' ');
1323 static struct commit_queue_entry *
1324 alloc_commit_queue_entry(struct got_commit_object *commit,
1325 struct got_object_id *id)
1327 struct commit_queue_entry *entry;
1329 entry = calloc(1, sizeof(*entry));
1334 entry->commit = commit;
1339 pop_commit(struct commit_queue *commits)
1341 struct commit_queue_entry *entry;
1343 entry = TAILQ_FIRST(&commits->head);
1344 TAILQ_REMOVE(&commits->head, entry, entry);
1345 got_object_commit_close(entry->commit);
1346 commits->ncommits--;
1347 /* Don't free entry->id! It is owned by the commit graph. */
1352 free_commits(struct commit_queue *commits)
1354 while (!TAILQ_EMPTY(&commits->head))
1355 pop_commit(commits);
1358 static const struct got_error *
1359 match_commit(int *have_match, struct got_object_id *id,
1360 struct got_commit_object *commit, regex_t *regex)
1362 const struct got_error *err = NULL;
1363 regmatch_t regmatch;
1364 char *id_str = NULL, *logmsg = NULL;
1368 err = got_object_id_str(&id_str, id);
1372 err = got_object_commit_get_logmsg(&logmsg, commit);
1376 if (regexec(regex, got_object_commit_get_author(commit), 1,
1377 ®match, 0) == 0 ||
1378 regexec(regex, got_object_commit_get_committer(commit), 1,
1379 ®match, 0) == 0 ||
1380 regexec(regex, id_str, 1, ®match, 0) == 0 ||
1381 regexec(regex, logmsg, 1, ®match, 0) == 0)
1389 static const struct got_error *
1390 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1391 int minqueue, struct got_repository *repo, const char *path,
1392 int *searching, int *search_next_done, regex_t *regex)
1394 const struct got_error *err = NULL;
1395 int nqueued = 0, have_match = 0;
1398 * We keep all commits open throughout the lifetime of the log
1399 * view in order to avoid having to re-fetch commits from disk
1400 * while updating the display.
1402 while (nqueued < minqueue ||
1403 (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1404 struct got_object_id *id;
1405 struct got_commit_object *commit;
1406 struct commit_queue_entry *entry;
1409 err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1410 if (err || id == NULL)
1413 err = got_object_open_as_commit(&commit, repo, id);
1416 entry = alloc_commit_queue_entry(commit, id);
1417 if (entry == NULL) {
1418 err = got_error_from_errno("alloc_commit_queue_entry");
1422 errcode = pthread_mutex_lock(&tog_mutex);
1424 err = got_error_set_errno(errcode,
1425 "pthread_mutex_lock");
1429 entry->idx = commits->ncommits;
1430 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1432 commits->ncommits++;
1434 if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1435 err = match_commit(&have_match, id, commit, regex);
1437 pthread_mutex_lock(&tog_mutex);
1442 errcode = pthread_mutex_unlock(&tog_mutex);
1443 if (errcode && err == NULL)
1444 err = got_error_set_errno(errcode,
1445 "pthread_mutex_unlock");
1454 static const struct got_error *
1455 get_head_commit_id(struct got_object_id **head_id, const char *branch_name,
1456 struct got_repository *repo)
1458 const struct got_error *err = NULL;
1459 struct got_reference *head_ref;
1463 err = got_ref_open(&head_ref, repo, branch_name, 0);
1467 err = got_ref_resolve(head_id, repo, head_ref);
1468 got_ref_close(head_ref);
1477 static const struct got_error *
1478 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1479 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1480 struct commit_queue *commits, int selected_idx, int limit,
1481 struct got_reflist_head *refs, const char *path, int commits_needed,
1482 struct tog_colors *colors)
1484 const struct got_error *err = NULL;
1485 struct tog_log_view_state *s = &view->state.log;
1486 struct commit_queue_entry *entry;
1488 int ncommits, author_cols = 4;
1489 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1490 char *refs_str = NULL;
1492 struct tog_color *tc;
1493 static const size_t date_display_cols = 12;
1498 if (ncommits == selected_idx) {
1502 entry = TAILQ_NEXT(entry, entry);
1506 if (*selected && !(view->searching && view->search_next_done == 0)) {
1507 err = got_object_id_str(&id_str, (*selected)->id);
1511 err = build_refs_str(&refs_str, refs, (*selected)->id,
1518 if (commits_needed == 0)
1519 halfdelay(10); /* disable fast refresh */
1521 if (asprintf(&ncommits_str, " [%d/%d] %s",
1522 entry ? entry->idx + 1 : 0, commits->ncommits,
1523 commits_needed > 0 ?
1524 (view->searching && view->search_next_done == 0
1525 ? "searching..." : "loading... ") :
1526 (refs_str ? refs_str : "")) == -1) {
1527 err = got_error_from_errno("asprintf");
1531 if (path && strcmp(path, "/") != 0) {
1532 if (asprintf(&header, "commit %s %s%s",
1533 id_str ? id_str : "........................................",
1534 path, ncommits_str) == -1) {
1535 err = got_error_from_errno("asprintf");
1539 } else if (asprintf(&header, "commit %s%s",
1540 id_str ? id_str : "........................................",
1541 ncommits_str) == -1) {
1542 err = got_error_from_errno("asprintf");
1546 err = format_line(&wline, &width, header, view->ncols, 0);
1550 werase(view->window);
1552 if (view_needs_focus_indication(view))
1553 wstandout(view->window);
1554 tc = get_color(colors, TOG_COLOR_COMMIT);
1556 wattr_on(view->window,
1557 COLOR_PAIR(tc->colorpair), NULL);
1558 waddwstr(view->window, wline);
1560 wattr_off(view->window,
1561 COLOR_PAIR(tc->colorpair), NULL);
1562 while (width < view->ncols) {
1563 waddch(view->window, ' ');
1566 if (view_needs_focus_indication(view))
1567 wstandend(view->window);
1572 /* Grow author column size if necessary. */
1579 if (ncommits >= limit - 1)
1581 author = strdup(got_object_commit_get_author(entry->commit));
1582 if (author == NULL) {
1583 err = got_error_from_errno("strdup");
1586 err = format_author(&wauthor, &width, author, COLS,
1588 if (author_cols < width)
1589 author_cols = width;
1593 entry = TAILQ_NEXT(entry, entry);
1600 if (ncommits >= limit - 1)
1602 if (ncommits == selected_idx)
1603 wstandout(view->window);
1604 err = draw_commit(view, entry->commit, entry->id, refs,
1605 date_display_cols, author_cols, colors);
1606 if (ncommits == selected_idx)
1607 wstandend(view->window);
1612 entry = TAILQ_NEXT(entry, entry);
1625 scroll_up(struct tog_view *view,
1626 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1627 struct commit_queue *commits)
1629 struct commit_queue_entry *entry;
1632 entry = TAILQ_FIRST(&commits->head);
1633 if (*first_displayed_entry == entry)
1636 entry = *first_displayed_entry;
1637 while (entry && nscrolled < maxscroll) {
1638 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1640 *first_displayed_entry = entry;
1646 static const struct got_error *
1647 trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1648 pthread_cond_t *need_commits)
1653 halfdelay(1); /* fast refresh while loading commits */
1655 while (*commits_needed > 0) {
1659 /* Wake the log thread. */
1660 errcode = pthread_cond_signal(need_commits);
1662 return got_error_set_errno(errcode,
1663 "pthread_cond_signal");
1664 errcode = pthread_mutex_unlock(&tog_mutex);
1666 return got_error_set_errno(errcode,
1667 "pthread_mutex_unlock");
1669 errcode = pthread_mutex_lock(&tog_mutex);
1671 return got_error_set_errno(errcode,
1672 "pthread_mutex_lock");
1674 if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1676 * Thread is not done yet; lose a key press
1677 * and let the user retry... this way the GUI
1678 * remains interactive while logging deep paths
1679 * with few commits in history.
1688 static const struct got_error *
1689 scroll_down(struct tog_view *view,
1690 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1691 struct commit_queue_entry **last_displayed_entry,
1692 struct commit_queue *commits, int *log_complete, int *commits_needed,
1693 pthread_cond_t *need_commits)
1695 const struct got_error *err = NULL;
1696 struct commit_queue_entry *pentry;
1699 if (*last_displayed_entry == NULL)
1702 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1703 if (pentry == NULL && !*log_complete) {
1705 * Ask the log thread for required amount of commits
1706 * plus some amount of pre-fetching.
1708 (*commits_needed) += maxscroll + 20;
1709 err = trigger_log_thread(0, commits_needed, log_complete,
1716 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1720 *last_displayed_entry = pentry;
1722 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1725 *first_displayed_entry = pentry;
1726 } while (++nscrolled < maxscroll);
1731 static const struct got_error *
1732 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1733 struct got_commit_object *commit, struct got_object_id *commit_id,
1734 struct tog_view *log_view, struct got_reflist_head *refs,
1735 struct got_repository *repo)
1737 const struct got_error *err;
1738 struct got_object_qid *parent_id;
1739 struct tog_view *diff_view;
1741 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1742 if (diff_view == NULL)
1743 return got_error_from_errno("view_open");
1745 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1746 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1747 commit_id, log_view, refs, repo);
1749 *new_view = diff_view;
1753 static const struct got_error *
1754 tree_view_visit_subtree(struct got_tree_object *subtree,
1755 struct tog_tree_view_state *s)
1757 struct tog_parent_tree *parent;
1759 parent = calloc(1, sizeof(*parent));
1761 return got_error_from_errno("calloc");
1763 parent->tree = s->tree;
1764 parent->first_displayed_entry = s->first_displayed_entry;
1765 parent->selected_entry = s->selected_entry;
1766 parent->selected = s->selected;
1767 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1770 s->first_displayed_entry = NULL;
1775 static const struct got_error *
1776 browse_commit_tree(struct tog_view **new_view, int begin_x,
1777 struct commit_queue_entry *entry, const char *path,
1778 struct got_reflist_head *refs, struct got_repository *repo)
1780 const struct got_error *err = NULL;
1781 struct got_tree_object *tree;
1782 struct tog_tree_view_state *s;
1783 struct tog_view *tree_view;
1784 char *slash, *subpath = NULL;
1787 err = got_object_open_as_tree(&tree, repo,
1788 got_object_commit_get_tree_id(entry->commit));
1792 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1793 if (tree_view == NULL)
1794 return got_error_from_errno("view_open");
1796 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1798 got_object_tree_close(tree);
1801 s = &tree_view->state.tree;
1803 *new_view = tree_view;
1805 if (got_path_is_root_dir(path))
1808 /* Walk the path and open corresponding tree objects. */
1811 struct got_tree_entry *te;
1812 struct got_object_id *tree_id;
1818 /* Ensure the correct subtree entry is selected. */
1819 slash = strchr(p, '/');
1821 te_name = strdup(p);
1823 te_name = strndup(p, slash - p);
1824 if (te_name == NULL) {
1825 err = got_error_from_errno("strndup");
1828 te = got_object_tree_find_entry(s->tree, te_name);
1830 err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1835 s->selected_entry = te;
1836 s->selected = got_tree_entry_get_index(te);
1837 if (s->tree != s->root)
1838 s->selected++; /* skip '..' */
1840 if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry))) {
1841 /* Jump to this file's entry. */
1842 s->first_displayed_entry = s->selected_entry;
1847 slash = strchr(p, '/');
1849 subpath = strndup(path, slash - path);
1851 subpath = strdup(path);
1852 if (subpath == NULL) {
1853 err = got_error_from_errno("strdup");
1857 err = got_object_id_by_path(&tree_id, repo, entry->id,
1862 err = got_object_open_as_tree(&tree, repo, tree_id);
1867 err = tree_view_visit_subtree(tree, s);
1869 got_object_tree_close(tree);
1883 static const struct got_error *
1884 block_signals_used_by_main_thread(void)
1889 if (sigemptyset(&sigset) == -1)
1890 return got_error_from_errno("sigemptyset");
1892 /* tog handles SIGWINCH and SIGCONT */
1893 if (sigaddset(&sigset, SIGWINCH) == -1)
1894 return got_error_from_errno("sigaddset");
1895 if (sigaddset(&sigset, SIGCONT) == -1)
1896 return got_error_from_errno("sigaddset");
1898 /* ncurses handles SIGTSTP */
1899 if (sigaddset(&sigset, SIGTSTP) == -1)
1900 return got_error_from_errno("sigaddset");
1902 errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1904 return got_error_set_errno(errcode, "pthread_sigmask");
1910 log_thread(void *arg)
1912 const struct got_error *err = NULL;
1914 struct tog_log_thread_args *a = arg;
1917 err = block_signals_used_by_main_thread();
1921 while (!done && !err && !tog_sigpipe_received) {
1922 err = queue_commits(a->graph, a->commits, 1, a->repo,
1923 a->in_repo_path, a->searching, a->search_next_done,
1926 if (err->code != GOT_ERR_ITER_COMPLETED)
1930 } else if (a->commits_needed > 0)
1931 a->commits_needed--;
1933 errcode = pthread_mutex_lock(&tog_mutex);
1935 err = got_error_set_errno(errcode,
1936 "pthread_mutex_lock");
1938 } else if (*a->quit)
1940 else if (*a->first_displayed_entry == NULL) {
1941 *a->first_displayed_entry =
1942 TAILQ_FIRST(&a->commits->head);
1943 *a->selected_entry = *a->first_displayed_entry;
1947 a->commits_needed = 0;
1948 else if (a->commits_needed == 0) {
1949 errcode = pthread_cond_wait(&a->need_commits,
1952 err = got_error_set_errno(errcode,
1953 "pthread_cond_wait");
1956 errcode = pthread_mutex_unlock(&tog_mutex);
1957 if (errcode && err == NULL)
1958 err = got_error_set_errno(errcode,
1959 "pthread_mutex_unlock");
1961 a->log_complete = 1;
1965 static const struct got_error *
1966 stop_log_thread(struct tog_log_view_state *s)
1968 const struct got_error *err = NULL;
1973 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1975 return got_error_set_errno(errcode,
1976 "pthread_cond_signal");
1977 errcode = pthread_mutex_unlock(&tog_mutex);
1979 return got_error_set_errno(errcode,
1980 "pthread_mutex_unlock");
1981 errcode = pthread_join(s->thread, (void **)&err);
1983 return got_error_set_errno(errcode, "pthread_join");
1984 errcode = pthread_mutex_lock(&tog_mutex);
1986 return got_error_set_errno(errcode,
1987 "pthread_mutex_lock");
1991 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1992 if (errcode && err == NULL)
1993 err = got_error_set_errno(errcode, "pthread_cond_destroy");
1995 if (s->thread_args.repo) {
1996 got_repo_close(s->thread_args.repo);
1997 s->thread_args.repo = NULL;
2000 if (s->thread_args.graph) {
2001 got_commit_graph_close(s->thread_args.graph);
2002 s->thread_args.graph = NULL;
2008 static const struct got_error *
2009 close_log_view(struct tog_view *view)
2011 const struct got_error *err = NULL;
2012 struct tog_log_view_state *s = &view->state.log;
2014 err = stop_log_thread(s);
2015 free_commits(&s->commits);
2016 free(s->in_repo_path);
2017 s->in_repo_path = NULL;
2023 static const struct got_error *
2024 search_start_log_view(struct tog_view *view)
2026 struct tog_log_view_state *s = &view->state.log;
2028 s->matched_entry = NULL;
2029 s->search_entry = NULL;
2033 static const struct got_error *
2034 search_next_log_view(struct tog_view *view)
2036 const struct got_error *err = NULL;
2037 struct tog_log_view_state *s = &view->state.log;
2038 struct commit_queue_entry *entry;
2040 if (!view->searching) {
2041 view->search_next_done = 1;
2045 if (s->search_entry) {
2047 errcode = pthread_mutex_unlock(&tog_mutex);
2049 return got_error_set_errno(errcode,
2050 "pthread_mutex_unlock");
2051 ch = wgetch(view->window);
2052 errcode = pthread_mutex_lock(&tog_mutex);
2054 return got_error_set_errno(errcode,
2055 "pthread_mutex_lock");
2056 if (ch == KEY_BACKSPACE) {
2057 view->search_next_done = 1;
2060 if (view->searching == TOG_SEARCH_FORWARD)
2061 entry = TAILQ_NEXT(s->search_entry, entry);
2063 entry = TAILQ_PREV(s->search_entry,
2064 commit_queue_head, entry);
2065 } else if (s->matched_entry) {
2066 if (view->searching == TOG_SEARCH_FORWARD)
2067 entry = TAILQ_NEXT(s->selected_entry, entry);
2069 entry = TAILQ_PREV(s->selected_entry,
2070 commit_queue_head, entry);
2072 if (view->searching == TOG_SEARCH_FORWARD)
2073 entry = TAILQ_FIRST(&s->commits.head);
2075 entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2081 if (entry == NULL) {
2082 if (s->thread_args.log_complete ||
2083 view->searching == TOG_SEARCH_BACKWARD) {
2084 view->search_next_done = 1;
2088 * Poke the log thread for more commits and return,
2089 * allowing the main loop to make progress. Search
2090 * will resume at s->search_entry once we come back.
2092 s->thread_args.commits_needed++;
2093 return trigger_log_thread(1,
2094 &s->thread_args.commits_needed,
2095 &s->thread_args.log_complete,
2096 &s->thread_args.need_commits);
2099 err = match_commit(&have_match, entry->id, entry->commit,
2104 view->search_next_done = 1;
2105 s->matched_entry = entry;
2109 s->search_entry = entry;
2110 if (view->searching == TOG_SEARCH_FORWARD)
2111 entry = TAILQ_NEXT(entry, entry);
2113 entry = TAILQ_PREV(entry, commit_queue_head, entry);
2116 if (s->matched_entry) {
2117 int cur = s->selected_entry->idx;
2118 while (cur < s->matched_entry->idx) {
2119 err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2124 while (cur > s->matched_entry->idx) {
2125 err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2132 s->search_entry = NULL;
2137 static const struct got_error *
2138 open_log_view(struct tog_view *view, struct got_object_id *start_id,
2139 struct got_reflist_head *refs, struct got_repository *repo,
2140 const char *head_ref_name, const char *path, int check_disk)
2142 const struct got_error *err = NULL;
2143 struct tog_log_view_state *s = &view->state.log;
2144 struct got_repository *thread_repo = NULL;
2145 struct got_commit_graph *thread_graph = NULL;
2148 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
2152 /* The commit queue only contains commits being displayed. */
2153 TAILQ_INIT(&s->commits.head);
2154 s->commits.ncommits = 0;
2158 s->head_ref_name = head_ref_name;
2159 s->start_id = got_object_id_dup(start_id);
2160 if (s->start_id == NULL) {
2161 err = got_error_from_errno("got_object_id_dup");
2165 SIMPLEQ_INIT(&s->colors);
2166 if (has_colors() && getenv("TOG_COLORS") != NULL) {
2167 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2168 get_color_value("TOG_COLOR_COMMIT"));
2171 err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2172 get_color_value("TOG_COLOR_AUTHOR"));
2174 free_colors(&s->colors);
2177 err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2178 get_color_value("TOG_COLOR_DATE"));
2180 free_colors(&s->colors);
2185 view->show = show_log_view;
2186 view->input = input_log_view;
2187 view->close = close_log_view;
2188 view->search_start = search_start_log_view;
2189 view->search_next = search_next_log_view;
2191 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2194 err = got_commit_graph_open(&thread_graph, s->in_repo_path, 0);
2197 err = got_commit_graph_iter_start(thread_graph,
2198 s->start_id, s->repo, NULL, NULL);
2202 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2204 err = got_error_set_errno(errcode, "pthread_cond_init");
2208 s->thread_args.commits_needed = view->nlines;
2209 s->thread_args.graph = thread_graph;
2210 s->thread_args.commits = &s->commits;
2211 s->thread_args.in_repo_path = s->in_repo_path;
2212 s->thread_args.start_id = s->start_id;
2213 s->thread_args.repo = thread_repo;
2214 s->thread_args.log_complete = 0;
2215 s->thread_args.quit = &s->quit;
2216 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2217 s->thread_args.selected_entry = &s->selected_entry;
2218 s->thread_args.searching = &view->searching;
2219 s->thread_args.search_next_done = &view->search_next_done;
2220 s->thread_args.regex = &view->regex;
2223 close_log_view(view);
2227 static const struct got_error *
2228 show_log_view(struct tog_view *view)
2230 struct tog_log_view_state *s = &view->state.log;
2232 if (s->thread == NULL) {
2233 int errcode = pthread_create(&s->thread, NULL, log_thread,
2236 return got_error_set_errno(errcode, "pthread_create");
2239 return draw_commits(view, &s->last_displayed_entry,
2240 &s->selected_entry, s->first_displayed_entry,
2241 &s->commits, s->selected, view->nlines, s->refs,
2242 s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2245 static const struct got_error *
2246 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2247 struct tog_view **focus_view, struct tog_view *view, int ch)
2249 const struct got_error *err = NULL;
2250 struct tog_log_view_state *s = &view->state.log;
2251 char *parent_path, *in_repo_path = NULL;
2252 struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2254 struct got_object_id *start_id;
2264 if (s->first_displayed_entry == NULL)
2266 if (s->selected > 0)
2269 scroll_up(view, &s->first_displayed_entry, 1,
2274 if (s->first_displayed_entry == NULL)
2276 if (TAILQ_FIRST(&s->commits.head) ==
2277 s->first_displayed_entry) {
2281 scroll_up(view, &s->first_displayed_entry,
2282 view->nlines, &s->commits);
2288 if (s->first_displayed_entry == NULL)
2290 if (s->selected < MIN(view->nlines - 2,
2291 s->commits.ncommits - 1)) {
2295 err = scroll_down(view, &s->first_displayed_entry, 1,
2296 &s->last_displayed_entry, &s->commits,
2297 &s->thread_args.log_complete,
2298 &s->thread_args.commits_needed,
2299 &s->thread_args.need_commits);
2303 struct commit_queue_entry *first;
2304 first = s->first_displayed_entry;
2307 err = scroll_down(view, &s->first_displayed_entry,
2308 view->nlines, &s->last_displayed_entry,
2309 &s->commits, &s->thread_args.log_complete,
2310 &s->thread_args.commits_needed,
2311 &s->thread_args.need_commits);
2314 if (first == s->first_displayed_entry &&
2315 s->selected < MIN(view->nlines - 2,
2316 s->commits.ncommits - 1)) {
2317 /* can't scroll further down */
2318 s->selected = MIN(view->nlines - 2,
2319 s->commits.ncommits - 1);
2325 if (s->selected > view->nlines - 2)
2326 s->selected = view->nlines - 2;
2327 if (s->selected > s->commits.ncommits - 1)
2328 s->selected = s->commits.ncommits - 1;
2333 if (s->selected_entry == NULL)
2335 if (view_is_parent_view(view))
2336 begin_x = view_split_begin_x(view->begin_x);
2337 err = open_diff_view_for_commit(&diff_view, begin_x,
2338 s->selected_entry->commit, s->selected_entry->id,
2339 view, s->refs, s->repo);
2342 if (view_is_parent_view(view)) {
2343 err = view_close_child(view);
2346 err = view_set_child(view, diff_view);
2348 view_close(diff_view);
2351 *focus_view = diff_view;
2352 view->child_focussed = 1;
2354 *new_view = diff_view;
2357 if (s->selected_entry == NULL)
2359 if (view_is_parent_view(view))
2360 begin_x = view_split_begin_x(view->begin_x);
2361 err = browse_commit_tree(&tree_view, begin_x,
2362 s->selected_entry, s->in_repo_path, s->refs, s->repo);
2365 if (view_is_parent_view(view)) {
2366 err = view_close_child(view);
2369 err = view_set_child(view, tree_view);
2371 view_close(tree_view);
2374 *focus_view = tree_view;
2375 view->child_focussed = 1;
2377 *new_view = tree_view;
2380 if (strcmp(s->in_repo_path, "/") == 0)
2382 parent_path = dirname(s->in_repo_path);
2383 if (parent_path && strcmp(parent_path, ".") != 0) {
2384 err = stop_log_thread(s);
2387 lv = view_open(view->nlines, view->ncols,
2388 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2390 return got_error_from_errno(
2392 err = open_log_view(lv, s->start_id, s->refs,
2393 s->repo, s->head_ref_name, parent_path, 0);
2396 if (view_is_parent_view(view))
2399 view_set_child(view->parent, lv);
2406 err = stop_log_thread(s);
2409 lv = view_open(view->nlines, view->ncols,
2410 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2412 return got_error_from_errno("view_open");
2413 err = get_head_commit_id(&start_id, s->head_ref_name ?
2414 s->head_ref_name : GOT_REF_HEAD, s->repo);
2419 in_repo_path = strdup(s->in_repo_path);
2420 if (in_repo_path == NULL) {
2423 return got_error_from_errno("strdup");
2425 got_ref_list_free(s->refs);
2426 err = got_ref_list(s->refs, s->repo, NULL,
2427 got_ref_cmp_by_name, NULL);
2433 err = open_log_view(lv, start_id, s->refs, s->repo,
2434 s->head_ref_name, in_repo_path, 0);
2450 static const struct got_error *
2451 apply_unveil(const char *repo_path, const char *worktree_path)
2453 const struct got_error *error;
2456 if (unveil("gmon.out", "rwc") != 0)
2457 return got_error_from_errno2("unveil", "gmon.out");
2459 if (repo_path && unveil(repo_path, "r") != 0)
2460 return got_error_from_errno2("unveil", repo_path);
2462 if (worktree_path && unveil(worktree_path, "rwc") != 0)
2463 return got_error_from_errno2("unveil", worktree_path);
2465 if (unveil("/tmp", "rwc") != 0)
2466 return got_error_from_errno2("unveil", "/tmp");
2468 error = got_privsep_unveil_exec_helpers();
2472 if (unveil(NULL, NULL) != 0)
2473 return got_error_from_errno("unveil");
2483 halfdelay(1); /* Do fast refresh while initial view is loading. */
2486 intrflush(stdscr, FALSE);
2487 keypad(stdscr, TRUE);
2489 if (getenv("TOG_COLORS") != NULL) {
2491 use_default_colors();
2493 signal(SIGWINCH, tog_sigwinch);
2494 signal(SIGPIPE, tog_sigpipe);
2495 signal(SIGCONT, tog_sigcont);
2498 static const struct got_error *
2499 cmd_log(int argc, char *argv[])
2501 const struct got_error *error;
2502 struct got_repository *repo = NULL;
2503 struct got_worktree *worktree = NULL;
2504 struct got_reflist_head refs;
2505 struct got_object_id *start_id = NULL;
2506 char *path = NULL, *repo_path = NULL, *cwd = NULL;
2507 char *start_commit = NULL, *head_ref_name = NULL;
2509 struct tog_view *view;
2511 SIMPLEQ_INIT(&refs);
2514 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2519 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2522 start_commit = optarg;
2525 repo_path = realpath(optarg, NULL);
2526 if (repo_path == NULL)
2527 return got_error_from_errno2("realpath",
2539 cwd = getcwd(NULL, 0);
2541 error = got_error_from_errno("getcwd");
2544 error = got_worktree_open(&worktree, cwd);
2545 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2552 error = got_error_from_errno("strdup");
2555 } else if (argc == 1) {
2557 error = got_worktree_resolve_path(&path, worktree,
2562 path = strdup(argv[0]);
2564 error = got_error_from_errno("strdup");
2571 if (repo_path == NULL) {
2574 got_worktree_get_repo_path(worktree));
2576 repo_path = strdup(cwd);
2578 if (repo_path == NULL) {
2579 error = got_error_from_errno("strdup");
2585 error = got_repo_open(&repo, repo_path, NULL);
2589 error = apply_unveil(got_repo_get_path(repo),
2590 worktree ? got_worktree_get_root_path(worktree) : NULL);
2594 if (start_commit == NULL)
2595 error = get_head_commit_id(&start_id, worktree ?
2596 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2599 error = get_head_commit_id(&start_id, start_commit, repo);
2601 if (error->code != GOT_ERR_NOT_REF)
2603 error = got_repo_match_object_id_prefix(&start_id,
2604 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2610 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2614 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2616 error = got_error_from_errno("view_open");
2620 head_ref_name = strdup(
2621 got_worktree_get_head_ref_name(worktree));
2622 if (head_ref_name == NULL) {
2623 error = got_error_from_errno("strdup");
2627 error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2632 /* Release work tree lock. */
2633 got_worktree_close(worktree);
2636 error = view_loop(view);
2642 free(head_ref_name);
2644 got_repo_close(repo);
2646 got_worktree_close(worktree);
2647 got_ref_list_free(&refs);
2655 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
2661 parse_next_line(FILE *f, size_t *len)
2666 const char delim[3] = { '\0', '\0', '\0'};
2668 line = fparseln(f, &linelen, &lineno, delim, 0);
2675 match_line(const char *line, regex_t *regex)
2677 regmatch_t regmatch;
2679 return regexec(regex, line, 1, ®match, 0) == 0;
2683 match_color(struct tog_colors *colors, const char *line)
2685 struct tog_color *tc = NULL;
2687 SIMPLEQ_FOREACH(tc, colors, entry) {
2688 if (match_line(line, &tc->regex))
2695 static const struct got_error *
2696 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
2697 int *last_displayed_line, int *eof, int max_lines, char *header,
2698 struct tog_colors *colors)
2700 const struct got_error *err;
2701 int nlines = 0, nprinted = 0;
2703 struct tog_color *tc;
2709 werase(view->window);
2712 err = format_line(&wline, &width, header, view->ncols, 0);
2717 if (view_needs_focus_indication(view))
2718 wstandout(view->window);
2719 waddwstr(view->window, wline);
2720 if (view_needs_focus_indication(view))
2721 wstandend(view->window);
2722 if (width <= view->ncols - 1)
2723 waddch(view->window, '\n');
2731 while (nprinted < max_lines) {
2732 line = parse_next_line(f, &len);
2737 if (++nlines < *first_displayed_line) {
2742 err = format_line(&wline, &width, line, view->ncols, 0);
2748 tc = match_color(colors, line);
2750 wattr_on(view->window,
2751 COLOR_PAIR(tc->colorpair), NULL);
2752 waddwstr(view->window, wline);
2754 wattr_off(view->window,
2755 COLOR_PAIR(tc->colorpair), NULL);
2756 if (width <= view->ncols - 1)
2757 waddch(view->window, '\n');
2758 if (++nprinted == 1)
2759 *first_displayed_line = nlines;
2764 *last_displayed_line = nlines;
2769 while (nprinted < view->nlines) {
2770 waddch(view->window, '\n');
2774 err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2779 wstandout(view->window);
2780 waddwstr(view->window, wline);
2781 wstandend(view->window);
2788 get_datestr(time_t *time, char *datebuf)
2790 struct tm mytm, *tm;
2793 tm = gmtime_r(time, &mytm);
2796 s = asctime_r(tm, datebuf);
2799 p = strchr(s, '\n');
2805 static const struct got_error *
2806 write_commit_info(struct got_object_id *commit_id,
2807 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2809 const struct got_error *err = NULL;
2810 char datebuf[26], *datestr;
2811 struct got_commit_object *commit;
2812 char *id_str = NULL, *logmsg = NULL;
2813 time_t committer_time;
2814 const char *author, *committer;
2815 char *refs_str = NULL;
2818 err = build_refs_str(&refs_str, refs, commit_id, repo);
2823 err = got_object_open_as_commit(&commit, repo, commit_id);
2827 err = got_object_id_str(&id_str, commit_id);
2829 err = got_error_from_errno("got_object_id_str");
2833 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2834 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2835 err = got_error_from_errno("fprintf");
2838 if (fprintf(outfile, "from: %s\n",
2839 got_object_commit_get_author(commit)) < 0) {
2840 err = got_error_from_errno("fprintf");
2843 committer_time = got_object_commit_get_committer_time(commit);
2844 datestr = get_datestr(&committer_time, datebuf);
2845 if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2846 err = got_error_from_errno("fprintf");
2849 author = got_object_commit_get_author(commit);
2850 committer = got_object_commit_get_committer(commit);
2851 if (strcmp(author, committer) != 0 &&
2852 fprintf(outfile, "via: %s\n", committer) < 0) {
2853 err = got_error_from_errno("fprintf");
2856 err = got_object_commit_get_logmsg(&logmsg, commit);
2859 if (fprintf(outfile, "%s\n", logmsg) < 0) {
2860 err = got_error_from_errno("fprintf");
2867 got_object_commit_close(commit);
2871 static const struct got_error *
2872 create_diff(struct tog_diff_view_state *s)
2874 const struct got_error *err = NULL;
2880 err = got_error_from_errno("got_opentemp");
2883 if (s->f && fclose(s->f) != 0) {
2884 err = got_error_from_errno("fclose");
2890 err = got_object_get_type(&obj_type, s->repo, s->id1);
2892 err = got_object_get_type(&obj_type, s->repo, s->id2);
2897 case GOT_OBJ_TYPE_BLOB:
2898 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2899 s->diff_context, 0, s->repo, f);
2901 case GOT_OBJ_TYPE_TREE:
2902 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2903 s->diff_context, 0, s->repo, f);
2905 case GOT_OBJ_TYPE_COMMIT: {
2906 const struct got_object_id_queue *parent_ids;
2907 struct got_object_qid *pid;
2908 struct got_commit_object *commit2;
2910 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2913 /* Show commit info if we're diffing to a parent/root commit. */
2915 write_commit_info(s->id2, s->refs, s->repo, f);
2917 parent_ids = got_object_commit_get_parent_ids(commit2);
2918 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2919 if (got_object_id_cmp(s->id1, pid->id) == 0) {
2920 write_commit_info(s->id2, s->refs,
2926 got_object_commit_close(commit2);
2928 err = got_diff_objects_as_commits(s->id1, s->id2,
2929 s->diff_context, 0, s->repo, f);
2933 err = got_error(GOT_ERR_OBJ_TYPE);
2937 if (f && fflush(f) != 0 && err == NULL)
2938 err = got_error_from_errno("fflush");
2943 diff_view_indicate_progress(struct tog_view *view)
2945 mvwaddstr(view->window, 0, 0, "diffing...");
2950 static const struct got_error *
2951 open_diff_view(struct tog_view *view, struct got_object_id *id1,
2952 struct got_object_id *id2, struct tog_view *log_view,
2953 struct got_reflist_head *refs, struct got_repository *repo)
2955 const struct got_error *err;
2957 if (id1 != NULL && id2 != NULL) {
2959 err = got_object_get_type(&type1, repo, id1);
2962 err = got_object_get_type(&type2, repo, id2);
2967 return got_error(GOT_ERR_OBJ_TYPE);
2971 view->state.diff.id1 = got_object_id_dup(id1);
2972 if (view->state.diff.id1 == NULL)
2973 return got_error_from_errno("got_object_id_dup");
2975 view->state.diff.id1 = NULL;
2977 view->state.diff.id2 = got_object_id_dup(id2);
2978 if (view->state.diff.id2 == NULL) {
2979 free(view->state.diff.id1);
2980 view->state.diff.id1 = NULL;
2981 return got_error_from_errno("got_object_id_dup");
2983 view->state.diff.f = NULL;
2984 view->state.diff.first_displayed_line = 1;
2985 view->state.diff.last_displayed_line = view->nlines;
2986 view->state.diff.diff_context = 3;
2987 view->state.diff.log_view = log_view;
2988 view->state.diff.repo = repo;
2989 view->state.diff.refs = refs;
2990 SIMPLEQ_INIT(&view->state.diff.colors);
2992 if (has_colors() && getenv("TOG_COLORS") != NULL) {
2993 err = add_color(&view->state.diff.colors,
2994 "^-", TOG_COLOR_DIFF_MINUS,
2995 get_color_value("TOG_COLOR_DIFF_MINUS"));
2998 err = add_color(&view->state.diff.colors, "^\\+",
2999 TOG_COLOR_DIFF_PLUS,
3000 get_color_value("TOG_COLOR_DIFF_PLUS"));
3002 free_colors(&view->state.diff.colors);
3005 err = add_color(&view->state.diff.colors,
3006 "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3007 get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3009 free_colors(&view->state.diff.colors);
3013 err = add_color(&view->state.diff.colors,
3014 "^(commit|(blob|file) [-+] )", TOG_COLOR_DIFF_META,
3015 get_color_value("TOG_COLOR_DIFF_META"));
3017 free_colors(&view->state.diff.colors);
3021 err = add_color(&view->state.diff.colors,
3022 "^(from|via): ", TOG_COLOR_AUTHOR,
3023 get_color_value("TOG_COLOR_AUTHOR"));
3025 free_colors(&view->state.diff.colors);
3029 err = add_color(&view->state.diff.colors,
3030 "^date: ", TOG_COLOR_DATE,
3031 get_color_value("TOG_COLOR_DATE"));
3033 free_colors(&view->state.diff.colors);
3038 if (log_view && view_is_splitscreen(view))
3039 show_log_view(log_view); /* draw vborder */
3040 diff_view_indicate_progress(view);
3042 err = create_diff(&view->state.diff);
3044 free(view->state.diff.id1);
3045 view->state.diff.id1 = NULL;
3046 free(view->state.diff.id2);
3047 view->state.diff.id2 = NULL;
3051 view->show = show_diff_view;
3052 view->input = input_diff_view;
3053 view->close = close_diff_view;
3058 static const struct got_error *
3059 close_diff_view(struct tog_view *view)
3061 const struct got_error *err = NULL;
3063 free(view->state.diff.id1);
3064 view->state.diff.id1 = NULL;
3065 free(view->state.diff.id2);
3066 view->state.diff.id2 = NULL;
3067 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
3068 err = got_error_from_errno("fclose");
3069 free_colors(&view->state.diff.colors);
3073 static const struct got_error *
3074 show_diff_view(struct tog_view *view)
3076 const struct got_error *err;
3077 struct tog_diff_view_state *s = &view->state.diff;
3078 char *id_str1 = NULL, *id_str2, *header;
3081 err = got_object_id_str(&id_str1, s->id1);
3085 err = got_object_id_str(&id_str2, s->id2);
3089 if (asprintf(&header, "diff %s %s",
3090 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3091 err = got_error_from_errno("asprintf");
3099 return draw_file(view, s->f, &s->first_displayed_line,
3100 &s->last_displayed_line, &s->eof, view->nlines,
3101 header, &s->colors);
3104 static const struct got_error *
3105 set_selected_commit(struct tog_diff_view_state *s,
3106 struct commit_queue_entry *entry)
3108 const struct got_error *err;
3109 const struct got_object_id_queue *parent_ids;
3110 struct got_commit_object *selected_commit;
3111 struct got_object_qid *pid;
3114 s->id2 = got_object_id_dup(entry->id);
3116 return got_error_from_errno("got_object_id_dup");
3118 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3121 parent_ids = got_object_commit_get_parent_ids(selected_commit);
3123 pid = SIMPLEQ_FIRST(parent_ids);
3124 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3125 got_object_commit_close(selected_commit);
3129 static const struct got_error *
3130 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3131 struct tog_view **focus_view, struct tog_view *view, int ch)
3133 const struct got_error *err = NULL;
3134 struct tog_diff_view_state *s = &view->state.diff;
3135 struct tog_log_view_state *ls;
3136 struct commit_queue_entry *entry;
3142 if (s->first_displayed_line > 1)
3143 s->first_displayed_line--;
3147 if (s->first_displayed_line == 1)
3150 while (i++ < view->nlines - 1 &&
3151 s->first_displayed_line > 1)
3152 s->first_displayed_line--;
3157 s->first_displayed_line++;
3165 while (!s->eof && i++ < view->nlines - 1) {
3167 line = parse_next_line(s->f, NULL);
3168 s->first_displayed_line++;
3174 if (s->diff_context > 0) {
3176 diff_view_indicate_progress(view);
3177 err = create_diff(s);
3181 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3183 diff_view_indicate_progress(view);
3184 err = create_diff(s);
3189 if (s->log_view == NULL)
3191 ls = &s->log_view->state.log;
3192 entry = TAILQ_PREV(ls->selected_entry,
3193 commit_queue_head, entry);
3197 err = input_log_view(NULL, NULL, NULL, s->log_view,
3202 err = set_selected_commit(s, entry);
3206 s->first_displayed_line = 1;
3207 s->last_displayed_line = view->nlines;
3209 diff_view_indicate_progress(view);
3210 err = create_diff(s);
3214 if (s->log_view == NULL)
3216 ls = &s->log_view->state.log;
3218 if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3219 ls->thread_args.commits_needed++;
3221 /* Display "loading..." in log view. */
3222 show_log_view(s->log_view);
3226 err = trigger_log_thread(1 /* load_all */,
3227 &ls->thread_args.commits_needed,
3228 &ls->thread_args.log_complete,
3229 &ls->thread_args.need_commits);
3233 err = input_log_view(NULL, NULL, NULL, s->log_view,
3238 entry = TAILQ_NEXT(ls->selected_entry, entry);
3242 err = set_selected_commit(s, entry);
3246 s->first_displayed_line = 1;
3247 s->last_displayed_line = view->nlines;
3249 diff_view_indicate_progress(view);
3250 err = create_diff(s);
3259 static const struct got_error *
3260 cmd_diff(int argc, char *argv[])
3262 const struct got_error *error = NULL;
3263 struct got_repository *repo = NULL;
3264 struct got_reflist_head refs;
3265 struct got_object_id *id1 = NULL, *id2 = NULL;
3266 char *repo_path = NULL;
3267 char *id_str1 = NULL, *id_str2 = NULL;
3269 struct tog_view *view;
3271 SIMPLEQ_INIT(&refs);
3274 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3279 while ((ch = getopt(argc, argv, "")) != -1) {
3291 usage_diff(); /* TODO show local worktree changes */
3292 } else if (argc == 2) {
3293 repo_path = getcwd(NULL, 0);
3294 if (repo_path == NULL)
3295 return got_error_from_errno("getcwd");
3298 } else if (argc == 3) {
3299 repo_path = realpath(argv[0], NULL);
3300 if (repo_path == NULL)
3301 return got_error_from_errno2("realpath", argv[0]);
3309 error = got_repo_open(&repo, repo_path, NULL);
3313 error = apply_unveil(got_repo_get_path(repo), NULL);
3317 error = got_repo_match_object_id_prefix(&id1, id_str1,
3318 GOT_OBJ_TYPE_ANY, repo);
3322 error = got_repo_match_object_id_prefix(&id2, id_str2,
3323 GOT_OBJ_TYPE_ANY, repo);
3327 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3331 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3333 error = got_error_from_errno("view_open");
3336 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3339 error = view_loop(view);
3343 got_repo_close(repo);
3344 got_ref_list_free(&refs);
3352 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3357 struct tog_blame_line {
3359 struct got_object_id *id;
3362 static const struct got_error *
3363 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3364 const char *path, struct tog_blame_line *lines, int nlines,
3365 int blame_complete, int selected_line, int *first_displayed_line,
3366 int *last_displayed_line, int *eof, int max_lines,
3367 struct tog_colors *colors)
3369 const struct got_error *err;
3370 int lineno = 0, nprinted = 0;
3375 struct tog_blame_line *blame_line;
3376 struct got_object_id *prev_id = NULL;
3378 struct tog_color *tc;
3380 err = got_object_id_str(&id_str, id);
3385 werase(view->window);
3387 if (asprintf(&line, "commit %s", id_str) == -1) {
3388 err = got_error_from_errno("asprintf");
3393 err = format_line(&wline, &width, line, view->ncols, 0);
3398 if (view_needs_focus_indication(view))
3399 wstandout(view->window);
3400 tc = get_color(colors, TOG_COLOR_COMMIT);
3402 wattr_on(view->window,
3403 COLOR_PAIR(tc->colorpair), NULL);
3404 waddwstr(view->window, wline);
3406 wattr_off(view->window,
3407 COLOR_PAIR(tc->colorpair), NULL);
3408 if (view_needs_focus_indication(view))
3409 wstandend(view->window);
3412 if (width < view->ncols - 1)
3413 waddch(view->window, '\n');
3415 if (asprintf(&line, "[%d/%d] %s%s",
3416 *first_displayed_line - 1 + selected_line, nlines,
3417 blame_complete ? "" : "annotating... ", path) == -1) {
3419 return got_error_from_errno("asprintf");
3422 err = format_line(&wline, &width, line, view->ncols, 0);
3427 waddwstr(view->window, wline);
3430 if (width < view->ncols - 1)
3431 waddch(view->window, '\n');
3434 while (nprinted < max_lines - 2) {
3435 line = parse_next_line(f, &len);
3440 if (++lineno < *first_displayed_line) {
3445 if (view->ncols <= 9) {
3447 wline = wcsdup(L"");
3449 err = got_error_from_errno("wcsdup");
3451 err = format_line(&wline, &width, line,
3452 view->ncols - 9, 9);
3460 if (view->focussed && nprinted == selected_line - 1)
3461 wstandout(view->window);
3464 blame_line = &lines[lineno - 1];
3465 if (blame_line->annotated && prev_id &&
3466 got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3468 nprinted == selected_line - 1)) {
3469 waddstr(view->window, " ");
3470 } else if (blame_line->annotated) {
3472 err = got_object_id_str(&id_str, blame_line->id);
3478 tc = get_color(colors, TOG_COLOR_COMMIT);
3480 wattr_on(view->window,
3481 COLOR_PAIR(tc->colorpair), NULL);
3482 wprintw(view->window, "%.8s", id_str);
3484 wattr_off(view->window,
3485 COLOR_PAIR(tc->colorpair), NULL);
3487 prev_id = blame_line->id;
3489 waddstr(view->window, "........");
3493 waddstr(view->window, "........");
3497 if (view->focussed && nprinted == selected_line - 1)
3498 wstandend(view->window);
3499 waddstr(view->window, " ");
3501 waddwstr(view->window, wline);
3502 if (width <= view->ncols - 1)
3503 waddch(view->window, '\n');
3504 if (++nprinted == 1)
3505 *first_displayed_line = lineno;
3510 *last_displayed_line = lineno;
3517 static const struct got_error *
3518 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3520 const struct got_error *err = NULL;
3521 struct tog_blame_cb_args *a = arg;
3522 struct tog_blame_line *line;
3525 if (nlines != a->nlines ||
3526 (lineno != -1 && lineno < 1) || lineno > a->nlines)
3527 return got_error(GOT_ERR_RANGE);
3529 errcode = pthread_mutex_lock(&tog_mutex);
3531 return got_error_set_errno(errcode, "pthread_mutex_lock");
3533 if (*a->quit) { /* user has quit the blame view */
3534 err = got_error(GOT_ERR_ITER_COMPLETED);
3539 goto done; /* no change in this commit */
3541 line = &a->lines[lineno - 1];
3542 if (line->annotated)
3545 line->id = got_object_id_dup(id);
3546 if (line->id == NULL) {
3547 err = got_error_from_errno("got_object_id_dup");
3550 line->annotated = 1;
3552 errcode = pthread_mutex_unlock(&tog_mutex);
3554 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3559 blame_thread(void *arg)
3561 const struct got_error *err;
3562 struct tog_blame_thread_args *ta = arg;
3563 struct tog_blame_cb_args *a = ta->cb_args;
3566 err = block_signals_used_by_main_thread();
3570 err = got_blame(ta->path, a->commit_id, ta->repo,
3571 blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3572 if (err && err->code == GOT_ERR_CANCELLED)
3575 errcode = pthread_mutex_lock(&tog_mutex);
3577 return (void *)got_error_set_errno(errcode,
3578 "pthread_mutex_lock");
3580 got_repo_close(ta->repo);
3584 errcode = pthread_mutex_unlock(&tog_mutex);
3585 if (errcode && err == NULL)
3586 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3591 static struct got_object_id *
3592 get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3593 int first_displayed_line, int selected_line)
3595 struct tog_blame_line *line;
3600 line = &lines[first_displayed_line - 1 + selected_line - 1];
3601 if (!line->annotated)
3607 static const struct got_error *
3608 stop_blame(struct tog_blame *blame)
3610 const struct got_error *err = NULL;
3613 if (blame->thread) {
3615 errcode = pthread_mutex_unlock(&tog_mutex);
3617 return got_error_set_errno(errcode,
3618 "pthread_mutex_unlock");
3619 errcode = pthread_join(blame->thread, (void **)&err);
3621 return got_error_set_errno(errcode, "pthread_join");
3622 errcode = pthread_mutex_lock(&tog_mutex);
3624 return got_error_set_errno(errcode,
3625 "pthread_mutex_lock");
3626 if (err && err->code == GOT_ERR_ITER_COMPLETED)
3628 blame->thread = NULL;
3630 if (blame->thread_args.repo) {
3631 got_repo_close(blame->thread_args.repo);
3632 blame->thread_args.repo = NULL;
3635 if (fclose(blame->f) != 0 && err == NULL)
3636 err = got_error_from_errno("fclose");
3640 for (i = 0; i < blame->nlines; i++)
3641 free(blame->lines[i].id);
3643 blame->lines = NULL;
3645 free(blame->cb_args.commit_id);
3646 blame->cb_args.commit_id = NULL;
3651 static const struct got_error *
3652 cancel_blame_view(void *arg)
3654 const struct got_error *err = NULL;
3658 errcode = pthread_mutex_lock(&tog_mutex);
3660 return got_error_set_errno(errcode,
3661 "pthread_mutex_unlock");
3664 err = got_error(GOT_ERR_CANCELLED);
3666 errcode = pthread_mutex_unlock(&tog_mutex);
3668 return got_error_set_errno(errcode,
3669 "pthread_mutex_lock");
3674 static const struct got_error *
3675 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3676 int *first_displayed_line, int *last_displayed_line, int *selected_line,
3677 int *done, int *eof, const char *path, struct got_object_id *commit_id,
3678 struct got_repository *repo)
3680 const struct got_error *err = NULL;
3681 struct got_blob_object *blob = NULL;
3682 struct got_repository *thread_repo = NULL;
3683 struct got_object_id *obj_id = NULL;
3686 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3690 return got_error(GOT_ERR_NO_OBJ);
3692 err = got_object_get_type(&obj_type, repo, obj_id);
3696 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3697 err = got_error(GOT_ERR_OBJ_TYPE);
3701 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3704 blame->f = got_opentemp();
3705 if (blame->f == NULL) {
3706 err = got_error_from_errno("got_opentemp");
3709 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3710 &blame->line_offsets, blame->f, blob);
3711 if (err || blame->nlines == 0)
3714 /* Don't include \n at EOF in the blame line count. */
3715 if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
3718 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
3719 if (blame->lines == NULL) {
3720 err = got_error_from_errno("calloc");
3724 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
3728 blame->cb_args.view = view;
3729 blame->cb_args.lines = blame->lines;
3730 blame->cb_args.nlines = blame->nlines;
3731 blame->cb_args.commit_id = got_object_id_dup(commit_id);
3732 if (blame->cb_args.commit_id == NULL) {
3733 err = got_error_from_errno("got_object_id_dup");
3736 blame->cb_args.quit = done;
3738 blame->thread_args.path = path;
3739 blame->thread_args.repo = thread_repo;
3740 blame->thread_args.cb_args = &blame->cb_args;
3741 blame->thread_args.complete = blame_complete;
3742 blame->thread_args.cancel_cb = cancel_blame_view;
3743 blame->thread_args.cancel_arg = done;
3744 *blame_complete = 0;
3748 got_object_blob_close(blob);
3755 static const struct got_error *
3756 open_blame_view(struct tog_view *view, char *path,
3757 struct got_object_id *commit_id, struct got_reflist_head *refs,
3758 struct got_repository *repo)
3760 const struct got_error *err = NULL;
3761 struct tog_blame_view_state *s = &view->state.blame;
3763 SIMPLEQ_INIT(&s->blamed_commits);
3765 s->path = strdup(path);
3766 if (s->path == NULL)
3767 return got_error_from_errno("strdup");
3769 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
3775 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
3776 s->first_displayed_line = 1;
3777 s->last_displayed_line = view->nlines;
3778 s->selected_line = 1;
3779 s->blame_complete = 0;
3782 s->commit_id = commit_id;
3783 memset(&s->blame, 0, sizeof(s->blame));
3785 SIMPLEQ_INIT(&s->colors);
3786 if (has_colors() && getenv("TOG_COLORS") != NULL) {
3787 err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
3788 get_color_value("TOG_COLOR_COMMIT"));
3793 view->show = show_blame_view;
3794 view->input = input_blame_view;
3795 view->close = close_blame_view;
3796 view->search_start = search_start_blame_view;
3797 view->search_next = search_next_blame_view;
3799 return run_blame(&s->blame, view, &s->blame_complete,
3800 &s->first_displayed_line, &s->last_displayed_line,
3801 &s->selected_line, &s->done, &s->eof, s->path,
3802 s->blamed_commit->id, s->repo);
3805 static const struct got_error *
3806 close_blame_view(struct tog_view *view)
3808 const struct got_error *err = NULL;
3809 struct tog_blame_view_state *s = &view->state.blame;
3811 if (s->blame.thread)
3812 err = stop_blame(&s->blame);
3814 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
3815 struct got_object_qid *blamed_commit;
3816 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
3817 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3818 got_object_qid_free(blamed_commit);
3822 free_colors(&s->colors);
3827 static const struct got_error *
3828 search_start_blame_view(struct tog_view *view)
3830 struct tog_blame_view_state *s = &view->state.blame;
3832 s->matched_line = 0;
3836 static const struct got_error *
3837 search_next_blame_view(struct tog_view *view)
3839 struct tog_blame_view_state *s = &view->state.blame;
3842 if (!view->searching) {
3843 view->search_next_done = 1;
3847 if (s->matched_line) {
3848 if (view->searching == TOG_SEARCH_FORWARD)
3849 lineno = s->matched_line + 1;
3851 lineno = s->matched_line - 1;
3853 if (view->searching == TOG_SEARCH_FORWARD)
3856 lineno = s->blame.nlines;
3864 if (lineno <= 0 || lineno > s->blame.nlines) {
3865 if (s->matched_line == 0) {
3866 view->search_next_done = 1;
3871 if (view->searching == TOG_SEARCH_FORWARD)
3874 lineno = s->blame.nlines;
3877 offset = s->blame.line_offsets[lineno - 1];
3878 if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
3880 return got_error_from_errno("fseeko");
3883 line = parse_next_line(s->blame.f, &len);
3884 if (line && match_line(line, &view->regex)) {
3885 view->search_next_done = 1;
3886 s->matched_line = lineno;
3891 if (view->searching == TOG_SEARCH_FORWARD)
3897 if (s->matched_line) {
3898 s->first_displayed_line = s->matched_line;
3899 s->selected_line = 1;
3905 static const struct got_error *
3906 show_blame_view(struct tog_view *view)
3908 const struct got_error *err = NULL;
3909 struct tog_blame_view_state *s = &view->state.blame;
3912 if (s->blame.thread == NULL) {
3913 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
3914 &s->blame.thread_args);
3916 return got_error_set_errno(errcode, "pthread_create");
3918 halfdelay(1); /* fast refresh while annotating */
3921 if (s->blame_complete)
3922 halfdelay(10); /* disable fast refresh */
3924 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
3925 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
3926 s->selected_line, &s->first_displayed_line,
3927 &s->last_displayed_line, &s->eof, view->nlines, &s->colors);
3933 static const struct got_error *
3934 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
3935 struct tog_view **focus_view, struct tog_view *view, int ch)
3937 const struct got_error *err = NULL, *thread_err = NULL;
3938 struct tog_view *diff_view;
3939 struct tog_blame_view_state *s = &view->state.blame;
3948 if (s->selected_line > 1)
3950 else if (s->selected_line == 1 &&
3951 s->first_displayed_line > 1)
3952 s->first_displayed_line--;
3955 if (s->first_displayed_line == 1) {
3956 s->selected_line = 1;
3959 if (s->first_displayed_line > view->nlines - 2)
3960 s->first_displayed_line -=
3963 s->first_displayed_line = 1;
3967 if (s->selected_line < view->nlines - 2 &&
3968 s->first_displayed_line +
3969 s->selected_line <= s->blame.nlines)
3971 else if (s->last_displayed_line <
3973 s->first_displayed_line++;
3977 struct got_object_id *id = NULL;
3978 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
3979 s->first_displayed_line, s->selected_line);
3983 struct got_commit_object *commit;
3984 struct got_object_qid *pid;
3985 struct got_object_id *blob_id = NULL;
3987 err = got_object_open_as_commit(&commit,
3991 pid = SIMPLEQ_FIRST(
3992 got_object_commit_get_parent_ids(commit));
3994 got_object_commit_close(commit);
3997 /* Check if path history ends here. */
3998 err = got_object_id_by_path(&blob_id, s->repo,
4001 if (err->code == GOT_ERR_NO_TREE_ENTRY)
4003 got_object_commit_close(commit);
4006 err = got_object_get_type(&obj_type, s->repo,
4009 /* Can't blame non-blob type objects. */
4010 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4011 got_object_commit_close(commit);
4014 err = got_object_qid_alloc(&s->blamed_commit,
4016 got_object_commit_close(commit);
4018 if (got_object_id_cmp(id,
4019 s->blamed_commit->id) == 0)
4021 err = got_object_qid_alloc(&s->blamed_commit,
4027 thread_err = stop_blame(&s->blame);
4031 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4032 s->blamed_commit, entry);
4033 err = run_blame(&s->blame, view, &s->blame_complete,
4034 &s->first_displayed_line, &s->last_displayed_line,
4035 &s->selected_line, &s->done, &s->eof,
4036 s->path, s->blamed_commit->id, s->repo);
4042 struct got_object_qid *first;
4043 first = SIMPLEQ_FIRST(&s->blamed_commits);
4044 if (!got_object_id_cmp(first->id, s->commit_id))
4047 thread_err = stop_blame(&s->blame);
4051 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4052 got_object_qid_free(s->blamed_commit);
4054 SIMPLEQ_FIRST(&s->blamed_commits);
4055 err = run_blame(&s->blame, view, &s->blame_complete,
4056 &s->first_displayed_line, &s->last_displayed_line,
4057 &s->selected_line, &s->done, &s->eof, s->path,
4058 s->blamed_commit->id, s->repo);
4065 struct got_object_id *id = NULL;
4066 struct got_object_qid *pid;
4067 struct got_commit_object *commit = NULL;
4068 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4069 s->first_displayed_line, s->selected_line);
4072 err = got_object_open_as_commit(&commit, s->repo, id);
4075 pid = SIMPLEQ_FIRST(
4076 got_object_commit_get_parent_ids(commit));
4077 if (view_is_parent_view(view))
4078 begin_x = view_split_begin_x(view->begin_x);
4079 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4080 if (diff_view == NULL) {
4081 got_object_commit_close(commit);
4082 err = got_error_from_errno("view_open");
4085 err = open_diff_view(diff_view, pid ? pid->id : NULL,
4086 id, NULL, s->refs, s->repo);
4087 got_object_commit_close(commit);
4089 view_close(diff_view);
4092 if (view_is_parent_view(view)) {
4093 err = view_close_child(view);
4096 err = view_set_child(view, diff_view);
4098 view_close(diff_view);
4101 *focus_view = diff_view;
4102 view->child_focussed = 1;
4104 *new_view = diff_view;
4111 if (s->last_displayed_line >= s->blame.nlines &&
4112 s->selected_line >= MIN(s->blame.nlines,
4113 view->nlines - 2)) {
4116 if (s->last_displayed_line >= s->blame.nlines &&
4117 s->selected_line < view->nlines - 2) {
4118 s->selected_line = MIN(s->blame.nlines,
4122 if (s->last_displayed_line + view->nlines - 2
4124 s->first_displayed_line +=
4127 s->first_displayed_line =
4132 if (s->selected_line > view->nlines - 2) {
4133 s->selected_line = MIN(s->blame.nlines,
4140 return thread_err ? thread_err : err;
4143 static const struct got_error *
4144 cmd_blame(int argc, char *argv[])
4146 const struct got_error *error;
4147 struct got_repository *repo = NULL;
4148 struct got_reflist_head refs;
4149 struct got_worktree *worktree = NULL;
4150 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4151 struct got_object_id *commit_id = NULL;
4152 char *commit_id_str = NULL;
4154 struct tog_view *view;
4156 SIMPLEQ_INIT(&refs);
4159 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4164 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4167 commit_id_str = optarg;
4170 repo_path = realpath(optarg, NULL);
4171 if (repo_path == NULL)
4172 return got_error_from_errno2("realpath",
4189 cwd = getcwd(NULL, 0);
4191 error = got_error_from_errno("getcwd");
4194 if (repo_path == NULL) {
4195 error = got_worktree_open(&worktree, cwd);
4196 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4202 strdup(got_worktree_get_repo_path(worktree));
4203 if (repo_path == NULL)
4204 error = got_error_from_errno("strdup");
4208 repo_path = strdup(cwd);
4209 if (repo_path == NULL) {
4210 error = got_error_from_errno("strdup");
4218 error = got_repo_open(&repo, repo_path, NULL);
4222 error = apply_unveil(got_repo_get_path(repo), NULL);
4227 const char *prefix = got_worktree_get_path_prefix(worktree);
4228 char *p, *worktree_subdir = cwd +
4229 strlen(got_worktree_get_root_path(worktree));
4230 if (asprintf(&p, "%s%s%s%s%s",
4231 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4232 worktree_subdir, worktree_subdir[0] ? "/" : "",
4234 error = got_error_from_errno("asprintf");
4237 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4240 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4245 if (commit_id_str == NULL) {
4246 struct got_reference *head_ref;
4247 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
4250 error = got_ref_resolve(&commit_id, repo, head_ref);
4251 got_ref_close(head_ref);
4253 error = get_head_commit_id(&commit_id, commit_id_str, repo);
4255 if (error->code != GOT_ERR_NOT_REF)
4257 error = got_repo_match_object_id_prefix(&commit_id,
4258 commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
4264 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4268 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4270 error = got_error_from_errno("view_open");
4273 error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
4277 /* Release work tree lock. */
4278 got_worktree_close(worktree);
4281 error = view_loop(view);
4287 got_worktree_close(worktree);
4289 got_repo_close(repo);
4290 got_ref_list_free(&refs);
4294 static const struct got_error *
4295 draw_tree_entries(struct tog_view *view,
4296 struct got_tree_entry **first_displayed_entry,
4297 struct got_tree_entry **last_displayed_entry,
4298 struct got_tree_entry **selected_entry, int *ndisplayed,
4299 const char *label, int show_ids, const char *parent_path,
4300 struct got_tree_object *tree, int selected, int limit,
4301 int isroot, struct tog_colors *colors)
4303 const struct got_error *err = NULL;
4304 struct got_tree_entry *te;
4306 struct tog_color *tc;
4307 int width, n, i, nentries;
4311 werase(view->window);
4316 err = format_line(&wline, &width, label, view->ncols, 0);
4319 if (view_needs_focus_indication(view))
4320 wstandout(view->window);
4321 tc = get_color(colors, TOG_COLOR_COMMIT);
4323 wattr_on(view->window,
4324 COLOR_PAIR(tc->colorpair), NULL);
4325 waddwstr(view->window, wline);
4327 wattr_off(view->window,
4328 COLOR_PAIR(tc->colorpair), NULL);
4329 if (view_needs_focus_indication(view))
4330 wstandend(view->window);
4333 if (width < view->ncols - 1)
4334 waddch(view->window, '\n');
4337 err = format_line(&wline, &width, parent_path, view->ncols, 0);
4340 waddwstr(view->window, wline);
4343 if (width < view->ncols - 1)
4344 waddch(view->window, '\n');
4347 waddch(view->window, '\n');
4351 if (*first_displayed_entry == NULL) {
4352 te = got_object_tree_get_first_entry(tree);
4353 if (selected == 0) {
4355 wstandout(view->window);
4356 *selected_entry = NULL;
4358 waddstr(view->window, " ..\n"); /* parent directory */
4359 if (selected == 0 && view->focussed)
4360 wstandend(view->window);
4367 te = *first_displayed_entry;
4370 nentries = got_object_tree_get_nentries(tree);
4371 for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4372 char *line = NULL, *id_str = NULL;
4373 const char *modestr = "";
4376 te = got_object_tree_get_entry(tree, i);
4377 mode = got_tree_entry_get_mode(te);
4380 err = got_object_id_str(&id_str,
4381 got_tree_entry_get_id(te));
4383 return got_error_from_errno(
4384 "got_object_id_str");
4386 if (got_object_tree_entry_is_submodule(te))
4388 else if (S_ISLNK(mode))
4390 else if (S_ISDIR(mode))
4392 else if (mode & S_IXUSR)
4394 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
4395 got_tree_entry_get_name(te), modestr) == -1) {
4397 return got_error_from_errno("asprintf");
4400 err = format_line(&wline, &width, line, view->ncols, 0);
4405 if (n == selected) {
4407 wstandout(view->window);
4408 *selected_entry = te;
4410 tc = match_color(colors, line);
4412 wattr_on(view->window,
4413 COLOR_PAIR(tc->colorpair), NULL);
4414 waddwstr(view->window, wline);
4416 wattr_off(view->window,
4417 COLOR_PAIR(tc->colorpair), NULL);
4418 if (width < view->ncols - 1)
4419 waddch(view->window, '\n');
4420 if (n == selected && view->focussed)
4421 wstandend(view->window);
4427 *last_displayed_entry = te;
4436 tree_scroll_up(struct tog_view *view,
4437 struct got_tree_entry **first_displayed_entry, int maxscroll,
4438 struct got_tree_object *tree, int isroot)
4440 struct got_tree_entry *te;
4443 if (*first_displayed_entry == NULL)
4446 te = got_object_tree_get_entry(tree, 0);
4447 if (*first_displayed_entry == te) {
4449 *first_displayed_entry = NULL;
4454 while (*first_displayed_entry && i < maxscroll) {
4455 *first_displayed_entry = got_tree_entry_get_prev(tree,
4456 *first_displayed_entry);
4459 if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4460 *first_displayed_entry = NULL;
4464 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4465 struct got_tree_entry *last_displayed_entry,
4466 struct got_tree_object *tree)
4468 struct got_tree_entry *next, *last;
4471 if (*first_displayed_entry)
4472 next = got_tree_entry_get_next(tree, *first_displayed_entry);
4474 next = got_object_tree_get_first_entry(tree);
4476 last = last_displayed_entry;
4477 while (next && last && n++ < maxscroll) {
4478 last = got_tree_entry_get_next(tree, last);
4480 *first_displayed_entry = next;
4481 next = got_tree_entry_get_next(tree, next);
4487 static const struct got_error *
4488 tree_entry_path(char **path, struct tog_parent_trees *parents,
4489 struct got_tree_entry *te)
4491 const struct got_error *err = NULL;
4492 struct tog_parent_tree *pt;
4493 size_t len = 2; /* for leading slash and NUL */
4495 TAILQ_FOREACH(pt, parents, entry)
4496 len += strlen(got_tree_entry_get_name(pt->selected_entry))
4499 len += strlen(got_tree_entry_get_name(te));
4501 *path = calloc(1, len);
4503 return got_error_from_errno("calloc");
4506 pt = TAILQ_LAST(parents, tog_parent_trees);
4508 const char *name = got_tree_entry_get_name(pt->selected_entry);
4509 if (strlcat(*path, name, len) >= len) {
4510 err = got_error(GOT_ERR_NO_SPACE);
4513 if (strlcat(*path, "/", len) >= len) {
4514 err = got_error(GOT_ERR_NO_SPACE);
4517 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4520 if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4521 err = got_error(GOT_ERR_NO_SPACE);
4533 static const struct got_error *
4534 blame_tree_entry(struct tog_view **new_view, int begin_x,
4535 struct got_tree_entry *te, struct tog_parent_trees *parents,
4536 struct got_object_id *commit_id, struct got_reflist_head *refs,
4537 struct got_repository *repo)
4539 const struct got_error *err = NULL;
4541 struct tog_view *blame_view;
4545 err = tree_entry_path(&path, parents, te);
4549 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4550 if (blame_view == NULL) {
4551 err = got_error_from_errno("view_open");
4555 err = open_blame_view(blame_view, path, commit_id, refs, repo);
4557 if (err->code == GOT_ERR_CANCELLED)
4559 view_close(blame_view);
4561 *new_view = blame_view;
4567 static const struct got_error *
4568 log_tree_entry(struct tog_view **new_view, int begin_x,
4569 struct got_tree_entry *te, struct tog_parent_trees *parents,
4570 struct got_object_id *commit_id, struct got_reflist_head *refs,
4571 struct got_repository *repo)
4573 struct tog_view *log_view;
4574 const struct got_error *err = NULL;
4579 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4580 if (log_view == NULL)
4581 return got_error_from_errno("view_open");
4583 err = tree_entry_path(&path, parents, te);
4587 err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4589 view_close(log_view);
4591 *new_view = log_view;
4596 static const struct got_error *
4597 open_tree_view(struct tog_view *view, struct got_tree_object *root,
4598 struct got_object_id *commit_id, struct got_reflist_head *refs,
4599 struct got_repository *repo)
4601 const struct got_error *err = NULL;
4602 char *commit_id_str = NULL;
4603 struct tog_tree_view_state *s = &view->state.tree;
4605 TAILQ_INIT(&s->parents);
4607 err = got_object_id_str(&commit_id_str, commit_id);
4611 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4612 err = got_error_from_errno("asprintf");
4616 s->root = s->tree = root;
4617 s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
4618 s->selected_entry = got_object_tree_get_entry(s->tree, 0);
4619 s->commit_id = got_object_id_dup(commit_id);
4620 if (s->commit_id == NULL) {
4621 err = got_error_from_errno("got_object_id_dup");
4627 SIMPLEQ_INIT(&s->colors);
4629 if (has_colors() && getenv("TOG_COLORS") != NULL) {
4630 err = add_color(&s->colors, "\\$$",
4631 TOG_COLOR_TREE_SUBMODULE,
4632 get_color_value("TOG_COLOR_TREE_SUBMODULE"));
4635 err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
4636 get_color_value("TOG_COLOR_TREE_SYMLINK"));
4638 free_colors(&s->colors);
4641 err = add_color(&s->colors, "/$",
4642 TOG_COLOR_TREE_DIRECTORY,
4643 get_color_value("TOG_COLOR_TREE_DIRECTORY"));
4645 free_colors(&s->colors);
4649 err = add_color(&s->colors, "\\*$",
4650 TOG_COLOR_TREE_EXECUTABLE,
4651 get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
4653 free_colors(&s->colors);
4657 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
4658 get_color_value("TOG_COLOR_COMMIT"));
4660 free_colors(&s->colors);
4665 view->show = show_tree_view;
4666 view->input = input_tree_view;
4667 view->close = close_tree_view;
4668 view->search_start = search_start_tree_view;
4669 view->search_next = search_next_tree_view;
4671 free(commit_id_str);
4673 free(s->tree_label);
4674 s->tree_label = NULL;
4679 static const struct got_error *
4680 close_tree_view(struct tog_view *view)
4682 struct tog_tree_view_state *s = &view->state.tree;
4684 free_colors(&s->colors);
4685 free(s->tree_label);
4686 s->tree_label = NULL;
4688 s->commit_id = NULL;
4689 while (!TAILQ_EMPTY(&s->parents)) {
4690 struct tog_parent_tree *parent;
4691 parent = TAILQ_FIRST(&s->parents);
4692 TAILQ_REMOVE(&s->parents, parent, entry);
4696 if (s->tree != s->root)
4697 got_object_tree_close(s->tree);
4698 got_object_tree_close(s->root);
4703 static const struct got_error *
4704 search_start_tree_view(struct tog_view *view)
4706 struct tog_tree_view_state *s = &view->state.tree;
4708 s->matched_entry = NULL;
4713 match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4715 regmatch_t regmatch;
4717 return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
4721 static const struct got_error *
4722 search_next_tree_view(struct tog_view *view)
4724 struct tog_tree_view_state *s = &view->state.tree;
4725 struct got_tree_entry *te = NULL;
4727 if (!view->searching) {
4728 view->search_next_done = 1;
4732 if (s->matched_entry) {
4733 if (view->searching == TOG_SEARCH_FORWARD) {
4734 if (s->selected_entry)
4735 te = got_tree_entry_get_next(s->tree,
4738 te = got_object_tree_get_first_entry(s->tree);
4740 if (s->selected_entry == NULL)
4741 te = got_object_tree_get_last_entry(s->tree);
4743 te = got_tree_entry_get_prev(s->tree,
4747 if (view->searching == TOG_SEARCH_FORWARD)
4748 te = got_object_tree_get_first_entry(s->tree);
4750 te = got_object_tree_get_last_entry(s->tree);
4755 if (s->matched_entry == NULL) {
4756 view->search_next_done = 1;
4759 if (view->searching == TOG_SEARCH_FORWARD)
4760 te = got_object_tree_get_first_entry(s->tree);
4762 te = got_object_tree_get_last_entry(s->tree);
4765 if (match_tree_entry(te, &view->regex)) {
4766 view->search_next_done = 1;
4767 s->matched_entry = te;
4771 if (view->searching == TOG_SEARCH_FORWARD)
4772 te = got_tree_entry_get_next(s->tree, te);
4774 te = got_tree_entry_get_prev(s->tree, te);
4777 if (s->matched_entry) {
4778 s->first_displayed_entry = s->matched_entry;
4785 static const struct got_error *
4786 show_tree_view(struct tog_view *view)
4788 const struct got_error *err = NULL;
4789 struct tog_tree_view_state *s = &view->state.tree;
4792 err = tree_entry_path(&parent_path, &s->parents, NULL);
4796 err = draw_tree_entries(view, &s->first_displayed_entry,
4797 &s->last_displayed_entry, &s->selected_entry,
4798 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
4799 s->tree, s->selected, view->nlines, s->tree == s->root,
4807 static const struct got_error *
4808 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
4809 struct tog_view **focus_view, struct tog_view *view, int ch)
4811 const struct got_error *err = NULL;
4812 struct tog_tree_view_state *s = &view->state.tree;
4813 struct tog_view *log_view;
4814 int begin_x = 0, nscrolled;
4818 s->show_ids = !s->show_ids;
4821 if (!s->selected_entry)
4823 if (view_is_parent_view(view))
4824 begin_x = view_split_begin_x(view->begin_x);
4825 err = log_tree_entry(&log_view, begin_x,
4826 s->selected_entry, &s->parents,
4827 s->commit_id, s->refs, s->repo);
4828 if (view_is_parent_view(view)) {
4829 err = view_close_child(view);
4832 err = view_set_child(view, log_view);
4834 view_close(log_view);
4837 *focus_view = log_view;
4838 view->child_focussed = 1;
4840 *new_view = log_view;
4844 if (s->selected > 0) {
4846 if (s->selected == 0)
4849 if (s->selected > 0)
4851 tree_scroll_up(view, &s->first_displayed_entry, 1,
4852 s->tree, s->tree == s->root);
4855 tree_scroll_up(view, &s->first_displayed_entry,
4856 MAX(0, view->nlines - 4 - s->selected), s->tree,
4857 s->tree == s->root);
4859 if (got_object_tree_get_first_entry(s->tree) ==
4860 s->first_displayed_entry && s->tree != s->root)
4861 s->first_displayed_entry = NULL;
4865 if (s->selected < s->ndisplayed - 1) {
4869 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
4871 /* can't scroll any further */
4873 tree_scroll_down(&s->first_displayed_entry, 1,
4874 s->last_displayed_entry, s->tree);
4877 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
4879 /* can't scroll any further; move cursor down */
4880 if (s->selected < s->ndisplayed - 1)
4881 s->selected = s->ndisplayed - 1;
4884 nscrolled = tree_scroll_down(&s->first_displayed_entry,
4885 view->nlines, s->last_displayed_entry, s->tree);
4886 if (nscrolled < view->nlines) {
4888 struct got_tree_entry *te;
4889 te = s->first_displayed_entry;
4892 te = got_tree_entry_get_next(s->tree, te);
4894 s->selected = ndisplayed - 1;
4900 if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
4901 struct tog_parent_tree *parent;
4902 /* user selected '..' */
4903 if (s->tree == s->root)
4905 parent = TAILQ_FIRST(&s->parents);
4906 TAILQ_REMOVE(&s->parents, parent,
4908 got_object_tree_close(s->tree);
4909 s->tree = parent->tree;
4910 s->first_displayed_entry =
4911 parent->first_displayed_entry;
4913 parent->selected_entry;
4914 s->selected = parent->selected;
4916 } else if (S_ISDIR(got_tree_entry_get_mode(
4917 s->selected_entry))) {
4918 struct got_tree_object *subtree;
4919 err = got_object_open_as_tree(&subtree, s->repo,
4920 got_tree_entry_get_id(s->selected_entry));
4923 err = tree_view_visit_subtree(subtree, s);
4925 got_object_tree_close(subtree);
4928 } else if (S_ISREG(got_tree_entry_get_mode(
4929 s->selected_entry))) {
4930 struct tog_view *blame_view;
4931 int begin_x = view_is_parent_view(view) ?
4932 view_split_begin_x(view->begin_x) : 0;
4934 err = blame_tree_entry(&blame_view, begin_x,
4935 s->selected_entry, &s->parents,
4936 s->commit_id, s->refs, s->repo);
4939 if (view_is_parent_view(view)) {
4940 err = view_close_child(view);
4943 err = view_set_child(view, blame_view);
4945 view_close(blame_view);
4948 *focus_view = blame_view;
4949 view->child_focussed = 1;
4951 *new_view = blame_view;
4955 if (s->selected > view->nlines)
4956 s->selected = s->ndisplayed - 1;
4969 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
4974 static const struct got_error *
4975 cmd_tree(int argc, char *argv[])
4977 const struct got_error *error;
4978 struct got_repository *repo = NULL;
4979 struct got_reflist_head refs;
4980 char *repo_path = NULL;
4981 struct got_object_id *commit_id = NULL;
4982 char *commit_id_arg = NULL;
4983 struct got_commit_object *commit = NULL;
4984 struct got_tree_object *tree = NULL;
4986 struct tog_view *view;
4988 SIMPLEQ_INIT(&refs);
4991 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4996 while ((ch = getopt(argc, argv, "c:")) != -1) {
4999 commit_id_arg = optarg;
5011 struct got_worktree *worktree;
5012 char *cwd = getcwd(NULL, 0);
5014 return got_error_from_errno("getcwd");
5015 error = got_worktree_open(&worktree, cwd);
5016 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5021 strdup(got_worktree_get_repo_path(worktree));
5022 got_worktree_close(worktree);
5025 if (repo_path == NULL) {
5026 error = got_error_from_errno("strdup");
5029 } else if (argc == 1) {
5030 repo_path = realpath(argv[0], NULL);
5031 if (repo_path == NULL)
5032 return got_error_from_errno2("realpath", argv[0]);
5038 error = got_repo_open(&repo, repo_path, NULL);
5042 error = apply_unveil(got_repo_get_path(repo), NULL);
5046 if (commit_id_arg == NULL)
5047 error = get_head_commit_id(&commit_id, GOT_REF_HEAD, repo);
5049 error = get_head_commit_id(&commit_id, commit_id_arg, repo);
5051 if (error->code != GOT_ERR_NOT_REF)
5053 error = got_repo_match_object_id_prefix(&commit_id,
5054 commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
5060 error = got_object_open_as_commit(&commit, repo, commit_id);
5064 error = got_object_open_as_tree(&tree, repo,
5065 got_object_commit_get_tree_id(commit));
5069 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5073 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5075 error = got_error_from_errno("view_open");
5078 error = open_tree_view(view, tree, commit_id, &refs, repo);
5081 error = view_loop(view);
5086 got_object_commit_close(commit);
5088 got_object_tree_close(tree);
5090 got_repo_close(repo);
5091 got_ref_list_free(&refs);
5100 fprintf(stderr, "commands:");
5101 for (i = 0; i < nitems(tog_commands); i++) {
5102 struct tog_cmd *cmd = &tog_commands[i];
5103 fprintf(stderr, " %s", cmd->name);
5105 fputc('\n', stderr);
5111 fprintf(stderr, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
5119 make_argv(const char *arg0, const char *arg1)
5122 int argc = (arg1 == NULL ? 1 : 2);
5124 argv = calloc(argc, sizeof(char *));
5127 argv[0] = strdup(arg0);
5128 if (argv[0] == NULL)
5131 argv[1] = strdup(arg1);
5132 if (argv[1] == NULL)
5140 main(int argc, char *argv[])
5142 const struct got_error *error = NULL;
5143 struct tog_cmd *cmd = NULL;
5144 int ch, hflag = 0, Vflag = 0;
5145 char **cmd_argv = NULL;
5146 static struct option longopts[] = {
5147 { "version", no_argument, NULL, 'V' },
5151 setlocale(LC_CTYPE, "");
5153 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5173 got_version_print_str();
5180 /* Build an argument vector which runs a default command. */
5181 cmd = &tog_commands[0];
5182 cmd_argv = make_argv(cmd->name, NULL);
5187 /* Did the user specific a command? */
5188 for (i = 0; i < nitems(tog_commands); i++) {
5189 if (strncmp(tog_commands[i].name, argv[0],
5190 strlen(argv[0])) == 0) {
5191 cmd = &tog_commands[i];
5197 fprintf(stderr, "%s: unknown command '%s'\n",
5198 getprogname(), argv[0]);
5207 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5211 if (error && error->code != GOT_ERR_CANCELLED)
5212 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);