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>
23 #define _XOPEN_SOURCE_EXTENDED
25 #undef _XOPEN_SOURCE_EXTENDED
44 #include "got_version.h"
45 #include "got_error.h"
46 #include "got_object.h"
47 #include "got_reference.h"
48 #include "got_repository.h"
50 #include "got_opentemp.h"
52 #include "got_cancel.h"
53 #include "got_commit_graph.h"
54 #include "got_blame.h"
55 #include "got_privsep.h"
57 #include "got_worktree.h"
60 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
64 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
67 #define CTRL(x) ((x) & 0x1f)
70 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
75 const struct got_error *(*cmd_main)(int, char *[]);
76 void (*cmd_usage)(void);
79 __dead static void usage(int, int);
80 __dead static void usage_log(void);
81 __dead static void usage_diff(void);
82 __dead static void usage_blame(void);
83 __dead static void usage_tree(void);
85 static const struct got_error* cmd_log(int, char *[]);
86 static const struct got_error* cmd_diff(int, char *[]);
87 static const struct got_error* cmd_blame(int, char *[]);
88 static const struct got_error* cmd_tree(int, char *[]);
90 static struct tog_cmd tog_commands[] = {
91 { "log", cmd_log, usage_log },
92 { "diff", cmd_diff, usage_diff },
93 { "blame", cmd_blame, usage_blame },
94 { "tree", cmd_tree, usage_tree },
104 #define TOG_EOF_STRING "(END)"
106 struct commit_queue_entry {
107 TAILQ_ENTRY(commit_queue_entry) entry;
108 struct got_object_id *id;
109 struct got_commit_object *commit;
112 TAILQ_HEAD(commit_queue_head, commit_queue_entry);
113 struct commit_queue {
115 struct commit_queue_head head;
119 SIMPLEQ_ENTRY(tog_color) entry;
123 SIMPLEQ_HEAD(tog_colors, tog_color);
125 static const struct got_error *
126 add_color(struct tog_colors *colors, const char *pattern,
127 int idx, short color)
129 const struct got_error *err = NULL;
130 struct tog_color *tc;
133 if (idx < 1 || idx > COLOR_PAIRS - 1)
136 init_pair(idx, color, -1);
138 tc = calloc(1, sizeof(*tc));
140 return got_error_from_errno("calloc");
141 regerr = regcomp(&tc->regex, pattern,
142 REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
144 static char regerr_msg[512];
145 static char err_msg[512];
146 regerror(regerr, &tc->regex, regerr_msg,
148 snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
150 err = got_error_msg(GOT_ERR_REGEX, err_msg);
155 SIMPLEQ_INSERT_HEAD(colors, tc, entry);
160 free_colors(struct tog_colors *colors)
162 struct tog_color *tc;
164 while (!SIMPLEQ_EMPTY(colors)) {
165 tc = SIMPLEQ_FIRST(colors);
166 SIMPLEQ_REMOVE_HEAD(colors, entry);
173 get_color(struct tog_colors *colors, int colorpair)
175 struct tog_color *tc = NULL;
177 SIMPLEQ_FOREACH(tc, colors, entry) {
178 if (tc->colorpair == colorpair)
186 default_color_value(const char *envvar)
188 if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
189 return COLOR_MAGENTA;
190 if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
192 if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
194 if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
196 if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
197 return COLOR_MAGENTA;
198 if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
199 return COLOR_MAGENTA;
200 if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
202 if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
204 if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
206 if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
208 if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
215 get_color_value(const char *envvar)
217 const char *val = getenv(envvar);
220 return default_color_value(envvar);
222 if (strcasecmp(val, "black") == 0)
224 if (strcasecmp(val, "red") == 0)
226 if (strcasecmp(val, "green") == 0)
228 if (strcasecmp(val, "yellow") == 0)
230 if (strcasecmp(val, "blue") == 0)
232 if (strcasecmp(val, "magenta") == 0)
233 return COLOR_MAGENTA;
234 if (strcasecmp(val, "cyan") == 0)
236 if (strcasecmp(val, "white") == 0)
238 if (strcasecmp(val, "default") == 0)
241 return default_color_value(envvar);
245 struct tog_diff_view_state {
246 struct got_object_id *id1, *id2;
248 int first_displayed_line;
249 int last_displayed_line;
252 struct got_repository *repo;
253 struct got_reflist_head *refs;
254 struct tog_colors colors;
260 /* passed from log view; may be NULL */
261 struct tog_view *log_view;
264 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
266 struct tog_log_thread_args {
267 pthread_cond_t need_commits;
268 pthread_cond_t commit_loaded;
270 struct got_commit_graph *graph;
271 struct commit_queue *commits;
272 const char *in_repo_path;
273 struct got_object_id *start_id;
274 struct got_repository *repo;
277 struct commit_queue_entry **first_displayed_entry;
278 struct commit_queue_entry **selected_entry;
280 int *search_next_done;
284 struct tog_log_view_state {
285 struct commit_queue commits;
286 struct commit_queue_entry *first_displayed_entry;
287 struct commit_queue_entry *last_displayed_entry;
288 struct commit_queue_entry *selected_entry;
291 const char *head_ref_name;
293 struct got_repository *repo;
294 struct got_reflist_head *refs;
295 struct got_object_id *start_id;
298 struct tog_log_thread_args thread_args;
299 struct commit_queue_entry *matched_entry;
300 struct commit_queue_entry *search_entry;
301 struct tog_colors colors;
304 #define TOG_COLOR_DIFF_MINUS 1
305 #define TOG_COLOR_DIFF_PLUS 2
306 #define TOG_COLOR_DIFF_CHUNK_HEADER 3
307 #define TOG_COLOR_DIFF_META 4
308 #define TOG_COLOR_TREE_SUBMODULE 5
309 #define TOG_COLOR_TREE_SYMLINK 6
310 #define TOG_COLOR_TREE_DIRECTORY 7
311 #define TOG_COLOR_TREE_EXECUTABLE 8
312 #define TOG_COLOR_COMMIT 9
313 #define TOG_COLOR_AUTHOR 10
314 #define TOG_COLOR_DATE 11
316 struct tog_blame_cb_args {
317 struct tog_blame_line *lines; /* one per line */
320 struct tog_view *view;
321 struct got_object_id *commit_id;
325 struct tog_blame_thread_args {
327 struct got_repository *repo;
328 struct tog_blame_cb_args *cb_args;
330 got_cancel_cb cancel_cb;
337 struct tog_blame_line *lines;
341 struct tog_blame_thread_args thread_args;
342 struct tog_blame_cb_args cb_args;
346 struct tog_blame_view_state {
347 int first_displayed_line;
348 int last_displayed_line;
353 struct got_object_id_queue blamed_commits;
354 struct got_object_qid *blamed_commit;
356 struct got_repository *repo;
357 struct got_reflist_head *refs;
358 struct got_object_id *commit_id;
359 struct tog_blame blame;
361 struct tog_colors colors;
364 struct tog_parent_tree {
365 TAILQ_ENTRY(tog_parent_tree) entry;
366 struct got_tree_object *tree;
367 struct got_tree_entry *first_displayed_entry;
368 struct got_tree_entry *selected_entry;
372 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
374 struct tog_tree_view_state {
376 struct got_tree_object *root;
377 struct got_tree_object *tree;
378 struct got_tree_entry *first_displayed_entry;
379 struct got_tree_entry *last_displayed_entry;
380 struct got_tree_entry *selected_entry;
381 int ndisplayed, selected, show_ids;
382 struct tog_parent_trees parents;
383 struct got_object_id *commit_id;
384 struct got_repository *repo;
385 struct got_reflist_head *refs;
386 struct got_tree_entry *matched_entry;
387 struct tog_colors colors;
391 * We implement two types of views: parent views and child views.
393 * The 'Tab' key switches between a parent view and its child view.
394 * Child views are shown side-by-side to their parent view, provided
395 * there is enough screen estate.
397 * When a new view is opened from within a parent view, this new view
398 * becomes a child view of the parent view, replacing any existing child.
400 * When a new view is opened from within a child view, this new view
401 * becomes a parent view which will obscure the views below until the
402 * user quits the new parent view by typing 'q'.
404 * This list of views contains parent views only.
405 * Child views are only pointed to by their parent view.
407 TAILQ_HEAD(tog_view_list_head, tog_view);
410 TAILQ_ENTRY(tog_view) entry;
413 int nlines, ncols, begin_y, begin_x;
414 int lines, cols; /* copies of LINES and COLS */
416 struct tog_view *parent;
417 struct tog_view *child;
420 /* type-specific state */
421 enum tog_view_type type;
423 struct tog_diff_view_state diff;
424 struct tog_log_view_state log;
425 struct tog_blame_view_state blame;
426 struct tog_tree_view_state tree;
429 const struct got_error *(*show)(struct tog_view *);
430 const struct got_error *(*input)(struct tog_view **,
431 struct tog_view **, struct tog_view**, struct tog_view *, int);
432 const struct got_error *(*close)(struct tog_view *);
434 const struct got_error *(*search_start)(struct tog_view *);
435 const struct got_error *(*search_next)(struct tog_view *);
437 #define TOG_SEARCH_FORWARD 1
438 #define TOG_SEARCH_BACKWARD 2
439 int search_next_done;
440 #define TOG_SEARCH_HAVE_MORE 1
441 #define TOG_SEARCH_NO_MORE 2
442 #define TOG_SEARCH_HAVE_NONE 3
447 static const struct got_error *open_diff_view(struct tog_view *,
448 struct got_object_id *, struct got_object_id *, struct tog_view *,
449 struct got_reflist_head *, struct got_repository *);
450 static const struct got_error *show_diff_view(struct tog_view *);
451 static const struct got_error *input_diff_view(struct tog_view **,
452 struct tog_view **, struct tog_view **, struct tog_view *, int);
453 static const struct got_error* close_diff_view(struct tog_view *);
454 static const struct got_error *search_start_diff_view(struct tog_view *);
455 static const struct got_error *search_next_diff_view(struct tog_view *);
457 static const struct got_error *open_log_view(struct tog_view *,
458 struct got_object_id *, struct got_reflist_head *,
459 struct got_repository *, const char *, const char *, int);
460 static const struct got_error * show_log_view(struct tog_view *);
461 static const struct got_error *input_log_view(struct tog_view **,
462 struct tog_view **, struct tog_view **, struct tog_view *, int);
463 static const struct got_error *close_log_view(struct tog_view *);
464 static const struct got_error *search_start_log_view(struct tog_view *);
465 static const struct got_error *search_next_log_view(struct tog_view *);
467 static const struct got_error *open_blame_view(struct tog_view *, char *,
468 struct got_object_id *, struct got_reflist_head *, struct got_repository *);
469 static const struct got_error *show_blame_view(struct tog_view *);
470 static const struct got_error *input_blame_view(struct tog_view **,
471 struct tog_view **, struct tog_view **, struct tog_view *, int);
472 static const struct got_error *close_blame_view(struct tog_view *);
473 static const struct got_error *search_start_blame_view(struct tog_view *);
474 static const struct got_error *search_next_blame_view(struct tog_view *);
476 static const struct got_error *open_tree_view(struct tog_view *,
477 struct got_tree_object *, struct got_object_id *, struct got_reflist_head *,
478 struct got_repository *);
479 static const struct got_error *show_tree_view(struct tog_view *);
480 static const struct got_error *input_tree_view(struct tog_view **,
481 struct tog_view **, struct tog_view **, struct tog_view *, int);
482 static const struct got_error *close_tree_view(struct tog_view *);
483 static const struct got_error *search_start_tree_view(struct tog_view *);
484 static const struct got_error *search_next_tree_view(struct tog_view *);
486 static volatile sig_atomic_t tog_sigwinch_received;
487 static volatile sig_atomic_t tog_sigpipe_received;
488 static volatile sig_atomic_t tog_sigcont_received;
491 tog_sigwinch(int signo)
493 tog_sigwinch_received = 1;
497 tog_sigpipe(int signo)
499 tog_sigpipe_received = 1;
503 tog_sigcont(int signo)
505 tog_sigcont_received = 1;
508 static const struct got_error *
509 view_close(struct tog_view *view)
511 const struct got_error *err = NULL;
514 view_close(view->child);
518 err = view->close(view);
520 del_panel(view->panel);
522 delwin(view->window);
527 static struct tog_view *
528 view_open(int nlines, int ncols, int begin_y, int begin_x,
529 enum tog_view_type type)
531 struct tog_view *view = calloc(1, sizeof(*view));
539 view->nlines = nlines ? nlines : LINES - begin_y;
540 view->ncols = ncols ? ncols : COLS - begin_x;
541 view->begin_y = begin_y;
542 view->begin_x = begin_x;
543 view->window = newwin(nlines, ncols, begin_y, begin_x);
544 if (view->window == NULL) {
548 view->panel = new_panel(view->window);
549 if (view->panel == NULL ||
550 set_panel_userptr(view->panel, view) != OK) {
555 keypad(view->window, TRUE);
560 view_split_begin_x(int begin_x)
562 if (begin_x > 0 || COLS < 120)
564 return (COLS - MAX(COLS / 2, 80));
567 static const struct got_error *view_resize(struct tog_view *);
569 static const struct got_error *
570 view_splitscreen(struct tog_view *view)
572 const struct got_error *err = NULL;
575 view->begin_x = view_split_begin_x(0);
576 view->nlines = LINES;
577 view->ncols = COLS - view->begin_x;
580 err = view_resize(view);
584 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
585 return got_error_from_errno("mvwin");
590 static const struct got_error *
591 view_fullscreen(struct tog_view *view)
593 const struct got_error *err = NULL;
597 view->nlines = LINES;
601 err = view_resize(view);
605 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
606 return got_error_from_errno("mvwin");
612 view_is_parent_view(struct tog_view *view)
614 return view->parent == NULL;
617 static const struct got_error *
618 view_resize(struct tog_view *view)
622 if (view->lines > LINES)
623 nlines = view->nlines - (view->lines - LINES);
625 nlines = view->nlines + (LINES - view->lines);
627 if (view->cols > COLS)
628 ncols = view->ncols - (view->cols - COLS);
630 ncols = view->ncols + (COLS - view->cols);
632 if (wresize(view->window, nlines, ncols) == ERR)
633 return got_error_from_errno("wresize");
634 if (replace_panel(view->panel, view->window) == ERR)
635 return got_error_from_errno("replace_panel");
636 wclear(view->window);
638 view->nlines = nlines;
644 view->child->begin_x = view_split_begin_x(view->begin_x);
645 if (view->child->begin_x == 0) {
646 view_fullscreen(view->child);
647 if (view->child->focussed)
648 show_panel(view->child->panel);
650 show_panel(view->panel);
652 view_splitscreen(view->child);
653 show_panel(view->child->panel);
660 static const struct got_error *
661 view_close_child(struct tog_view *view)
663 const struct got_error *err = NULL;
665 if (view->child == NULL)
668 err = view_close(view->child);
673 static const struct got_error *
674 view_set_child(struct tog_view *view, struct tog_view *child)
676 const struct got_error *err = NULL;
679 child->parent = view;
684 view_is_splitscreen(struct tog_view *view)
686 return view->begin_x > 0;
695 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
696 cols = 80; /* Default */
702 resize_term(lines, cols);
705 static const struct got_error *
706 view_search_start(struct tog_view *view)
708 const struct got_error *err = NULL;
712 if (view->nlines < 1)
715 mvwaddstr(view->window, view->begin_y + view->nlines - 1, 0, "/");
716 wclrtoeol(view->window);
720 ret = wgetnstr(view->window, pattern, sizeof(pattern));
726 if (view->searching) {
727 regfree(&view->regex);
731 if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) {
732 err = view->search_start(view);
734 regfree(&view->regex);
737 view->searching = TOG_SEARCH_FORWARD;
738 view->search_next_done = 0;
739 view->search_next(view);
745 static const struct got_error *
746 view_input(struct tog_view **new, struct tog_view **dead,
747 struct tog_view **focus, int *done, struct tog_view *view,
748 struct tog_view_list_head *views)
750 const struct got_error *err = NULL;
758 /* Clear "no matches" indicator. */
759 if (view->search_next_done == TOG_SEARCH_NO_MORE ||
760 view->search_next_done == TOG_SEARCH_HAVE_NONE)
761 view->search_next_done = TOG_SEARCH_HAVE_MORE;
763 if (view->searching && !view->search_next_done) {
764 errcode = pthread_mutex_unlock(&tog_mutex);
766 return got_error_set_errno(errcode,
767 "pthread_mutex_unlock");
769 errcode = pthread_mutex_lock(&tog_mutex);
771 return got_error_set_errno(errcode,
772 "pthread_mutex_lock");
773 view->search_next(view);
777 nodelay(stdscr, FALSE);
778 /* Allow threads to make progress while we are waiting for input. */
779 errcode = pthread_mutex_unlock(&tog_mutex);
781 return got_error_set_errno(errcode, "pthread_mutex_unlock");
782 ch = wgetch(view->window);
783 errcode = pthread_mutex_lock(&tog_mutex);
785 return got_error_set_errno(errcode, "pthread_mutex_lock");
786 nodelay(stdscr, TRUE);
788 if (tog_sigwinch_received || tog_sigcont_received) {
790 tog_sigwinch_received = 0;
791 tog_sigcont_received = 0;
792 TAILQ_FOREACH(v, views, entry) {
793 err = view_resize(v);
796 err = v->input(new, dead, focus, v, KEY_RESIZE);
807 *focus = view->child;
808 view->child_focussed = 1;
809 } else if (view->parent) {
810 *focus = view->parent;
811 view->parent->child_focussed = 0;
815 err = view->input(new, dead, focus, view, ch);
822 if (view_is_parent_view(view)) {
823 if (view->child == NULL)
825 if (view_is_splitscreen(view->child)) {
826 *focus = view->child;
827 view->child_focussed = 1;
828 err = view_fullscreen(view->child);
830 err = view_splitscreen(view->child);
833 err = view->child->input(new, dead, focus,
834 view->child, KEY_RESIZE);
836 if (view_is_splitscreen(view)) {
838 view->parent->child_focussed = 1;
839 err = view_fullscreen(view);
841 err = view_splitscreen(view);
845 err = view->input(new, dead, focus, view,
852 if (view->search_start)
853 view_search_start(view);
855 err = view->input(new, dead, focus, view, ch);
859 if (view->search_next) {
860 view->searching = (ch == 'n' ?
861 TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
862 view->search_next_done = 0;
863 view->search_next(view);
865 err = view->input(new, dead, focus, view, ch);
868 err = view->input(new, dead, focus, view, ch);
876 view_vborder(struct tog_view *view)
879 struct tog_view *view_above;
882 return view_vborder(view->parent);
884 panel = panel_above(view->panel);
888 view_above = panel_userptr(panel);
889 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
890 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
894 view_needs_focus_indication(struct tog_view *view)
896 if (view_is_parent_view(view)) {
897 if (view->child == NULL || view->child_focussed)
899 if (!view_is_splitscreen(view->child))
901 } else if (!view_is_splitscreen(view))
904 return view->focussed;
907 static const struct got_error *
908 view_loop(struct tog_view *view)
910 const struct got_error *err = NULL;
911 struct tog_view_list_head views;
912 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
913 int fast_refresh = 10;
914 int done = 0, errcode;
916 errcode = pthread_mutex_lock(&tog_mutex);
918 return got_error_set_errno(errcode, "pthread_mutex_lock");
921 TAILQ_INSERT_HEAD(&views, view, entry);
925 err = view->show(view);
930 while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
931 /* Refresh fast during initialization, then become slower. */
932 if (fast_refresh && fast_refresh-- == 0)
933 halfdelay(10); /* switch to once per second */
935 err = view_input(&new_view, &dead_view, &focus_view, &done,
940 struct tog_view *prev = NULL;
942 if (view_is_parent_view(dead_view))
943 prev = TAILQ_PREV(dead_view,
944 tog_view_list_head, entry);
945 else if (view->parent != dead_view)
948 if (dead_view->parent)
949 dead_view->parent->child = NULL;
951 TAILQ_REMOVE(&views, dead_view, entry);
953 err = view_close(dead_view);
954 if (err || (dead_view == main_view && new_view == NULL))
957 if (view == dead_view) {
962 else if (!TAILQ_EMPTY(&views))
963 view = TAILQ_LAST(&views,
968 if (view->child && view->child_focussed)
969 focus_view = view->child;
976 struct tog_view *v, *t;
977 /* Only allow one parent view per type. */
978 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
979 if (v->type != new_view->type)
981 TAILQ_REMOVE(&views, v, entry);
987 TAILQ_INSERT_TAIL(&views, new_view, entry);
989 if (focus_view == NULL)
990 focus_view = new_view;
993 show_panel(focus_view->panel);
996 focus_view->focussed = 1;
999 show_panel(new_view->panel);
1000 if (view->child && view_is_splitscreen(view->child))
1001 show_panel(view->child->panel);
1004 if (focus_view == NULL) {
1006 show_panel(view->panel);
1007 if (view->child && view_is_splitscreen(view->child))
1008 show_panel(view->child->panel);
1012 err = view->parent->show(view->parent);
1016 err = view->show(view);
1020 err = view->child->show(view->child);
1029 while (!TAILQ_EMPTY(&views)) {
1030 view = TAILQ_FIRST(&views);
1031 TAILQ_REMOVE(&views, view, entry);
1035 errcode = pthread_mutex_unlock(&tog_mutex);
1036 if (errcode && err == NULL)
1037 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1047 "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1052 /* Create newly allocated wide-character string equivalent to a byte string. */
1053 static const struct got_error *
1054 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1057 const struct got_error *err = NULL;
1060 *wlen = mbstowcs(NULL, s, 0);
1061 if (*wlen == (size_t)-1) {
1063 if (errno != EILSEQ)
1064 return got_error_from_errno("mbstowcs");
1066 /* byte string invalid in current encoding; try to "fix" it */
1067 err = got_mbsavis(&vis, &vislen, s);
1070 *wlen = mbstowcs(NULL, vis, 0);
1071 if (*wlen == (size_t)-1) {
1072 err = got_error_from_errno("mbstowcs"); /* give up */
1077 *ws = calloc(*wlen + 1, sizeof(**ws));
1079 err = got_error_from_errno("calloc");
1083 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1084 err = got_error_from_errno("mbstowcs");
1095 /* Format a line for display, ensuring that it won't overflow a width limit. */
1096 static const struct got_error *
1097 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1100 const struct got_error *err = NULL;
1102 wchar_t *wline = NULL;
1109 err = mbs2ws(&wline, &wlen, line);
1115 int width = wcwidth(wline[i]);
1122 if (width == 1 || width == 2) {
1123 if (cols + width > wlimit)
1127 } else if (width == -1) {
1128 if (wline[i] == L'\t') {
1130 ((cols + col_tab_align) % TABSIZE);
1131 if (cols + width > wlimit)
1137 err = got_error_from_errno("wcwidth");
1152 static const struct got_error*
1153 build_refs_str(char **refs_str, struct got_reflist_head *refs,
1154 struct got_object_id *id, struct got_repository *repo)
1156 static const struct got_error *err = NULL;
1157 struct got_reflist_entry *re;
1163 SIMPLEQ_FOREACH(re, refs, entry) {
1164 struct got_tag_object *tag = NULL;
1165 struct got_object_id *ref_id;
1168 name = got_ref_get_name(re->ref);
1169 if (strcmp(name, GOT_REF_HEAD) == 0)
1171 if (strncmp(name, "refs/", 5) == 0)
1173 if (strncmp(name, "got/", 4) == 0)
1175 if (strncmp(name, "heads/", 6) == 0)
1177 if (strncmp(name, "remotes/", 8) == 0) {
1179 s = strstr(name, "/" GOT_REF_HEAD);
1180 if (s != NULL && s[strlen(s)] == '\0')
1183 err = got_ref_resolve(&ref_id, repo, re->ref);
1186 if (strncmp(name, "tags/", 5) == 0) {
1187 err = got_object_open_as_tag(&tag, repo, ref_id);
1189 if (err->code != GOT_ERR_OBJ_TYPE) {
1193 /* Ref points at something other than a tag. */
1198 cmp = got_object_id_cmp(tag ?
1199 got_object_tag_get_object_id(tag) : ref_id, id);
1202 got_object_tag_close(tag);
1206 if (asprintf(refs_str, "%s%s%s", s ? s : "",
1207 s ? ", " : "", name) == -1) {
1208 err = got_error_from_errno("asprintf");
1219 static const struct got_error *
1220 format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1223 char *smallerthan, *at;
1225 smallerthan = strchr(author, '<');
1226 if (smallerthan && smallerthan[1] != '\0')
1227 author = smallerthan + 1;
1228 at = strchr(author, '@');
1231 return format_line(wauthor, author_width, author, limit, col_tab_align);
1234 static const struct got_error *
1235 draw_commit(struct tog_view *view, struct got_commit_object *commit,
1236 struct got_object_id *id, struct got_reflist_head *refs,
1237 const size_t date_display_cols, int author_display_cols,
1238 struct tog_colors *colors)
1240 const struct got_error *err = NULL;
1241 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1242 char *logmsg0 = NULL, *logmsg = NULL;
1243 char *author = NULL;
1244 wchar_t *wlogmsg = NULL, *wauthor = NULL;
1245 int author_width, logmsg_width;
1246 char *newline, *line = NULL;
1248 const int avail = view->ncols;
1250 time_t committer_time;
1251 struct tog_color *tc;
1253 committer_time = got_object_commit_get_committer_time(commit);
1254 if (localtime_r(&committer_time, &tm) == NULL)
1255 return got_error_from_errno("localtime_r");
1256 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1258 return got_error(GOT_ERR_NO_SPACE);
1260 if (avail <= date_display_cols)
1261 limit = MIN(sizeof(datebuf) - 1, avail);
1263 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1264 tc = get_color(colors, TOG_COLOR_DATE);
1266 wattr_on(view->window,
1267 COLOR_PAIR(tc->colorpair), NULL);
1268 waddnstr(view->window, datebuf, limit);
1270 wattr_off(view->window,
1271 COLOR_PAIR(tc->colorpair), NULL);
1278 err = got_object_id_str(&id_str, id);
1281 tc = get_color(colors, TOG_COLOR_COMMIT);
1283 wattr_on(view->window,
1284 COLOR_PAIR(tc->colorpair), NULL);
1285 wprintw(view->window, "%.8s ", id_str);
1287 wattr_off(view->window,
1288 COLOR_PAIR(tc->colorpair), NULL);
1295 author = strdup(got_object_commit_get_author(commit));
1296 if (author == NULL) {
1297 err = got_error_from_errno("strdup");
1300 err = format_author(&wauthor, &author_width, author, avail - col, col);
1303 tc = get_color(colors, TOG_COLOR_AUTHOR);
1305 wattr_on(view->window,
1306 COLOR_PAIR(tc->colorpair), NULL);
1307 waddwstr(view->window, wauthor);
1309 wattr_off(view->window,
1310 COLOR_PAIR(tc->colorpair), NULL);
1311 col += author_width;
1312 while (col < avail && author_width < author_display_cols + 2) {
1313 waddch(view->window, ' ');
1320 err = got_object_commit_get_logmsg(&logmsg0, commit);
1324 while (*logmsg == '\n')
1326 newline = strchr(logmsg, '\n');
1329 limit = avail - col;
1330 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1333 waddwstr(view->window, wlogmsg);
1334 col += logmsg_width;
1335 while (col < avail) {
1336 waddch(view->window, ' ');
1348 static struct commit_queue_entry *
1349 alloc_commit_queue_entry(struct got_commit_object *commit,
1350 struct got_object_id *id)
1352 struct commit_queue_entry *entry;
1354 entry = calloc(1, sizeof(*entry));
1359 entry->commit = commit;
1364 pop_commit(struct commit_queue *commits)
1366 struct commit_queue_entry *entry;
1368 entry = TAILQ_FIRST(&commits->head);
1369 TAILQ_REMOVE(&commits->head, entry, entry);
1370 got_object_commit_close(entry->commit);
1371 commits->ncommits--;
1372 /* Don't free entry->id! It is owned by the commit graph. */
1377 free_commits(struct commit_queue *commits)
1379 while (!TAILQ_EMPTY(&commits->head))
1380 pop_commit(commits);
1383 static const struct got_error *
1384 match_commit(int *have_match, struct got_object_id *id,
1385 struct got_commit_object *commit, regex_t *regex)
1387 const struct got_error *err = NULL;
1388 regmatch_t regmatch;
1389 char *id_str = NULL, *logmsg = NULL;
1393 err = got_object_id_str(&id_str, id);
1397 err = got_object_commit_get_logmsg(&logmsg, commit);
1401 if (regexec(regex, got_object_commit_get_author(commit), 1,
1402 ®match, 0) == 0 ||
1403 regexec(regex, got_object_commit_get_committer(commit), 1,
1404 ®match, 0) == 0 ||
1405 regexec(regex, id_str, 1, ®match, 0) == 0 ||
1406 regexec(regex, logmsg, 1, ®match, 0) == 0)
1414 static const struct got_error *
1415 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1416 int minqueue, struct got_repository *repo, const char *path,
1417 int *searching, int *search_next_done, regex_t *regex)
1419 const struct got_error *err = NULL;
1423 * We keep all commits open throughout the lifetime of the log
1424 * view in order to avoid having to re-fetch commits from disk
1425 * while updating the display.
1427 while (nqueued < minqueue ||
1428 (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1429 struct got_object_id *id;
1430 struct got_commit_object *commit;
1431 struct commit_queue_entry *entry;
1434 err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1435 if (err || id == NULL)
1438 err = got_object_open_as_commit(&commit, repo, id);
1441 entry = alloc_commit_queue_entry(commit, id);
1442 if (entry == NULL) {
1443 err = got_error_from_errno("alloc_commit_queue_entry");
1447 errcode = pthread_mutex_lock(&tog_mutex);
1449 err = got_error_set_errno(errcode,
1450 "pthread_mutex_lock");
1454 entry->idx = commits->ncommits;
1455 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1457 commits->ncommits++;
1459 if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1461 err = match_commit(&have_match, id, commit, regex);
1465 *search_next_done = TOG_SEARCH_HAVE_MORE;
1468 errcode = pthread_mutex_unlock(&tog_mutex);
1469 if (errcode && err == NULL)
1470 err = got_error_set_errno(errcode,
1471 "pthread_mutex_unlock");
1479 static const struct got_error *
1480 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1481 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1482 struct commit_queue *commits, int selected_idx, int limit,
1483 struct got_reflist_head *refs, const char *path, int commits_needed,
1484 struct tog_colors *colors)
1486 const struct got_error *err = NULL;
1487 struct tog_log_view_state *s = &view->state.log;
1488 struct commit_queue_entry *entry;
1490 int ncommits, author_cols = 4;
1491 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1492 char *refs_str = NULL;
1494 struct tog_color *tc;
1495 static const size_t date_display_cols = 12;
1500 if (ncommits == selected_idx) {
1504 entry = TAILQ_NEXT(entry, entry);
1508 if (*selected && !(view->searching && view->search_next_done == 0)) {
1509 err = got_object_id_str(&id_str, (*selected)->id);
1513 err = build_refs_str(&refs_str, refs, (*selected)->id,
1520 if (commits_needed == 0)
1521 halfdelay(10); /* disable fast refresh */
1523 if (commits_needed > 0) {
1524 if (asprintf(&ncommits_str, " [%d/%d] %s",
1525 entry ? entry->idx + 1 : 0, commits->ncommits,
1526 (view->searching && !view->search_next_done) ?
1527 "searching..." : "loading...") == -1) {
1528 err = got_error_from_errno("asprintf");
1532 const char *search_str = NULL;
1534 if (view->searching) {
1535 if (view->search_next_done == TOG_SEARCH_NO_MORE)
1536 search_str = "no more matches";
1537 else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1538 search_str = "no matches found";
1539 else if (!view->search_next_done)
1540 search_str = "searching...";
1543 if (asprintf(&ncommits_str, " [%d/%d] %s",
1544 entry ? entry->idx + 1 : 0, commits->ncommits,
1545 search_str ? search_str :
1546 (refs_str ? refs_str : "")) == -1) {
1547 err = got_error_from_errno("asprintf");
1552 if (path && strcmp(path, "/") != 0) {
1553 if (asprintf(&header, "commit %s %s%s",
1554 id_str ? id_str : "........................................",
1555 path, ncommits_str) == -1) {
1556 err = got_error_from_errno("asprintf");
1560 } else if (asprintf(&header, "commit %s%s",
1561 id_str ? id_str : "........................................",
1562 ncommits_str) == -1) {
1563 err = got_error_from_errno("asprintf");
1567 err = format_line(&wline, &width, header, view->ncols, 0);
1571 werase(view->window);
1573 if (view_needs_focus_indication(view))
1574 wstandout(view->window);
1575 tc = get_color(colors, TOG_COLOR_COMMIT);
1577 wattr_on(view->window,
1578 COLOR_PAIR(tc->colorpair), NULL);
1579 waddwstr(view->window, wline);
1581 wattr_off(view->window,
1582 COLOR_PAIR(tc->colorpair), NULL);
1583 while (width < view->ncols) {
1584 waddch(view->window, ' ');
1587 if (view_needs_focus_indication(view))
1588 wstandend(view->window);
1593 /* Grow author column size if necessary. */
1600 if (ncommits >= limit - 1)
1602 author = strdup(got_object_commit_get_author(entry->commit));
1603 if (author == NULL) {
1604 err = got_error_from_errno("strdup");
1607 err = format_author(&wauthor, &width, author, COLS,
1609 if (author_cols < width)
1610 author_cols = width;
1614 entry = TAILQ_NEXT(entry, entry);
1621 if (ncommits >= limit - 1)
1623 if (ncommits == selected_idx)
1624 wstandout(view->window);
1625 err = draw_commit(view, entry->commit, entry->id, refs,
1626 date_display_cols, author_cols, colors);
1627 if (ncommits == selected_idx)
1628 wstandend(view->window);
1633 entry = TAILQ_NEXT(entry, entry);
1646 scroll_up(struct tog_view *view,
1647 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1648 struct commit_queue *commits)
1650 struct commit_queue_entry *entry;
1653 entry = TAILQ_FIRST(&commits->head);
1654 if (*first_displayed_entry == entry)
1657 entry = *first_displayed_entry;
1658 while (entry && nscrolled < maxscroll) {
1659 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1661 *first_displayed_entry = entry;
1667 static const struct got_error *
1668 trigger_log_thread(struct tog_view *log_view, int wait,
1669 int *commits_needed, int *log_complete,
1670 pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1674 halfdelay(1); /* fast refresh while loading commits */
1676 while (*commits_needed > 0) {
1680 /* Wake the log thread. */
1681 errcode = pthread_cond_signal(need_commits);
1683 return got_error_set_errno(errcode,
1684 "pthread_cond_signal");
1687 * The mutex will be released while the view loop waits
1688 * in wgetch(), at which time the log thread will run.
1693 /* Display progress update in log view. */
1694 show_log_view(log_view);
1698 /* Wait right here while next commit is being loaded. */
1699 errcode = pthread_cond_wait(commit_loaded, &tog_mutex);
1701 return got_error_set_errno(errcode,
1702 "pthread_cond_wait");
1704 /* Display progress update in log view. */
1705 show_log_view(log_view);
1713 static const struct got_error *
1714 scroll_down(struct tog_view *log_view,
1715 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1716 struct commit_queue_entry **last_displayed_entry,
1717 struct commit_queue *commits, int *log_complete, int *commits_needed,
1718 pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1720 const struct got_error *err = NULL;
1721 struct commit_queue_entry *pentry;
1722 int nscrolled = 0, ncommits_needed;
1724 if (*last_displayed_entry == NULL)
1727 ncommits_needed = (*last_displayed_entry)->idx + 1 + maxscroll;
1728 if (commits->ncommits < ncommits_needed && !*log_complete) {
1730 * Ask the log thread for required amount of commits.
1732 (*commits_needed) += maxscroll;
1733 err = trigger_log_thread(log_view, 1, commits_needed,
1734 log_complete, need_commits, commit_loaded);
1740 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1744 *last_displayed_entry = pentry;
1746 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1749 *first_displayed_entry = pentry;
1750 } while (++nscrolled < maxscroll);
1755 static const struct got_error *
1756 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1757 struct got_commit_object *commit, struct got_object_id *commit_id,
1758 struct tog_view *log_view, struct got_reflist_head *refs,
1759 struct got_repository *repo)
1761 const struct got_error *err;
1762 struct got_object_qid *parent_id;
1763 struct tog_view *diff_view;
1765 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1766 if (diff_view == NULL)
1767 return got_error_from_errno("view_open");
1769 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1770 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1771 commit_id, log_view, refs, repo);
1773 *new_view = diff_view;
1777 static const struct got_error *
1778 tree_view_visit_subtree(struct got_tree_object *subtree,
1779 struct tog_tree_view_state *s)
1781 struct tog_parent_tree *parent;
1783 parent = calloc(1, sizeof(*parent));
1785 return got_error_from_errno("calloc");
1787 parent->tree = s->tree;
1788 parent->first_displayed_entry = s->first_displayed_entry;
1789 parent->selected_entry = s->selected_entry;
1790 parent->selected = s->selected;
1791 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1794 s->first_displayed_entry = NULL;
1798 static const struct got_error *
1799 tree_view_walk_path(struct tog_tree_view_state *s,
1800 struct got_object_id *commit_id,
1801 const char *path, struct got_repository *repo)
1803 const struct got_error *err = NULL;
1804 struct got_tree_object *tree = NULL;
1806 char *slash, *subpath = NULL;
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, commit_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 browse_commit_tree(struct tog_view **new_view, int begin_x,
1885 struct commit_queue_entry *entry, const char *path,
1886 struct got_reflist_head *refs, struct got_repository *repo)
1888 const struct got_error *err = NULL;
1889 struct got_tree_object *tree;
1890 struct tog_tree_view_state *s;
1891 struct tog_view *tree_view;
1893 err = got_object_open_as_tree(&tree, repo,
1894 got_object_commit_get_tree_id(entry->commit));
1898 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1899 if (tree_view == NULL)
1900 return got_error_from_errno("view_open");
1902 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1904 got_object_tree_close(tree);
1907 s = &tree_view->state.tree;
1909 *new_view = tree_view;
1911 if (got_path_is_root_dir(path))
1914 return tree_view_walk_path(s, entry->id, path, repo);
1917 static const struct got_error *
1918 block_signals_used_by_main_thread(void)
1923 if (sigemptyset(&sigset) == -1)
1924 return got_error_from_errno("sigemptyset");
1926 /* tog handles SIGWINCH and SIGCONT */
1927 if (sigaddset(&sigset, SIGWINCH) == -1)
1928 return got_error_from_errno("sigaddset");
1929 if (sigaddset(&sigset, SIGCONT) == -1)
1930 return got_error_from_errno("sigaddset");
1932 /* ncurses handles SIGTSTP */
1933 if (sigaddset(&sigset, SIGTSTP) == -1)
1934 return got_error_from_errno("sigaddset");
1936 errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1938 return got_error_set_errno(errcode, "pthread_sigmask");
1944 log_thread(void *arg)
1946 const struct got_error *err = NULL;
1948 struct tog_log_thread_args *a = arg;
1951 err = block_signals_used_by_main_thread();
1955 while (!done && !err && !tog_sigpipe_received) {
1956 err = queue_commits(a->graph, a->commits, 1, a->repo,
1957 a->in_repo_path, a->searching, a->search_next_done,
1960 if (err->code != GOT_ERR_ITER_COMPLETED)
1964 } else if (a->commits_needed > 0)
1965 a->commits_needed--;
1967 errcode = pthread_mutex_lock(&tog_mutex);
1969 err = got_error_set_errno(errcode,
1970 "pthread_mutex_lock");
1972 } else if (*a->quit)
1974 else if (*a->first_displayed_entry == NULL) {
1975 *a->first_displayed_entry =
1976 TAILQ_FIRST(&a->commits->head);
1977 *a->selected_entry = *a->first_displayed_entry;
1980 errcode = pthread_cond_signal(&a->commit_loaded);
1982 err = got_error_set_errno(errcode,
1983 "pthread_cond_signal");
1984 pthread_mutex_unlock(&tog_mutex);
1989 a->commits_needed = 0;
1991 if (a->commits_needed == 0) {
1992 errcode = pthread_cond_wait(&a->need_commits,
1995 err = got_error_set_errno(errcode,
1996 "pthread_cond_wait");
2000 errcode = pthread_mutex_unlock(&tog_mutex);
2001 if (errcode && err == NULL)
2002 err = got_error_set_errno(errcode,
2003 "pthread_mutex_unlock");
2005 a->log_complete = 1;
2009 static const struct got_error *
2010 stop_log_thread(struct tog_log_view_state *s)
2012 const struct got_error *err = NULL;
2017 errcode = pthread_cond_signal(&s->thread_args.need_commits);
2019 return got_error_set_errno(errcode,
2020 "pthread_cond_signal");
2021 errcode = pthread_mutex_unlock(&tog_mutex);
2023 return got_error_set_errno(errcode,
2024 "pthread_mutex_unlock");
2025 errcode = pthread_join(s->thread, (void **)&err);
2027 return got_error_set_errno(errcode, "pthread_join");
2028 errcode = pthread_mutex_lock(&tog_mutex);
2030 return got_error_set_errno(errcode,
2031 "pthread_mutex_lock");
2035 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2036 if (errcode && err == NULL)
2037 err = got_error_set_errno(errcode, "pthread_cond_destroy");
2039 if (s->thread_args.repo) {
2040 got_repo_close(s->thread_args.repo);
2041 s->thread_args.repo = NULL;
2044 if (s->thread_args.graph) {
2045 got_commit_graph_close(s->thread_args.graph);
2046 s->thread_args.graph = NULL;
2052 static const struct got_error *
2053 close_log_view(struct tog_view *view)
2055 const struct got_error *err = NULL;
2056 struct tog_log_view_state *s = &view->state.log;
2058 err = stop_log_thread(s);
2059 free_commits(&s->commits);
2060 free(s->in_repo_path);
2061 s->in_repo_path = NULL;
2067 static const struct got_error *
2068 search_start_log_view(struct tog_view *view)
2070 struct tog_log_view_state *s = &view->state.log;
2072 s->matched_entry = NULL;
2073 s->search_entry = NULL;
2077 static const struct got_error *
2078 search_next_log_view(struct tog_view *view)
2080 const struct got_error *err = NULL;
2081 struct tog_log_view_state *s = &view->state.log;
2082 struct commit_queue_entry *entry;
2084 /* Display progress update in log view. */
2085 show_log_view(view);
2089 if (s->search_entry) {
2091 errcode = pthread_mutex_unlock(&tog_mutex);
2093 return got_error_set_errno(errcode,
2094 "pthread_mutex_unlock");
2095 ch = wgetch(view->window);
2096 errcode = pthread_mutex_lock(&tog_mutex);
2098 return got_error_set_errno(errcode,
2099 "pthread_mutex_lock");
2100 if (ch == KEY_BACKSPACE) {
2101 view->search_next_done = TOG_SEARCH_HAVE_MORE;
2104 if (view->searching == TOG_SEARCH_FORWARD)
2105 entry = TAILQ_NEXT(s->search_entry, entry);
2107 entry = TAILQ_PREV(s->search_entry,
2108 commit_queue_head, entry);
2109 } else if (s->matched_entry) {
2110 if (view->searching == TOG_SEARCH_FORWARD)
2111 entry = TAILQ_NEXT(s->matched_entry, entry);
2113 entry = TAILQ_PREV(s->matched_entry,
2114 commit_queue_head, entry);
2116 if (view->searching == TOG_SEARCH_FORWARD)
2117 entry = TAILQ_FIRST(&s->commits.head);
2119 entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2125 if (entry == NULL) {
2126 if (s->thread_args.log_complete ||
2127 view->searching == TOG_SEARCH_BACKWARD) {
2128 view->search_next_done =
2129 (s->matched_entry == NULL ?
2130 TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2131 s->search_entry = NULL;
2135 * Poke the log thread for more commits and return,
2136 * allowing the main loop to make progress. Search
2137 * will resume at s->search_entry once we come back.
2139 s->thread_args.commits_needed++;
2140 return trigger_log_thread(view, 0,
2141 &s->thread_args.commits_needed,
2142 &s->thread_args.log_complete,
2143 &s->thread_args.need_commits,
2144 &s->thread_args.commit_loaded);
2147 err = match_commit(&have_match, entry->id, entry->commit,
2152 view->search_next_done = TOG_SEARCH_HAVE_MORE;
2153 s->matched_entry = entry;
2157 s->search_entry = entry;
2158 if (view->searching == TOG_SEARCH_FORWARD)
2159 entry = TAILQ_NEXT(entry, entry);
2161 entry = TAILQ_PREV(entry, commit_queue_head, entry);
2164 if (s->matched_entry) {
2165 int cur = s->selected_entry->idx;
2166 while (cur < s->matched_entry->idx) {
2167 err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2172 while (cur > s->matched_entry->idx) {
2173 err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2180 s->search_entry = NULL;
2185 static const struct got_error *
2186 open_log_view(struct tog_view *view, struct got_object_id *start_id,
2187 struct got_reflist_head *refs, struct got_repository *repo,
2188 const char *head_ref_name, const char *in_repo_path,
2191 const struct got_error *err = NULL;
2192 struct tog_log_view_state *s = &view->state.log;
2193 struct got_repository *thread_repo = NULL;
2194 struct got_commit_graph *thread_graph = NULL;
2197 if (in_repo_path != s->in_repo_path) {
2198 free(s->in_repo_path);
2199 s->in_repo_path = strdup(in_repo_path);
2200 if (s->in_repo_path == NULL)
2201 return got_error_from_errno("strdup");
2204 /* The commit queue only contains commits being displayed. */
2205 TAILQ_INIT(&s->commits.head);
2206 s->commits.ncommits = 0;
2210 s->head_ref_name = head_ref_name;
2211 s->start_id = got_object_id_dup(start_id);
2212 if (s->start_id == NULL) {
2213 err = got_error_from_errno("got_object_id_dup");
2216 s->log_branches = log_branches;
2218 SIMPLEQ_INIT(&s->colors);
2219 if (has_colors() && getenv("TOG_COLORS") != NULL) {
2220 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2221 get_color_value("TOG_COLOR_COMMIT"));
2224 err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2225 get_color_value("TOG_COLOR_AUTHOR"));
2227 free_colors(&s->colors);
2230 err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2231 get_color_value("TOG_COLOR_DATE"));
2233 free_colors(&s->colors);
2238 view->show = show_log_view;
2239 view->input = input_log_view;
2240 view->close = close_log_view;
2241 view->search_start = search_start_log_view;
2242 view->search_next = search_next_log_view;
2244 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2247 err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2251 err = got_commit_graph_iter_start(thread_graph, s->start_id,
2252 s->repo, NULL, NULL);
2256 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2258 err = got_error_set_errno(errcode, "pthread_cond_init");
2261 errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2263 err = got_error_set_errno(errcode, "pthread_cond_init");
2267 s->thread_args.commits_needed = view->nlines;
2268 s->thread_args.graph = thread_graph;
2269 s->thread_args.commits = &s->commits;
2270 s->thread_args.in_repo_path = s->in_repo_path;
2271 s->thread_args.start_id = s->start_id;
2272 s->thread_args.repo = thread_repo;
2273 s->thread_args.log_complete = 0;
2274 s->thread_args.quit = &s->quit;
2275 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2276 s->thread_args.selected_entry = &s->selected_entry;
2277 s->thread_args.searching = &view->searching;
2278 s->thread_args.search_next_done = &view->search_next_done;
2279 s->thread_args.regex = &view->regex;
2282 close_log_view(view);
2286 static const struct got_error *
2287 show_log_view(struct tog_view *view)
2289 struct tog_log_view_state *s = &view->state.log;
2291 if (s->thread == NULL) {
2292 int errcode = pthread_create(&s->thread, NULL, log_thread,
2295 return got_error_set_errno(errcode, "pthread_create");
2298 return draw_commits(view, &s->last_displayed_entry,
2299 &s->selected_entry, s->first_displayed_entry,
2300 &s->commits, s->selected, view->nlines, s->refs,
2301 s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2304 static const struct got_error *
2305 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2306 struct tog_view **focus_view, struct tog_view *view, int ch)
2308 const struct got_error *err = NULL;
2309 struct tog_log_view_state *s = &view->state.log;
2310 char *parent_path, *in_repo_path = NULL;
2311 struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2313 struct got_object_id *start_id;
2323 if (s->first_displayed_entry == NULL)
2325 if (s->selected > 0)
2328 scroll_up(view, &s->first_displayed_entry, 1,
2333 if (s->first_displayed_entry == NULL)
2335 if (TAILQ_FIRST(&s->commits.head) ==
2336 s->first_displayed_entry) {
2340 scroll_up(view, &s->first_displayed_entry,
2341 view->nlines - 1, &s->commits);
2347 if (s->first_displayed_entry == NULL)
2349 if (s->selected < MIN(view->nlines - 2,
2350 s->commits.ncommits - 1)) {
2354 err = scroll_down(view, &s->first_displayed_entry, 1,
2355 &s->last_displayed_entry, &s->commits,
2356 &s->thread_args.log_complete,
2357 &s->thread_args.commits_needed,
2358 &s->thread_args.need_commits,
2359 &s->thread_args.commit_loaded);
2363 struct commit_queue_entry *first;
2364 first = s->first_displayed_entry;
2367 err = scroll_down(view, &s->first_displayed_entry,
2368 view->nlines - 1, &s->last_displayed_entry,
2369 &s->commits, &s->thread_args.log_complete,
2370 &s->thread_args.commits_needed,
2371 &s->thread_args.need_commits,
2372 &s->thread_args.commit_loaded);
2375 if (first == s->first_displayed_entry &&
2376 s->selected < MIN(view->nlines - 2,
2377 s->commits.ncommits - 1)) {
2378 /* can't scroll further down */
2379 s->selected = MIN(view->nlines - 2,
2380 s->commits.ncommits - 1);
2386 if (s->selected > view->nlines - 2)
2387 s->selected = view->nlines - 2;
2388 if (s->selected > s->commits.ncommits - 1)
2389 s->selected = s->commits.ncommits - 1;
2394 if (s->selected_entry == NULL)
2396 if (view_is_parent_view(view))
2397 begin_x = view_split_begin_x(view->begin_x);
2398 err = open_diff_view_for_commit(&diff_view, begin_x,
2399 s->selected_entry->commit, s->selected_entry->id,
2400 view, s->refs, s->repo);
2403 if (view_is_parent_view(view)) {
2404 err = view_close_child(view);
2407 err = view_set_child(view, diff_view);
2409 view_close(diff_view);
2412 *focus_view = diff_view;
2413 view->child_focussed = 1;
2415 *new_view = diff_view;
2418 if (s->selected_entry == NULL)
2420 if (view_is_parent_view(view))
2421 begin_x = view_split_begin_x(view->begin_x);
2422 err = browse_commit_tree(&tree_view, begin_x,
2423 s->selected_entry, s->in_repo_path, s->refs, s->repo);
2426 if (view_is_parent_view(view)) {
2427 err = view_close_child(view);
2430 err = view_set_child(view, tree_view);
2432 view_close(tree_view);
2435 *focus_view = tree_view;
2436 view->child_focussed = 1;
2438 *new_view = tree_view;
2441 if (got_path_cmp(s->in_repo_path, "/",
2442 strlen(s->in_repo_path), 1) == 0)
2444 err = got_path_dirname(&parent_path, s->in_repo_path);
2447 err = stop_log_thread(s);
2452 lv = view_open(view->nlines, view->ncols,
2453 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2456 return got_error_from_errno("view_open");
2458 err = open_log_view(lv, s->start_id, s->refs,
2459 s->repo, s->head_ref_name, parent_path,
2464 if (view_is_parent_view(view))
2467 view_set_child(view->parent, lv);
2472 err = stop_log_thread(s);
2475 lv = view_open(view->nlines, view->ncols,
2476 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2478 return got_error_from_errno("view_open");
2479 err = got_repo_match_object_id(&start_id, NULL,
2480 s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2481 GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2486 in_repo_path = strdup(s->in_repo_path);
2487 if (in_repo_path == NULL) {
2490 return got_error_from_errno("strdup");
2492 got_ref_list_free(s->refs);
2493 err = got_ref_list(s->refs, s->repo, NULL,
2494 got_ref_cmp_by_name, NULL);
2500 err = open_log_view(lv, start_id, s->refs, s->repo,
2501 s->head_ref_name, in_repo_path, s->log_branches);
2511 s->log_branches = !s->log_branches;
2512 err = stop_log_thread(s);
2515 lv = view_open(view->nlines, view->ncols,
2516 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2518 return got_error_from_errno("view_open");
2519 err = open_log_view(lv, s->start_id, s->refs, s->repo,
2520 s->head_ref_name, s->in_repo_path, s->log_branches);
2535 static const struct got_error *
2536 apply_unveil(const char *repo_path, const char *worktree_path)
2538 const struct got_error *error;
2541 if (unveil("gmon.out", "rwc") != 0)
2542 return got_error_from_errno2("unveil", "gmon.out");
2544 if (repo_path && unveil(repo_path, "r") != 0)
2545 return got_error_from_errno2("unveil", repo_path);
2547 if (worktree_path && unveil(worktree_path, "rwc") != 0)
2548 return got_error_from_errno2("unveil", worktree_path);
2550 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2551 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2553 error = got_privsep_unveil_exec_helpers();
2557 if (unveil(NULL, NULL) != 0)
2558 return got_error_from_errno("unveil");
2568 halfdelay(1); /* Do fast refresh while initial view is loading. */
2571 intrflush(stdscr, FALSE);
2572 keypad(stdscr, TRUE);
2574 if (getenv("TOG_COLORS") != NULL) {
2576 use_default_colors();
2578 signal(SIGWINCH, tog_sigwinch);
2579 signal(SIGPIPE, tog_sigpipe);
2580 signal(SIGCONT, tog_sigcont);
2583 static const struct got_error *
2584 get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2585 struct got_repository *repo, struct got_worktree *worktree)
2587 const struct got_error *err = NULL;
2590 *in_repo_path = strdup("/");
2591 if (*in_repo_path == NULL)
2592 return got_error_from_errno("strdup");
2597 const char *prefix = got_worktree_get_path_prefix(worktree);
2600 err = got_worktree_resolve_path(&wt_path, worktree, argv[0]);
2604 if (asprintf(&p, "%s%s%s", prefix,
2605 (strcmp(prefix, "/") != 0) ? "/" : "", wt_path) == -1) {
2606 err = got_error_from_errno("asprintf");
2610 err = got_repo_map_path(in_repo_path, repo, p, 0);
2614 err = got_repo_map_path(in_repo_path, repo, argv[0], 1);
2619 static const struct got_error *
2620 cmd_log(int argc, char *argv[])
2622 const struct got_error *error;
2623 struct got_repository *repo = NULL;
2624 struct got_worktree *worktree = NULL;
2625 struct got_reflist_head refs;
2626 struct got_object_id *start_id = NULL;
2627 char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2628 char *start_commit = NULL, *head_ref_name = NULL;
2629 int ch, log_branches = 0;
2630 struct tog_view *view;
2632 SIMPLEQ_INIT(&refs);
2635 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2640 while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2646 start_commit = optarg;
2649 repo_path = realpath(optarg, NULL);
2650 if (repo_path == NULL)
2651 return got_error_from_errno2("realpath",
2666 cwd = getcwd(NULL, 0);
2668 return got_error_from_errno("getcwd");
2670 error = got_worktree_open(&worktree, cwd);
2671 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2674 if (repo_path == NULL) {
2677 strdup(got_worktree_get_repo_path(worktree));
2679 repo_path = strdup(cwd);
2681 if (repo_path == NULL) {
2682 error = got_error_from_errno("strdup");
2686 error = got_repo_open(&repo, repo_path, NULL);
2690 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2697 error = apply_unveil(got_repo_get_path(repo),
2698 worktree ? got_worktree_get_root_path(worktree) : NULL);
2702 if (start_commit == NULL)
2703 error = got_repo_match_object_id(&start_id, NULL, worktree ?
2704 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2705 GOT_OBJ_TYPE_COMMIT, 1, repo);
2707 error = got_repo_match_object_id(&start_id, NULL, start_commit,
2708 GOT_OBJ_TYPE_COMMIT, 1, repo);
2712 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2716 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2718 error = got_error_from_errno("view_open");
2722 head_ref_name = strdup(
2723 got_worktree_get_head_ref_name(worktree));
2724 if (head_ref_name == NULL) {
2725 error = got_error_from_errno("strdup");
2729 error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2730 in_repo_path, log_branches);
2734 /* Release work tree lock. */
2735 got_worktree_close(worktree);
2738 error = view_loop(view);
2744 free(head_ref_name);
2746 got_repo_close(repo);
2748 got_worktree_close(worktree);
2749 got_ref_list_free(&refs);
2757 fprintf(stderr, "usage: %s diff [-r repository-path] object1 object2\n",
2763 parse_next_line(FILE *f, size_t *len)
2768 const char delim[3] = { '\0', '\0', '\0'};
2770 line = fparseln(f, &linelen, &lineno, delim, 0);
2777 match_line(const char *line, regex_t *regex, size_t nmatch,
2778 regmatch_t *regmatch)
2780 return regexec(regex, line, nmatch, regmatch, 0) == 0;
2784 match_color(struct tog_colors *colors, const char *line)
2786 struct tog_color *tc = NULL;
2788 SIMPLEQ_FOREACH(tc, colors, entry) {
2789 if (match_line(line, &tc->regex, 0, NULL))
2796 static const struct got_error *
2797 add_matched_line(int *wtotal, const char *line, int wlimit, int col_tab_align,
2798 WINDOW *window, regmatch_t *regmatch)
2800 const struct got_error *err = NULL;
2807 s = strndup(line, regmatch->rm_so);
2809 return got_error_from_errno("strndup");
2811 err = format_line(&wline, &width, s, wlimit, col_tab_align);
2816 waddwstr(window, wline);
2823 s = strndup(line + regmatch->rm_so,
2824 regmatch->rm_eo - regmatch->rm_so);
2826 err = got_error_from_errno("strndup");
2830 err = format_line(&wline, &width, s, wlimit, col_tab_align);
2835 wattr_on(window, A_STANDOUT, NULL);
2836 waddwstr(window, wline);
2837 wattr_off(window, A_STANDOUT, NULL);
2844 if (wlimit > 0 && strlen(line) > regmatch->rm_eo) {
2845 err = format_line(&wline, &width,
2846 line + regmatch->rm_eo, wlimit, col_tab_align);
2849 waddwstr(window, wline);
2857 static const struct got_error *
2858 draw_file(struct tog_view *view, FILE *f, int first_displayed_line, int nlines,
2859 off_t *line_offsets, int selected_line, int max_lines,
2860 int *last_displayed_line, int *eof, char *header,
2861 struct tog_colors *colors, int matched_line, regmatch_t *regmatch)
2863 const struct got_error *err;
2866 struct tog_color *tc;
2872 line_offset = line_offsets[first_displayed_line - 1];
2873 if (fseeko(f, line_offset, SEEK_SET) == -1)
2874 return got_error_from_errno("fseek");
2876 werase(view->window);
2879 if (asprintf(&line, "[%d/%d] %s",
2880 first_displayed_line - 1 + selected_line, nlines,
2882 return got_error_from_errno("asprintf");
2883 err = format_line(&wline, &width, line, view->ncols, 0);
2888 if (view_needs_focus_indication(view))
2889 wstandout(view->window);
2890 waddwstr(view->window, wline);
2893 if (view_needs_focus_indication(view))
2894 wstandend(view->window);
2895 if (width <= view->ncols - 1)
2896 waddch(view->window, '\n');
2904 while (max_lines > 0 && nprinted < max_lines) {
2905 line = parse_next_line(f, &len);
2911 tc = match_color(colors, line);
2913 wattr_on(view->window,
2914 COLOR_PAIR(tc->colorpair), NULL);
2915 if (first_displayed_line + nprinted == matched_line &&
2916 regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
2917 err = add_matched_line(&width, line, view->ncols, 0,
2918 view->window, regmatch);
2924 err = format_line(&wline, &width, line, view->ncols, 0);
2929 waddwstr(view->window, wline);
2934 wattr_off(view->window,
2935 COLOR_PAIR(tc->colorpair), NULL);
2936 if (width <= view->ncols - 1)
2937 waddch(view->window, '\n');
2942 *last_displayed_line = first_displayed_line + (nprinted - 1);
2944 *last_displayed_line = first_displayed_line;
2949 while (nprinted < view->nlines) {
2950 waddch(view->window, '\n');
2954 err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2959 wstandout(view->window);
2960 waddwstr(view->window, wline);
2963 wstandend(view->window);
2970 get_datestr(time_t *time, char *datebuf)
2972 struct tm mytm, *tm;
2975 tm = gmtime_r(time, &mytm);
2978 s = asctime_r(tm, datebuf);
2981 p = strchr(s, '\n');
2987 static const struct got_error *
2988 get_changed_paths(struct got_pathlist_head *paths,
2989 struct got_commit_object *commit, struct got_repository *repo)
2991 const struct got_error *err = NULL;
2992 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2993 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2994 struct got_object_qid *qid;
2996 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2998 struct got_commit_object *pcommit;
2999 err = got_object_open_as_commit(&pcommit, repo,
3004 tree_id1 = got_object_commit_get_tree_id(pcommit);
3005 got_object_commit_close(pcommit);
3010 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3015 tree_id2 = got_object_commit_get_tree_id(commit);
3016 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3020 err = got_diff_tree(tree1, tree2, "", "", repo,
3021 got_diff_tree_collect_changed_paths, paths, 0);
3024 got_object_tree_close(tree1);
3026 got_object_tree_close(tree2);
3030 static const struct got_error *
3031 add_line_offset(off_t **line_offsets, size_t *nlines, off_t off)
3035 p = reallocarray(*line_offsets, *nlines + 1, sizeof(off_t));
3037 return got_error_from_errno("reallocarray");
3039 (*line_offsets)[*nlines] = off;
3044 static const struct got_error *
3045 write_commit_info(off_t **line_offsets, size_t *nlines,
3046 struct got_object_id *commit_id, struct got_reflist_head *refs,
3047 struct got_repository *repo, FILE *outfile)
3049 const struct got_error *err = NULL;
3050 char datebuf[26], *datestr;
3051 struct got_commit_object *commit;
3052 char *id_str = NULL, *logmsg = NULL, *s = NULL, *line;
3053 time_t committer_time;
3054 const char *author, *committer;
3055 char *refs_str = NULL;
3056 struct got_pathlist_head changed_paths;
3057 struct got_pathlist_entry *pe;
3061 TAILQ_INIT(&changed_paths);
3064 err = build_refs_str(&refs_str, refs, commit_id, repo);
3069 err = got_object_open_as_commit(&commit, repo, commit_id);
3073 err = got_object_id_str(&id_str, commit_id);
3075 err = got_error_from_errno("got_object_id_str");
3079 err = add_line_offset(line_offsets, nlines, 0);
3083 n = fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3084 refs_str ? refs_str : "", refs_str ? ")" : "");
3086 err = got_error_from_errno("fprintf");
3090 err = add_line_offset(line_offsets, nlines, outoff);
3094 n = fprintf(outfile, "from: %s\n",
3095 got_object_commit_get_author(commit));
3097 err = got_error_from_errno("fprintf");
3101 err = add_line_offset(line_offsets, nlines, outoff);
3105 committer_time = got_object_commit_get_committer_time(commit);
3106 datestr = get_datestr(&committer_time, datebuf);
3108 n = fprintf(outfile, "date: %s UTC\n", datestr);
3110 err = got_error_from_errno("fprintf");
3114 err = add_line_offset(line_offsets, nlines, outoff);
3118 author = got_object_commit_get_author(commit);
3119 committer = got_object_commit_get_committer(commit);
3120 if (strcmp(author, committer) != 0) {
3121 n = fprintf(outfile, "via: %s\n", committer);
3123 err = got_error_from_errno("fprintf");
3127 err = add_line_offset(line_offsets, nlines, outoff);
3131 err = got_object_commit_get_logmsg(&logmsg, commit);
3135 while ((line = strsep(&s, "\n")) != NULL) {
3136 n = fprintf(outfile, "%s\n", line);
3138 err = got_error_from_errno("fprintf");
3142 err = add_line_offset(line_offsets, nlines, outoff);
3147 err = get_changed_paths(&changed_paths, commit, repo);
3150 TAILQ_FOREACH(pe, &changed_paths, entry) {
3151 struct got_diff_changed_path *cp = pe->data;
3152 n = fprintf(outfile, "%c %s\n", cp->status, pe->path);
3154 err = got_error_from_errno("fprintf");
3158 err = add_line_offset(line_offsets, nlines, outoff);
3161 free((char *)pe->path);
3165 fputc('\n', outfile);
3167 err = add_line_offset(line_offsets, nlines, outoff);
3169 got_pathlist_free(&changed_paths);
3173 got_object_commit_close(commit);
3175 free(*line_offsets);
3176 *line_offsets = NULL;
3182 static const struct got_error *
3183 create_diff(struct tog_diff_view_state *s)
3185 const struct got_error *err = NULL;
3189 free(s->line_offsets);
3190 s->line_offsets = malloc(sizeof(off_t));
3191 if (s->line_offsets == NULL)
3192 return got_error_from_errno("malloc");
3197 err = got_error_from_errno("got_opentemp");
3200 if (s->f && fclose(s->f) != 0) {
3201 err = got_error_from_errno("fclose");
3207 err = got_object_get_type(&obj_type, s->repo, s->id1);
3209 err = got_object_get_type(&obj_type, s->repo, s->id2);
3214 case GOT_OBJ_TYPE_BLOB:
3215 err = got_diff_objects_as_blobs(&s->line_offsets, &s->nlines,
3216 s->id1, s->id2, NULL, NULL, s->diff_context, 0,
3219 case GOT_OBJ_TYPE_TREE:
3220 err = got_diff_objects_as_trees(&s->line_offsets, &s->nlines,
3221 s->id1, s->id2, "", "", s->diff_context, 0, s->repo, s->f);
3223 case GOT_OBJ_TYPE_COMMIT: {
3224 const struct got_object_id_queue *parent_ids;
3225 struct got_object_qid *pid;
3226 struct got_commit_object *commit2;
3228 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3231 /* Show commit info if we're diffing to a parent/root commit. */
3232 if (s->id1 == NULL) {
3233 err = write_commit_info(&s->line_offsets, &s->nlines,
3234 s->id2, s->refs, s->repo, s->f);
3238 parent_ids = got_object_commit_get_parent_ids(commit2);
3239 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3240 if (got_object_id_cmp(s->id1, pid->id) == 0) {
3241 err = write_commit_info(
3242 &s->line_offsets, &s->nlines,
3243 s->id2, s->refs, s->repo, s->f);
3250 got_object_commit_close(commit2);
3252 err = got_diff_objects_as_commits(&s->line_offsets, &s->nlines,
3253 s->id1, s->id2, s->diff_context, 0, s->repo, s->f);
3257 err = got_error(GOT_ERR_OBJ_TYPE);
3263 if (s->f && fflush(s->f) != 0 && err == NULL)
3264 err = got_error_from_errno("fflush");
3269 diff_view_indicate_progress(struct tog_view *view)
3271 mvwaddstr(view->window, 0, 0, "diffing...");
3276 static const struct got_error *
3277 search_start_diff_view(struct tog_view *view)
3279 struct tog_diff_view_state *s = &view->state.diff;
3281 s->matched_line = 0;
3285 static const struct got_error *
3286 search_next_diff_view(struct tog_view *view)
3288 struct tog_diff_view_state *s = &view->state.diff;
3291 if (!view->searching) {
3292 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3296 if (s->matched_line) {
3297 if (view->searching == TOG_SEARCH_FORWARD)
3298 lineno = s->matched_line + 1;
3300 lineno = s->matched_line - 1;
3302 if (view->searching == TOG_SEARCH_FORWARD)
3313 if (lineno <= 0 || lineno > s->nlines) {
3314 if (s->matched_line == 0) {
3315 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3320 if (view->searching == TOG_SEARCH_FORWARD)
3326 offset = s->line_offsets[lineno - 1];
3327 if (fseeko(s->f, offset, SEEK_SET) != 0) {
3329 return got_error_from_errno("fseeko");
3332 line = parse_next_line(s->f, &len);
3334 match_line(line, &view->regex, 1, &view->regmatch)) {
3335 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3336 s->matched_line = lineno;
3341 if (view->searching == TOG_SEARCH_FORWARD)
3347 if (s->matched_line) {
3348 s->first_displayed_line = s->matched_line;
3349 s->selected_line = 1;
3355 static const struct got_error *
3356 open_diff_view(struct tog_view *view, struct got_object_id *id1,
3357 struct got_object_id *id2, struct tog_view *log_view,
3358 struct got_reflist_head *refs, struct got_repository *repo)
3360 const struct got_error *err;
3361 struct tog_diff_view_state *s = &view->state.diff;
3363 if (id1 != NULL && id2 != NULL) {
3365 err = got_object_get_type(&type1, repo, id1);
3368 err = got_object_get_type(&type2, repo, id2);
3373 return got_error(GOT_ERR_OBJ_TYPE);
3375 s->first_displayed_line = 1;
3376 s->last_displayed_line = view->nlines;
3377 s->selected_line = 1;
3384 s->id1 = got_object_id_dup(id1);
3386 return got_error_from_errno("got_object_id_dup");
3390 s->id2 = got_object_id_dup(id2);
3391 if (s->id2 == NULL) {
3394 return got_error_from_errno("got_object_id_dup");
3397 s->first_displayed_line = 1;
3398 s->last_displayed_line = view->nlines;
3399 s->diff_context = 3;
3400 s->log_view = log_view;
3404 SIMPLEQ_INIT(&s->colors);
3405 if (has_colors() && getenv("TOG_COLORS") != NULL) {
3406 err = add_color(&s->colors,
3407 "^-", TOG_COLOR_DIFF_MINUS,
3408 get_color_value("TOG_COLOR_DIFF_MINUS"));
3411 err = add_color(&s->colors, "^\\+",
3412 TOG_COLOR_DIFF_PLUS,
3413 get_color_value("TOG_COLOR_DIFF_PLUS"));
3415 free_colors(&s->colors);
3418 err = add_color(&s->colors,
3419 "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3420 get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3422 free_colors(&s->colors);
3426 err = add_color(&s->colors,
3427 "^(commit [0-9a-f]|(blob|file) [-+] |[MDmA] [^ ])",
3428 TOG_COLOR_DIFF_META,
3429 get_color_value("TOG_COLOR_DIFF_META"));
3431 free_colors(&s->colors);
3435 err = add_color(&s->colors,
3436 "^(from|via): ", TOG_COLOR_AUTHOR,
3437 get_color_value("TOG_COLOR_AUTHOR"));
3439 free_colors(&s->colors);
3443 err = add_color(&s->colors,
3444 "^date: ", TOG_COLOR_DATE,
3445 get_color_value("TOG_COLOR_DATE"));
3447 free_colors(&s->colors);
3452 if (log_view && view_is_splitscreen(view))
3453 show_log_view(log_view); /* draw vborder */
3454 diff_view_indicate_progress(view);
3456 s->line_offsets = NULL;
3458 err = create_diff(s);
3467 view->show = show_diff_view;
3468 view->input = input_diff_view;
3469 view->close = close_diff_view;
3470 view->search_start = search_start_diff_view;
3471 view->search_next = search_next_diff_view;
3476 static const struct got_error *
3477 close_diff_view(struct tog_view *view)
3479 const struct got_error *err = NULL;
3480 struct tog_diff_view_state *s = &view->state.diff;
3486 if (s->f && fclose(s->f) == EOF)
3487 err = got_error_from_errno("fclose");
3488 free_colors(&s->colors);
3489 free(s->line_offsets);
3490 s->line_offsets = NULL;
3495 static const struct got_error *
3496 show_diff_view(struct tog_view *view)
3498 const struct got_error *err;
3499 struct tog_diff_view_state *s = &view->state.diff;
3500 char *id_str1 = NULL, *id_str2, *header;
3503 err = got_object_id_str(&id_str1, s->id1);
3507 err = got_object_id_str(&id_str2, s->id2);
3511 if (asprintf(&header, "diff %s %s",
3512 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3513 err = got_error_from_errno("asprintf");
3521 return draw_file(view, s->f, s->first_displayed_line, s->nlines,
3522 s->line_offsets, s->selected_line, view->nlines,
3523 &s->last_displayed_line, &s->eof, header, &s->colors,
3524 s->matched_line, &view->regmatch);
3527 static const struct got_error *
3528 set_selected_commit(struct tog_diff_view_state *s,
3529 struct commit_queue_entry *entry)
3531 const struct got_error *err;
3532 const struct got_object_id_queue *parent_ids;
3533 struct got_commit_object *selected_commit;
3534 struct got_object_qid *pid;
3537 s->id2 = got_object_id_dup(entry->id);
3539 return got_error_from_errno("got_object_id_dup");
3541 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3544 parent_ids = got_object_commit_get_parent_ids(selected_commit);
3546 pid = SIMPLEQ_FIRST(parent_ids);
3547 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3548 got_object_commit_close(selected_commit);
3552 static const struct got_error *
3553 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3554 struct tog_view **focus_view, struct tog_view *view, int ch)
3556 const struct got_error *err = NULL;
3557 struct tog_diff_view_state *s = &view->state.diff;
3558 struct tog_log_view_state *ls;
3559 struct commit_queue_entry *entry;
3565 if (s->first_displayed_line > 1)
3566 s->first_displayed_line--;
3570 if (s->first_displayed_line == 1)
3573 while (i++ < view->nlines - 1 &&
3574 s->first_displayed_line > 1)
3575 s->first_displayed_line--;
3580 s->first_displayed_line++;
3588 while (!s->eof && i++ < view->nlines - 1) {
3590 line = parse_next_line(s->f, NULL);
3591 s->first_displayed_line++;
3597 if (s->diff_context > 0) {
3599 diff_view_indicate_progress(view);
3600 err = create_diff(s);
3604 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3606 diff_view_indicate_progress(view);
3607 err = create_diff(s);
3612 if (s->log_view == NULL)
3614 ls = &s->log_view->state.log;
3615 entry = TAILQ_PREV(ls->selected_entry,
3616 commit_queue_head, entry);
3620 err = input_log_view(NULL, NULL, NULL, s->log_view,
3625 err = set_selected_commit(s, entry);
3629 s->first_displayed_line = 1;
3630 s->last_displayed_line = view->nlines;
3632 diff_view_indicate_progress(view);
3633 err = create_diff(s);
3637 if (s->log_view == NULL)
3639 ls = &s->log_view->state.log;
3641 if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3642 ls->thread_args.commits_needed++;
3643 err = trigger_log_thread(s->log_view, 1,
3644 &ls->thread_args.commits_needed,
3645 &ls->thread_args.log_complete,
3646 &ls->thread_args.need_commits,
3647 &ls->thread_args.commit_loaded);
3651 err = input_log_view(NULL, NULL, NULL, s->log_view,
3656 entry = TAILQ_NEXT(ls->selected_entry, entry);
3660 err = set_selected_commit(s, entry);
3664 s->first_displayed_line = 1;
3665 s->last_displayed_line = view->nlines;
3667 diff_view_indicate_progress(view);
3668 err = create_diff(s);
3677 static const struct got_error *
3678 cmd_diff(int argc, char *argv[])
3680 const struct got_error *error = NULL;
3681 struct got_repository *repo = NULL;
3682 struct got_worktree *worktree = NULL;
3683 struct got_reflist_head refs;
3684 struct got_object_id *id1 = NULL, *id2 = NULL;
3685 char *repo_path = NULL, *cwd = NULL;
3686 char *id_str1 = NULL, *id_str2 = NULL;
3688 struct tog_view *view;
3690 SIMPLEQ_INIT(&refs);
3693 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3698 while ((ch = getopt(argc, argv, "r:")) != -1) {
3701 repo_path = realpath(optarg, NULL);
3702 if (repo_path == NULL)
3703 return got_error_from_errno2("realpath",
3716 usage_diff(); /* TODO show local worktree changes */
3717 } else if (argc == 2) {
3723 cwd = getcwd(NULL, 0);
3725 return got_error_from_errno("getcwd");
3727 error = got_worktree_open(&worktree, cwd);
3728 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3731 if (repo_path == NULL) {
3734 strdup(got_worktree_get_repo_path(worktree));
3736 repo_path = strdup(cwd);
3738 if (repo_path == NULL) {
3739 error = got_error_from_errno("strdup");
3743 error = got_repo_open(&repo, repo_path, NULL);
3749 error = apply_unveil(got_repo_get_path(repo), NULL);
3753 error = got_repo_match_object_id_prefix(&id1, id_str1,
3754 GOT_OBJ_TYPE_ANY, repo);
3758 error = got_repo_match_object_id_prefix(&id2, id_str2,
3759 GOT_OBJ_TYPE_ANY, repo);
3763 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3767 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3769 error = got_error_from_errno("view_open");
3772 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3775 error = view_loop(view);
3780 got_repo_close(repo);
3782 got_worktree_close(worktree);
3783 got_ref_list_free(&refs);
3791 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3796 struct tog_blame_line {
3798 struct got_object_id *id;
3801 static const struct got_error *
3802 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3803 const char *path, struct tog_blame_line *lines, int nlines,
3804 int blame_complete, int selected_line, int *first_displayed_line,
3805 int *last_displayed_line, int *eof, int max_lines,
3806 struct tog_colors *colors, int matched_line, regmatch_t *regmatch)
3808 const struct got_error *err;
3809 int lineno = 0, nprinted = 0;
3814 struct tog_blame_line *blame_line;
3815 struct got_object_id *prev_id = NULL;
3817 struct tog_color *tc;
3819 err = got_object_id_str(&id_str, id);
3824 werase(view->window);
3826 if (asprintf(&line, "commit %s", id_str) == -1) {
3827 err = got_error_from_errno("asprintf");
3832 err = format_line(&wline, &width, line, view->ncols, 0);
3837 if (view_needs_focus_indication(view))
3838 wstandout(view->window);
3839 tc = get_color(colors, TOG_COLOR_COMMIT);
3841 wattr_on(view->window,
3842 COLOR_PAIR(tc->colorpair), NULL);
3843 waddwstr(view->window, wline);
3845 wattr_off(view->window,
3846 COLOR_PAIR(tc->colorpair), NULL);
3847 if (view_needs_focus_indication(view))
3848 wstandend(view->window);
3851 if (width < view->ncols - 1)
3852 waddch(view->window, '\n');
3854 if (asprintf(&line, "[%d/%d] %s%s",
3855 *first_displayed_line - 1 + selected_line, nlines,
3856 blame_complete ? "" : "annotating... ", path) == -1) {
3858 return got_error_from_errno("asprintf");
3861 err = format_line(&wline, &width, line, view->ncols, 0);
3866 waddwstr(view->window, wline);
3869 if (width < view->ncols - 1)
3870 waddch(view->window, '\n');
3873 while (nprinted < max_lines - 2) {
3874 line = parse_next_line(f, &len);
3879 if (++lineno < *first_displayed_line) {
3884 if (view->focussed && nprinted == selected_line - 1)
3885 wstandout(view->window);
3888 blame_line = &lines[lineno - 1];
3889 if (blame_line->annotated && prev_id &&
3890 got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3892 nprinted == selected_line - 1)) {
3893 waddstr(view->window, " ");
3894 } else if (blame_line->annotated) {
3896 err = got_object_id_str(&id_str, blame_line->id);
3901 tc = get_color(colors, TOG_COLOR_COMMIT);
3903 wattr_on(view->window,
3904 COLOR_PAIR(tc->colorpair), NULL);
3905 wprintw(view->window, "%.8s", id_str);
3907 wattr_off(view->window,
3908 COLOR_PAIR(tc->colorpair), NULL);
3910 prev_id = blame_line->id;
3912 waddstr(view->window, "........");
3916 waddstr(view->window, "........");
3920 if (view->focussed && nprinted == selected_line - 1)
3921 wstandend(view->window);
3922 waddstr(view->window, " ");
3924 if (view->ncols <= 9) {
3926 wline = wcsdup(L"");
3927 if (wline == NULL) {
3928 err = got_error_from_errno("wcsdup");
3932 } else if (*first_displayed_line + nprinted == matched_line &&
3933 regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
3934 err = add_matched_line(&width, line, view->ncols - 9, 9,
3935 view->window, regmatch);
3942 err = format_line(&wline, &width, line,
3943 view->ncols - 9, 9);
3944 waddwstr(view->window, wline);
3950 if (width <= view->ncols - 1)
3951 waddch(view->window, '\n');
3952 if (++nprinted == 1)
3953 *first_displayed_line = lineno;
3956 *last_displayed_line = lineno;
3963 static const struct got_error *
3964 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3966 const struct got_error *err = NULL;
3967 struct tog_blame_cb_args *a = arg;
3968 struct tog_blame_line *line;
3971 if (nlines != a->nlines ||
3972 (lineno != -1 && lineno < 1) || lineno > a->nlines)
3973 return got_error(GOT_ERR_RANGE);
3975 errcode = pthread_mutex_lock(&tog_mutex);
3977 return got_error_set_errno(errcode, "pthread_mutex_lock");
3979 if (*a->quit) { /* user has quit the blame view */
3980 err = got_error(GOT_ERR_ITER_COMPLETED);
3985 goto done; /* no change in this commit */
3987 line = &a->lines[lineno - 1];
3988 if (line->annotated)
3991 line->id = got_object_id_dup(id);
3992 if (line->id == NULL) {
3993 err = got_error_from_errno("got_object_id_dup");
3996 line->annotated = 1;
3998 errcode = pthread_mutex_unlock(&tog_mutex);
4000 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4005 blame_thread(void *arg)
4007 const struct got_error *err;
4008 struct tog_blame_thread_args *ta = arg;
4009 struct tog_blame_cb_args *a = ta->cb_args;
4012 err = block_signals_used_by_main_thread();
4016 err = got_blame(ta->path, a->commit_id, ta->repo,
4017 blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
4018 if (err && err->code == GOT_ERR_CANCELLED)
4021 errcode = pthread_mutex_lock(&tog_mutex);
4023 return (void *)got_error_set_errno(errcode,
4024 "pthread_mutex_lock");
4026 got_repo_close(ta->repo);
4030 errcode = pthread_mutex_unlock(&tog_mutex);
4031 if (errcode && err == NULL)
4032 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
4037 static struct got_object_id *
4038 get_selected_commit_id(struct tog_blame_line *lines, int nlines,
4039 int first_displayed_line, int selected_line)
4041 struct tog_blame_line *line;
4046 line = &lines[first_displayed_line - 1 + selected_line - 1];
4047 if (!line->annotated)
4053 static const struct got_error *
4054 stop_blame(struct tog_blame *blame)
4056 const struct got_error *err = NULL;
4059 if (blame->thread) {
4061 errcode = pthread_mutex_unlock(&tog_mutex);
4063 return got_error_set_errno(errcode,
4064 "pthread_mutex_unlock");
4065 errcode = pthread_join(blame->thread, (void **)&err);
4067 return got_error_set_errno(errcode, "pthread_join");
4068 errcode = pthread_mutex_lock(&tog_mutex);
4070 return got_error_set_errno(errcode,
4071 "pthread_mutex_lock");
4072 if (err && err->code == GOT_ERR_ITER_COMPLETED)
4074 blame->thread = NULL;
4076 if (blame->thread_args.repo) {
4077 got_repo_close(blame->thread_args.repo);
4078 blame->thread_args.repo = NULL;
4081 if (fclose(blame->f) != 0 && err == NULL)
4082 err = got_error_from_errno("fclose");
4086 for (i = 0; i < blame->nlines; i++)
4087 free(blame->lines[i].id);
4089 blame->lines = NULL;
4091 free(blame->cb_args.commit_id);
4092 blame->cb_args.commit_id = NULL;
4097 static const struct got_error *
4098 cancel_blame_view(void *arg)
4100 const struct got_error *err = NULL;
4104 errcode = pthread_mutex_lock(&tog_mutex);
4106 return got_error_set_errno(errcode,
4107 "pthread_mutex_unlock");
4110 err = got_error(GOT_ERR_CANCELLED);
4112 errcode = pthread_mutex_unlock(&tog_mutex);
4114 return got_error_set_errno(errcode,
4115 "pthread_mutex_lock");
4120 static const struct got_error *
4121 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
4122 int *first_displayed_line, int *last_displayed_line, int *selected_line,
4123 int *done, int *eof, const char *path, struct got_object_id *commit_id,
4124 struct got_repository *repo)
4126 const struct got_error *err = NULL;
4127 struct got_blob_object *blob = NULL;
4128 struct got_repository *thread_repo = NULL;
4129 struct got_object_id *obj_id = NULL;
4132 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
4136 err = got_object_get_type(&obj_type, repo, obj_id);
4140 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4141 err = got_error(GOT_ERR_OBJ_TYPE);
4145 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4148 blame->f = got_opentemp();
4149 if (blame->f == NULL) {
4150 err = got_error_from_errno("got_opentemp");
4153 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4154 &blame->line_offsets, blame->f, blob);
4155 if (err || blame->nlines == 0)
4158 /* Don't include \n at EOF in the blame line count. */
4159 if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4162 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4163 if (blame->lines == NULL) {
4164 err = got_error_from_errno("calloc");
4168 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
4172 blame->cb_args.view = view;
4173 blame->cb_args.lines = blame->lines;
4174 blame->cb_args.nlines = blame->nlines;
4175 blame->cb_args.commit_id = got_object_id_dup(commit_id);
4176 if (blame->cb_args.commit_id == NULL) {
4177 err = got_error_from_errno("got_object_id_dup");
4180 blame->cb_args.quit = done;
4182 blame->thread_args.path = path;
4183 blame->thread_args.repo = thread_repo;
4184 blame->thread_args.cb_args = &blame->cb_args;
4185 blame->thread_args.complete = blame_complete;
4186 blame->thread_args.cancel_cb = cancel_blame_view;
4187 blame->thread_args.cancel_arg = done;
4188 *blame_complete = 0;
4192 got_object_blob_close(blob);
4199 static const struct got_error *
4200 open_blame_view(struct tog_view *view, char *path,
4201 struct got_object_id *commit_id, struct got_reflist_head *refs,
4202 struct got_repository *repo)
4204 const struct got_error *err = NULL;
4205 struct tog_blame_view_state *s = &view->state.blame;
4207 SIMPLEQ_INIT(&s->blamed_commits);
4209 s->path = strdup(path);
4210 if (s->path == NULL)
4211 return got_error_from_errno("strdup");
4213 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4219 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4220 s->first_displayed_line = 1;
4221 s->last_displayed_line = view->nlines;
4222 s->selected_line = 1;
4223 s->blame_complete = 0;
4226 s->commit_id = commit_id;
4227 memset(&s->blame, 0, sizeof(s->blame));
4229 SIMPLEQ_INIT(&s->colors);
4230 if (has_colors() && getenv("TOG_COLORS") != NULL) {
4231 err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4232 get_color_value("TOG_COLOR_COMMIT"));
4237 view->show = show_blame_view;
4238 view->input = input_blame_view;
4239 view->close = close_blame_view;
4240 view->search_start = search_start_blame_view;
4241 view->search_next = search_next_blame_view;
4243 return run_blame(&s->blame, view, &s->blame_complete,
4244 &s->first_displayed_line, &s->last_displayed_line,
4245 &s->selected_line, &s->done, &s->eof, s->path,
4246 s->blamed_commit->id, s->repo);
4249 static const struct got_error *
4250 close_blame_view(struct tog_view *view)
4252 const struct got_error *err = NULL;
4253 struct tog_blame_view_state *s = &view->state.blame;
4255 if (s->blame.thread)
4256 err = stop_blame(&s->blame);
4258 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4259 struct got_object_qid *blamed_commit;
4260 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4261 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4262 got_object_qid_free(blamed_commit);
4266 free_colors(&s->colors);
4271 static const struct got_error *
4272 search_start_blame_view(struct tog_view *view)
4274 struct tog_blame_view_state *s = &view->state.blame;
4276 s->matched_line = 0;
4280 static const struct got_error *
4281 search_next_blame_view(struct tog_view *view)
4283 struct tog_blame_view_state *s = &view->state.blame;
4286 if (!view->searching) {
4287 view->search_next_done = TOG_SEARCH_HAVE_MORE;
4291 if (s->matched_line) {
4292 if (view->searching == TOG_SEARCH_FORWARD)
4293 lineno = s->matched_line + 1;
4295 lineno = s->matched_line - 1;
4297 if (view->searching == TOG_SEARCH_FORWARD)
4300 lineno = s->blame.nlines;
4308 if (lineno <= 0 || lineno > s->blame.nlines) {
4309 if (s->matched_line == 0) {
4310 view->search_next_done = TOG_SEARCH_HAVE_MORE;
4315 if (view->searching == TOG_SEARCH_FORWARD)
4318 lineno = s->blame.nlines;
4321 offset = s->blame.line_offsets[lineno - 1];
4322 if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4324 return got_error_from_errno("fseeko");
4327 line = parse_next_line(s->blame.f, &len);
4329 match_line(line, &view->regex, 1, &view->regmatch)) {
4330 view->search_next_done = TOG_SEARCH_HAVE_MORE;
4331 s->matched_line = lineno;
4336 if (view->searching == TOG_SEARCH_FORWARD)
4342 if (s->matched_line) {
4343 s->first_displayed_line = s->matched_line;
4344 s->selected_line = 1;
4350 static const struct got_error *
4351 show_blame_view(struct tog_view *view)
4353 const struct got_error *err = NULL;
4354 struct tog_blame_view_state *s = &view->state.blame;
4357 if (s->blame.thread == NULL) {
4358 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4359 &s->blame.thread_args);
4361 return got_error_set_errno(errcode, "pthread_create");
4363 halfdelay(1); /* fast refresh while annotating */
4366 if (s->blame_complete)
4367 halfdelay(10); /* disable fast refresh */
4369 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
4370 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
4371 s->selected_line, &s->first_displayed_line,
4372 &s->last_displayed_line, &s->eof, view->nlines, &s->colors,
4373 s->matched_line, &view->regmatch);
4379 static const struct got_error *
4380 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
4381 struct tog_view **focus_view, struct tog_view *view, int ch)
4383 const struct got_error *err = NULL, *thread_err = NULL;
4384 struct tog_view *diff_view;
4385 struct tog_blame_view_state *s = &view->state.blame;
4394 if (s->selected_line > 1)
4396 else if (s->selected_line == 1 &&
4397 s->first_displayed_line > 1)
4398 s->first_displayed_line--;
4402 if (s->first_displayed_line == 1) {
4403 s->selected_line = 1;
4406 if (s->first_displayed_line > view->nlines - 2)
4407 s->first_displayed_line -=
4410 s->first_displayed_line = 1;
4414 if (s->selected_line < view->nlines - 2 &&
4415 s->first_displayed_line +
4416 s->selected_line <= s->blame.nlines)
4418 else if (s->last_displayed_line <
4420 s->first_displayed_line++;
4424 struct got_object_id *id = NULL;
4425 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4426 s->first_displayed_line, s->selected_line);
4430 struct got_commit_object *commit;
4431 struct got_object_qid *pid;
4432 struct got_object_id *blob_id = NULL;
4434 err = got_object_open_as_commit(&commit,
4438 pid = SIMPLEQ_FIRST(
4439 got_object_commit_get_parent_ids(commit));
4441 got_object_commit_close(commit);
4444 /* Check if path history ends here. */
4445 err = got_object_id_by_path(&blob_id, s->repo,
4448 if (err->code == GOT_ERR_NO_TREE_ENTRY)
4450 got_object_commit_close(commit);
4453 err = got_object_get_type(&obj_type, s->repo,
4456 /* Can't blame non-blob type objects. */
4457 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4458 got_object_commit_close(commit);
4461 err = got_object_qid_alloc(&s->blamed_commit,
4463 got_object_commit_close(commit);
4465 if (got_object_id_cmp(id,
4466 s->blamed_commit->id) == 0)
4468 err = got_object_qid_alloc(&s->blamed_commit,
4474 thread_err = stop_blame(&s->blame);
4478 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4479 s->blamed_commit, entry);
4480 err = run_blame(&s->blame, view, &s->blame_complete,
4481 &s->first_displayed_line, &s->last_displayed_line,
4482 &s->selected_line, &s->done, &s->eof,
4483 s->path, s->blamed_commit->id, s->repo);
4489 struct got_object_qid *first;
4490 first = SIMPLEQ_FIRST(&s->blamed_commits);
4491 if (!got_object_id_cmp(first->id, s->commit_id))
4494 thread_err = stop_blame(&s->blame);
4498 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4499 got_object_qid_free(s->blamed_commit);
4501 SIMPLEQ_FIRST(&s->blamed_commits);
4502 err = run_blame(&s->blame, view, &s->blame_complete,
4503 &s->first_displayed_line, &s->last_displayed_line,
4504 &s->selected_line, &s->done, &s->eof, s->path,
4505 s->blamed_commit->id, s->repo);
4512 struct got_object_id *id = NULL;
4513 struct got_object_qid *pid;
4514 struct got_commit_object *commit = NULL;
4515 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4516 s->first_displayed_line, s->selected_line);
4519 err = got_object_open_as_commit(&commit, s->repo, id);
4522 pid = SIMPLEQ_FIRST(
4523 got_object_commit_get_parent_ids(commit));
4524 if (view_is_parent_view(view))
4525 begin_x = view_split_begin_x(view->begin_x);
4526 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4527 if (diff_view == NULL) {
4528 got_object_commit_close(commit);
4529 err = got_error_from_errno("view_open");
4532 err = open_diff_view(diff_view, pid ? pid->id : NULL,
4533 id, NULL, s->refs, s->repo);
4534 got_object_commit_close(commit);
4536 view_close(diff_view);
4539 if (view_is_parent_view(view)) {
4540 err = view_close_child(view);
4543 err = view_set_child(view, diff_view);
4545 view_close(diff_view);
4548 *focus_view = diff_view;
4549 view->child_focussed = 1;
4551 *new_view = diff_view;
4559 if (s->last_displayed_line >= s->blame.nlines &&
4560 s->selected_line >= MIN(s->blame.nlines,
4561 view->nlines - 2)) {
4564 if (s->last_displayed_line >= s->blame.nlines &&
4565 s->selected_line < view->nlines - 2) {
4566 s->selected_line = MIN(s->blame.nlines,
4570 if (s->last_displayed_line + view->nlines - 2
4572 s->first_displayed_line +=
4575 s->first_displayed_line =
4580 if (s->selected_line > view->nlines - 2) {
4581 s->selected_line = MIN(s->blame.nlines,
4588 return thread_err ? thread_err : err;
4591 static const struct got_error *
4592 cmd_blame(int argc, char *argv[])
4594 const struct got_error *error;
4595 struct got_repository *repo = NULL;
4596 struct got_reflist_head refs;
4597 struct got_worktree *worktree = NULL;
4598 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4599 char *link_target = NULL;
4600 struct got_object_id *commit_id = NULL;
4601 char *commit_id_str = NULL;
4603 struct tog_view *view;
4605 SIMPLEQ_INIT(&refs);
4608 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4613 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4616 commit_id_str = optarg;
4619 repo_path = realpath(optarg, NULL);
4620 if (repo_path == NULL)
4621 return got_error_from_errno2("realpath",
4636 cwd = getcwd(NULL, 0);
4638 return got_error_from_errno("getcwd");
4640 error = got_worktree_open(&worktree, cwd);
4641 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4644 if (repo_path == NULL) {
4647 strdup(got_worktree_get_repo_path(worktree));
4649 repo_path = strdup(cwd);
4651 if (repo_path == NULL) {
4652 error = got_error_from_errno("strdup");
4656 error = got_repo_open(&repo, repo_path, NULL);
4660 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4667 error = apply_unveil(got_repo_get_path(repo), NULL);
4671 if (commit_id_str == NULL) {
4672 struct got_reference *head_ref;
4673 error = got_ref_open(&head_ref, repo, worktree ?
4674 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4677 error = got_ref_resolve(&commit_id, repo, head_ref);
4678 got_ref_close(head_ref);
4680 error = got_repo_match_object_id(&commit_id, NULL,
4681 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4686 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4690 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4692 error = got_error_from_errno("view_open");
4696 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4701 error = open_blame_view(view, link_target ? link_target : in_repo_path,
4702 commit_id, &refs, repo);
4706 /* Release work tree lock. */
4707 got_worktree_close(worktree);
4710 error = view_loop(view);
4718 got_worktree_close(worktree);
4720 got_repo_close(repo);
4721 got_ref_list_free(&refs);
4725 static const struct got_error *
4726 draw_tree_entries(struct tog_view *view,
4727 struct got_tree_entry **first_displayed_entry,
4728 struct got_tree_entry **last_displayed_entry,
4729 struct got_tree_entry **selected_entry, int *ndisplayed,
4730 const char *label, int show_ids, const char *parent_path,
4731 struct got_tree_object *tree, int selected, int limit,
4732 int isroot, struct tog_colors *colors, struct got_repository *repo)
4734 const struct got_error *err = NULL;
4735 struct got_tree_entry *te;
4737 struct tog_color *tc;
4738 int width, n, i, nentries;
4742 werase(view->window);
4747 err = format_line(&wline, &width, label, view->ncols, 0);
4750 if (view_needs_focus_indication(view))
4751 wstandout(view->window);
4752 tc = get_color(colors, TOG_COLOR_COMMIT);
4754 wattr_on(view->window,
4755 COLOR_PAIR(tc->colorpair), NULL);
4756 waddwstr(view->window, wline);
4758 wattr_off(view->window,
4759 COLOR_PAIR(tc->colorpair), NULL);
4760 if (view_needs_focus_indication(view))
4761 wstandend(view->window);
4764 if (width < view->ncols - 1)
4765 waddch(view->window, '\n');
4768 err = format_line(&wline, &width, parent_path, view->ncols, 0);
4771 waddwstr(view->window, wline);
4774 if (width < view->ncols - 1)
4775 waddch(view->window, '\n');
4778 waddch(view->window, '\n');
4782 if (*first_displayed_entry == NULL) {
4783 te = got_object_tree_get_first_entry(tree);
4784 if (selected == 0) {
4786 wstandout(view->window);
4787 *selected_entry = NULL;
4789 waddstr(view->window, " ..\n"); /* parent directory */
4790 if (selected == 0 && view->focussed)
4791 wstandend(view->window);
4798 te = *first_displayed_entry;
4801 nentries = got_object_tree_get_nentries(tree);
4802 for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4803 char *line = NULL, *id_str = NULL, *link_target = NULL;
4804 const char *modestr = "";
4807 te = got_object_tree_get_entry(tree, i);
4808 mode = got_tree_entry_get_mode(te);
4811 err = got_object_id_str(&id_str,
4812 got_tree_entry_get_id(te));
4814 return got_error_from_errno(
4815 "got_object_id_str");
4817 if (got_object_tree_entry_is_submodule(te))
4819 else if (S_ISLNK(mode)) {
4822 err = got_tree_entry_get_symlink_target(&link_target,
4828 for (i = 0; i < strlen(link_target); i++) {
4829 if (!isprint((unsigned char)link_target[i]))
4830 link_target[i] = '?';
4834 else if (S_ISDIR(mode))
4836 else if (mode & S_IXUSR)
4838 if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
4839 got_tree_entry_get_name(te), modestr,
4840 link_target ? " -> ": "",
4841 link_target ? link_target : "") == -1) {
4844 return got_error_from_errno("asprintf");
4848 err = format_line(&wline, &width, line, view->ncols, 0);
4853 if (n == selected) {
4855 wstandout(view->window);
4856 *selected_entry = te;
4858 tc = match_color(colors, line);
4860 wattr_on(view->window,
4861 COLOR_PAIR(tc->colorpair), NULL);
4862 waddwstr(view->window, wline);
4864 wattr_off(view->window,
4865 COLOR_PAIR(tc->colorpair), NULL);
4866 if (width < view->ncols - 1)
4867 waddch(view->window, '\n');
4868 if (n == selected && view->focussed)
4869 wstandend(view->window);
4875 *last_displayed_entry = te;
4884 tree_scroll_up(struct tog_view *view,
4885 struct got_tree_entry **first_displayed_entry, int maxscroll,
4886 struct got_tree_object *tree, int isroot)
4888 struct got_tree_entry *te;
4891 if (*first_displayed_entry == NULL)
4894 te = got_object_tree_get_entry(tree, 0);
4895 if (*first_displayed_entry == te) {
4897 *first_displayed_entry = NULL;
4902 while (*first_displayed_entry && i < maxscroll) {
4903 *first_displayed_entry = got_tree_entry_get_prev(tree,
4904 *first_displayed_entry);
4907 if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4908 *first_displayed_entry = NULL;
4912 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4913 struct got_tree_entry *last_displayed_entry,
4914 struct got_tree_object *tree)
4916 struct got_tree_entry *next, *last;
4919 if (*first_displayed_entry)
4920 next = got_tree_entry_get_next(tree, *first_displayed_entry);
4922 next = got_object_tree_get_first_entry(tree);
4924 last = last_displayed_entry;
4925 while (next && last && n++ < maxscroll) {
4926 last = got_tree_entry_get_next(tree, last);
4928 *first_displayed_entry = next;
4929 next = got_tree_entry_get_next(tree, next);
4935 static const struct got_error *
4936 tree_entry_path(char **path, struct tog_parent_trees *parents,
4937 struct got_tree_entry *te)
4939 const struct got_error *err = NULL;
4940 struct tog_parent_tree *pt;
4941 size_t len = 2; /* for leading slash and NUL */
4943 TAILQ_FOREACH(pt, parents, entry)
4944 len += strlen(got_tree_entry_get_name(pt->selected_entry))
4947 len += strlen(got_tree_entry_get_name(te));
4949 *path = calloc(1, len);
4951 return got_error_from_errno("calloc");
4954 pt = TAILQ_LAST(parents, tog_parent_trees);
4956 const char *name = got_tree_entry_get_name(pt->selected_entry);
4957 if (strlcat(*path, name, len) >= len) {
4958 err = got_error(GOT_ERR_NO_SPACE);
4961 if (strlcat(*path, "/", len) >= len) {
4962 err = got_error(GOT_ERR_NO_SPACE);
4965 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4968 if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4969 err = got_error(GOT_ERR_NO_SPACE);
4981 static const struct got_error *
4982 blame_tree_entry(struct tog_view **new_view, int begin_x,
4983 struct got_tree_entry *te, struct tog_parent_trees *parents,
4984 struct got_object_id *commit_id, struct got_reflist_head *refs,
4985 struct got_repository *repo)
4987 const struct got_error *err = NULL;
4989 struct tog_view *blame_view;
4993 err = tree_entry_path(&path, parents, te);
4997 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4998 if (blame_view == NULL) {
4999 err = got_error_from_errno("view_open");
5003 err = open_blame_view(blame_view, path, commit_id, refs, repo);
5005 if (err->code == GOT_ERR_CANCELLED)
5007 view_close(blame_view);
5009 *new_view = blame_view;
5015 static const struct got_error *
5016 log_tree_entry(struct tog_view **new_view, int begin_x,
5017 struct got_tree_entry *te, struct tog_parent_trees *parents,
5018 struct got_object_id *commit_id, struct got_reflist_head *refs,
5019 struct got_repository *repo)
5021 struct tog_view *log_view;
5022 const struct got_error *err = NULL;
5027 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
5028 if (log_view == NULL)
5029 return got_error_from_errno("view_open");
5031 err = tree_entry_path(&path, parents, te);
5035 err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
5037 view_close(log_view);
5039 *new_view = log_view;
5044 static const struct got_error *
5045 open_tree_view(struct tog_view *view, struct got_tree_object *root,
5046 struct got_object_id *commit_id, struct got_reflist_head *refs,
5047 struct got_repository *repo)
5049 const struct got_error *err = NULL;
5050 char *commit_id_str = NULL;
5051 struct tog_tree_view_state *s = &view->state.tree;
5053 TAILQ_INIT(&s->parents);
5055 err = got_object_id_str(&commit_id_str, commit_id);
5059 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
5060 err = got_error_from_errno("asprintf");
5064 s->root = s->tree = root;
5065 s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
5066 s->selected_entry = got_object_tree_get_entry(s->tree, 0);
5067 s->commit_id = got_object_id_dup(commit_id);
5068 if (s->commit_id == NULL) {
5069 err = got_error_from_errno("got_object_id_dup");
5075 SIMPLEQ_INIT(&s->colors);
5077 if (has_colors() && getenv("TOG_COLORS") != NULL) {
5078 err = add_color(&s->colors, "\\$$",
5079 TOG_COLOR_TREE_SUBMODULE,
5080 get_color_value("TOG_COLOR_TREE_SUBMODULE"));
5083 err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5084 get_color_value("TOG_COLOR_TREE_SYMLINK"));
5086 free_colors(&s->colors);
5089 err = add_color(&s->colors, "/$",
5090 TOG_COLOR_TREE_DIRECTORY,
5091 get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5093 free_colors(&s->colors);
5097 err = add_color(&s->colors, "\\*$",
5098 TOG_COLOR_TREE_EXECUTABLE,
5099 get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5101 free_colors(&s->colors);
5105 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5106 get_color_value("TOG_COLOR_COMMIT"));
5108 free_colors(&s->colors);
5113 view->show = show_tree_view;
5114 view->input = input_tree_view;
5115 view->close = close_tree_view;
5116 view->search_start = search_start_tree_view;
5117 view->search_next = search_next_tree_view;
5119 free(commit_id_str);
5121 free(s->tree_label);
5122 s->tree_label = NULL;
5127 static const struct got_error *
5128 close_tree_view(struct tog_view *view)
5130 struct tog_tree_view_state *s = &view->state.tree;
5132 free_colors(&s->colors);
5133 free(s->tree_label);
5134 s->tree_label = NULL;
5136 s->commit_id = NULL;
5137 while (!TAILQ_EMPTY(&s->parents)) {
5138 struct tog_parent_tree *parent;
5139 parent = TAILQ_FIRST(&s->parents);
5140 TAILQ_REMOVE(&s->parents, parent, entry);
5144 if (s->tree != s->root)
5145 got_object_tree_close(s->tree);
5146 got_object_tree_close(s->root);
5151 static const struct got_error *
5152 search_start_tree_view(struct tog_view *view)
5154 struct tog_tree_view_state *s = &view->state.tree;
5156 s->matched_entry = NULL;
5161 match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5163 regmatch_t regmatch;
5165 return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5169 static const struct got_error *
5170 search_next_tree_view(struct tog_view *view)
5172 struct tog_tree_view_state *s = &view->state.tree;
5173 struct got_tree_entry *te = NULL;
5175 if (!view->searching) {
5176 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5180 if (s->matched_entry) {
5181 if (view->searching == TOG_SEARCH_FORWARD) {
5182 if (s->selected_entry)
5183 te = got_tree_entry_get_next(s->tree,
5186 te = got_object_tree_get_first_entry(s->tree);
5188 if (s->selected_entry == NULL)
5189 te = got_object_tree_get_last_entry(s->tree);
5191 te = got_tree_entry_get_prev(s->tree,
5195 if (view->searching == TOG_SEARCH_FORWARD)
5196 te = got_object_tree_get_first_entry(s->tree);
5198 te = got_object_tree_get_last_entry(s->tree);
5203 if (s->matched_entry == NULL) {
5204 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5207 if (view->searching == TOG_SEARCH_FORWARD)
5208 te = got_object_tree_get_first_entry(s->tree);
5210 te = got_object_tree_get_last_entry(s->tree);
5213 if (match_tree_entry(te, &view->regex)) {
5214 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5215 s->matched_entry = te;
5219 if (view->searching == TOG_SEARCH_FORWARD)
5220 te = got_tree_entry_get_next(s->tree, te);
5222 te = got_tree_entry_get_prev(s->tree, te);
5225 if (s->matched_entry) {
5226 s->first_displayed_entry = s->matched_entry;
5233 static const struct got_error *
5234 show_tree_view(struct tog_view *view)
5236 const struct got_error *err = NULL;
5237 struct tog_tree_view_state *s = &view->state.tree;
5240 err = tree_entry_path(&parent_path, &s->parents, NULL);
5244 err = draw_tree_entries(view, &s->first_displayed_entry,
5245 &s->last_displayed_entry, &s->selected_entry,
5246 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
5247 s->tree, s->selected, view->nlines, s->tree == s->root,
5248 &s->colors, s->repo);
5255 static const struct got_error *
5256 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
5257 struct tog_view **focus_view, struct tog_view *view, int ch)
5259 const struct got_error *err = NULL;
5260 struct tog_tree_view_state *s = &view->state.tree;
5261 struct tog_view *log_view;
5262 int begin_x = 0, nscrolled;
5266 s->show_ids = !s->show_ids;
5269 if (!s->selected_entry)
5271 if (view_is_parent_view(view))
5272 begin_x = view_split_begin_x(view->begin_x);
5273 err = log_tree_entry(&log_view, begin_x,
5274 s->selected_entry, &s->parents,
5275 s->commit_id, s->refs, s->repo);
5276 if (view_is_parent_view(view)) {
5277 err = view_close_child(view);
5280 err = view_set_child(view, log_view);
5282 view_close(log_view);
5285 *focus_view = log_view;
5286 view->child_focussed = 1;
5288 *new_view = log_view;
5292 if (s->selected > 0) {
5294 if (s->selected == 0)
5297 if (s->selected > 0)
5299 tree_scroll_up(view, &s->first_displayed_entry, 1,
5300 s->tree, s->tree == s->root);
5304 tree_scroll_up(view, &s->first_displayed_entry,
5305 MAX(0, view->nlines - 4 - s->selected), s->tree,
5306 s->tree == s->root);
5308 if (got_object_tree_get_first_entry(s->tree) ==
5309 s->first_displayed_entry && s->tree != s->root)
5310 s->first_displayed_entry = NULL;
5314 if (s->selected < s->ndisplayed - 1) {
5318 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5320 /* can't scroll any further */
5322 tree_scroll_down(&s->first_displayed_entry, 1,
5323 s->last_displayed_entry, s->tree);
5327 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5329 /* can't scroll any further; move cursor down */
5330 if (s->selected < s->ndisplayed - 1)
5331 s->selected = s->ndisplayed - 1;
5334 nscrolled = tree_scroll_down(&s->first_displayed_entry,
5335 view->nlines, s->last_displayed_entry, s->tree);
5336 if (nscrolled < view->nlines) {
5338 struct got_tree_entry *te;
5339 te = s->first_displayed_entry;
5342 te = got_tree_entry_get_next(s->tree, te);
5344 s->selected = ndisplayed - 1;
5350 if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5351 struct tog_parent_tree *parent;
5352 /* user selected '..' */
5353 if (s->tree == s->root)
5355 parent = TAILQ_FIRST(&s->parents);
5356 TAILQ_REMOVE(&s->parents, parent,
5358 got_object_tree_close(s->tree);
5359 s->tree = parent->tree;
5360 s->first_displayed_entry =
5361 parent->first_displayed_entry;
5363 parent->selected_entry;
5364 s->selected = parent->selected;
5366 } else if (S_ISDIR(got_tree_entry_get_mode(
5367 s->selected_entry))) {
5368 struct got_tree_object *subtree;
5369 err = got_object_open_as_tree(&subtree, s->repo,
5370 got_tree_entry_get_id(s->selected_entry));
5373 err = tree_view_visit_subtree(subtree, s);
5375 got_object_tree_close(subtree);
5378 } else if (S_ISREG(got_tree_entry_get_mode(
5379 s->selected_entry))) {
5380 struct tog_view *blame_view;
5381 int begin_x = view_is_parent_view(view) ?
5382 view_split_begin_x(view->begin_x) : 0;
5384 err = blame_tree_entry(&blame_view, begin_x,
5385 s->selected_entry, &s->parents,
5386 s->commit_id, s->refs, s->repo);
5389 if (view_is_parent_view(view)) {
5390 err = view_close_child(view);
5393 err = view_set_child(view, blame_view);
5395 view_close(blame_view);
5398 *focus_view = blame_view;
5399 view->child_focussed = 1;
5401 *new_view = blame_view;
5405 if (s->selected > view->nlines)
5406 s->selected = s->ndisplayed - 1;
5419 fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5424 static const struct got_error *
5425 cmd_tree(int argc, char *argv[])
5427 const struct got_error *error;
5428 struct got_repository *repo = NULL;
5429 struct got_worktree *worktree = NULL;
5430 struct got_reflist_head refs;
5431 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5432 struct got_object_id *commit_id = NULL;
5433 char *commit_id_arg = NULL;
5434 struct got_commit_object *commit = NULL;
5435 struct got_tree_object *tree = NULL;
5437 struct tog_view *view;
5439 SIMPLEQ_INIT(&refs);
5442 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
5447 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5450 commit_id_arg = optarg;
5453 repo_path = realpath(optarg, NULL);
5454 if (repo_path == NULL)
5455 return got_error_from_errno2("realpath",
5470 cwd = getcwd(NULL, 0);
5472 return got_error_from_errno("getcwd");
5474 error = got_worktree_open(&worktree, cwd);
5475 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5478 if (repo_path == NULL) {
5481 strdup(got_worktree_get_repo_path(worktree));
5483 repo_path = strdup(cwd);
5485 if (repo_path == NULL) {
5486 error = got_error_from_errno("strdup");
5490 error = got_repo_open(&repo, repo_path, NULL);
5494 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5501 error = apply_unveil(got_repo_get_path(repo), NULL);
5505 error = got_repo_match_object_id(&commit_id, NULL,
5506 commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5507 GOT_OBJ_TYPE_COMMIT, 1, repo);
5511 error = got_object_open_as_commit(&commit, repo, commit_id);
5515 error = got_object_open_as_tree(&tree, repo,
5516 got_object_commit_get_tree_id(commit));
5520 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5524 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5526 error = got_error_from_errno("view_open");
5529 error = open_tree_view(view, tree, commit_id, &refs, repo);
5532 if (!got_path_is_root_dir(in_repo_path)) {
5533 error = tree_view_walk_path(&view->state.tree, commit_id,
5534 in_repo_path, repo);
5540 /* Release work tree lock. */
5541 got_worktree_close(worktree);
5544 error = view_loop(view);
5550 got_object_commit_close(commit);
5552 got_object_tree_close(tree);
5554 got_repo_close(repo);
5555 got_ref_list_free(&refs);
5560 list_commands(FILE *fp)
5564 fprintf(fp, "commands:");
5565 for (i = 0; i < nitems(tog_commands); i++) {
5566 struct tog_cmd *cmd = &tog_commands[i];
5567 fprintf(fp, " %s", cmd->name);
5573 usage(int hflag, int status)
5575 FILE *fp = (status == 0) ? stdout : stderr;
5577 fprintf(fp, "usage: %s [-h] [-V | --version] [command] [arg ...]\n",
5580 fprintf(fp, "lazy usage: %s path\n", getprogname());
5587 make_argv(int argc, ...)
5595 argv = calloc(argc, sizeof(char *));
5598 for (i = 0; i < argc; i++) {
5599 argv[i] = strdup(va_arg(ap, char *));
5600 if (argv[i] == NULL)
5609 * Try to convert 'tog path' into a 'tog log path' command.
5610 * The user could simply have mistyped the command rather than knowingly
5611 * provided a path. So check whether argv[0] can in fact be resolved
5612 * to a path in the HEAD commit and print a special error if not.
5613 * This hack is for mpi@ <3
5615 static const struct got_error *
5616 tog_log_with_path(int argc, char *argv[])
5618 const struct got_error *error = NULL;
5619 struct tog_cmd *cmd = NULL;
5620 struct got_repository *repo = NULL;
5621 struct got_worktree *worktree = NULL;
5622 struct got_object_id *commit_id = NULL, *id = NULL;
5623 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5624 char *commit_id_str = NULL, **cmd_argv = NULL;
5626 cwd = getcwd(NULL, 0);
5628 return got_error_from_errno("getcwd");
5630 error = got_worktree_open(&worktree, cwd);
5631 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5635 repo_path = strdup(got_worktree_get_repo_path(worktree));
5637 repo_path = strdup(cwd);
5638 if (repo_path == NULL) {
5639 error = got_error_from_errno("strdup");
5643 error = got_repo_open(&repo, repo_path, NULL);
5647 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5652 error = got_repo_match_object_id(&commit_id, NULL, worktree ?
5653 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
5654 GOT_OBJ_TYPE_COMMIT, 1, repo);
5659 got_worktree_close(worktree);
5663 error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
5665 if (error->code != GOT_ERR_NO_TREE_ENTRY)
5667 fprintf(stderr, "%s: '%s' is no known command or path\n",
5668 getprogname(), argv[0]);
5673 got_repo_close(repo);
5676 error = got_object_id_str(&commit_id_str, commit_id);
5680 cmd = &tog_commands[0]; /* log */
5682 cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
5683 error = cmd->cmd_main(argc, cmd_argv);
5686 got_repo_close(repo);
5688 got_worktree_close(worktree);
5690 free(commit_id_str);
5697 for (i = 0; i < argc; i++)
5705 main(int argc, char *argv[])
5707 const struct got_error *error = NULL;
5708 struct tog_cmd *cmd = NULL;
5709 int ch, hflag = 0, Vflag = 0;
5710 char **cmd_argv = NULL;
5711 static struct option longopts[] = {
5712 { "version", no_argument, NULL, 'V' },
5716 setlocale(LC_CTYPE, "");
5718 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5738 got_version_print_str();
5745 /* Build an argument vector which runs a default command. */
5746 cmd = &tog_commands[0];
5748 cmd_argv = make_argv(argc, cmd->name);
5752 /* Did the user specify a command? */
5753 for (i = 0; i < nitems(tog_commands); i++) {
5754 if (strncmp(tog_commands[i].name, argv[0],
5755 strlen(argv[0])) == 0) {
5756 cmd = &tog_commands[i];
5765 /* No command specified; try log with a path */
5766 error = tog_log_with_path(argc, argv);
5771 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5778 for (i = 0; i < argc; i++)
5783 if (error && error->code != GOT_ERR_CANCELLED)
5784 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);