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);
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;
261 /* passed from log view; may be NULL */
262 struct tog_view *log_view;
265 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
267 struct tog_log_thread_args {
268 pthread_cond_t need_commits;
269 pthread_cond_t commit_loaded;
271 struct got_commit_graph *graph;
272 struct commit_queue *commits;
273 const char *in_repo_path;
274 struct got_object_id *start_id;
275 struct got_repository *repo;
278 struct commit_queue_entry **first_displayed_entry;
279 struct commit_queue_entry **selected_entry;
281 int *search_next_done;
285 struct tog_log_view_state {
286 struct commit_queue commits;
287 struct commit_queue_entry *first_displayed_entry;
288 struct commit_queue_entry *last_displayed_entry;
289 struct commit_queue_entry *selected_entry;
292 const char *head_ref_name;
294 struct got_repository *repo;
295 struct got_reflist_head *refs;
296 struct got_object_id *start_id;
299 struct tog_log_thread_args thread_args;
300 struct commit_queue_entry *matched_entry;
301 struct commit_queue_entry *search_entry;
302 struct tog_colors colors;
305 #define TOG_COLOR_DIFF_MINUS 1
306 #define TOG_COLOR_DIFF_PLUS 2
307 #define TOG_COLOR_DIFF_CHUNK_HEADER 3
308 #define TOG_COLOR_DIFF_META 4
309 #define TOG_COLOR_TREE_SUBMODULE 5
310 #define TOG_COLOR_TREE_SYMLINK 6
311 #define TOG_COLOR_TREE_DIRECTORY 7
312 #define TOG_COLOR_TREE_EXECUTABLE 8
313 #define TOG_COLOR_COMMIT 9
314 #define TOG_COLOR_AUTHOR 10
315 #define TOG_COLOR_DATE 11
317 struct tog_blame_cb_args {
318 struct tog_blame_line *lines; /* one per line */
321 struct tog_view *view;
322 struct got_object_id *commit_id;
326 struct tog_blame_thread_args {
328 struct got_repository *repo;
329 struct tog_blame_cb_args *cb_args;
331 got_cancel_cb cancel_cb;
338 struct tog_blame_line *lines;
342 struct tog_blame_thread_args thread_args;
343 struct tog_blame_cb_args cb_args;
347 struct tog_blame_view_state {
348 int first_displayed_line;
349 int last_displayed_line;
354 struct got_object_id_queue blamed_commits;
355 struct got_object_qid *blamed_commit;
357 struct got_repository *repo;
358 struct got_reflist_head *refs;
359 struct got_object_id *commit_id;
360 struct tog_blame blame;
362 struct tog_colors colors;
365 struct tog_parent_tree {
366 TAILQ_ENTRY(tog_parent_tree) entry;
367 struct got_tree_object *tree;
368 struct got_tree_entry *first_displayed_entry;
369 struct got_tree_entry *selected_entry;
373 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
375 struct tog_tree_view_state {
377 struct got_tree_object *root;
378 struct got_tree_object *tree;
379 struct got_tree_entry *first_displayed_entry;
380 struct got_tree_entry *last_displayed_entry;
381 struct got_tree_entry *selected_entry;
382 int ndisplayed, selected, show_ids;
383 struct tog_parent_trees parents;
384 struct got_object_id *commit_id;
385 struct got_repository *repo;
386 struct got_reflist_head *refs;
387 struct got_tree_entry *matched_entry;
388 struct tog_colors colors;
392 * We implement two types of views: parent views and child views.
394 * The 'Tab' key switches between a parent view and its child view.
395 * Child views are shown side-by-side to their parent view, provided
396 * there is enough screen estate.
398 * When a new view is opened from within a parent view, this new view
399 * becomes a child view of the parent view, replacing any existing child.
401 * When a new view is opened from within a child view, this new view
402 * becomes a parent view which will obscure the views below until the
403 * user quits the new parent view by typing 'q'.
405 * This list of views contains parent views only.
406 * Child views are only pointed to by their parent view.
408 TAILQ_HEAD(tog_view_list_head, tog_view);
411 TAILQ_ENTRY(tog_view) entry;
414 int nlines, ncols, begin_y, begin_x;
415 int lines, cols; /* copies of LINES and COLS */
417 struct tog_view *parent;
418 struct tog_view *child;
421 /* type-specific state */
422 enum tog_view_type type;
424 struct tog_diff_view_state diff;
425 struct tog_log_view_state log;
426 struct tog_blame_view_state blame;
427 struct tog_tree_view_state tree;
430 const struct got_error *(*show)(struct tog_view *);
431 const struct got_error *(*input)(struct tog_view **,
432 struct tog_view **, struct tog_view**, struct tog_view *, int);
433 const struct got_error *(*close)(struct tog_view *);
435 const struct got_error *(*search_start)(struct tog_view *);
436 const struct got_error *(*search_next)(struct tog_view *);
438 #define TOG_SEARCH_FORWARD 1
439 #define TOG_SEARCH_BACKWARD 2
440 int search_next_done;
441 #define TOG_SEARCH_HAVE_MORE 1
442 #define TOG_SEARCH_NO_MORE 2
443 #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,
732 REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
733 err = view->search_start(view);
735 regfree(&view->regex);
738 view->searching = TOG_SEARCH_FORWARD;
739 view->search_next_done = 0;
740 view->search_next(view);
746 static const struct got_error *
747 view_input(struct tog_view **new, struct tog_view **dead,
748 struct tog_view **focus, int *done, struct tog_view *view,
749 struct tog_view_list_head *views)
751 const struct got_error *err = NULL;
759 /* Clear "no matches" indicator. */
760 if (view->search_next_done == TOG_SEARCH_NO_MORE ||
761 view->search_next_done == TOG_SEARCH_HAVE_NONE)
762 view->search_next_done = TOG_SEARCH_HAVE_MORE;
764 if (view->searching && !view->search_next_done) {
765 errcode = pthread_mutex_unlock(&tog_mutex);
767 return got_error_set_errno(errcode,
768 "pthread_mutex_unlock");
770 errcode = pthread_mutex_lock(&tog_mutex);
772 return got_error_set_errno(errcode,
773 "pthread_mutex_lock");
774 view->search_next(view);
778 nodelay(stdscr, FALSE);
779 /* Allow threads to make progress while we are waiting for input. */
780 errcode = pthread_mutex_unlock(&tog_mutex);
782 return got_error_set_errno(errcode, "pthread_mutex_unlock");
783 ch = wgetch(view->window);
784 errcode = pthread_mutex_lock(&tog_mutex);
786 return got_error_set_errno(errcode, "pthread_mutex_lock");
787 nodelay(stdscr, TRUE);
789 if (tog_sigwinch_received || tog_sigcont_received) {
791 tog_sigwinch_received = 0;
792 tog_sigcont_received = 0;
793 TAILQ_FOREACH(v, views, entry) {
794 err = view_resize(v);
797 err = v->input(new, dead, focus, v, KEY_RESIZE);
808 *focus = view->child;
809 view->child_focussed = 1;
810 } else if (view->parent) {
811 *focus = view->parent;
812 view->parent->child_focussed = 0;
816 err = view->input(new, dead, focus, view, ch);
823 if (view_is_parent_view(view)) {
824 if (view->child == NULL)
826 if (view_is_splitscreen(view->child)) {
827 *focus = view->child;
828 view->child_focussed = 1;
829 err = view_fullscreen(view->child);
831 err = view_splitscreen(view->child);
834 err = view->child->input(new, dead, focus,
835 view->child, KEY_RESIZE);
837 if (view_is_splitscreen(view)) {
839 view->parent->child_focussed = 1;
840 err = view_fullscreen(view);
842 err = view_splitscreen(view);
846 err = view->input(new, dead, focus, view,
853 if (view->search_start)
854 view_search_start(view);
856 err = view->input(new, dead, focus, view, ch);
860 if (view->search_next) {
861 view->searching = (ch == 'n' ?
862 TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
863 view->search_next_done = 0;
864 view->search_next(view);
866 err = view->input(new, dead, focus, view, ch);
869 err = view->input(new, dead, focus, view, ch);
877 view_vborder(struct tog_view *view)
880 struct tog_view *view_above;
883 return view_vborder(view->parent);
885 panel = panel_above(view->panel);
889 view_above = panel_userptr(panel);
890 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
891 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
895 view_needs_focus_indication(struct tog_view *view)
897 if (view_is_parent_view(view)) {
898 if (view->child == NULL || view->child_focussed)
900 if (!view_is_splitscreen(view->child))
902 } else if (!view_is_splitscreen(view))
905 return view->focussed;
908 static const struct got_error *
909 view_loop(struct tog_view *view)
911 const struct got_error *err = NULL;
912 struct tog_view_list_head views;
913 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
914 int fast_refresh = 10;
915 int done = 0, errcode;
917 errcode = pthread_mutex_lock(&tog_mutex);
919 return got_error_set_errno(errcode, "pthread_mutex_lock");
922 TAILQ_INSERT_HEAD(&views, view, entry);
926 err = view->show(view);
931 while (!TAILQ_EMPTY(&views) && !done && !tog_sigpipe_received) {
932 /* Refresh fast during initialization, then become slower. */
933 if (fast_refresh && fast_refresh-- == 0)
934 halfdelay(10); /* switch to once per second */
936 err = view_input(&new_view, &dead_view, &focus_view, &done,
941 struct tog_view *prev = NULL;
943 if (view_is_parent_view(dead_view))
944 prev = TAILQ_PREV(dead_view,
945 tog_view_list_head, entry);
946 else if (view->parent != dead_view)
949 if (dead_view->parent)
950 dead_view->parent->child = NULL;
952 TAILQ_REMOVE(&views, dead_view, entry);
954 err = view_close(dead_view);
955 if (err || (dead_view == main_view && new_view == NULL))
958 if (view == dead_view) {
963 else if (!TAILQ_EMPTY(&views))
964 view = TAILQ_LAST(&views,
969 if (view->child && view->child_focussed)
970 focus_view = view->child;
977 struct tog_view *v, *t;
978 /* Only allow one parent view per type. */
979 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
980 if (v->type != new_view->type)
982 TAILQ_REMOVE(&views, v, entry);
988 TAILQ_INSERT_TAIL(&views, new_view, entry);
990 if (focus_view == NULL)
991 focus_view = new_view;
994 show_panel(focus_view->panel);
997 focus_view->focussed = 1;
1000 show_panel(new_view->panel);
1001 if (view->child && view_is_splitscreen(view->child))
1002 show_panel(view->child->panel);
1005 if (focus_view == NULL) {
1007 show_panel(view->panel);
1008 if (view->child && view_is_splitscreen(view->child))
1009 show_panel(view->child->panel);
1013 err = view->parent->show(view->parent);
1017 err = view->show(view);
1021 err = view->child->show(view->child);
1030 while (!TAILQ_EMPTY(&views)) {
1031 view = TAILQ_FIRST(&views);
1032 TAILQ_REMOVE(&views, view, entry);
1036 errcode = pthread_mutex_unlock(&tog_mutex);
1037 if (errcode && err == NULL)
1038 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
1048 "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
1053 /* Create newly allocated wide-character string equivalent to a byte string. */
1054 static const struct got_error *
1055 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
1058 const struct got_error *err = NULL;
1061 *wlen = mbstowcs(NULL, s, 0);
1062 if (*wlen == (size_t)-1) {
1064 if (errno != EILSEQ)
1065 return got_error_from_errno("mbstowcs");
1067 /* byte string invalid in current encoding; try to "fix" it */
1068 err = got_mbsavis(&vis, &vislen, s);
1071 *wlen = mbstowcs(NULL, vis, 0);
1072 if (*wlen == (size_t)-1) {
1073 err = got_error_from_errno("mbstowcs"); /* give up */
1078 *ws = calloc(*wlen + 1, sizeof(**ws));
1080 err = got_error_from_errno("calloc");
1084 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
1085 err = got_error_from_errno("mbstowcs");
1096 /* Format a line for display, ensuring that it won't overflow a width limit. */
1097 static const struct got_error *
1098 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit,
1101 const struct got_error *err = NULL;
1103 wchar_t *wline = NULL;
1110 err = mbs2ws(&wline, &wlen, line);
1116 int width = wcwidth(wline[i]);
1123 if (width == 1 || width == 2) {
1124 if (cols + width > wlimit)
1128 } else if (width == -1) {
1129 if (wline[i] == L'\t') {
1131 ((cols + col_tab_align) % TABSIZE);
1132 if (cols + width > wlimit)
1138 err = got_error_from_errno("wcwidth");
1153 static const struct got_error*
1154 build_refs_str(char **refs_str, struct got_reflist_head *refs,
1155 struct got_object_id *id, struct got_repository *repo)
1157 static const struct got_error *err = NULL;
1158 struct got_reflist_entry *re;
1164 SIMPLEQ_FOREACH(re, refs, entry) {
1165 struct got_tag_object *tag = NULL;
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 if (strncmp(name, "tags/", 5) == 0) {
1184 err = got_object_open_as_tag(&tag, repo, re->id);
1186 if (err->code != GOT_ERR_OBJ_TYPE)
1188 /* Ref points at something other than a tag. */
1193 cmp = got_object_id_cmp(tag ?
1194 got_object_tag_get_object_id(tag) : re->id, id);
1196 got_object_tag_close(tag);
1200 if (asprintf(refs_str, "%s%s%s", s ? s : "",
1201 s ? ", " : "", name) == -1) {
1202 err = got_error_from_errno("asprintf");
1213 static const struct got_error *
1214 format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
1217 char *smallerthan, *at;
1219 smallerthan = strchr(author, '<');
1220 if (smallerthan && smallerthan[1] != '\0')
1221 author = smallerthan + 1;
1222 at = strchr(author, '@');
1225 return format_line(wauthor, author_width, author, limit, col_tab_align);
1228 static const struct got_error *
1229 draw_commit(struct tog_view *view, struct got_commit_object *commit,
1230 struct got_object_id *id, struct got_reflist_head *refs,
1231 const size_t date_display_cols, int author_display_cols,
1232 struct tog_colors *colors)
1234 const struct got_error *err = NULL;
1235 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
1236 char *logmsg0 = NULL, *logmsg = NULL;
1237 char *author = NULL;
1238 wchar_t *wlogmsg = NULL, *wauthor = NULL;
1239 int author_width, logmsg_width;
1240 char *newline, *line = NULL;
1242 const int avail = view->ncols;
1244 time_t committer_time;
1245 struct tog_color *tc;
1247 committer_time = got_object_commit_get_committer_time(commit);
1248 if (localtime_r(&committer_time, &tm) == NULL)
1249 return got_error_from_errno("localtime_r");
1250 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm)
1252 return got_error(GOT_ERR_NO_SPACE);
1254 if (avail <= date_display_cols)
1255 limit = MIN(sizeof(datebuf) - 1, avail);
1257 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1258 tc = get_color(colors, TOG_COLOR_DATE);
1260 wattr_on(view->window,
1261 COLOR_PAIR(tc->colorpair), NULL);
1262 waddnstr(view->window, datebuf, limit);
1264 wattr_off(view->window,
1265 COLOR_PAIR(tc->colorpair), NULL);
1272 err = got_object_id_str(&id_str, id);
1275 tc = get_color(colors, TOG_COLOR_COMMIT);
1277 wattr_on(view->window,
1278 COLOR_PAIR(tc->colorpair), NULL);
1279 wprintw(view->window, "%.8s ", id_str);
1281 wattr_off(view->window,
1282 COLOR_PAIR(tc->colorpair), NULL);
1289 author = strdup(got_object_commit_get_author(commit));
1290 if (author == NULL) {
1291 err = got_error_from_errno("strdup");
1294 err = format_author(&wauthor, &author_width, author, avail - col, col);
1297 tc = get_color(colors, TOG_COLOR_AUTHOR);
1299 wattr_on(view->window,
1300 COLOR_PAIR(tc->colorpair), NULL);
1301 waddwstr(view->window, wauthor);
1303 wattr_off(view->window,
1304 COLOR_PAIR(tc->colorpair), NULL);
1305 col += author_width;
1306 while (col < avail && author_width < author_display_cols + 2) {
1307 waddch(view->window, ' ');
1314 err = got_object_commit_get_logmsg(&logmsg0, commit);
1318 while (*logmsg == '\n')
1320 newline = strchr(logmsg, '\n');
1323 limit = avail - col;
1324 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit, col);
1327 waddwstr(view->window, wlogmsg);
1328 col += logmsg_width;
1329 while (col < avail) {
1330 waddch(view->window, ' ');
1342 static struct commit_queue_entry *
1343 alloc_commit_queue_entry(struct got_commit_object *commit,
1344 struct got_object_id *id)
1346 struct commit_queue_entry *entry;
1348 entry = calloc(1, sizeof(*entry));
1353 entry->commit = commit;
1358 pop_commit(struct commit_queue *commits)
1360 struct commit_queue_entry *entry;
1362 entry = TAILQ_FIRST(&commits->head);
1363 TAILQ_REMOVE(&commits->head, entry, entry);
1364 got_object_commit_close(entry->commit);
1365 commits->ncommits--;
1366 /* Don't free entry->id! It is owned by the commit graph. */
1371 free_commits(struct commit_queue *commits)
1373 while (!TAILQ_EMPTY(&commits->head))
1374 pop_commit(commits);
1377 static const struct got_error *
1378 match_commit(int *have_match, struct got_object_id *id,
1379 struct got_commit_object *commit, regex_t *regex)
1381 const struct got_error *err = NULL;
1382 regmatch_t regmatch;
1383 char *id_str = NULL, *logmsg = NULL;
1387 err = got_object_id_str(&id_str, id);
1391 err = got_object_commit_get_logmsg(&logmsg, commit);
1395 if (regexec(regex, got_object_commit_get_author(commit), 1,
1396 ®match, 0) == 0 ||
1397 regexec(regex, got_object_commit_get_committer(commit), 1,
1398 ®match, 0) == 0 ||
1399 regexec(regex, id_str, 1, ®match, 0) == 0 ||
1400 regexec(regex, logmsg, 1, ®match, 0) == 0)
1408 static const struct got_error *
1409 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1410 int minqueue, struct got_repository *repo, const char *path,
1411 int *searching, int *search_next_done, regex_t *regex)
1413 const struct got_error *err = NULL;
1417 * We keep all commits open throughout the lifetime of the log
1418 * view in order to avoid having to re-fetch commits from disk
1419 * while updating the display.
1421 while (nqueued < minqueue ||
1422 (*searching == TOG_SEARCH_FORWARD && !*search_next_done)) {
1423 struct got_object_id *id;
1424 struct got_commit_object *commit;
1425 struct commit_queue_entry *entry;
1428 err = got_commit_graph_iter_next(&id, graph, repo, NULL, NULL);
1429 if (err || id == NULL)
1432 err = got_object_open_as_commit(&commit, repo, id);
1435 entry = alloc_commit_queue_entry(commit, id);
1436 if (entry == NULL) {
1437 err = got_error_from_errno("alloc_commit_queue_entry");
1441 errcode = pthread_mutex_lock(&tog_mutex);
1443 err = got_error_set_errno(errcode,
1444 "pthread_mutex_lock");
1448 entry->idx = commits->ncommits;
1449 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1451 commits->ncommits++;
1453 if (*searching == TOG_SEARCH_FORWARD && !*search_next_done) {
1455 err = match_commit(&have_match, id, commit, regex);
1459 *search_next_done = TOG_SEARCH_HAVE_MORE;
1462 errcode = pthread_mutex_unlock(&tog_mutex);
1463 if (errcode && err == NULL)
1464 err = got_error_set_errno(errcode,
1465 "pthread_mutex_unlock");
1473 static const struct got_error *
1474 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1475 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1476 struct commit_queue *commits, int selected_idx, int limit,
1477 struct got_reflist_head *refs, const char *path, int commits_needed,
1478 struct tog_colors *colors)
1480 const struct got_error *err = NULL;
1481 struct tog_log_view_state *s = &view->state.log;
1482 struct commit_queue_entry *entry;
1484 int ncommits, author_cols = 4;
1485 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1486 char *refs_str = NULL;
1488 struct tog_color *tc;
1489 static const size_t date_display_cols = 12;
1494 if (ncommits == selected_idx) {
1498 entry = TAILQ_NEXT(entry, entry);
1502 if (*selected && !(view->searching && view->search_next_done == 0)) {
1503 err = got_object_id_str(&id_str, (*selected)->id);
1507 err = build_refs_str(&refs_str, refs, (*selected)->id,
1514 if (commits_needed == 0)
1515 halfdelay(10); /* disable fast refresh */
1517 if (commits_needed > 0) {
1518 if (asprintf(&ncommits_str, " [%d/%d] %s",
1519 entry ? entry->idx + 1 : 0, commits->ncommits,
1520 (view->searching && !view->search_next_done) ?
1521 "searching..." : "loading...") == -1) {
1522 err = got_error_from_errno("asprintf");
1526 const char *search_str = NULL;
1528 if (view->searching) {
1529 if (view->search_next_done == TOG_SEARCH_NO_MORE)
1530 search_str = "no more matches";
1531 else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
1532 search_str = "no matches found";
1533 else if (!view->search_next_done)
1534 search_str = "searching...";
1537 if (asprintf(&ncommits_str, " [%d/%d] %s",
1538 entry ? entry->idx + 1 : 0, commits->ncommits,
1539 search_str ? search_str :
1540 (refs_str ? refs_str : "")) == -1) {
1541 err = got_error_from_errno("asprintf");
1546 if (path && strcmp(path, "/") != 0) {
1547 if (asprintf(&header, "commit %s %s%s",
1548 id_str ? id_str : "........................................",
1549 path, ncommits_str) == -1) {
1550 err = got_error_from_errno("asprintf");
1554 } else if (asprintf(&header, "commit %s%s",
1555 id_str ? id_str : "........................................",
1556 ncommits_str) == -1) {
1557 err = got_error_from_errno("asprintf");
1561 err = format_line(&wline, &width, header, view->ncols, 0);
1565 werase(view->window);
1567 if (view_needs_focus_indication(view))
1568 wstandout(view->window);
1569 tc = get_color(colors, TOG_COLOR_COMMIT);
1571 wattr_on(view->window,
1572 COLOR_PAIR(tc->colorpair), NULL);
1573 waddwstr(view->window, wline);
1575 wattr_off(view->window,
1576 COLOR_PAIR(tc->colorpair), NULL);
1577 while (width < view->ncols) {
1578 waddch(view->window, ' ');
1581 if (view_needs_focus_indication(view))
1582 wstandend(view->window);
1587 /* Grow author column size if necessary. */
1594 if (ncommits >= limit - 1)
1596 author = strdup(got_object_commit_get_author(entry->commit));
1597 if (author == NULL) {
1598 err = got_error_from_errno("strdup");
1601 err = format_author(&wauthor, &width, author, COLS,
1603 if (author_cols < width)
1604 author_cols = width;
1608 entry = TAILQ_NEXT(entry, entry);
1615 if (ncommits >= limit - 1)
1617 if (ncommits == selected_idx)
1618 wstandout(view->window);
1619 err = draw_commit(view, entry->commit, entry->id, refs,
1620 date_display_cols, author_cols, colors);
1621 if (ncommits == selected_idx)
1622 wstandend(view->window);
1627 entry = TAILQ_NEXT(entry, entry);
1640 scroll_up(struct tog_view *view,
1641 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1642 struct commit_queue *commits)
1644 struct commit_queue_entry *entry;
1647 entry = TAILQ_FIRST(&commits->head);
1648 if (*first_displayed_entry == entry)
1651 entry = *first_displayed_entry;
1652 while (entry && nscrolled < maxscroll) {
1653 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1655 *first_displayed_entry = entry;
1661 static const struct got_error *
1662 trigger_log_thread(struct tog_view *log_view, int wait,
1663 int *commits_needed, int *log_complete,
1664 pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1668 halfdelay(1); /* fast refresh while loading commits */
1670 while (*commits_needed > 0) {
1674 /* Wake the log thread. */
1675 errcode = pthread_cond_signal(need_commits);
1677 return got_error_set_errno(errcode,
1678 "pthread_cond_signal");
1681 * The mutex will be released while the view loop waits
1682 * in wgetch(), at which time the log thread will run.
1687 /* Display progress update in log view. */
1688 show_log_view(log_view);
1692 /* Wait right here while next commit is being loaded. */
1693 errcode = pthread_cond_wait(commit_loaded, &tog_mutex);
1695 return got_error_set_errno(errcode,
1696 "pthread_cond_wait");
1698 /* Display progress update in log view. */
1699 show_log_view(log_view);
1707 static const struct got_error *
1708 scroll_down(struct tog_view *log_view,
1709 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1710 struct commit_queue_entry **last_displayed_entry,
1711 struct commit_queue *commits, int *log_complete, int *commits_needed,
1712 pthread_cond_t *need_commits, pthread_cond_t *commit_loaded)
1714 const struct got_error *err = NULL;
1715 struct commit_queue_entry *pentry;
1716 int nscrolled = 0, ncommits_needed;
1718 if (*last_displayed_entry == NULL)
1721 ncommits_needed = (*last_displayed_entry)->idx + 1 + maxscroll;
1722 if (commits->ncommits < ncommits_needed && !*log_complete) {
1724 * Ask the log thread for required amount of commits.
1726 (*commits_needed) += maxscroll;
1727 err = trigger_log_thread(log_view, 1, commits_needed,
1728 log_complete, need_commits, commit_loaded);
1734 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1738 *last_displayed_entry = pentry;
1740 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1743 *first_displayed_entry = pentry;
1744 } while (++nscrolled < maxscroll);
1749 static const struct got_error *
1750 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1751 struct got_commit_object *commit, struct got_object_id *commit_id,
1752 struct tog_view *log_view, struct got_reflist_head *refs,
1753 struct got_repository *repo)
1755 const struct got_error *err;
1756 struct got_object_qid *parent_id;
1757 struct tog_view *diff_view;
1759 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1760 if (diff_view == NULL)
1761 return got_error_from_errno("view_open");
1763 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1764 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1765 commit_id, log_view, refs, repo);
1767 *new_view = diff_view;
1771 static const struct got_error *
1772 tree_view_visit_subtree(struct got_tree_object *subtree,
1773 struct tog_tree_view_state *s)
1775 struct tog_parent_tree *parent;
1777 parent = calloc(1, sizeof(*parent));
1779 return got_error_from_errno("calloc");
1781 parent->tree = s->tree;
1782 parent->first_displayed_entry = s->first_displayed_entry;
1783 parent->selected_entry = s->selected_entry;
1784 parent->selected = s->selected;
1785 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1788 s->first_displayed_entry = NULL;
1792 static const struct got_error *
1793 tree_view_walk_path(struct tog_tree_view_state *s,
1794 struct got_object_id *commit_id,
1795 const char *path, struct got_repository *repo)
1797 const struct got_error *err = NULL;
1798 struct got_tree_object *tree = NULL;
1800 char *slash, *subpath = NULL;
1802 /* Walk the path and open corresponding tree objects. */
1805 struct got_tree_entry *te;
1806 struct got_object_id *tree_id;
1812 /* Ensure the correct subtree entry is selected. */
1813 slash = strchr(p, '/');
1815 te_name = strdup(p);
1817 te_name = strndup(p, slash - p);
1818 if (te_name == NULL) {
1819 err = got_error_from_errno("strndup");
1822 te = got_object_tree_find_entry(s->tree, te_name);
1824 err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
1829 s->selected_entry = te;
1830 s->selected = got_tree_entry_get_index(te);
1831 if (s->tree != s->root)
1832 s->selected++; /* skip '..' */
1834 if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry))) {
1835 /* Jump to this file's entry. */
1836 s->first_displayed_entry = s->selected_entry;
1841 slash = strchr(p, '/');
1843 subpath = strndup(path, slash - path);
1845 subpath = strdup(path);
1846 if (subpath == NULL) {
1847 err = got_error_from_errno("strdup");
1851 err = got_object_id_by_path(&tree_id, repo, commit_id,
1856 err = got_object_open_as_tree(&tree, repo, tree_id);
1861 err = tree_view_visit_subtree(tree, s);
1863 got_object_tree_close(tree);
1877 static const struct got_error *
1878 browse_commit_tree(struct tog_view **new_view, int begin_x,
1879 struct commit_queue_entry *entry, const char *path,
1880 struct got_reflist_head *refs, struct got_repository *repo)
1882 const struct got_error *err = NULL;
1883 struct got_tree_object *tree;
1884 struct tog_tree_view_state *s;
1885 struct tog_view *tree_view;
1887 err = got_object_open_as_tree(&tree, repo,
1888 got_object_commit_get_tree_id(entry->commit));
1892 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1893 if (tree_view == NULL)
1894 return got_error_from_errno("view_open");
1896 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1898 got_object_tree_close(tree);
1901 s = &tree_view->state.tree;
1903 *new_view = tree_view;
1905 if (got_path_is_root_dir(path))
1908 return tree_view_walk_path(s, entry->id, path, repo);
1911 static const struct got_error *
1912 block_signals_used_by_main_thread(void)
1917 if (sigemptyset(&sigset) == -1)
1918 return got_error_from_errno("sigemptyset");
1920 /* tog handles SIGWINCH and SIGCONT */
1921 if (sigaddset(&sigset, SIGWINCH) == -1)
1922 return got_error_from_errno("sigaddset");
1923 if (sigaddset(&sigset, SIGCONT) == -1)
1924 return got_error_from_errno("sigaddset");
1926 /* ncurses handles SIGTSTP */
1927 if (sigaddset(&sigset, SIGTSTP) == -1)
1928 return got_error_from_errno("sigaddset");
1930 errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
1932 return got_error_set_errno(errcode, "pthread_sigmask");
1938 log_thread(void *arg)
1940 const struct got_error *err = NULL;
1942 struct tog_log_thread_args *a = arg;
1945 err = block_signals_used_by_main_thread();
1949 while (!done && !err && !tog_sigpipe_received) {
1950 err = queue_commits(a->graph, a->commits, 1, a->repo,
1951 a->in_repo_path, a->searching, a->search_next_done,
1954 if (err->code != GOT_ERR_ITER_COMPLETED)
1958 } else if (a->commits_needed > 0)
1959 a->commits_needed--;
1961 errcode = pthread_mutex_lock(&tog_mutex);
1963 err = got_error_set_errno(errcode,
1964 "pthread_mutex_lock");
1966 } else if (*a->quit)
1968 else if (*a->first_displayed_entry == NULL) {
1969 *a->first_displayed_entry =
1970 TAILQ_FIRST(&a->commits->head);
1971 *a->selected_entry = *a->first_displayed_entry;
1974 errcode = pthread_cond_signal(&a->commit_loaded);
1976 err = got_error_set_errno(errcode,
1977 "pthread_cond_signal");
1978 pthread_mutex_unlock(&tog_mutex);
1983 a->commits_needed = 0;
1985 if (a->commits_needed == 0) {
1986 errcode = pthread_cond_wait(&a->need_commits,
1989 err = got_error_set_errno(errcode,
1990 "pthread_cond_wait");
1994 errcode = pthread_mutex_unlock(&tog_mutex);
1995 if (errcode && err == NULL)
1996 err = got_error_set_errno(errcode,
1997 "pthread_mutex_unlock");
1999 a->log_complete = 1;
2003 static const struct got_error *
2004 stop_log_thread(struct tog_log_view_state *s)
2006 const struct got_error *err = NULL;
2011 errcode = pthread_cond_signal(&s->thread_args.need_commits);
2013 return got_error_set_errno(errcode,
2014 "pthread_cond_signal");
2015 errcode = pthread_mutex_unlock(&tog_mutex);
2017 return got_error_set_errno(errcode,
2018 "pthread_mutex_unlock");
2019 errcode = pthread_join(s->thread, (void **)&err);
2021 return got_error_set_errno(errcode, "pthread_join");
2022 errcode = pthread_mutex_lock(&tog_mutex);
2024 return got_error_set_errno(errcode,
2025 "pthread_mutex_lock");
2029 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
2030 if (errcode && err == NULL)
2031 err = got_error_set_errno(errcode, "pthread_cond_destroy");
2033 if (s->thread_args.repo) {
2034 got_repo_close(s->thread_args.repo);
2035 s->thread_args.repo = NULL;
2038 if (s->thread_args.graph) {
2039 got_commit_graph_close(s->thread_args.graph);
2040 s->thread_args.graph = NULL;
2046 static const struct got_error *
2047 close_log_view(struct tog_view *view)
2049 const struct got_error *err = NULL;
2050 struct tog_log_view_state *s = &view->state.log;
2052 err = stop_log_thread(s);
2053 free_commits(&s->commits);
2054 free(s->in_repo_path);
2055 s->in_repo_path = NULL;
2061 static const struct got_error *
2062 search_start_log_view(struct tog_view *view)
2064 struct tog_log_view_state *s = &view->state.log;
2066 s->matched_entry = NULL;
2067 s->search_entry = NULL;
2071 static const struct got_error *
2072 search_next_log_view(struct tog_view *view)
2074 const struct got_error *err = NULL;
2075 struct tog_log_view_state *s = &view->state.log;
2076 struct commit_queue_entry *entry;
2078 /* Display progress update in log view. */
2079 show_log_view(view);
2083 if (s->search_entry) {
2085 errcode = pthread_mutex_unlock(&tog_mutex);
2087 return got_error_set_errno(errcode,
2088 "pthread_mutex_unlock");
2089 ch = wgetch(view->window);
2090 errcode = pthread_mutex_lock(&tog_mutex);
2092 return got_error_set_errno(errcode,
2093 "pthread_mutex_lock");
2094 if (ch == KEY_BACKSPACE) {
2095 view->search_next_done = TOG_SEARCH_HAVE_MORE;
2098 if (view->searching == TOG_SEARCH_FORWARD)
2099 entry = TAILQ_NEXT(s->search_entry, entry);
2101 entry = TAILQ_PREV(s->search_entry,
2102 commit_queue_head, entry);
2103 } else if (s->matched_entry) {
2104 if (view->searching == TOG_SEARCH_FORWARD)
2105 entry = TAILQ_NEXT(s->matched_entry, entry);
2107 entry = TAILQ_PREV(s->matched_entry,
2108 commit_queue_head, entry);
2110 if (view->searching == TOG_SEARCH_FORWARD)
2111 entry = TAILQ_FIRST(&s->commits.head);
2113 entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
2119 if (entry == NULL) {
2120 if (s->thread_args.log_complete ||
2121 view->searching == TOG_SEARCH_BACKWARD) {
2122 view->search_next_done =
2123 (s->matched_entry == NULL ?
2124 TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
2125 s->search_entry = NULL;
2129 * Poke the log thread for more commits and return,
2130 * allowing the main loop to make progress. Search
2131 * will resume at s->search_entry once we come back.
2133 s->thread_args.commits_needed++;
2134 return trigger_log_thread(view, 0,
2135 &s->thread_args.commits_needed,
2136 &s->thread_args.log_complete,
2137 &s->thread_args.need_commits,
2138 &s->thread_args.commit_loaded);
2141 err = match_commit(&have_match, entry->id, entry->commit,
2146 view->search_next_done = TOG_SEARCH_HAVE_MORE;
2147 s->matched_entry = entry;
2151 s->search_entry = entry;
2152 if (view->searching == TOG_SEARCH_FORWARD)
2153 entry = TAILQ_NEXT(entry, entry);
2155 entry = TAILQ_PREV(entry, commit_queue_head, entry);
2158 if (s->matched_entry) {
2159 int cur = s->selected_entry->idx;
2160 while (cur < s->matched_entry->idx) {
2161 err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
2166 while (cur > s->matched_entry->idx) {
2167 err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
2174 s->search_entry = NULL;
2179 static const struct got_error *
2180 open_log_view(struct tog_view *view, struct got_object_id *start_id,
2181 struct got_reflist_head *refs, struct got_repository *repo,
2182 const char *head_ref_name, const char *in_repo_path,
2185 const struct got_error *err = NULL;
2186 struct tog_log_view_state *s = &view->state.log;
2187 struct got_repository *thread_repo = NULL;
2188 struct got_commit_graph *thread_graph = NULL;
2191 if (in_repo_path != s->in_repo_path) {
2192 free(s->in_repo_path);
2193 s->in_repo_path = strdup(in_repo_path);
2194 if (s->in_repo_path == NULL)
2195 return got_error_from_errno("strdup");
2198 /* The commit queue only contains commits being displayed. */
2199 TAILQ_INIT(&s->commits.head);
2200 s->commits.ncommits = 0;
2204 s->head_ref_name = head_ref_name;
2205 s->start_id = got_object_id_dup(start_id);
2206 if (s->start_id == NULL) {
2207 err = got_error_from_errno("got_object_id_dup");
2210 s->log_branches = log_branches;
2212 SIMPLEQ_INIT(&s->colors);
2213 if (has_colors() && getenv("TOG_COLORS") != NULL) {
2214 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
2215 get_color_value("TOG_COLOR_COMMIT"));
2218 err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
2219 get_color_value("TOG_COLOR_AUTHOR"));
2221 free_colors(&s->colors);
2224 err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
2225 get_color_value("TOG_COLOR_DATE"));
2227 free_colors(&s->colors);
2232 view->show = show_log_view;
2233 view->input = input_log_view;
2234 view->close = close_log_view;
2235 view->search_start = search_start_log_view;
2236 view->search_next = search_next_log_view;
2238 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
2241 err = got_commit_graph_open(&thread_graph, s->in_repo_path,
2245 err = got_commit_graph_iter_start(thread_graph,
2246 s->start_id, s->repo, NULL, NULL);
2250 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
2252 err = got_error_set_errno(errcode, "pthread_cond_init");
2255 errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
2257 err = got_error_set_errno(errcode, "pthread_cond_init");
2261 s->thread_args.commits_needed = view->nlines;
2262 s->thread_args.graph = thread_graph;
2263 s->thread_args.commits = &s->commits;
2264 s->thread_args.in_repo_path = s->in_repo_path;
2265 s->thread_args.start_id = s->start_id;
2266 s->thread_args.repo = thread_repo;
2267 s->thread_args.log_complete = 0;
2268 s->thread_args.quit = &s->quit;
2269 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
2270 s->thread_args.selected_entry = &s->selected_entry;
2271 s->thread_args.searching = &view->searching;
2272 s->thread_args.search_next_done = &view->search_next_done;
2273 s->thread_args.regex = &view->regex;
2276 close_log_view(view);
2280 static const struct got_error *
2281 show_log_view(struct tog_view *view)
2283 struct tog_log_view_state *s = &view->state.log;
2285 if (s->thread == NULL) {
2286 int errcode = pthread_create(&s->thread, NULL, log_thread,
2289 return got_error_set_errno(errcode, "pthread_create");
2292 return draw_commits(view, &s->last_displayed_entry,
2293 &s->selected_entry, s->first_displayed_entry,
2294 &s->commits, s->selected, view->nlines, s->refs,
2295 s->in_repo_path, s->thread_args.commits_needed, &s->colors);
2298 static const struct got_error *
2299 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
2300 struct tog_view **focus_view, struct tog_view *view, int ch)
2302 const struct got_error *err = NULL;
2303 struct tog_log_view_state *s = &view->state.log;
2304 char *parent_path, *in_repo_path = NULL;
2305 struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
2307 struct got_object_id *start_id;
2317 if (s->first_displayed_entry == NULL)
2319 if (s->selected > 0)
2322 scroll_up(view, &s->first_displayed_entry, 1,
2327 if (s->first_displayed_entry == NULL)
2329 if (TAILQ_FIRST(&s->commits.head) ==
2330 s->first_displayed_entry) {
2334 scroll_up(view, &s->first_displayed_entry,
2335 view->nlines - 1, &s->commits);
2341 if (s->first_displayed_entry == NULL)
2343 if (s->selected < MIN(view->nlines - 2,
2344 s->commits.ncommits - 1)) {
2348 err = scroll_down(view, &s->first_displayed_entry, 1,
2349 &s->last_displayed_entry, &s->commits,
2350 &s->thread_args.log_complete,
2351 &s->thread_args.commits_needed,
2352 &s->thread_args.need_commits,
2353 &s->thread_args.commit_loaded);
2357 struct commit_queue_entry *first;
2358 first = s->first_displayed_entry;
2361 err = scroll_down(view, &s->first_displayed_entry,
2362 view->nlines - 1, &s->last_displayed_entry,
2363 &s->commits, &s->thread_args.log_complete,
2364 &s->thread_args.commits_needed,
2365 &s->thread_args.need_commits,
2366 &s->thread_args.commit_loaded);
2369 if (first == s->first_displayed_entry &&
2370 s->selected < MIN(view->nlines - 2,
2371 s->commits.ncommits - 1)) {
2372 /* can't scroll further down */
2373 s->selected = MIN(view->nlines - 2,
2374 s->commits.ncommits - 1);
2380 if (s->selected > view->nlines - 2)
2381 s->selected = view->nlines - 2;
2382 if (s->selected > s->commits.ncommits - 1)
2383 s->selected = s->commits.ncommits - 1;
2388 if (s->selected_entry == NULL)
2390 if (view_is_parent_view(view))
2391 begin_x = view_split_begin_x(view->begin_x);
2392 err = open_diff_view_for_commit(&diff_view, begin_x,
2393 s->selected_entry->commit, s->selected_entry->id,
2394 view, s->refs, s->repo);
2397 if (view_is_parent_view(view)) {
2398 err = view_close_child(view);
2401 err = view_set_child(view, diff_view);
2403 view_close(diff_view);
2406 *focus_view = diff_view;
2407 view->child_focussed = 1;
2409 *new_view = diff_view;
2412 if (s->selected_entry == NULL)
2414 if (view_is_parent_view(view))
2415 begin_x = view_split_begin_x(view->begin_x);
2416 err = browse_commit_tree(&tree_view, begin_x,
2417 s->selected_entry, s->in_repo_path, s->refs, s->repo);
2420 if (view_is_parent_view(view)) {
2421 err = view_close_child(view);
2424 err = view_set_child(view, tree_view);
2426 view_close(tree_view);
2429 *focus_view = tree_view;
2430 view->child_focussed = 1;
2432 *new_view = tree_view;
2435 if (strcmp(s->in_repo_path, "/") == 0)
2437 parent_path = dirname(s->in_repo_path);
2438 if (parent_path && strcmp(parent_path, ".") != 0) {
2439 err = stop_log_thread(s);
2442 lv = view_open(view->nlines, view->ncols,
2443 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2445 return got_error_from_errno(
2447 err = open_log_view(lv, s->start_id, s->refs,
2448 s->repo, s->head_ref_name, parent_path,
2452 if (view_is_parent_view(view))
2455 view_set_child(view->parent, lv);
2462 err = stop_log_thread(s);
2465 lv = view_open(view->nlines, view->ncols,
2466 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2468 return got_error_from_errno("view_open");
2469 err = got_repo_match_object_id(&start_id, NULL,
2470 s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
2471 GOT_OBJ_TYPE_COMMIT, 1, s->repo);
2476 in_repo_path = strdup(s->in_repo_path);
2477 if (in_repo_path == NULL) {
2480 return got_error_from_errno("strdup");
2482 got_ref_list_free(s->refs);
2483 err = got_ref_list(s->refs, s->repo, NULL,
2484 got_ref_cmp_by_name, NULL);
2490 err = open_log_view(lv, start_id, s->refs, s->repo,
2491 s->head_ref_name, in_repo_path, s->log_branches);
2501 s->log_branches = !s->log_branches;
2502 err = stop_log_thread(s);
2505 lv = view_open(view->nlines, view->ncols,
2506 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2508 return got_error_from_errno("view_open");
2509 err = open_log_view(lv, s->start_id, s->refs, s->repo,
2510 s->head_ref_name, s->in_repo_path, s->log_branches);
2525 static const struct got_error *
2526 apply_unveil(const char *repo_path, const char *worktree_path)
2528 const struct got_error *error;
2531 if (unveil("gmon.out", "rwc") != 0)
2532 return got_error_from_errno2("unveil", "gmon.out");
2534 if (repo_path && unveil(repo_path, "r") != 0)
2535 return got_error_from_errno2("unveil", repo_path);
2537 if (worktree_path && unveil(worktree_path, "rwc") != 0)
2538 return got_error_from_errno2("unveil", worktree_path);
2540 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
2541 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
2543 error = got_privsep_unveil_exec_helpers();
2547 if (unveil(NULL, NULL) != 0)
2548 return got_error_from_errno("unveil");
2558 halfdelay(1); /* Do fast refresh while initial view is loading. */
2561 intrflush(stdscr, FALSE);
2562 keypad(stdscr, TRUE);
2564 if (getenv("TOG_COLORS") != NULL) {
2566 use_default_colors();
2568 signal(SIGWINCH, tog_sigwinch);
2569 signal(SIGPIPE, tog_sigpipe);
2570 signal(SIGCONT, tog_sigcont);
2573 static const struct got_error *
2574 get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
2575 struct got_repository *repo, struct got_worktree *worktree)
2577 const struct got_error *err = NULL;
2580 *in_repo_path = strdup("/");
2581 if (*in_repo_path == NULL)
2582 return got_error_from_errno("strdup");
2587 const char *prefix = got_worktree_get_path_prefix(worktree);
2590 err = got_worktree_resolve_path(&wt_path, worktree, argv[0]);
2594 if (asprintf(&p, "%s%s%s", prefix,
2595 (strcmp(prefix, "/") != 0) ? "/" : "", wt_path) == -1) {
2596 err = got_error_from_errno("asprintf");
2600 err = got_repo_map_path(in_repo_path, repo, p, 0);
2604 err = got_repo_map_path(in_repo_path, repo, argv[0], 1);
2609 static const struct got_error *
2610 cmd_log(int argc, char *argv[])
2612 const struct got_error *error;
2613 struct got_repository *repo = NULL;
2614 struct got_worktree *worktree = NULL;
2615 struct got_reflist_head refs;
2616 struct got_object_id *start_id = NULL;
2617 char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
2618 char *start_commit = NULL, *head_ref_name = NULL;
2619 int ch, log_branches = 0;
2620 struct tog_view *view;
2622 SIMPLEQ_INIT(&refs);
2625 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2630 while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
2636 start_commit = optarg;
2639 repo_path = realpath(optarg, NULL);
2640 if (repo_path == NULL)
2641 return got_error_from_errno2("realpath",
2656 cwd = getcwd(NULL, 0);
2658 return got_error_from_errno("getcwd");
2660 error = got_worktree_open(&worktree, cwd);
2661 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2664 if (repo_path == NULL) {
2667 strdup(got_worktree_get_repo_path(worktree));
2669 repo_path = strdup(cwd);
2671 if (repo_path == NULL) {
2672 error = got_error_from_errno("strdup");
2676 error = got_repo_open(&repo, repo_path, NULL);
2680 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
2687 error = apply_unveil(got_repo_get_path(repo),
2688 worktree ? got_worktree_get_root_path(worktree) : NULL);
2692 if (start_commit == NULL)
2693 error = got_repo_match_object_id(&start_id, NULL, worktree ?
2694 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2695 GOT_OBJ_TYPE_COMMIT, 1, repo);
2697 error = got_repo_match_object_id(&start_id, NULL, start_commit,
2698 GOT_OBJ_TYPE_COMMIT, 1, repo);
2702 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2706 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2708 error = got_error_from_errno("view_open");
2712 head_ref_name = strdup(
2713 got_worktree_get_head_ref_name(worktree));
2714 if (head_ref_name == NULL) {
2715 error = got_error_from_errno("strdup");
2719 error = open_log_view(view, start_id, &refs, repo, head_ref_name,
2720 in_repo_path, log_branches);
2724 /* Release work tree lock. */
2725 got_worktree_close(worktree);
2728 error = view_loop(view);
2734 free(head_ref_name);
2736 got_repo_close(repo);
2738 got_worktree_close(worktree);
2739 got_ref_list_free(&refs);
2747 fprintf(stderr, "usage: %s diff [-r repository-path] object1 object2\n",
2753 parse_next_line(FILE *f, size_t *len)
2758 const char delim[3] = { '\0', '\0', '\0'};
2760 line = fparseln(f, &linelen, &lineno, delim, 0);
2767 match_line(const char *line, regex_t *regex)
2769 regmatch_t regmatch;
2771 return regexec(regex, line, 1, ®match, 0) == 0;
2775 match_color(struct tog_colors *colors, const char *line)
2777 struct tog_color *tc = NULL;
2779 SIMPLEQ_FOREACH(tc, colors, entry) {
2780 if (match_line(line, &tc->regex))
2787 static const struct got_error *
2788 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line, int nlines,
2789 int selected_line, int max_lines, int *last_displayed_line, int *eof,
2790 char *header, struct tog_colors *colors)
2792 const struct got_error *err;
2793 int lineno = 0, nprinted = 0;
2795 struct tog_color *tc;
2801 werase(view->window);
2804 err = format_line(&wline, &width, header, view->ncols, 0);
2809 if (view_needs_focus_indication(view))
2810 wstandout(view->window);
2811 waddwstr(view->window, wline);
2812 if (view_needs_focus_indication(view))
2813 wstandend(view->window);
2814 if (width <= view->ncols - 1)
2815 waddch(view->window, '\n');
2823 while (nprinted < max_lines) {
2824 line = parse_next_line(f, &len);
2829 if (++lineno < *first_displayed_line) {
2834 err = format_line(&wline, &width, line, view->ncols, 0);
2840 tc = match_color(colors, line);
2842 wattr_on(view->window,
2843 COLOR_PAIR(tc->colorpair), NULL);
2844 waddwstr(view->window, wline);
2846 wattr_off(view->window,
2847 COLOR_PAIR(tc->colorpair), NULL);
2848 if (width <= view->ncols - 1)
2849 waddch(view->window, '\n');
2850 if (++nprinted == 1)
2851 *first_displayed_line = lineno;
2856 *last_displayed_line = lineno;
2861 while (nprinted < view->nlines) {
2862 waddch(view->window, '\n');
2866 err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols, 0);
2871 wstandout(view->window);
2872 waddwstr(view->window, wline);
2873 wstandend(view->window);
2880 get_datestr(time_t *time, char *datebuf)
2882 struct tm mytm, *tm;
2885 tm = gmtime_r(time, &mytm);
2888 s = asctime_r(tm, datebuf);
2891 p = strchr(s, '\n');
2897 static const struct got_error *
2898 get_changed_paths(struct got_pathlist_head *paths,
2899 struct got_commit_object *commit, struct got_repository *repo)
2901 const struct got_error *err = NULL;
2902 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2903 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2904 struct got_object_qid *qid;
2906 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2908 struct got_commit_object *pcommit;
2909 err = got_object_open_as_commit(&pcommit, repo,
2914 tree_id1 = got_object_commit_get_tree_id(pcommit);
2915 got_object_commit_close(pcommit);
2920 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2925 tree_id2 = got_object_commit_get_tree_id(commit);
2926 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2930 err = got_diff_tree(tree1, tree2, "", "", repo,
2931 got_diff_tree_collect_changed_paths, paths, 0);
2934 got_object_tree_close(tree1);
2936 got_object_tree_close(tree2);
2940 static const struct got_error *
2941 write_commit_info(struct got_object_id *commit_id,
2942 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2944 const struct got_error *err = NULL;
2945 char datebuf[26], *datestr;
2946 struct got_commit_object *commit;
2947 char *id_str = NULL, *logmsg = NULL;
2948 time_t committer_time;
2949 const char *author, *committer;
2950 char *refs_str = NULL;
2951 struct got_pathlist_head changed_paths;
2952 struct got_pathlist_entry *pe;
2954 TAILQ_INIT(&changed_paths);
2957 err = build_refs_str(&refs_str, refs, commit_id, repo);
2962 err = got_object_open_as_commit(&commit, repo, commit_id);
2966 err = got_object_id_str(&id_str, commit_id);
2968 err = got_error_from_errno("got_object_id_str");
2972 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2973 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2974 err = got_error_from_errno("fprintf");
2977 if (fprintf(outfile, "from: %s\n",
2978 got_object_commit_get_author(commit)) < 0) {
2979 err = got_error_from_errno("fprintf");
2982 committer_time = got_object_commit_get_committer_time(commit);
2983 datestr = get_datestr(&committer_time, datebuf);
2984 if (datestr && fprintf(outfile, "date: %s UTC\n", datestr) < 0) {
2985 err = got_error_from_errno("fprintf");
2988 author = got_object_commit_get_author(commit);
2989 committer = got_object_commit_get_committer(commit);
2990 if (strcmp(author, committer) != 0 &&
2991 fprintf(outfile, "via: %s\n", committer) < 0) {
2992 err = got_error_from_errno("fprintf");
2995 err = got_object_commit_get_logmsg(&logmsg, commit);
2998 if (fprintf(outfile, "%s\n", logmsg) < 0) {
2999 err = got_error_from_errno("fprintf");
3002 err = get_changed_paths(&changed_paths, commit, repo);
3005 TAILQ_FOREACH(pe, &changed_paths, entry) {
3006 struct got_diff_changed_path *cp = pe->data;
3007 fprintf(outfile, "%c %s\n", cp->status, pe->path);
3008 free((char *)pe->path);
3011 fputc('\n', outfile);
3013 got_pathlist_free(&changed_paths);
3017 got_object_commit_close(commit);
3021 const struct got_error *
3022 get_filestream_info(size_t *filesize, int *nlines, off_t **line_offsets,
3025 const struct got_error *err = NULL;
3032 *line_offsets = NULL;
3036 if (fseek(infile, 0, SEEK_END) == -1)
3037 return got_error_from_errno("fseek");
3038 len = ftell(infile) + 1;
3040 return got_error_from_errno("ftell");
3041 if (fseek(infile, 0, SEEK_SET) == -1)
3042 return got_error_from_errno("fseek");
3048 while (remain > 0) {
3049 size_t r, n = MIN(remain, sizeof(buf));
3050 r = fread(buf, 1, n, infile);
3052 if (ferror(infile)) {
3053 err = got_error_from_errno("fread");
3061 if (*line_offsets == NULL) {
3062 /* Have some data but perhaps no '\n'. */
3064 nalloc = len / 40; /* 40-char average line length */
3065 *line_offsets = calloc(nalloc, sizeof(**line_offsets));
3066 if (*line_offsets == NULL) {
3067 err = got_error_from_errno("calloc");
3070 /* Skip forward over end of first line. */
3078 /* Scan '\n' offsets in remaining chunk of data. */
3080 if (buf[i] != '\n') {
3085 if (nalloc < *nlines) {
3086 size_t nallocnew = *nlines + (remain / 40);
3087 off_t *o = recallocarray(*line_offsets,
3088 nalloc, nallocnew, sizeof(**line_offsets));
3090 err = got_error_from_errno(
3098 (*line_offsets)[*nlines - 1] = off;
3103 if (fflush(infile) != 0) {
3104 err = got_error_from_errno("fflush");
3112 free(*line_offsets);
3113 *line_offsets = NULL;
3120 static const struct got_error *
3121 create_diff(struct tog_diff_view_state *s)
3123 const struct got_error *err = NULL;
3129 err = got_error_from_errno("got_opentemp");
3132 if (s->f && fclose(s->f) != 0) {
3133 err = got_error_from_errno("fclose");
3139 err = got_object_get_type(&obj_type, s->repo, s->id1);
3141 err = got_object_get_type(&obj_type, s->repo, s->id2);
3146 case GOT_OBJ_TYPE_BLOB:
3147 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
3148 s->diff_context, 0, s->repo, s->f);
3150 case GOT_OBJ_TYPE_TREE:
3151 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
3152 s->diff_context, 0, s->repo, s->f);
3154 case GOT_OBJ_TYPE_COMMIT: {
3155 const struct got_object_id_queue *parent_ids;
3156 struct got_object_qid *pid;
3157 struct got_commit_object *commit2;
3159 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
3162 /* Show commit info if we're diffing to a parent/root commit. */
3163 if (s->id1 == NULL) {
3164 err = write_commit_info(s->id2, s->refs, s->repo, s->f);
3168 parent_ids = got_object_commit_get_parent_ids(commit2);
3169 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
3170 if (got_object_id_cmp(s->id1, pid->id) == 0) {
3171 err = write_commit_info(s->id2, s->refs,
3179 got_object_commit_close(commit2);
3181 err = got_diff_objects_as_commits(s->id1, s->id2,
3182 s->diff_context, 0, s->repo, s->f);
3186 err = got_error(GOT_ERR_OBJ_TYPE);
3191 err = get_filestream_info(&s->filesize, &s->nlines, &s->line_offsets,
3194 if (s->f && fflush(s->f) != 0 && err == NULL)
3195 err = got_error_from_errno("fflush");
3200 diff_view_indicate_progress(struct tog_view *view)
3202 mvwaddstr(view->window, 0, 0, "diffing...");
3207 static const struct got_error *
3208 search_start_diff_view(struct tog_view *view)
3210 struct tog_diff_view_state *s = &view->state.diff;
3212 s->matched_line = 0;
3216 static const struct got_error *
3217 search_next_diff_view(struct tog_view *view)
3219 struct tog_diff_view_state *s = &view->state.diff;
3222 if (!view->searching) {
3223 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3227 if (s->matched_line) {
3228 if (view->searching == TOG_SEARCH_FORWARD)
3229 lineno = s->matched_line + 1;
3231 lineno = s->matched_line - 1;
3233 if (view->searching == TOG_SEARCH_FORWARD)
3244 if (lineno <= 0 || lineno > s->nlines) {
3245 if (s->matched_line == 0) {
3246 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3251 if (view->searching == TOG_SEARCH_FORWARD)
3257 offset = s->line_offsets[lineno - 1];
3258 if (fseeko(s->f, offset, SEEK_SET) != 0) {
3260 return got_error_from_errno("fseeko");
3263 line = parse_next_line(s->f, &len);
3264 if (line && match_line(line, &view->regex)) {
3265 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3266 s->matched_line = lineno;
3271 if (view->searching == TOG_SEARCH_FORWARD)
3277 if (s->matched_line) {
3278 s->first_displayed_line = s->matched_line;
3279 s->selected_line = 1;
3285 static const struct got_error *
3286 open_diff_view(struct tog_view *view, struct got_object_id *id1,
3287 struct got_object_id *id2, struct tog_view *log_view,
3288 struct got_reflist_head *refs, struct got_repository *repo)
3290 const struct got_error *err;
3291 struct tog_diff_view_state *s = &view->state.diff;
3293 if (id1 != NULL && id2 != NULL) {
3295 err = got_object_get_type(&type1, repo, id1);
3298 err = got_object_get_type(&type2, repo, id2);
3303 return got_error(GOT_ERR_OBJ_TYPE);
3305 s->first_displayed_line = 1;
3306 s->last_displayed_line = view->nlines;
3307 s->selected_line = 1;
3314 s->id1 = got_object_id_dup(id1);
3316 return got_error_from_errno("got_object_id_dup");
3320 s->id2 = got_object_id_dup(id2);
3321 if (s->id2 == NULL) {
3324 return got_error_from_errno("got_object_id_dup");
3327 s->first_displayed_line = 1;
3328 s->last_displayed_line = view->nlines;
3329 s->diff_context = 3;
3330 s->log_view = log_view;
3334 SIMPLEQ_INIT(&s->colors);
3335 if (has_colors() && getenv("TOG_COLORS") != NULL) {
3336 err = add_color(&s->colors,
3337 "^-", TOG_COLOR_DIFF_MINUS,
3338 get_color_value("TOG_COLOR_DIFF_MINUS"));
3341 err = add_color(&s->colors, "^\\+",
3342 TOG_COLOR_DIFF_PLUS,
3343 get_color_value("TOG_COLOR_DIFF_PLUS"));
3345 free_colors(&s->colors);
3348 err = add_color(&s->colors,
3349 "^@@", TOG_COLOR_DIFF_CHUNK_HEADER,
3350 get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"));
3352 free_colors(&s->colors);
3356 err = add_color(&s->colors,
3357 "^(commit [0-9a-f]|(blob|file) [-+] |[MDmA] [^ ])",
3358 TOG_COLOR_DIFF_META,
3359 get_color_value("TOG_COLOR_DIFF_META"));
3361 free_colors(&s->colors);
3365 err = add_color(&s->colors,
3366 "^(from|via): ", TOG_COLOR_AUTHOR,
3367 get_color_value("TOG_COLOR_AUTHOR"));
3369 free_colors(&s->colors);
3373 err = add_color(&s->colors,
3374 "^date: ", TOG_COLOR_DATE,
3375 get_color_value("TOG_COLOR_DATE"));
3377 free_colors(&s->colors);
3382 if (log_view && view_is_splitscreen(view))
3383 show_log_view(log_view); /* draw vborder */
3384 diff_view_indicate_progress(view);
3386 err = create_diff(s);
3395 view->show = show_diff_view;
3396 view->input = input_diff_view;
3397 view->close = close_diff_view;
3398 view->search_start = search_start_diff_view;
3399 view->search_next = search_next_diff_view;
3404 static const struct got_error *
3405 close_diff_view(struct tog_view *view)
3407 const struct got_error *err = NULL;
3408 struct tog_diff_view_state *s = &view->state.diff;
3414 if (s->f && fclose(s->f) == EOF)
3415 err = got_error_from_errno("fclose");
3416 free_colors(&s->colors);
3417 free(s->line_offsets);
3421 static const struct got_error *
3422 show_diff_view(struct tog_view *view)
3424 const struct got_error *err;
3425 struct tog_diff_view_state *s = &view->state.diff;
3426 char *id_str1 = NULL, *id_str2, *header;
3429 err = got_object_id_str(&id_str1, s->id1);
3433 err = got_object_id_str(&id_str2, s->id2);
3437 if (asprintf(&header, "diff %s %s",
3438 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
3439 err = got_error_from_errno("asprintf");
3447 return draw_file(view, s->f, &s->first_displayed_line, s->nlines,
3448 s->selected_line, view->nlines, &s->last_displayed_line, &s->eof,
3449 header, &s->colors);
3452 static const struct got_error *
3453 set_selected_commit(struct tog_diff_view_state *s,
3454 struct commit_queue_entry *entry)
3456 const struct got_error *err;
3457 const struct got_object_id_queue *parent_ids;
3458 struct got_commit_object *selected_commit;
3459 struct got_object_qid *pid;
3462 s->id2 = got_object_id_dup(entry->id);
3464 return got_error_from_errno("got_object_id_dup");
3466 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
3469 parent_ids = got_object_commit_get_parent_ids(selected_commit);
3471 pid = SIMPLEQ_FIRST(parent_ids);
3472 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
3473 got_object_commit_close(selected_commit);
3477 static const struct got_error *
3478 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
3479 struct tog_view **focus_view, struct tog_view *view, int ch)
3481 const struct got_error *err = NULL;
3482 struct tog_diff_view_state *s = &view->state.diff;
3483 struct tog_log_view_state *ls;
3484 struct commit_queue_entry *entry;
3490 if (s->first_displayed_line > 1)
3491 s->first_displayed_line--;
3495 if (s->first_displayed_line == 1)
3498 while (i++ < view->nlines - 1 &&
3499 s->first_displayed_line > 1)
3500 s->first_displayed_line--;
3505 s->first_displayed_line++;
3513 while (!s->eof && i++ < view->nlines - 1) {
3515 line = parse_next_line(s->f, NULL);
3516 s->first_displayed_line++;
3522 if (s->diff_context > 0) {
3524 diff_view_indicate_progress(view);
3525 err = create_diff(s);
3529 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
3531 diff_view_indicate_progress(view);
3532 err = create_diff(s);
3537 if (s->log_view == NULL)
3539 ls = &s->log_view->state.log;
3540 entry = TAILQ_PREV(ls->selected_entry,
3541 commit_queue_head, entry);
3545 err = input_log_view(NULL, NULL, NULL, s->log_view,
3550 err = set_selected_commit(s, entry);
3554 s->first_displayed_line = 1;
3555 s->last_displayed_line = view->nlines;
3557 diff_view_indicate_progress(view);
3558 err = create_diff(s);
3562 if (s->log_view == NULL)
3564 ls = &s->log_view->state.log;
3566 if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
3567 ls->thread_args.commits_needed++;
3568 err = trigger_log_thread(s->log_view, 1,
3569 &ls->thread_args.commits_needed,
3570 &ls->thread_args.log_complete,
3571 &ls->thread_args.need_commits,
3572 &ls->thread_args.commit_loaded);
3576 err = input_log_view(NULL, NULL, NULL, s->log_view,
3581 entry = TAILQ_NEXT(ls->selected_entry, entry);
3585 err = set_selected_commit(s, entry);
3589 s->first_displayed_line = 1;
3590 s->last_displayed_line = view->nlines;
3592 diff_view_indicate_progress(view);
3593 err = create_diff(s);
3602 static const struct got_error *
3603 cmd_diff(int argc, char *argv[])
3605 const struct got_error *error = NULL;
3606 struct got_repository *repo = NULL;
3607 struct got_worktree *worktree = NULL;
3608 struct got_reflist_head refs;
3609 struct got_object_id *id1 = NULL, *id2 = NULL;
3610 char *repo_path = NULL, *cwd = NULL;
3611 char *id_str1 = NULL, *id_str2 = NULL;
3613 struct tog_view *view;
3615 SIMPLEQ_INIT(&refs);
3618 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3623 while ((ch = getopt(argc, argv, "r:")) != -1) {
3626 repo_path = realpath(optarg, NULL);
3627 if (repo_path == NULL)
3628 return got_error_from_errno2("realpath",
3641 usage_diff(); /* TODO show local worktree changes */
3642 } else if (argc == 2) {
3648 cwd = getcwd(NULL, 0);
3650 return got_error_from_errno("getcwd");
3652 error = got_worktree_open(&worktree, cwd);
3653 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3656 if (repo_path == NULL) {
3659 strdup(got_worktree_get_repo_path(worktree));
3661 repo_path = strdup(cwd);
3663 if (repo_path == NULL) {
3664 error = got_error_from_errno("strdup");
3668 error = got_repo_open(&repo, repo_path, NULL);
3674 error = apply_unveil(got_repo_get_path(repo), NULL);
3678 error = got_repo_match_object_id_prefix(&id1, id_str1,
3679 GOT_OBJ_TYPE_ANY, repo);
3683 error = got_repo_match_object_id_prefix(&id2, id_str2,
3684 GOT_OBJ_TYPE_ANY, repo);
3688 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3692 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
3694 error = got_error_from_errno("view_open");
3697 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
3700 error = view_loop(view);
3705 got_repo_close(repo);
3707 got_worktree_close(worktree);
3708 got_ref_list_free(&refs);
3716 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
3721 struct tog_blame_line {
3723 struct got_object_id *id;
3726 static const struct got_error *
3727 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
3728 const char *path, struct tog_blame_line *lines, int nlines,
3729 int blame_complete, int selected_line, int *first_displayed_line,
3730 int *last_displayed_line, int *eof, int max_lines,
3731 struct tog_colors *colors)
3733 const struct got_error *err;
3734 int lineno = 0, nprinted = 0;
3739 struct tog_blame_line *blame_line;
3740 struct got_object_id *prev_id = NULL;
3742 struct tog_color *tc;
3744 err = got_object_id_str(&id_str, id);
3749 werase(view->window);
3751 if (asprintf(&line, "commit %s", id_str) == -1) {
3752 err = got_error_from_errno("asprintf");
3757 err = format_line(&wline, &width, line, view->ncols, 0);
3762 if (view_needs_focus_indication(view))
3763 wstandout(view->window);
3764 tc = get_color(colors, TOG_COLOR_COMMIT);
3766 wattr_on(view->window,
3767 COLOR_PAIR(tc->colorpair), NULL);
3768 waddwstr(view->window, wline);
3770 wattr_off(view->window,
3771 COLOR_PAIR(tc->colorpair), NULL);
3772 if (view_needs_focus_indication(view))
3773 wstandend(view->window);
3776 if (width < view->ncols - 1)
3777 waddch(view->window, '\n');
3779 if (asprintf(&line, "[%d/%d] %s%s",
3780 *first_displayed_line - 1 + selected_line, nlines,
3781 blame_complete ? "" : "annotating... ", path) == -1) {
3783 return got_error_from_errno("asprintf");
3786 err = format_line(&wline, &width, line, view->ncols, 0);
3791 waddwstr(view->window, wline);
3794 if (width < view->ncols - 1)
3795 waddch(view->window, '\n');
3798 while (nprinted < max_lines - 2) {
3799 line = parse_next_line(f, &len);
3804 if (++lineno < *first_displayed_line) {
3809 if (view->ncols <= 9) {
3811 wline = wcsdup(L"");
3813 err = got_error_from_errno("wcsdup");
3815 err = format_line(&wline, &width, line,
3816 view->ncols - 9, 9);
3824 if (view->focussed && nprinted == selected_line - 1)
3825 wstandout(view->window);
3828 blame_line = &lines[lineno - 1];
3829 if (blame_line->annotated && prev_id &&
3830 got_object_id_cmp(prev_id, blame_line->id) == 0 &&
3832 nprinted == selected_line - 1)) {
3833 waddstr(view->window, " ");
3834 } else if (blame_line->annotated) {
3836 err = got_object_id_str(&id_str, blame_line->id);
3842 tc = get_color(colors, TOG_COLOR_COMMIT);
3844 wattr_on(view->window,
3845 COLOR_PAIR(tc->colorpair), NULL);
3846 wprintw(view->window, "%.8s", id_str);
3848 wattr_off(view->window,
3849 COLOR_PAIR(tc->colorpair), NULL);
3851 prev_id = blame_line->id;
3853 waddstr(view->window, "........");
3857 waddstr(view->window, "........");
3861 if (view->focussed && nprinted == selected_line - 1)
3862 wstandend(view->window);
3863 waddstr(view->window, " ");
3865 waddwstr(view->window, wline);
3866 if (width <= view->ncols - 1)
3867 waddch(view->window, '\n');
3868 if (++nprinted == 1)
3869 *first_displayed_line = lineno;
3874 *last_displayed_line = lineno;
3881 static const struct got_error *
3882 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3884 const struct got_error *err = NULL;
3885 struct tog_blame_cb_args *a = arg;
3886 struct tog_blame_line *line;
3889 if (nlines != a->nlines ||
3890 (lineno != -1 && lineno < 1) || lineno > a->nlines)
3891 return got_error(GOT_ERR_RANGE);
3893 errcode = pthread_mutex_lock(&tog_mutex);
3895 return got_error_set_errno(errcode, "pthread_mutex_lock");
3897 if (*a->quit) { /* user has quit the blame view */
3898 err = got_error(GOT_ERR_ITER_COMPLETED);
3903 goto done; /* no change in this commit */
3905 line = &a->lines[lineno - 1];
3906 if (line->annotated)
3909 line->id = got_object_id_dup(id);
3910 if (line->id == NULL) {
3911 err = got_error_from_errno("got_object_id_dup");
3914 line->annotated = 1;
3916 errcode = pthread_mutex_unlock(&tog_mutex);
3918 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3923 blame_thread(void *arg)
3925 const struct got_error *err;
3926 struct tog_blame_thread_args *ta = arg;
3927 struct tog_blame_cb_args *a = ta->cb_args;
3930 err = block_signals_used_by_main_thread();
3934 err = got_blame(ta->path, a->commit_id, ta->repo,
3935 blame_cb, ta->cb_args, ta->cancel_cb, ta->cancel_arg);
3936 if (err && err->code == GOT_ERR_CANCELLED)
3939 errcode = pthread_mutex_lock(&tog_mutex);
3941 return (void *)got_error_set_errno(errcode,
3942 "pthread_mutex_lock");
3944 got_repo_close(ta->repo);
3948 errcode = pthread_mutex_unlock(&tog_mutex);
3949 if (errcode && err == NULL)
3950 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3955 static struct got_object_id *
3956 get_selected_commit_id(struct tog_blame_line *lines, int nlines,
3957 int first_displayed_line, int selected_line)
3959 struct tog_blame_line *line;
3964 line = &lines[first_displayed_line - 1 + selected_line - 1];
3965 if (!line->annotated)
3971 static const struct got_error *
3972 stop_blame(struct tog_blame *blame)
3974 const struct got_error *err = NULL;
3977 if (blame->thread) {
3979 errcode = pthread_mutex_unlock(&tog_mutex);
3981 return got_error_set_errno(errcode,
3982 "pthread_mutex_unlock");
3983 errcode = pthread_join(blame->thread, (void **)&err);
3985 return got_error_set_errno(errcode, "pthread_join");
3986 errcode = pthread_mutex_lock(&tog_mutex);
3988 return got_error_set_errno(errcode,
3989 "pthread_mutex_lock");
3990 if (err && err->code == GOT_ERR_ITER_COMPLETED)
3992 blame->thread = NULL;
3994 if (blame->thread_args.repo) {
3995 got_repo_close(blame->thread_args.repo);
3996 blame->thread_args.repo = NULL;
3999 if (fclose(blame->f) != 0 && err == NULL)
4000 err = got_error_from_errno("fclose");
4004 for (i = 0; i < blame->nlines; i++)
4005 free(blame->lines[i].id);
4007 blame->lines = NULL;
4009 free(blame->cb_args.commit_id);
4010 blame->cb_args.commit_id = NULL;
4015 static const struct got_error *
4016 cancel_blame_view(void *arg)
4018 const struct got_error *err = NULL;
4022 errcode = pthread_mutex_lock(&tog_mutex);
4024 return got_error_set_errno(errcode,
4025 "pthread_mutex_unlock");
4028 err = got_error(GOT_ERR_CANCELLED);
4030 errcode = pthread_mutex_unlock(&tog_mutex);
4032 return got_error_set_errno(errcode,
4033 "pthread_mutex_lock");
4038 static const struct got_error *
4039 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
4040 int *first_displayed_line, int *last_displayed_line, int *selected_line,
4041 int *done, int *eof, const char *path, struct got_object_id *commit_id,
4042 struct got_repository *repo)
4044 const struct got_error *err = NULL;
4045 struct got_blob_object *blob = NULL;
4046 struct got_repository *thread_repo = NULL;
4047 struct got_object_id *obj_id = NULL;
4050 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
4054 err = got_object_get_type(&obj_type, repo, obj_id);
4058 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4059 err = got_error(GOT_ERR_OBJ_TYPE);
4063 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4066 blame->f = got_opentemp();
4067 if (blame->f == NULL) {
4068 err = got_error_from_errno("got_opentemp");
4071 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
4072 &blame->line_offsets, blame->f, blob);
4073 if (err || blame->nlines == 0)
4076 /* Don't include \n at EOF in the blame line count. */
4077 if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
4080 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
4081 if (blame->lines == NULL) {
4082 err = got_error_from_errno("calloc");
4086 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL);
4090 blame->cb_args.view = view;
4091 blame->cb_args.lines = blame->lines;
4092 blame->cb_args.nlines = blame->nlines;
4093 blame->cb_args.commit_id = got_object_id_dup(commit_id);
4094 if (blame->cb_args.commit_id == NULL) {
4095 err = got_error_from_errno("got_object_id_dup");
4098 blame->cb_args.quit = done;
4100 blame->thread_args.path = path;
4101 blame->thread_args.repo = thread_repo;
4102 blame->thread_args.cb_args = &blame->cb_args;
4103 blame->thread_args.complete = blame_complete;
4104 blame->thread_args.cancel_cb = cancel_blame_view;
4105 blame->thread_args.cancel_arg = done;
4106 *blame_complete = 0;
4110 got_object_blob_close(blob);
4117 static const struct got_error *
4118 open_blame_view(struct tog_view *view, char *path,
4119 struct got_object_id *commit_id, struct got_reflist_head *refs,
4120 struct got_repository *repo)
4122 const struct got_error *err = NULL;
4123 struct tog_blame_view_state *s = &view->state.blame;
4125 SIMPLEQ_INIT(&s->blamed_commits);
4127 s->path = strdup(path);
4128 if (s->path == NULL)
4129 return got_error_from_errno("strdup");
4131 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
4137 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
4138 s->first_displayed_line = 1;
4139 s->last_displayed_line = view->nlines;
4140 s->selected_line = 1;
4141 s->blame_complete = 0;
4144 s->commit_id = commit_id;
4145 memset(&s->blame, 0, sizeof(s->blame));
4147 SIMPLEQ_INIT(&s->colors);
4148 if (has_colors() && getenv("TOG_COLORS") != NULL) {
4149 err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
4150 get_color_value("TOG_COLOR_COMMIT"));
4155 view->show = show_blame_view;
4156 view->input = input_blame_view;
4157 view->close = close_blame_view;
4158 view->search_start = search_start_blame_view;
4159 view->search_next = search_next_blame_view;
4161 return run_blame(&s->blame, view, &s->blame_complete,
4162 &s->first_displayed_line, &s->last_displayed_line,
4163 &s->selected_line, &s->done, &s->eof, s->path,
4164 s->blamed_commit->id, s->repo);
4167 static const struct got_error *
4168 close_blame_view(struct tog_view *view)
4170 const struct got_error *err = NULL;
4171 struct tog_blame_view_state *s = &view->state.blame;
4173 if (s->blame.thread)
4174 err = stop_blame(&s->blame);
4176 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
4177 struct got_object_qid *blamed_commit;
4178 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
4179 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4180 got_object_qid_free(blamed_commit);
4184 free_colors(&s->colors);
4189 static const struct got_error *
4190 search_start_blame_view(struct tog_view *view)
4192 struct tog_blame_view_state *s = &view->state.blame;
4194 s->matched_line = 0;
4198 static const struct got_error *
4199 search_next_blame_view(struct tog_view *view)
4201 struct tog_blame_view_state *s = &view->state.blame;
4204 if (!view->searching) {
4205 view->search_next_done = TOG_SEARCH_HAVE_MORE;
4209 if (s->matched_line) {
4210 if (view->searching == TOG_SEARCH_FORWARD)
4211 lineno = s->matched_line + 1;
4213 lineno = s->matched_line - 1;
4215 if (view->searching == TOG_SEARCH_FORWARD)
4218 lineno = s->blame.nlines;
4226 if (lineno <= 0 || lineno > s->blame.nlines) {
4227 if (s->matched_line == 0) {
4228 view->search_next_done = TOG_SEARCH_HAVE_MORE;
4233 if (view->searching == TOG_SEARCH_FORWARD)
4236 lineno = s->blame.nlines;
4239 offset = s->blame.line_offsets[lineno - 1];
4240 if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
4242 return got_error_from_errno("fseeko");
4245 line = parse_next_line(s->blame.f, &len);
4246 if (line && match_line(line, &view->regex)) {
4247 view->search_next_done = TOG_SEARCH_HAVE_MORE;
4248 s->matched_line = lineno;
4253 if (view->searching == TOG_SEARCH_FORWARD)
4259 if (s->matched_line) {
4260 s->first_displayed_line = s->matched_line;
4261 s->selected_line = 1;
4267 static const struct got_error *
4268 show_blame_view(struct tog_view *view)
4270 const struct got_error *err = NULL;
4271 struct tog_blame_view_state *s = &view->state.blame;
4274 if (s->blame.thread == NULL) {
4275 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
4276 &s->blame.thread_args);
4278 return got_error_set_errno(errcode, "pthread_create");
4280 halfdelay(1); /* fast refresh while annotating */
4283 if (s->blame_complete)
4284 halfdelay(10); /* disable fast refresh */
4286 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
4287 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
4288 s->selected_line, &s->first_displayed_line,
4289 &s->last_displayed_line, &s->eof, view->nlines, &s->colors);
4295 static const struct got_error *
4296 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
4297 struct tog_view **focus_view, struct tog_view *view, int ch)
4299 const struct got_error *err = NULL, *thread_err = NULL;
4300 struct tog_view *diff_view;
4301 struct tog_blame_view_state *s = &view->state.blame;
4310 if (s->selected_line > 1)
4312 else if (s->selected_line == 1 &&
4313 s->first_displayed_line > 1)
4314 s->first_displayed_line--;
4318 if (s->first_displayed_line == 1) {
4319 s->selected_line = 1;
4322 if (s->first_displayed_line > view->nlines - 2)
4323 s->first_displayed_line -=
4326 s->first_displayed_line = 1;
4330 if (s->selected_line < view->nlines - 2 &&
4331 s->first_displayed_line +
4332 s->selected_line <= s->blame.nlines)
4334 else if (s->last_displayed_line <
4336 s->first_displayed_line++;
4340 struct got_object_id *id = NULL;
4341 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4342 s->first_displayed_line, s->selected_line);
4346 struct got_commit_object *commit;
4347 struct got_object_qid *pid;
4348 struct got_object_id *blob_id = NULL;
4350 err = got_object_open_as_commit(&commit,
4354 pid = SIMPLEQ_FIRST(
4355 got_object_commit_get_parent_ids(commit));
4357 got_object_commit_close(commit);
4360 /* Check if path history ends here. */
4361 err = got_object_id_by_path(&blob_id, s->repo,
4364 if (err->code == GOT_ERR_NO_TREE_ENTRY)
4366 got_object_commit_close(commit);
4369 err = got_object_get_type(&obj_type, s->repo,
4372 /* Can't blame non-blob type objects. */
4373 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4374 got_object_commit_close(commit);
4377 err = got_object_qid_alloc(&s->blamed_commit,
4379 got_object_commit_close(commit);
4381 if (got_object_id_cmp(id,
4382 s->blamed_commit->id) == 0)
4384 err = got_object_qid_alloc(&s->blamed_commit,
4390 thread_err = stop_blame(&s->blame);
4394 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
4395 s->blamed_commit, entry);
4396 err = run_blame(&s->blame, view, &s->blame_complete,
4397 &s->first_displayed_line, &s->last_displayed_line,
4398 &s->selected_line, &s->done, &s->eof,
4399 s->path, s->blamed_commit->id, s->repo);
4405 struct got_object_qid *first;
4406 first = SIMPLEQ_FIRST(&s->blamed_commits);
4407 if (!got_object_id_cmp(first->id, s->commit_id))
4410 thread_err = stop_blame(&s->blame);
4414 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
4415 got_object_qid_free(s->blamed_commit);
4417 SIMPLEQ_FIRST(&s->blamed_commits);
4418 err = run_blame(&s->blame, view, &s->blame_complete,
4419 &s->first_displayed_line, &s->last_displayed_line,
4420 &s->selected_line, &s->done, &s->eof, s->path,
4421 s->blamed_commit->id, s->repo);
4428 struct got_object_id *id = NULL;
4429 struct got_object_qid *pid;
4430 struct got_commit_object *commit = NULL;
4431 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
4432 s->first_displayed_line, s->selected_line);
4435 err = got_object_open_as_commit(&commit, s->repo, id);
4438 pid = SIMPLEQ_FIRST(
4439 got_object_commit_get_parent_ids(commit));
4440 if (view_is_parent_view(view))
4441 begin_x = view_split_begin_x(view->begin_x);
4442 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
4443 if (diff_view == NULL) {
4444 got_object_commit_close(commit);
4445 err = got_error_from_errno("view_open");
4448 err = open_diff_view(diff_view, pid ? pid->id : NULL,
4449 id, NULL, s->refs, s->repo);
4450 got_object_commit_close(commit);
4452 view_close(diff_view);
4455 if (view_is_parent_view(view)) {
4456 err = view_close_child(view);
4459 err = view_set_child(view, diff_view);
4461 view_close(diff_view);
4464 *focus_view = diff_view;
4465 view->child_focussed = 1;
4467 *new_view = diff_view;
4475 if (s->last_displayed_line >= s->blame.nlines &&
4476 s->selected_line >= MIN(s->blame.nlines,
4477 view->nlines - 2)) {
4480 if (s->last_displayed_line >= s->blame.nlines &&
4481 s->selected_line < view->nlines - 2) {
4482 s->selected_line = MIN(s->blame.nlines,
4486 if (s->last_displayed_line + view->nlines - 2
4488 s->first_displayed_line +=
4491 s->first_displayed_line =
4496 if (s->selected_line > view->nlines - 2) {
4497 s->selected_line = MIN(s->blame.nlines,
4504 return thread_err ? thread_err : err;
4507 static const struct got_error *
4508 cmd_blame(int argc, char *argv[])
4510 const struct got_error *error;
4511 struct got_repository *repo = NULL;
4512 struct got_reflist_head refs;
4513 struct got_worktree *worktree = NULL;
4514 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4515 char *link_target = NULL;
4516 struct got_object_id *commit_id = NULL;
4517 char *commit_id_str = NULL;
4519 struct tog_view *view;
4521 SIMPLEQ_INIT(&refs);
4524 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4529 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4532 commit_id_str = optarg;
4535 repo_path = realpath(optarg, NULL);
4536 if (repo_path == NULL)
4537 return got_error_from_errno2("realpath",
4552 cwd = getcwd(NULL, 0);
4554 return got_error_from_errno("getcwd");
4556 error = got_worktree_open(&worktree, cwd);
4557 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4560 if (repo_path == NULL) {
4563 strdup(got_worktree_get_repo_path(worktree));
4565 repo_path = strdup(cwd);
4567 if (repo_path == NULL) {
4568 error = got_error_from_errno("strdup");
4572 error = got_repo_open(&repo, repo_path, NULL);
4576 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
4583 error = apply_unveil(got_repo_get_path(repo), NULL);
4587 if (commit_id_str == NULL) {
4588 struct got_reference *head_ref;
4589 error = got_ref_open(&head_ref, repo, worktree ?
4590 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4593 error = got_ref_resolve(&commit_id, repo, head_ref);
4594 got_ref_close(head_ref);
4596 error = got_repo_match_object_id(&commit_id, NULL,
4597 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4602 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4606 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
4608 error = got_error_from_errno("view_open");
4612 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4617 error = open_blame_view(view, link_target ? link_target : in_repo_path,
4618 commit_id, &refs, repo);
4622 /* Release work tree lock. */
4623 got_worktree_close(worktree);
4626 error = view_loop(view);
4634 got_worktree_close(worktree);
4636 got_repo_close(repo);
4637 got_ref_list_free(&refs);
4641 static const struct got_error *
4642 draw_tree_entries(struct tog_view *view,
4643 struct got_tree_entry **first_displayed_entry,
4644 struct got_tree_entry **last_displayed_entry,
4645 struct got_tree_entry **selected_entry, int *ndisplayed,
4646 const char *label, int show_ids, const char *parent_path,
4647 struct got_tree_object *tree, int selected, int limit,
4648 int isroot, struct tog_colors *colors, struct got_repository *repo)
4650 const struct got_error *err = NULL;
4651 struct got_tree_entry *te;
4653 struct tog_color *tc;
4654 int width, n, i, nentries;
4658 werase(view->window);
4663 err = format_line(&wline, &width, label, view->ncols, 0);
4666 if (view_needs_focus_indication(view))
4667 wstandout(view->window);
4668 tc = get_color(colors, TOG_COLOR_COMMIT);
4670 wattr_on(view->window,
4671 COLOR_PAIR(tc->colorpair), NULL);
4672 waddwstr(view->window, wline);
4674 wattr_off(view->window,
4675 COLOR_PAIR(tc->colorpair), NULL);
4676 if (view_needs_focus_indication(view))
4677 wstandend(view->window);
4680 if (width < view->ncols - 1)
4681 waddch(view->window, '\n');
4684 err = format_line(&wline, &width, parent_path, view->ncols, 0);
4687 waddwstr(view->window, wline);
4690 if (width < view->ncols - 1)
4691 waddch(view->window, '\n');
4694 waddch(view->window, '\n');
4698 if (*first_displayed_entry == NULL) {
4699 te = got_object_tree_get_first_entry(tree);
4700 if (selected == 0) {
4702 wstandout(view->window);
4703 *selected_entry = NULL;
4705 waddstr(view->window, " ..\n"); /* parent directory */
4706 if (selected == 0 && view->focussed)
4707 wstandend(view->window);
4714 te = *first_displayed_entry;
4717 nentries = got_object_tree_get_nentries(tree);
4718 for (i = got_tree_entry_get_index(te); i < nentries; i++) {
4719 char *line = NULL, *id_str = NULL, *link_target = NULL;
4720 const char *modestr = "";
4723 te = got_object_tree_get_entry(tree, i);
4724 mode = got_tree_entry_get_mode(te);
4727 err = got_object_id_str(&id_str,
4728 got_tree_entry_get_id(te));
4730 return got_error_from_errno(
4731 "got_object_id_str");
4733 if (got_object_tree_entry_is_submodule(te))
4735 else if (S_ISLNK(mode)) {
4738 err = got_tree_entry_get_symlink_target(&link_target,
4744 for (i = 0; i < strlen(link_target); i++) {
4745 if (!isprint((unsigned char)link_target[i]))
4746 link_target[i] = '?';
4750 else if (S_ISDIR(mode))
4752 else if (mode & S_IXUSR)
4754 if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
4755 got_tree_entry_get_name(te), modestr,
4756 link_target ? " -> ": "",
4757 link_target ? link_target : "") == -1) {
4760 return got_error_from_errno("asprintf");
4764 err = format_line(&wline, &width, line, view->ncols, 0);
4769 if (n == selected) {
4771 wstandout(view->window);
4772 *selected_entry = te;
4774 tc = match_color(colors, line);
4776 wattr_on(view->window,
4777 COLOR_PAIR(tc->colorpair), NULL);
4778 waddwstr(view->window, wline);
4780 wattr_off(view->window,
4781 COLOR_PAIR(tc->colorpair), NULL);
4782 if (width < view->ncols - 1)
4783 waddch(view->window, '\n');
4784 if (n == selected && view->focussed)
4785 wstandend(view->window);
4791 *last_displayed_entry = te;
4800 tree_scroll_up(struct tog_view *view,
4801 struct got_tree_entry **first_displayed_entry, int maxscroll,
4802 struct got_tree_object *tree, int isroot)
4804 struct got_tree_entry *te;
4807 if (*first_displayed_entry == NULL)
4810 te = got_object_tree_get_entry(tree, 0);
4811 if (*first_displayed_entry == te) {
4813 *first_displayed_entry = NULL;
4818 while (*first_displayed_entry && i < maxscroll) {
4819 *first_displayed_entry = got_tree_entry_get_prev(tree,
4820 *first_displayed_entry);
4823 if (!isroot && te == got_object_tree_get_first_entry(tree) && i < maxscroll)
4824 *first_displayed_entry = NULL;
4828 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
4829 struct got_tree_entry *last_displayed_entry,
4830 struct got_tree_object *tree)
4832 struct got_tree_entry *next, *last;
4835 if (*first_displayed_entry)
4836 next = got_tree_entry_get_next(tree, *first_displayed_entry);
4838 next = got_object_tree_get_first_entry(tree);
4840 last = last_displayed_entry;
4841 while (next && last && n++ < maxscroll) {
4842 last = got_tree_entry_get_next(tree, last);
4844 *first_displayed_entry = next;
4845 next = got_tree_entry_get_next(tree, next);
4851 static const struct got_error *
4852 tree_entry_path(char **path, struct tog_parent_trees *parents,
4853 struct got_tree_entry *te)
4855 const struct got_error *err = NULL;
4856 struct tog_parent_tree *pt;
4857 size_t len = 2; /* for leading slash and NUL */
4859 TAILQ_FOREACH(pt, parents, entry)
4860 len += strlen(got_tree_entry_get_name(pt->selected_entry))
4863 len += strlen(got_tree_entry_get_name(te));
4865 *path = calloc(1, len);
4867 return got_error_from_errno("calloc");
4870 pt = TAILQ_LAST(parents, tog_parent_trees);
4872 const char *name = got_tree_entry_get_name(pt->selected_entry);
4873 if (strlcat(*path, name, len) >= len) {
4874 err = got_error(GOT_ERR_NO_SPACE);
4877 if (strlcat(*path, "/", len) >= len) {
4878 err = got_error(GOT_ERR_NO_SPACE);
4881 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
4884 if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
4885 err = got_error(GOT_ERR_NO_SPACE);
4897 static const struct got_error *
4898 blame_tree_entry(struct tog_view **new_view, int begin_x,
4899 struct got_tree_entry *te, struct tog_parent_trees *parents,
4900 struct got_object_id *commit_id, struct got_reflist_head *refs,
4901 struct got_repository *repo)
4903 const struct got_error *err = NULL;
4905 struct tog_view *blame_view;
4909 err = tree_entry_path(&path, parents, te);
4913 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
4914 if (blame_view == NULL) {
4915 err = got_error_from_errno("view_open");
4919 err = open_blame_view(blame_view, path, commit_id, refs, repo);
4921 if (err->code == GOT_ERR_CANCELLED)
4923 view_close(blame_view);
4925 *new_view = blame_view;
4931 static const struct got_error *
4932 log_tree_entry(struct tog_view **new_view, int begin_x,
4933 struct got_tree_entry *te, struct tog_parent_trees *parents,
4934 struct got_object_id *commit_id, struct got_reflist_head *refs,
4935 struct got_repository *repo)
4937 struct tog_view *log_view;
4938 const struct got_error *err = NULL;
4943 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
4944 if (log_view == NULL)
4945 return got_error_from_errno("view_open");
4947 err = tree_entry_path(&path, parents, te);
4951 err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
4953 view_close(log_view);
4955 *new_view = log_view;
4960 static const struct got_error *
4961 open_tree_view(struct tog_view *view, struct got_tree_object *root,
4962 struct got_object_id *commit_id, struct got_reflist_head *refs,
4963 struct got_repository *repo)
4965 const struct got_error *err = NULL;
4966 char *commit_id_str = NULL;
4967 struct tog_tree_view_state *s = &view->state.tree;
4969 TAILQ_INIT(&s->parents);
4971 err = got_object_id_str(&commit_id_str, commit_id);
4975 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4976 err = got_error_from_errno("asprintf");
4980 s->root = s->tree = root;
4981 s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
4982 s->selected_entry = got_object_tree_get_entry(s->tree, 0);
4983 s->commit_id = got_object_id_dup(commit_id);
4984 if (s->commit_id == NULL) {
4985 err = got_error_from_errno("got_object_id_dup");
4991 SIMPLEQ_INIT(&s->colors);
4993 if (has_colors() && getenv("TOG_COLORS") != NULL) {
4994 err = add_color(&s->colors, "\\$$",
4995 TOG_COLOR_TREE_SUBMODULE,
4996 get_color_value("TOG_COLOR_TREE_SUBMODULE"));
4999 err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
5000 get_color_value("TOG_COLOR_TREE_SYMLINK"));
5002 free_colors(&s->colors);
5005 err = add_color(&s->colors, "/$",
5006 TOG_COLOR_TREE_DIRECTORY,
5007 get_color_value("TOG_COLOR_TREE_DIRECTORY"));
5009 free_colors(&s->colors);
5013 err = add_color(&s->colors, "\\*$",
5014 TOG_COLOR_TREE_EXECUTABLE,
5015 get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
5017 free_colors(&s->colors);
5021 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
5022 get_color_value("TOG_COLOR_COMMIT"));
5024 free_colors(&s->colors);
5029 view->show = show_tree_view;
5030 view->input = input_tree_view;
5031 view->close = close_tree_view;
5032 view->search_start = search_start_tree_view;
5033 view->search_next = search_next_tree_view;
5035 free(commit_id_str);
5037 free(s->tree_label);
5038 s->tree_label = NULL;
5043 static const struct got_error *
5044 close_tree_view(struct tog_view *view)
5046 struct tog_tree_view_state *s = &view->state.tree;
5048 free_colors(&s->colors);
5049 free(s->tree_label);
5050 s->tree_label = NULL;
5052 s->commit_id = NULL;
5053 while (!TAILQ_EMPTY(&s->parents)) {
5054 struct tog_parent_tree *parent;
5055 parent = TAILQ_FIRST(&s->parents);
5056 TAILQ_REMOVE(&s->parents, parent, entry);
5060 if (s->tree != s->root)
5061 got_object_tree_close(s->tree);
5062 got_object_tree_close(s->root);
5067 static const struct got_error *
5068 search_start_tree_view(struct tog_view *view)
5070 struct tog_tree_view_state *s = &view->state.tree;
5072 s->matched_entry = NULL;
5077 match_tree_entry(struct got_tree_entry *te, regex_t *regex)
5079 regmatch_t regmatch;
5081 return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
5085 static const struct got_error *
5086 search_next_tree_view(struct tog_view *view)
5088 struct tog_tree_view_state *s = &view->state.tree;
5089 struct got_tree_entry *te = NULL;
5091 if (!view->searching) {
5092 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5096 if (s->matched_entry) {
5097 if (view->searching == TOG_SEARCH_FORWARD) {
5098 if (s->selected_entry)
5099 te = got_tree_entry_get_next(s->tree,
5102 te = got_object_tree_get_first_entry(s->tree);
5104 if (s->selected_entry == NULL)
5105 te = got_object_tree_get_last_entry(s->tree);
5107 te = got_tree_entry_get_prev(s->tree,
5111 if (view->searching == TOG_SEARCH_FORWARD)
5112 te = got_object_tree_get_first_entry(s->tree);
5114 te = got_object_tree_get_last_entry(s->tree);
5119 if (s->matched_entry == NULL) {
5120 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5123 if (view->searching == TOG_SEARCH_FORWARD)
5124 te = got_object_tree_get_first_entry(s->tree);
5126 te = got_object_tree_get_last_entry(s->tree);
5129 if (match_tree_entry(te, &view->regex)) {
5130 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5131 s->matched_entry = te;
5135 if (view->searching == TOG_SEARCH_FORWARD)
5136 te = got_tree_entry_get_next(s->tree, te);
5138 te = got_tree_entry_get_prev(s->tree, te);
5141 if (s->matched_entry) {
5142 s->first_displayed_entry = s->matched_entry;
5149 static const struct got_error *
5150 show_tree_view(struct tog_view *view)
5152 const struct got_error *err = NULL;
5153 struct tog_tree_view_state *s = &view->state.tree;
5156 err = tree_entry_path(&parent_path, &s->parents, NULL);
5160 err = draw_tree_entries(view, &s->first_displayed_entry,
5161 &s->last_displayed_entry, &s->selected_entry,
5162 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
5163 s->tree, s->selected, view->nlines, s->tree == s->root,
5164 &s->colors, s->repo);
5171 static const struct got_error *
5172 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
5173 struct tog_view **focus_view, struct tog_view *view, int ch)
5175 const struct got_error *err = NULL;
5176 struct tog_tree_view_state *s = &view->state.tree;
5177 struct tog_view *log_view;
5178 int begin_x = 0, nscrolled;
5182 s->show_ids = !s->show_ids;
5185 if (!s->selected_entry)
5187 if (view_is_parent_view(view))
5188 begin_x = view_split_begin_x(view->begin_x);
5189 err = log_tree_entry(&log_view, begin_x,
5190 s->selected_entry, &s->parents,
5191 s->commit_id, s->refs, s->repo);
5192 if (view_is_parent_view(view)) {
5193 err = view_close_child(view);
5196 err = view_set_child(view, log_view);
5198 view_close(log_view);
5201 *focus_view = log_view;
5202 view->child_focussed = 1;
5204 *new_view = log_view;
5208 if (s->selected > 0) {
5210 if (s->selected == 0)
5213 if (s->selected > 0)
5215 tree_scroll_up(view, &s->first_displayed_entry, 1,
5216 s->tree, s->tree == s->root);
5220 tree_scroll_up(view, &s->first_displayed_entry,
5221 MAX(0, view->nlines - 4 - s->selected), s->tree,
5222 s->tree == s->root);
5224 if (got_object_tree_get_first_entry(s->tree) ==
5225 s->first_displayed_entry && s->tree != s->root)
5226 s->first_displayed_entry = NULL;
5230 if (s->selected < s->ndisplayed - 1) {
5234 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5236 /* can't scroll any further */
5238 tree_scroll_down(&s->first_displayed_entry, 1,
5239 s->last_displayed_entry, s->tree);
5243 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
5245 /* can't scroll any further; move cursor down */
5246 if (s->selected < s->ndisplayed - 1)
5247 s->selected = s->ndisplayed - 1;
5250 nscrolled = tree_scroll_down(&s->first_displayed_entry,
5251 view->nlines, s->last_displayed_entry, s->tree);
5252 if (nscrolled < view->nlines) {
5254 struct got_tree_entry *te;
5255 te = s->first_displayed_entry;
5258 te = got_tree_entry_get_next(s->tree, te);
5260 s->selected = ndisplayed - 1;
5266 if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
5267 struct tog_parent_tree *parent;
5268 /* user selected '..' */
5269 if (s->tree == s->root)
5271 parent = TAILQ_FIRST(&s->parents);
5272 TAILQ_REMOVE(&s->parents, parent,
5274 got_object_tree_close(s->tree);
5275 s->tree = parent->tree;
5276 s->first_displayed_entry =
5277 parent->first_displayed_entry;
5279 parent->selected_entry;
5280 s->selected = parent->selected;
5282 } else if (S_ISDIR(got_tree_entry_get_mode(
5283 s->selected_entry))) {
5284 struct got_tree_object *subtree;
5285 err = got_object_open_as_tree(&subtree, s->repo,
5286 got_tree_entry_get_id(s->selected_entry));
5289 err = tree_view_visit_subtree(subtree, s);
5291 got_object_tree_close(subtree);
5294 } else if (S_ISREG(got_tree_entry_get_mode(
5295 s->selected_entry))) {
5296 struct tog_view *blame_view;
5297 int begin_x = view_is_parent_view(view) ?
5298 view_split_begin_x(view->begin_x) : 0;
5300 err = blame_tree_entry(&blame_view, begin_x,
5301 s->selected_entry, &s->parents,
5302 s->commit_id, s->refs, s->repo);
5305 if (view_is_parent_view(view)) {
5306 err = view_close_child(view);
5309 err = view_set_child(view, blame_view);
5311 view_close(blame_view);
5314 *focus_view = blame_view;
5315 view->child_focussed = 1;
5317 *new_view = blame_view;
5321 if (s->selected > view->nlines)
5322 s->selected = s->ndisplayed - 1;
5335 fprintf(stderr, "usage: %s tree [-c commit] [-r repository-path] [path]\n",
5340 static const struct got_error *
5341 cmd_tree(int argc, char *argv[])
5343 const struct got_error *error;
5344 struct got_repository *repo = NULL;
5345 struct got_worktree *worktree = NULL;
5346 struct got_reflist_head refs;
5347 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5348 struct got_object_id *commit_id = NULL;
5349 char *commit_id_arg = NULL;
5350 struct got_commit_object *commit = NULL;
5351 struct got_tree_object *tree = NULL;
5353 struct tog_view *view;
5355 SIMPLEQ_INIT(&refs);
5358 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
5363 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5366 commit_id_arg = optarg;
5369 repo_path = realpath(optarg, NULL);
5370 if (repo_path == NULL)
5371 return got_error_from_errno2("realpath",
5386 cwd = getcwd(NULL, 0);
5388 return got_error_from_errno("getcwd");
5390 error = got_worktree_open(&worktree, cwd);
5391 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5394 if (repo_path == NULL) {
5397 strdup(got_worktree_get_repo_path(worktree));
5399 repo_path = strdup(cwd);
5401 if (repo_path == NULL) {
5402 error = got_error_from_errno("strdup");
5406 error = got_repo_open(&repo, repo_path, NULL);
5410 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5417 error = apply_unveil(got_repo_get_path(repo), NULL);
5421 error = got_repo_match_object_id(&commit_id, NULL,
5422 commit_id_arg ? commit_id_arg : GOT_REF_HEAD,
5423 GOT_OBJ_TYPE_COMMIT, 1, repo);
5427 error = got_object_open_as_commit(&commit, repo, commit_id);
5431 error = got_object_open_as_tree(&tree, repo,
5432 got_object_commit_get_tree_id(commit));
5436 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5440 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
5442 error = got_error_from_errno("view_open");
5445 error = open_tree_view(view, tree, commit_id, &refs, repo);
5448 if (!got_path_is_root_dir(in_repo_path)) {
5449 error = tree_view_walk_path(&view->state.tree, commit_id,
5450 in_repo_path, repo);
5456 /* Release work tree lock. */
5457 got_worktree_close(worktree);
5460 error = view_loop(view);
5466 got_object_commit_close(commit);
5468 got_object_tree_close(tree);
5470 got_repo_close(repo);
5471 got_ref_list_free(&refs);
5480 fprintf(stderr, "commands:");
5481 for (i = 0; i < nitems(tog_commands); i++) {
5482 struct tog_cmd *cmd = &tog_commands[i];
5483 fprintf(stderr, " %s", cmd->name);
5485 fputc('\n', stderr);
5491 fprintf(stderr, "usage: %s [-h] [-V | --version] [command] "
5492 "[arg ...]\n", getprogname());
5494 fprintf(stderr, "lazy usage: %s path\n", getprogname());
5501 make_argv(int argc, ...)
5509 argv = calloc(argc, sizeof(char *));
5512 for (i = 0; i < argc; i++) {
5513 argv[i] = strdup(va_arg(ap, char *));
5514 if (argv[i] == NULL)
5523 * Try to convert 'tog path' into a 'tog log path' command.
5524 * The user could simply have mistyped the command rather than knowingly
5525 * provided a path. So check whether argv[0] can in fact be resolved
5526 * to a path in the HEAD commit and print a special error if not.
5527 * This hack is for mpi@ <3
5529 static const struct got_error *
5530 tog_log_with_path(int argc, char *argv[])
5532 const struct got_error *error = NULL;
5533 struct tog_cmd *cmd = NULL;
5534 struct got_repository *repo = NULL;
5535 struct got_worktree *worktree = NULL;
5536 struct got_object_id *commit_id = NULL, *id = NULL;
5537 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5538 char *commit_id_str = NULL, **cmd_argv = NULL;
5540 cwd = getcwd(NULL, 0);
5542 return got_error_from_errno("getcwd");
5544 error = got_worktree_open(&worktree, cwd);
5545 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5549 repo_path = strdup(got_worktree_get_repo_path(worktree));
5551 repo_path = strdup(cwd);
5552 if (repo_path == NULL) {
5553 error = got_error_from_errno("strdup");
5557 error = got_repo_open(&repo, repo_path, NULL);
5561 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
5566 error = got_repo_match_object_id(&commit_id, NULL, worktree ?
5567 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
5568 GOT_OBJ_TYPE_COMMIT, 1, repo);
5573 got_worktree_close(worktree);
5577 error = got_object_id_by_path(&id, repo, commit_id, in_repo_path);
5579 if (error->code != GOT_ERR_NO_TREE_ENTRY)
5581 fprintf(stderr, "%s: '%s' is no known command or path\n",
5582 getprogname(), argv[0]);
5587 got_repo_close(repo);
5590 error = got_object_id_str(&commit_id_str, commit_id);
5594 cmd = &tog_commands[0]; /* log */
5596 cmd_argv = make_argv(argc, cmd->name, "-c", commit_id_str, argv[0]);
5597 error = cmd->cmd_main(argc, cmd_argv);
5600 got_repo_close(repo);
5602 got_worktree_close(worktree);
5604 free(commit_id_str);
5611 for (i = 0; i < argc; i++)
5619 main(int argc, char *argv[])
5621 const struct got_error *error = NULL;
5622 struct tog_cmd *cmd = NULL;
5623 int ch, hflag = 0, Vflag = 0;
5624 char **cmd_argv = NULL;
5625 static struct option longopts[] = {
5626 { "version", no_argument, NULL, 'V' },
5630 setlocale(LC_CTYPE, "");
5632 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
5652 got_version_print_str();
5659 /* Build an argument vector which runs a default command. */
5660 cmd = &tog_commands[0];
5662 cmd_argv = make_argv(argc, cmd->name);
5666 /* Did the user specify a command? */
5667 for (i = 0; i < nitems(tog_commands); i++) {
5668 if (strncmp(tog_commands[i].name, argv[0],
5669 strlen(argv[0])) == 0) {
5670 cmd = &tog_commands[i];
5679 /* No command specified; try log with a path */
5680 error = tog_log_with_path(argc, argv);
5685 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
5692 for (i = 0; i < argc; i++)
5697 if (error && error->code != GOT_ERR_CANCELLED)
5698 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);