2 * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 #include <sys/queue.h>
19 #include <sys/ioctl.h>
22 #define _XOPEN_SOURCE_EXTENDED
24 #undef _XOPEN_SOURCE_EXTENDED
41 #include "got_error.h"
42 #include "got_object.h"
43 #include "got_reference.h"
44 #include "got_repository.h"
46 #include "got_opentemp.h"
47 #include "got_commit_graph.h"
49 #include "got_blame.h"
50 #include "got_privsep.h"
52 #include "got_worktree.h"
55 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
59 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
62 #define CTRL(x) ((x) & 0x1f)
65 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
70 const struct got_error *(*cmd_main)(int, char *[]);
71 void (*cmd_usage)(void);
74 __dead static void usage(void);
75 __dead static void usage_log(void);
76 __dead static void usage_diff(void);
77 __dead static void usage_blame(void);
78 __dead static void usage_tree(void);
80 static const struct got_error* cmd_log(int, char *[]);
81 static const struct got_error* cmd_diff(int, char *[]);
82 static const struct got_error* cmd_blame(int, char *[]);
83 static const struct got_error* cmd_tree(int, char *[]);
85 static struct tog_cmd tog_commands[] = {
86 { "log", cmd_log, usage_log },
87 { "diff", cmd_diff, usage_diff },
88 { "blame", cmd_blame, usage_blame },
89 { "tree", cmd_tree, usage_tree },
99 #define TOG_EOF_STRING "(END)"
101 struct commit_queue_entry {
102 TAILQ_ENTRY(commit_queue_entry) entry;
103 struct got_object_id *id;
104 struct got_commit_object *commit;
107 TAILQ_HEAD(commit_queue_head, commit_queue_entry);
108 struct commit_queue {
110 struct commit_queue_head head;
113 struct tog_diff_view_state {
114 struct got_object_id *id1, *id2;
116 int first_displayed_line;
117 int last_displayed_line;
120 struct got_repository *repo;
121 struct got_reflist_head *refs;
123 /* passed from log view; may be NULL */
124 struct tog_view *log_view;
127 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
129 struct tog_log_thread_args {
130 pthread_cond_t need_commits;
132 struct got_commit_graph *graph;
133 struct commit_queue *commits;
134 const char *in_repo_path;
135 struct got_object_id *start_id;
136 struct got_repository *repo;
139 struct tog_view *view;
140 struct commit_queue_entry **first_displayed_entry;
141 struct commit_queue_entry **selected_entry;
144 struct tog_log_view_state {
145 struct commit_queue commits;
146 struct commit_queue_entry *first_displayed_entry;
147 struct commit_queue_entry *last_displayed_entry;
148 struct commit_queue_entry *selected_entry;
151 const char *head_ref_name;
152 struct got_repository *repo;
153 struct got_reflist_head *refs;
154 struct got_object_id *start_id;
157 struct tog_log_thread_args thread_args;
158 struct commit_queue_entry *matched_entry;
161 struct tog_blame_cb_args {
162 struct tog_blame_line *lines; /* one per line */
165 struct tog_view *view;
166 struct got_object_id *commit_id;
170 struct tog_blame_thread_args {
172 struct got_repository *repo;
173 struct tog_blame_cb_args *cb_args;
180 struct tog_blame_line *lines;
184 struct tog_blame_thread_args thread_args;
185 struct tog_blame_cb_args cb_args;
189 struct tog_blame_view_state {
190 int first_displayed_line;
191 int last_displayed_line;
196 struct got_object_id_queue blamed_commits;
197 struct got_object_qid *blamed_commit;
199 struct got_repository *repo;
200 struct got_reflist_head *refs;
201 struct got_object_id *commit_id;
202 struct tog_blame blame;
206 struct tog_parent_tree {
207 TAILQ_ENTRY(tog_parent_tree) entry;
208 struct got_tree_object *tree;
209 struct got_tree_entry *first_displayed_entry;
210 struct got_tree_entry *selected_entry;
214 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
216 struct tog_tree_view_state {
218 struct got_tree_object *root;
219 struct got_tree_object *tree;
220 const struct got_tree_entries *entries;
221 struct got_tree_entry *first_displayed_entry;
222 struct got_tree_entry *last_displayed_entry;
223 struct got_tree_entry *selected_entry;
224 int ndisplayed, selected, show_ids;
225 struct tog_parent_trees parents;
226 struct got_object_id *commit_id;
227 struct got_repository *repo;
228 struct got_reflist_head *refs;
229 struct got_tree_entry *matched_entry;
233 * We implement two types of views: parent views and child views.
235 * The 'Tab' key switches between a parent view and its child view.
236 * Child views are shown side-by-side to their parent view, provided
237 * there is enough screen estate.
239 * When a new view is opened from within a parent view, this new view
240 * becomes a child view of the parent view, replacing any existing child.
242 * When a new view is opened from within a child view, this new view
243 * becomes a parent view which will obscure the views below until the
244 * user quits the new parent view by typing 'q'.
246 * This list of views contains parent views only.
247 * Child views are only pointed to by their parent view.
249 TAILQ_HEAD(tog_view_list_head, tog_view);
252 TAILQ_ENTRY(tog_view) entry;
255 int nlines, ncols, begin_y, begin_x;
256 int lines, cols; /* copies of LINES and COLS */
258 struct tog_view *parent;
259 struct tog_view *child;
262 /* type-specific state */
263 enum tog_view_type type;
265 struct tog_diff_view_state diff;
266 struct tog_log_view_state log;
267 struct tog_blame_view_state blame;
268 struct tog_tree_view_state tree;
271 const struct got_error *(*show)(struct tog_view *);
272 const struct got_error *(*input)(struct tog_view **,
273 struct tog_view **, struct tog_view**, struct tog_view *, int);
274 const struct got_error *(*close)(struct tog_view *);
276 const struct got_error *(*search_start)(struct tog_view *);
277 const struct got_error *(*search_next)(struct tog_view *);
279 #define TOG_SEARCH_FORWARD 1
280 #define TOG_SEARCH_BACKWARD 2
281 int search_next_done;
285 static const struct got_error *open_diff_view(struct tog_view *,
286 struct got_object_id *, struct got_object_id *, struct tog_view *,
287 struct got_reflist_head *, struct got_repository *);
288 static const struct got_error *show_diff_view(struct tog_view *);
289 static const struct got_error *input_diff_view(struct tog_view **,
290 struct tog_view **, struct tog_view **, struct tog_view *, int);
291 static const struct got_error* close_diff_view(struct tog_view *);
293 static const struct got_error *open_log_view(struct tog_view *,
294 struct got_object_id *, struct got_reflist_head *,
295 struct got_repository *, const char *, const char *, int);
296 static const struct got_error * show_log_view(struct tog_view *);
297 static const struct got_error *input_log_view(struct tog_view **,
298 struct tog_view **, struct tog_view **, struct tog_view *, int);
299 static const struct got_error *close_log_view(struct tog_view *);
300 static const struct got_error *search_start_log_view(struct tog_view *);
301 static const struct got_error *search_next_log_view(struct tog_view *);
303 static const struct got_error *open_blame_view(struct tog_view *, char *,
304 struct got_object_id *, struct got_reflist_head *, struct got_repository *);
305 static const struct got_error *show_blame_view(struct tog_view *);
306 static const struct got_error *input_blame_view(struct tog_view **,
307 struct tog_view **, struct tog_view **, struct tog_view *, int);
308 static const struct got_error *close_blame_view(struct tog_view *);
309 static const struct got_error *search_start_blame_view(struct tog_view *);
310 static const struct got_error *search_next_blame_view(struct tog_view *);
312 static const struct got_error *open_tree_view(struct tog_view *,
313 struct got_tree_object *, struct got_object_id *,
314 struct got_reflist_head *, struct got_repository *);
315 static const struct got_error *show_tree_view(struct tog_view *);
316 static const struct got_error *input_tree_view(struct tog_view **,
317 struct tog_view **, struct tog_view **, struct tog_view *, int);
318 static const struct got_error *close_tree_view(struct tog_view *);
319 static const struct got_error *search_start_tree_view(struct tog_view *);
320 static const struct got_error *search_next_tree_view(struct tog_view *);
322 static volatile sig_atomic_t tog_sigwinch_received;
325 tog_sigwinch(int signo)
327 tog_sigwinch_received = 1;
330 static const struct got_error *
331 view_close(struct tog_view *view)
333 const struct got_error *err = NULL;
336 view_close(view->child);
340 err = view->close(view);
342 del_panel(view->panel);
344 delwin(view->window);
349 static struct tog_view *
350 view_open(int nlines, int ncols, int begin_y, int begin_x,
351 enum tog_view_type type)
353 struct tog_view *view = calloc(1, sizeof(*view));
361 view->nlines = nlines ? nlines : LINES - begin_y;
362 view->ncols = ncols ? ncols : COLS - begin_x;
363 view->begin_y = begin_y;
364 view->begin_x = begin_x;
365 view->window = newwin(nlines, ncols, begin_y, begin_x);
366 if (view->window == NULL) {
370 view->panel = new_panel(view->window);
371 if (view->panel == NULL ||
372 set_panel_userptr(view->panel, view) != OK) {
377 keypad(view->window, TRUE);
382 view_split_begin_x(int begin_x)
384 if (begin_x > 0 || COLS < 120)
386 return (COLS - MAX(COLS / 2, 80));
389 static const struct got_error *view_resize(struct tog_view *);
391 static const struct got_error *
392 view_splitscreen(struct tog_view *view)
394 const struct got_error *err = NULL;
397 view->begin_x = view_split_begin_x(0);
398 view->nlines = LINES;
399 view->ncols = COLS - view->begin_x;
402 err = view_resize(view);
406 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
407 return got_error_from_errno("mvwin");
412 static const struct got_error *
413 view_fullscreen(struct tog_view *view)
415 const struct got_error *err = NULL;
419 view->nlines = LINES;
423 err = view_resize(view);
427 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
428 return got_error_from_errno("mvwin");
434 view_is_parent_view(struct tog_view *view)
436 return view->parent == NULL;
439 static const struct got_error *
440 view_resize(struct tog_view *view)
444 if (view->lines > LINES)
445 nlines = view->nlines - (view->lines - LINES);
447 nlines = view->nlines + (LINES - view->lines);
449 if (view->cols > COLS)
450 ncols = view->ncols - (view->cols - COLS);
452 ncols = view->ncols + (COLS - view->cols);
454 if (wresize(view->window, nlines, ncols) == ERR)
455 return got_error_from_errno("wresize");
456 if (replace_panel(view->panel, view->window) == ERR)
457 return got_error_from_errno("replace_panel");
458 wclear(view->window);
460 view->nlines = nlines;
466 view->child->begin_x = view_split_begin_x(view->begin_x);
467 if (view->child->begin_x == 0) {
468 view_fullscreen(view->child);
469 if (view->child->focussed)
470 show_panel(view->child->panel);
472 show_panel(view->panel);
474 view_splitscreen(view->child);
475 show_panel(view->child->panel);
482 static const struct got_error *
483 view_close_child(struct tog_view *view)
485 const struct got_error *err = NULL;
487 if (view->child == NULL)
490 err = view_close(view->child);
495 static const struct got_error *
496 view_set_child(struct tog_view *view, struct tog_view *child)
498 const struct got_error *err = NULL;
501 child->parent = view;
506 view_is_splitscreen(struct tog_view *view)
508 return view->begin_x > 0;
517 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
518 cols = 80; /* Default */
524 resize_term(lines, cols);
527 static const struct got_error *
528 view_search_start(struct tog_view *view)
530 const struct got_error *err = NULL;
534 if (view->nlines < 1)
537 mvwaddstr(view->window, view->begin_y + view->nlines - 1,
539 wclrtoeol(view->window);
543 ret = wgetnstr(view->window, pattern, sizeof(pattern));
549 if (view->searching) {
550 regfree(&view->regex);
554 if (regcomp(&view->regex, pattern,
555 REG_EXTENDED | REG_NOSUB | REG_NEWLINE) == 0) {
556 err = view->search_start(view);
558 regfree(&view->regex);
561 view->searching = TOG_SEARCH_FORWARD;
562 view->search_next_done = 0;
563 view->search_next(view);
569 static const struct got_error *
570 view_input(struct tog_view **new, struct tog_view **dead,
571 struct tog_view **focus, int *done, struct tog_view *view,
572 struct tog_view_list_head *views)
574 const struct got_error *err = NULL;
582 if (view->searching && !view->search_next_done) {
583 errcode = pthread_mutex_unlock(&tog_mutex);
585 return got_error_set_errno(errcode,
586 "pthread_mutex_unlock");
588 errcode = pthread_mutex_lock(&tog_mutex);
590 return got_error_set_errno(errcode,
591 "pthread_mutex_lock");
592 view->search_next(view);
596 nodelay(stdscr, FALSE);
597 /* Allow threads to make progress while we are waiting for input. */
598 errcode = pthread_mutex_unlock(&tog_mutex);
600 return got_error_set_errno(errcode, "pthread_mutex_unlock");
601 ch = wgetch(view->window);
602 errcode = pthread_mutex_lock(&tog_mutex);
604 return got_error_set_errno(errcode, "pthread_mutex_lock");
605 nodelay(stdscr, TRUE);
607 if (tog_sigwinch_received) {
609 tog_sigwinch_received = 0;
610 TAILQ_FOREACH(v, views, entry) {
611 err = view_resize(v);
614 err = v->input(new, dead, focus, v, KEY_RESIZE);
625 *focus = view->child;
626 view->child_focussed = 1;
627 } else if (view->parent) {
628 *focus = view->parent;
629 view->parent->child_focussed = 0;
633 err = view->input(new, dead, focus, view, ch);
640 if (view_is_parent_view(view)) {
641 if (view->child == NULL)
643 if (view_is_splitscreen(view->child)) {
644 *focus = view->child;
645 view->child_focussed = 1;
646 err = view_fullscreen(view->child);
648 err = view_splitscreen(view->child);
651 err = view->child->input(new, dead, focus,
652 view->child, KEY_RESIZE);
654 if (view_is_splitscreen(view)) {
656 view->parent->child_focussed = 1;
657 err = view_fullscreen(view);
659 err = view_splitscreen(view);
663 err = view->input(new, dead, focus, view,
670 if (view->search_start)
671 view_search_start(view);
673 err = view->input(new, dead, focus, view, ch);
677 if (view->search_next && view->searching) {
678 view->searching = (ch == 'n' ?
679 TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
680 view->search_next_done = 0;
681 view->search_next(view);
683 err = view->input(new, dead, focus, view, ch);
686 err = view->input(new, dead, focus, view, ch);
694 view_vborder(struct tog_view *view)
697 struct tog_view *view_above;
700 return view_vborder(view->parent);
702 panel = panel_above(view->panel);
706 view_above = panel_userptr(panel);
707 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
708 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
712 view_needs_focus_indication(struct tog_view *view)
714 if (view_is_parent_view(view)) {
715 if (view->child == NULL || view->child_focussed)
717 if (!view_is_splitscreen(view->child))
719 } else if (!view_is_splitscreen(view))
722 return view->focussed;
725 static const struct got_error *
726 view_loop(struct tog_view *view)
728 const struct got_error *err = NULL;
729 struct tog_view_list_head views;
730 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
731 int fast_refresh = 10;
732 int done = 0, errcode;
734 errcode = pthread_mutex_lock(&tog_mutex);
736 return got_error_set_errno(errcode, "pthread_mutex_lock");
739 TAILQ_INSERT_HEAD(&views, view, entry);
743 err = view->show(view);
748 while (!TAILQ_EMPTY(&views) && !done) {
749 /* Refresh fast during initialization, then become slower. */
750 if (fast_refresh && fast_refresh-- == 0)
751 halfdelay(10); /* switch to once per second */
753 err = view_input(&new_view, &dead_view, &focus_view, &done,
758 struct tog_view *prev = NULL;
760 if (view_is_parent_view(dead_view))
761 prev = TAILQ_PREV(dead_view,
762 tog_view_list_head, entry);
763 else if (view->parent != dead_view)
766 if (dead_view->parent)
767 dead_view->parent->child = NULL;
769 TAILQ_REMOVE(&views, dead_view, entry);
771 err = view_close(dead_view);
772 if (err || (dead_view == main_view && new_view == NULL))
775 if (view == dead_view) {
780 else if (!TAILQ_EMPTY(&views))
781 view = TAILQ_LAST(&views,
786 if (view->child && view->child_focussed)
787 focus_view = view->child;
794 struct tog_view *v, *t;
795 /* Only allow one parent view per type. */
796 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
797 if (v->type != new_view->type)
799 TAILQ_REMOVE(&views, v, entry);
805 TAILQ_INSERT_TAIL(&views, new_view, entry);
807 if (focus_view == NULL)
808 focus_view = new_view;
811 show_panel(focus_view->panel);
814 focus_view->focussed = 1;
817 show_panel(new_view->panel);
818 if (view->child && view_is_splitscreen(view->child))
819 show_panel(view->child->panel);
822 if (focus_view == NULL) {
824 show_panel(view->panel);
825 if (view->child && view_is_splitscreen(view->child))
826 show_panel(view->child->panel);
830 err = view->parent->show(view->parent);
834 err = view->show(view);
838 err = view->child->show(view->child);
847 while (!TAILQ_EMPTY(&views)) {
848 view = TAILQ_FIRST(&views);
849 TAILQ_REMOVE(&views, view, entry);
853 errcode = pthread_mutex_unlock(&tog_mutex);
855 return got_error_set_errno(errcode, "pthread_mutex_unlock");
865 "usage: %s log [-c commit] [-r repository-path] [path]\n",
870 /* Create newly allocated wide-character string equivalent to a byte string. */
871 static const struct got_error *
872 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
875 const struct got_error *err = NULL;
878 *wlen = mbstowcs(NULL, s, 0);
879 if (*wlen == (size_t)-1) {
882 return got_error_from_errno("mbstowcs");
884 /* byte string invalid in current encoding; try to "fix" it */
885 err = got_mbsavis(&vis, &vislen, s);
888 *wlen = mbstowcs(NULL, vis, 0);
889 if (*wlen == (size_t)-1) {
890 err = got_error_from_errno("mbstowcs"); /* give up */
895 *ws = calloc(*wlen + 1, sizeof(*ws));
897 err = got_error_from_errno("calloc");
901 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
902 err = got_error_from_errno("mbstowcs");
913 /* Format a line for display, ensuring that it won't overflow a width limit. */
914 static const struct got_error *
915 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
917 const struct got_error *err = NULL;
919 wchar_t *wline = NULL;
926 err = mbs2ws(&wline, &wlen, line);
931 while (i < wlen && cols < wlimit) {
932 int width = wcwidth(wline[i]);
939 if (cols + width <= wlimit)
944 if (wline[i] == L'\t')
945 cols += TABSIZE - ((cols + 1) % TABSIZE);
949 err = got_error_from_errno("wcwidth");
964 static const struct got_error*
965 build_refs_str(char **refs_str, struct got_reflist_head *refs,
966 struct got_object_id *id)
968 static const struct got_error *err = NULL;
969 struct got_reflist_entry *re;
975 SIMPLEQ_FOREACH(re, refs, entry) {
976 if (got_object_id_cmp(re->id, id) != 0)
978 name = got_ref_get_name(re->ref);
979 if (strcmp(name, GOT_REF_HEAD) == 0)
981 if (strncmp(name, "refs/", 5) == 0)
983 if (strncmp(name, "got/", 4) == 0)
985 if (strncmp(name, "heads/", 6) == 0)
987 if (strncmp(name, "remotes/", 8) == 0)
990 if (asprintf(refs_str, "%s%s%s", s ? s : "",
991 s ? ", " : "", name) == -1) {
992 err = got_error_from_errno("asprintf");
1003 static const struct got_error *
1004 format_author(wchar_t **wauthor, int *author_width, char *author, int limit)
1006 char *smallerthan, *at;
1008 smallerthan = strchr(author, '<');
1009 if (smallerthan && smallerthan[1] != '\0')
1010 author = smallerthan + 1;
1011 at = strchr(author, '@');
1014 return format_line(wauthor, author_width, author, limit);
1017 static const struct got_error *
1018 draw_commit(struct tog_view *view, struct got_commit_object *commit,
1019 struct got_object_id *id, struct got_reflist_head *refs,
1020 int author_display_cols)
1022 const struct got_error *err = NULL;
1023 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
1024 char *logmsg0 = NULL, *logmsg = NULL;
1025 char *author = NULL;
1026 wchar_t *wlogmsg = NULL, *wauthor = NULL;
1027 int author_width, logmsg_width;
1028 char *newline, *line = NULL;
1030 static const size_t date_display_cols = 9;
1031 const int avail = view->ncols;
1033 time_t committer_time;
1035 committer_time = got_object_commit_get_committer_time(commit);
1036 if (localtime_r(&committer_time, &tm) == NULL)
1037 return got_error_from_errno("localtime_r");
1038 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
1040 return got_error(GOT_ERR_NO_SPACE);
1042 if (avail < date_display_cols)
1043 limit = MIN(sizeof(datebuf) - 1, avail);
1045 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
1046 waddnstr(view->window, datebuf, limit);
1051 author = strdup(got_object_commit_get_author(commit));
1052 if (author == NULL) {
1053 err = got_error_from_errno("strdup");
1056 err = format_author(&wauthor, &author_width, author, avail - col);
1059 waddwstr(view->window, wauthor);
1060 col += author_width;
1061 while (col <= avail && author_width < author_display_cols + 2) {
1062 waddch(view->window, ' ');
1069 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1070 if (logmsg0 == NULL) {
1071 err = got_error_from_errno("strdup");
1075 while (*logmsg == '\n')
1077 newline = strchr(logmsg, '\n');
1080 limit = avail - col;
1081 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
1084 waddwstr(view->window, wlogmsg);
1085 col += logmsg_width;
1086 while (col <= avail) {
1087 waddch(view->window, ' ');
1099 static struct commit_queue_entry *
1100 alloc_commit_queue_entry(struct got_commit_object *commit,
1101 struct got_object_id *id)
1103 struct commit_queue_entry *entry;
1105 entry = calloc(1, sizeof(*entry));
1110 entry->commit = commit;
1115 pop_commit(struct commit_queue *commits)
1117 struct commit_queue_entry *entry;
1119 entry = TAILQ_FIRST(&commits->head);
1120 TAILQ_REMOVE(&commits->head, entry, entry);
1121 got_object_commit_close(entry->commit);
1122 commits->ncommits--;
1123 /* Don't free entry->id! It is owned by the commit graph. */
1128 free_commits(struct commit_queue *commits)
1130 while (!TAILQ_EMPTY(&commits->head))
1131 pop_commit(commits);
1134 static const struct got_error *
1135 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1136 int minqueue, struct got_repository *repo, const char *path)
1138 const struct got_error *err = NULL;
1142 * We keep all commits open throughout the lifetime of the log
1143 * view in order to avoid having to re-fetch commits from disk
1144 * while updating the display.
1146 while (nqueued < minqueue) {
1147 struct got_object_id *id;
1148 struct got_commit_object *commit;
1149 struct commit_queue_entry *entry;
1152 err = got_commit_graph_iter_next(&id, graph);
1154 if (err->code != GOT_ERR_ITER_NEED_MORE)
1156 err = got_commit_graph_fetch_commits(graph,
1166 err = got_object_open_as_commit(&commit, repo, id);
1169 entry = alloc_commit_queue_entry(commit, id);
1170 if (entry == NULL) {
1171 err = got_error_from_errno("alloc_commit_queue_entry");
1175 errcode = pthread_mutex_lock(&tog_mutex);
1177 err = got_error_set_errno(errcode, "pthread_mutex_lock");
1181 entry->idx = commits->ncommits;
1182 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1184 commits->ncommits++;
1186 errcode = pthread_mutex_unlock(&tog_mutex);
1187 if (errcode && err == NULL)
1188 err = got_error_set_errno(errcode,
1189 "pthread_mutex_unlock");
1195 static const struct got_error *
1196 get_head_commit_id(struct got_object_id **head_id, const char *branch_name,
1197 struct got_repository *repo)
1199 const struct got_error *err = NULL;
1200 struct got_reference *head_ref;
1204 err = got_ref_open(&head_ref, repo, branch_name, 0);
1208 err = got_ref_resolve(head_id, repo, head_ref);
1209 got_ref_close(head_ref);
1218 static const struct got_error *
1219 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1220 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1221 struct commit_queue *commits, int selected_idx, int limit,
1222 struct got_reflist_head *refs, const char *path, int commits_needed)
1224 const struct got_error *err = NULL;
1225 struct commit_queue_entry *entry;
1227 int ncommits, author_cols = 10;
1228 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1229 char *refs_str = NULL;
1235 if (ncommits == selected_idx) {
1239 entry = TAILQ_NEXT(entry, entry);
1243 if (*selected && !(view->searching && view->search_next_done == 0)) {
1244 err = got_object_id_str(&id_str, (*selected)->id);
1248 err = build_refs_str(&refs_str, refs, (*selected)->id);
1254 if (commits_needed == 0)
1255 halfdelay(10); /* disable fast refresh */
1257 if (asprintf(&ncommits_str, " [%d/%d] %s",
1258 entry ? entry->idx + 1 : 0, commits->ncommits,
1259 commits_needed > 0 ?
1260 (view->searching && view->search_next_done == 0
1261 ? "searching..." : "loading... ") :
1262 (refs_str ? refs_str : "")) == -1) {
1263 err = got_error_from_errno("asprintf");
1267 if (path && strcmp(path, "/") != 0) {
1268 if (asprintf(&header, "commit %s %s%s",
1269 id_str ? id_str : "........................................",
1270 path, ncommits_str) == -1) {
1271 err = got_error_from_errno("asprintf");
1275 } else if (asprintf(&header, "commit %s%s",
1276 id_str ? id_str : "........................................",
1277 ncommits_str) == -1) {
1278 err = got_error_from_errno("asprintf");
1282 err = format_line(&wline, &width, header, view->ncols);
1286 werase(view->window);
1288 if (view_needs_focus_indication(view))
1289 wstandout(view->window);
1290 waddwstr(view->window, wline);
1291 while (width < view->ncols) {
1292 waddch(view->window, ' ');
1295 if (view_needs_focus_indication(view))
1296 wstandend(view->window);
1301 /* Grow author column size if necessary. */
1308 if (ncommits >= limit - 1)
1310 author = strdup(got_object_commit_get_author(entry->commit));
1311 if (author == NULL) {
1312 err = got_error_from_errno("strdup");
1315 err = format_author(&wauthor, &width, author, COLS);
1316 if (author_cols < width)
1317 author_cols = width;
1320 entry = TAILQ_NEXT(entry, entry);
1327 if (ncommits >= limit - 1)
1329 if (ncommits == selected_idx)
1330 wstandout(view->window);
1331 err = draw_commit(view, entry->commit, entry->id, refs,
1333 if (ncommits == selected_idx)
1334 wstandend(view->window);
1339 entry = TAILQ_NEXT(entry, entry);
1352 scroll_up(struct tog_view *view,
1353 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1354 struct commit_queue *commits)
1356 struct commit_queue_entry *entry;
1359 entry = TAILQ_FIRST(&commits->head);
1360 if (*first_displayed_entry == entry)
1363 entry = *first_displayed_entry;
1364 while (entry && nscrolled < maxscroll) {
1365 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1367 *first_displayed_entry = entry;
1373 static const struct got_error *
1374 trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1375 pthread_cond_t *need_commits)
1380 halfdelay(1); /* fast refresh while loading commits */
1382 while (*commits_needed > 0) {
1386 /* Wake the log thread. */
1387 errcode = pthread_cond_signal(need_commits);
1389 return got_error_set_errno(errcode,
1390 "pthread_cond_signal");
1391 errcode = pthread_mutex_unlock(&tog_mutex);
1393 return got_error_set_errno(errcode,
1394 "pthread_mutex_unlock");
1396 errcode = pthread_mutex_lock(&tog_mutex);
1398 return got_error_set_errno(errcode,
1399 "pthread_mutex_lock");
1401 if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1403 * Thread is not done yet; lose a key press
1404 * and let the user retry... this way the GUI
1405 * remains interactive while logging deep paths
1406 * with few commits in history.
1415 static const struct got_error *
1416 scroll_down(struct tog_view *view,
1417 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1418 struct commit_queue_entry **last_displayed_entry,
1419 struct commit_queue *commits, int *log_complete, int *commits_needed,
1420 pthread_cond_t *need_commits)
1422 const struct got_error *err = NULL;
1423 struct commit_queue_entry *pentry;
1426 if (*last_displayed_entry == NULL)
1429 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1430 if (pentry == NULL && !*log_complete) {
1432 * Ask the log thread for required amount of commits
1433 * plus some amount of pre-fetching.
1435 (*commits_needed) += maxscroll + 20;
1436 err = trigger_log_thread(0, commits_needed, log_complete,
1443 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1447 *last_displayed_entry = pentry;
1449 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1452 *first_displayed_entry = pentry;
1453 } while (++nscrolled < maxscroll);
1458 static const struct got_error *
1459 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1460 struct got_commit_object *commit, struct got_object_id *commit_id,
1461 struct tog_view *log_view, struct got_reflist_head *refs,
1462 struct got_repository *repo)
1464 const struct got_error *err;
1465 struct got_object_qid *parent_id;
1466 struct tog_view *diff_view;
1468 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1469 if (diff_view == NULL)
1470 return got_error_from_errno("view_open");
1472 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1473 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1474 commit_id, log_view, refs, repo);
1476 *new_view = diff_view;
1480 static const struct got_error *
1481 tree_view_visit_subtree(struct got_tree_object *subtree,
1482 struct tog_tree_view_state *s)
1484 struct tog_parent_tree *parent;
1486 parent = calloc(1, sizeof(*parent));
1488 return got_error_from_errno("calloc");
1490 parent->tree = s->tree;
1491 parent->first_displayed_entry = s->first_displayed_entry;
1492 parent->selected_entry = s->selected_entry;
1493 parent->selected = s->selected;
1494 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1496 s->entries = got_object_tree_get_entries(s->tree);
1498 s->first_displayed_entry = NULL;
1503 static const struct got_error *
1504 browse_commit_tree(struct tog_view **new_view, int begin_x,
1505 struct commit_queue_entry *entry, const char *path,
1506 struct got_reflist_head *refs, struct got_repository *repo)
1508 const struct got_error *err = NULL;
1509 struct got_tree_object *tree;
1510 struct got_tree_entry *te;
1511 struct tog_tree_view_state *s;
1512 struct tog_view *tree_view;
1513 char *slash, *subpath = NULL;
1516 err = got_object_open_as_tree(&tree, repo,
1517 got_object_commit_get_tree_id(entry->commit));
1521 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1522 if (tree_view == NULL)
1523 return got_error_from_errno("view_open");
1525 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1527 got_object_tree_close(tree);
1530 s = &tree_view->state.tree;
1532 *new_view = tree_view;
1534 /* Walk the path and open corresponding tree objects. */
1537 struct got_object_id *tree_id;
1542 /* Ensure the correct subtree entry is selected. */
1543 slash = strchr(p, '/');
1545 slash = strchr(p, '\0');
1546 SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
1547 if (strncmp(p, te->name, slash - p) == 0) {
1548 s->selected_entry = te;
1553 if (s->selected_entry == NULL) {
1554 err = got_error(GOT_ERR_NO_TREE_ENTRY);
1557 if (s->tree != s->root)
1558 s->selected++; /* skip '..' */
1560 if (!S_ISDIR(s->selected_entry->mode)) {
1561 /* Jump to this file's entry. */
1562 s->first_displayed_entry = s->selected_entry;
1567 slash = strchr(p, '/');
1569 subpath = strndup(path, slash - path);
1571 subpath = strdup(path);
1572 if (subpath == NULL) {
1573 err = got_error_from_errno("strdup");
1577 err = got_object_id_by_path(&tree_id, repo, entry->id,
1582 err = got_object_open_as_tree(&tree, repo, tree_id);
1587 err = tree_view_visit_subtree(tree, s);
1589 got_object_tree_close(tree);
1604 log_thread(void *arg)
1606 const struct got_error *err = NULL;
1608 struct tog_log_thread_args *a = arg;
1611 err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1615 while (!done && !err) {
1616 err = queue_commits(a->graph, a->commits, 1, a->repo,
1619 if (err->code != GOT_ERR_ITER_COMPLETED)
1623 } else if (a->commits_needed > 0)
1624 a->commits_needed--;
1626 errcode = pthread_mutex_lock(&tog_mutex);
1628 err = got_error_set_errno(errcode,
1629 "pthread_mutex_lock");
1631 } else if (*a->quit)
1633 else if (*a->first_displayed_entry == NULL) {
1634 *a->first_displayed_entry =
1635 TAILQ_FIRST(&a->commits->head);
1636 *a->selected_entry = *a->first_displayed_entry;
1640 a->commits_needed = 0;
1641 else if (a->commits_needed == 0) {
1642 errcode = pthread_cond_wait(&a->need_commits,
1645 err = got_error_set_errno(errcode,
1646 "pthread_cond_wait");
1649 errcode = pthread_mutex_unlock(&tog_mutex);
1650 if (errcode && err == NULL)
1651 err = got_error_set_errno(errcode,
1652 "pthread_mutex_unlock");
1654 a->log_complete = 1;
1658 static const struct got_error *
1659 stop_log_thread(struct tog_log_view_state *s)
1661 const struct got_error *err = NULL;
1666 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1668 return got_error_set_errno(errcode,
1669 "pthread_cond_signal");
1670 errcode = pthread_mutex_unlock(&tog_mutex);
1672 return got_error_set_errno(errcode,
1673 "pthread_mutex_unlock");
1674 errcode = pthread_join(s->thread, (void **)&err);
1676 return got_error_set_errno(errcode, "pthread_join");
1677 errcode = pthread_mutex_lock(&tog_mutex);
1679 return got_error_set_errno(errcode,
1680 "pthread_mutex_lock");
1684 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1685 if (errcode && err == NULL)
1686 err = got_error_set_errno(errcode, "pthread_cond_destroy");
1688 if (s->thread_args.repo) {
1689 got_repo_close(s->thread_args.repo);
1690 s->thread_args.repo = NULL;
1693 if (s->thread_args.graph) {
1694 got_commit_graph_close(s->thread_args.graph);
1695 s->thread_args.graph = NULL;
1701 static const struct got_error *
1702 close_log_view(struct tog_view *view)
1704 const struct got_error *err = NULL;
1705 struct tog_log_view_state *s = &view->state.log;
1707 err = stop_log_thread(s);
1708 free_commits(&s->commits);
1709 free(s->in_repo_path);
1710 s->in_repo_path = NULL;
1716 static const struct got_error *
1717 search_start_log_view(struct tog_view *view)
1719 struct tog_log_view_state *s = &view->state.log;
1721 s->matched_entry = NULL;
1726 match_commit(struct got_commit_object *commit, const char *id_str,
1729 regmatch_t regmatch;
1731 if (regexec(regex, got_object_commit_get_author(commit), 1,
1732 ®match, 0) == 0 ||
1733 regexec(regex, got_object_commit_get_committer(commit), 1,
1734 ®match, 0) == 0 ||
1735 regexec(regex, got_object_commit_get_logmsg(commit), 1,
1736 ®match, 0) == 0 ||
1737 regexec(regex, id_str, 1, ®match, 0) == 0)
1743 static const struct got_error *
1744 search_next_log_view(struct tog_view *view)
1746 const struct got_error *err = NULL;
1747 struct tog_log_view_state *s = &view->state.log;
1748 struct commit_queue_entry *entry;
1750 if (!view->searching) {
1751 view->search_next_done = 1;
1755 if (s->matched_entry) {
1756 if (view->searching == TOG_SEARCH_FORWARD)
1757 entry = TAILQ_NEXT(s->selected_entry, entry);
1759 entry = TAILQ_PREV(s->selected_entry,
1760 commit_queue_head, entry);
1762 if (view->searching == TOG_SEARCH_FORWARD)
1763 entry = TAILQ_FIRST(&s->commits.head);
1765 entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
1770 if (entry == NULL) {
1771 if (s->thread_args.log_complete ||
1772 view->searching == TOG_SEARCH_BACKWARD) {
1773 view->search_next_done = 1;
1776 s->thread_args.commits_needed = 1;
1777 return trigger_log_thread(0,
1778 &s->thread_args.commits_needed,
1779 &s->thread_args.log_complete,
1780 &s->thread_args.need_commits);
1783 err = got_object_id_str(&id_str, entry->id);
1787 if (match_commit(entry->commit, id_str, &view->regex)) {
1788 view->search_next_done = 1;
1789 s->matched_entry = entry;
1794 if (view->searching == TOG_SEARCH_FORWARD)
1795 entry = TAILQ_NEXT(entry, entry);
1797 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1800 if (s->matched_entry) {
1801 int cur = s->selected_entry->idx;
1802 while (cur < s->matched_entry->idx) {
1803 err = input_log_view(NULL, NULL, NULL, view, KEY_DOWN);
1808 while (cur > s->matched_entry->idx) {
1809 err = input_log_view(NULL, NULL, NULL, view, KEY_UP);
1819 static const struct got_error *
1820 open_log_view(struct tog_view *view, struct got_object_id *start_id,
1821 struct got_reflist_head *refs, struct got_repository *repo,
1822 const char *head_ref_name, const char *path, int check_disk)
1824 const struct got_error *err = NULL;
1825 struct tog_log_view_state *s = &view->state.log;
1826 struct got_repository *thread_repo = NULL;
1827 struct got_commit_graph *thread_graph = NULL;
1830 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1834 /* The commit queue only contains commits being displayed. */
1835 TAILQ_INIT(&s->commits.head);
1836 s->commits.ncommits = 0;
1840 s->head_ref_name = head_ref_name;
1841 s->start_id = got_object_id_dup(start_id);
1842 if (s->start_id == NULL) {
1843 err = got_error_from_errno("got_object_id_dup");
1847 view->show = show_log_view;
1848 view->input = input_log_view;
1849 view->close = close_log_view;
1850 view->search_start = search_start_log_view;
1851 view->search_next = search_next_log_view;
1853 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1856 err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1861 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1863 err = got_error_set_errno(errcode, "pthread_cond_init");
1867 s->thread_args.commits_needed = view->nlines;
1868 s->thread_args.graph = thread_graph;
1869 s->thread_args.commits = &s->commits;
1870 s->thread_args.in_repo_path = s->in_repo_path;
1871 s->thread_args.start_id = s->start_id;
1872 s->thread_args.repo = thread_repo;
1873 s->thread_args.log_complete = 0;
1874 s->thread_args.quit = &s->quit;
1875 s->thread_args.view = view;
1876 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1877 s->thread_args.selected_entry = &s->selected_entry;
1880 close_log_view(view);
1884 static const struct got_error *
1885 show_log_view(struct tog_view *view)
1887 struct tog_log_view_state *s = &view->state.log;
1889 if (s->thread == NULL) {
1890 int errcode = pthread_create(&s->thread, NULL, log_thread,
1893 return got_error_set_errno(errcode, "pthread_create");
1896 return draw_commits(view, &s->last_displayed_entry,
1897 &s->selected_entry, s->first_displayed_entry,
1898 &s->commits, s->selected, view->nlines, s->refs,
1899 s->in_repo_path, s->thread_args.commits_needed);
1902 static const struct got_error *
1903 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1904 struct tog_view **focus_view, struct tog_view *view, int ch)
1906 const struct got_error *err = NULL;
1907 struct tog_log_view_state *s = &view->state.log;
1908 char *parent_path, *in_repo_path = NULL;
1909 struct tog_view *diff_view = NULL, *tree_view = NULL, *lv = NULL;
1911 struct got_object_id *start_id;
1921 if (s->first_displayed_entry == NULL)
1923 if (s->selected > 0)
1926 scroll_up(view, &s->first_displayed_entry, 1,
1931 if (s->first_displayed_entry == NULL)
1933 if (TAILQ_FIRST(&s->commits.head) ==
1934 s->first_displayed_entry) {
1938 scroll_up(view, &s->first_displayed_entry,
1939 view->nlines, &s->commits);
1945 if (s->first_displayed_entry == NULL)
1947 if (s->selected < MIN(view->nlines - 2,
1948 s->commits.ncommits - 1)) {
1952 err = scroll_down(view, &s->first_displayed_entry, 1,
1953 &s->last_displayed_entry, &s->commits,
1954 &s->thread_args.log_complete,
1955 &s->thread_args.commits_needed,
1956 &s->thread_args.need_commits);
1960 struct commit_queue_entry *first;
1961 first = s->first_displayed_entry;
1964 err = scroll_down(view, &s->first_displayed_entry,
1965 view->nlines, &s->last_displayed_entry,
1966 &s->commits, &s->thread_args.log_complete,
1967 &s->thread_args.commits_needed,
1968 &s->thread_args.need_commits);
1969 if (first == s->first_displayed_entry &&
1970 s->selected < MIN(view->nlines - 2,
1971 s->commits.ncommits - 1)) {
1972 /* can't scroll further down */
1973 s->selected = MIN(view->nlines - 2,
1974 s->commits.ncommits - 1);
1980 if (s->selected > view->nlines - 2)
1981 s->selected = view->nlines - 2;
1982 if (s->selected > s->commits.ncommits - 1)
1983 s->selected = s->commits.ncommits - 1;
1988 if (s->selected_entry == NULL)
1990 if (view_is_parent_view(view))
1991 begin_x = view_split_begin_x(view->begin_x);
1992 err = open_diff_view_for_commit(&diff_view, begin_x,
1993 s->selected_entry->commit, s->selected_entry->id,
1994 view, s->refs, s->repo);
1997 if (view_is_parent_view(view)) {
1998 err = view_close_child(view);
2001 err = view_set_child(view, diff_view);
2003 view_close(diff_view);
2006 *focus_view = diff_view;
2007 view->child_focussed = 1;
2009 *new_view = diff_view;
2012 if (s->selected_entry == NULL)
2014 if (view_is_parent_view(view))
2015 begin_x = view_split_begin_x(view->begin_x);
2016 err = browse_commit_tree(&tree_view, begin_x,
2017 s->selected_entry, s->in_repo_path, s->refs, s->repo);
2020 if (view_is_parent_view(view)) {
2021 err = view_close_child(view);
2024 err = view_set_child(view, tree_view);
2026 view_close(tree_view);
2029 *focus_view = tree_view;
2030 view->child_focussed = 1;
2032 *new_view = tree_view;
2035 if (strcmp(s->in_repo_path, "/") == 0)
2037 parent_path = dirname(s->in_repo_path);
2038 if (parent_path && strcmp(parent_path, ".") != 0) {
2039 err = stop_log_thread(s);
2042 lv = view_open(view->nlines, view->ncols,
2043 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2045 return got_error_from_errno(
2047 err = open_log_view(lv, s->start_id, s->refs,
2048 s->repo, s->head_ref_name, parent_path, 0);
2051 if (view_is_parent_view(view))
2054 view_set_child(view->parent, lv);
2061 err = stop_log_thread(s);
2064 lv = view_open(view->nlines, view->ncols,
2065 view->begin_y, view->begin_x, TOG_VIEW_LOG);
2067 return got_error_from_errno("view_open");
2068 err = get_head_commit_id(&start_id, s->head_ref_name ?
2069 s->head_ref_name : GOT_REF_HEAD, s->repo);
2072 in_repo_path = strdup(s->in_repo_path);
2073 if (in_repo_path == NULL) {
2075 return got_error_from_errno("strdup");
2077 err = open_log_view(lv, start_id, s->refs, s->repo,
2078 s->head_ref_name, in_repo_path, 0);
2091 static const struct got_error *
2092 apply_unveil(const char *repo_path, const char *worktree_path)
2094 const struct got_error *error;
2096 if (repo_path && unveil(repo_path, "r") != 0)
2097 return got_error_from_errno2("unveil", repo_path);
2099 if (worktree_path && unveil(worktree_path, "rwc") != 0)
2100 return got_error_from_errno2("unveil", worktree_path);
2102 if (unveil("/tmp", "rwc") != 0)
2103 return got_error_from_errno2("unveil", "/tmp");
2105 error = got_privsep_unveil_exec_helpers();
2109 if (unveil(NULL, NULL) != 0)
2110 return got_error_from_errno("unveil");
2120 halfdelay(1); /* Do fast refresh while initial view is loading. */
2123 intrflush(stdscr, FALSE);
2124 keypad(stdscr, TRUE);
2126 signal(SIGWINCH, tog_sigwinch);
2129 static const struct got_error *
2130 cmd_log(int argc, char *argv[])
2132 const struct got_error *error;
2133 struct got_repository *repo = NULL;
2134 struct got_worktree *worktree = NULL;
2135 struct got_reflist_head refs;
2136 struct got_object_id *start_id = NULL;
2137 char *path = NULL, *repo_path = NULL, *cwd = NULL;
2138 char *start_commit = NULL;
2140 struct tog_view *view;
2142 SIMPLEQ_INIT(&refs);
2145 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2150 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2153 start_commit = optarg;
2156 repo_path = realpath(optarg, NULL);
2157 if (repo_path == NULL)
2158 err(1, "-r option");
2169 cwd = getcwd(NULL, 0);
2171 error = got_error_from_errno("getcwd");
2174 error = got_worktree_open(&worktree, cwd);
2175 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2182 error = got_error_from_errno("strdup");
2185 } else if (argc == 1) {
2187 error = got_worktree_resolve_path(&path, worktree,
2192 path = strdup(argv[0]);
2194 error = got_error_from_errno("strdup");
2201 repo_path = worktree ?
2202 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
2203 if (repo_path == NULL) {
2204 error = got_error_from_errno("strdup");
2210 error = got_repo_open(&repo, repo_path);
2214 error = apply_unveil(got_repo_get_path(repo),
2215 worktree ? got_worktree_get_root_path(worktree) : NULL);
2219 if (start_commit == NULL)
2220 error = get_head_commit_id(&start_id, worktree ?
2221 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2224 error = got_repo_match_object_id_prefix(&start_id,
2225 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2229 error = got_ref_list(&refs, repo);
2233 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2235 error = got_error_from_errno("view_open");
2238 error = open_log_view(view, start_id, &refs, repo, worktree ?
2239 got_worktree_get_head_ref_name(worktree) : NULL, path, 1);
2242 error = view_loop(view);
2249 got_repo_close(repo);
2251 got_worktree_close(worktree);
2252 got_ref_list_free(&refs);
2260 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
2266 parse_next_line(FILE *f, size_t *len)
2271 const char delim[3] = { '\0', '\0', '\0'};
2273 line = fparseln(f, &linelen, &lineno, delim, 0);
2279 static const struct got_error *
2280 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
2281 int *last_displayed_line, int *eof, int max_lines,
2284 const struct got_error *err;
2285 int nlines = 0, nprinted = 0;
2292 werase(view->window);
2295 err = format_line(&wline, &width, header, view->ncols);
2300 if (view_needs_focus_indication(view))
2301 wstandout(view->window);
2302 waddwstr(view->window, wline);
2303 if (view_needs_focus_indication(view))
2304 wstandend(view->window);
2305 if (width < view->ncols - 1)
2306 waddch(view->window, '\n');
2314 while (nprinted < max_lines) {
2315 line = parse_next_line(f, &len);
2320 if (++nlines < *first_displayed_line) {
2325 err = format_line(&wline, &width, line, view->ncols);
2330 waddwstr(view->window, wline);
2331 if (width < view->ncols - 1)
2332 waddch(view->window, '\n');
2333 if (++nprinted == 1)
2334 *first_displayed_line = nlines;
2339 *last_displayed_line = nlines;
2344 while (nprinted < view->nlines) {
2345 waddch(view->window, '\n');
2349 err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols);
2354 wstandout(view->window);
2355 waddwstr(view->window, wline);
2356 wstandend(view->window);
2363 get_datestr(time_t *time, char *datebuf)
2365 char *p, *s = ctime_r(time, datebuf);
2366 p = strchr(s, '\n');
2372 static const struct got_error *
2373 write_commit_info(struct got_object_id *commit_id,
2374 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2376 const struct got_error *err = NULL;
2378 struct got_commit_object *commit;
2379 char *id_str = NULL;
2380 time_t committer_time;
2381 const char *author, *committer;
2382 char *refs_str = NULL;
2385 err = build_refs_str(&refs_str, refs, commit_id);
2390 err = got_object_open_as_commit(&commit, repo, commit_id);
2394 err = got_object_id_str(&id_str, commit_id);
2396 err = got_error_from_errno("got_object_id_str");
2400 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2401 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2402 err = got_error_from_errno("fprintf");
2405 if (fprintf(outfile, "from: %s\n",
2406 got_object_commit_get_author(commit)) < 0) {
2407 err = got_error_from_errno("fprintf");
2410 committer_time = got_object_commit_get_committer_time(commit);
2411 if (fprintf(outfile, "date: %s UTC\n",
2412 get_datestr(&committer_time, datebuf)) < 0) {
2413 err = got_error_from_errno("fprintf");
2416 author = got_object_commit_get_author(commit);
2417 committer = got_object_commit_get_committer(commit);
2418 if (strcmp(author, committer) != 0 &&
2419 fprintf(outfile, "via: %s\n", committer) < 0) {
2420 err = got_error_from_errno("fprintf");
2423 if (fprintf(outfile, "%s\n",
2424 got_object_commit_get_logmsg(commit)) < 0) {
2425 err = got_error_from_errno("fprintf");
2431 got_object_commit_close(commit);
2435 static const struct got_error *
2436 create_diff(struct tog_diff_view_state *s)
2438 const struct got_error *err = NULL;
2444 err = got_error_from_errno("got_opentemp");
2447 if (s->f && fclose(s->f) != 0) {
2448 err = got_error_from_errno("fclose");
2454 err = got_object_get_type(&obj_type, s->repo, s->id1);
2456 err = got_object_get_type(&obj_type, s->repo, s->id2);
2461 case GOT_OBJ_TYPE_BLOB:
2462 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2463 s->diff_context, s->repo, f);
2465 case GOT_OBJ_TYPE_TREE:
2466 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2467 s->diff_context, s->repo, f);
2469 case GOT_OBJ_TYPE_COMMIT: {
2470 const struct got_object_id_queue *parent_ids;
2471 struct got_object_qid *pid;
2472 struct got_commit_object *commit2;
2474 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2477 /* Show commit info if we're diffing to a parent/root commit. */
2479 write_commit_info(s->id2, s->refs, s->repo, f);
2481 parent_ids = got_object_commit_get_parent_ids(commit2);
2482 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2483 if (got_object_id_cmp(s->id1, pid->id) == 0) {
2484 write_commit_info(s->id2, s->refs,
2490 got_object_commit_close(commit2);
2492 err = got_diff_objects_as_commits(s->id1, s->id2,
2493 s->diff_context, s->repo, f);
2497 err = got_error(GOT_ERR_OBJ_TYPE);
2501 if (f && fflush(f) != 0 && err == NULL)
2502 err = got_error_from_errno("fflush");
2507 diff_view_indicate_progress(struct tog_view *view)
2509 mvwaddstr(view->window, 0, 0, "diffing...");
2514 static const struct got_error *
2515 open_diff_view(struct tog_view *view, struct got_object_id *id1,
2516 struct got_object_id *id2, struct tog_view *log_view,
2517 struct got_reflist_head *refs, struct got_repository *repo)
2519 const struct got_error *err;
2521 if (id1 != NULL && id2 != NULL) {
2523 err = got_object_get_type(&type1, repo, id1);
2526 err = got_object_get_type(&type2, repo, id2);
2531 return got_error(GOT_ERR_OBJ_TYPE);
2535 view->state.diff.id1 = got_object_id_dup(id1);
2536 if (view->state.diff.id1 == NULL)
2537 return got_error_from_errno("got_object_id_dup");
2539 view->state.diff.id1 = NULL;
2541 view->state.diff.id2 = got_object_id_dup(id2);
2542 if (view->state.diff.id2 == NULL) {
2543 free(view->state.diff.id1);
2544 view->state.diff.id1 = NULL;
2545 return got_error_from_errno("got_object_id_dup");
2547 view->state.diff.f = NULL;
2548 view->state.diff.first_displayed_line = 1;
2549 view->state.diff.last_displayed_line = view->nlines;
2550 view->state.diff.diff_context = 3;
2551 view->state.diff.log_view = log_view;
2552 view->state.diff.repo = repo;
2553 view->state.diff.refs = refs;
2555 if (log_view && view_is_splitscreen(view))
2556 show_log_view(log_view); /* draw vborder */
2557 diff_view_indicate_progress(view);
2559 err = create_diff(&view->state.diff);
2561 free(view->state.diff.id1);
2562 view->state.diff.id1 = NULL;
2563 free(view->state.diff.id2);
2564 view->state.diff.id2 = NULL;
2568 view->show = show_diff_view;
2569 view->input = input_diff_view;
2570 view->close = close_diff_view;
2575 static const struct got_error *
2576 close_diff_view(struct tog_view *view)
2578 const struct got_error *err = NULL;
2580 free(view->state.diff.id1);
2581 view->state.diff.id1 = NULL;
2582 free(view->state.diff.id2);
2583 view->state.diff.id2 = NULL;
2584 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2585 err = got_error_from_errno("fclose");
2589 static const struct got_error *
2590 show_diff_view(struct tog_view *view)
2592 const struct got_error *err;
2593 struct tog_diff_view_state *s = &view->state.diff;
2594 char *id_str1 = NULL, *id_str2, *header;
2597 err = got_object_id_str(&id_str1, s->id1);
2601 err = got_object_id_str(&id_str2, s->id2);
2605 if (asprintf(&header, "diff %s %s",
2606 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2607 err = got_error_from_errno("asprintf");
2615 return draw_file(view, s->f, &s->first_displayed_line,
2616 &s->last_displayed_line, &s->eof, view->nlines,
2620 static const struct got_error *
2621 set_selected_commit(struct tog_diff_view_state *s,
2622 struct commit_queue_entry *entry)
2624 const struct got_error *err;
2625 const struct got_object_id_queue *parent_ids;
2626 struct got_commit_object *selected_commit;
2627 struct got_object_qid *pid;
2630 s->id2 = got_object_id_dup(entry->id);
2632 return got_error_from_errno("got_object_id_dup");
2634 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2637 parent_ids = got_object_commit_get_parent_ids(selected_commit);
2639 pid = SIMPLEQ_FIRST(parent_ids);
2640 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2641 got_object_commit_close(selected_commit);
2645 static const struct got_error *
2646 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2647 struct tog_view **focus_view, struct tog_view *view, int ch)
2649 const struct got_error *err = NULL;
2650 struct tog_diff_view_state *s = &view->state.diff;
2651 struct tog_log_view_state *ls;
2652 struct commit_queue_entry *entry;
2658 if (s->first_displayed_line > 1)
2659 s->first_displayed_line--;
2663 if (s->first_displayed_line == 1)
2666 while (i++ < view->nlines - 1 &&
2667 s->first_displayed_line > 1)
2668 s->first_displayed_line--;
2673 s->first_displayed_line++;
2681 while (!s->eof && i++ < view->nlines - 1) {
2683 line = parse_next_line(s->f, NULL);
2684 s->first_displayed_line++;
2690 if (s->diff_context > 0) {
2692 diff_view_indicate_progress(view);
2693 err = create_diff(s);
2697 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2699 diff_view_indicate_progress(view);
2700 err = create_diff(s);
2705 if (s->log_view == NULL)
2707 ls = &s->log_view->state.log;
2708 entry = TAILQ_PREV(ls->selected_entry,
2709 commit_queue_head, entry);
2713 err = input_log_view(NULL, NULL, NULL, s->log_view,
2718 err = set_selected_commit(s, entry);
2722 s->first_displayed_line = 1;
2723 s->last_displayed_line = view->nlines;
2725 diff_view_indicate_progress(view);
2726 err = create_diff(s);
2730 if (s->log_view == NULL)
2732 ls = &s->log_view->state.log;
2734 if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2735 ls->thread_args.commits_needed++;
2737 /* Display "loading..." in log view. */
2738 show_log_view(s->log_view);
2742 err = trigger_log_thread(1 /* load_all */,
2743 &ls->thread_args.commits_needed,
2744 &ls->thread_args.log_complete,
2745 &ls->thread_args.need_commits);
2749 err = input_log_view(NULL, NULL, NULL, s->log_view,
2754 entry = TAILQ_NEXT(ls->selected_entry, entry);
2758 err = set_selected_commit(s, entry);
2762 s->first_displayed_line = 1;
2763 s->last_displayed_line = view->nlines;
2765 diff_view_indicate_progress(view);
2766 err = create_diff(s);
2775 static const struct got_error *
2776 cmd_diff(int argc, char *argv[])
2778 const struct got_error *error = NULL;
2779 struct got_repository *repo = NULL;
2780 struct got_reflist_head refs;
2781 struct got_object_id *id1 = NULL, *id2 = NULL;
2782 char *repo_path = NULL;
2783 char *id_str1 = NULL, *id_str2 = NULL;
2785 struct tog_view *view;
2787 SIMPLEQ_INIT(&refs);
2790 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2795 while ((ch = getopt(argc, argv, "")) != -1) {
2807 usage_diff(); /* TODO show local worktree changes */
2808 } else if (argc == 2) {
2809 repo_path = getcwd(NULL, 0);
2810 if (repo_path == NULL)
2811 return got_error_from_errno("getcwd");
2814 } else if (argc == 3) {
2815 repo_path = realpath(argv[0], NULL);
2816 if (repo_path == NULL)
2817 return got_error_from_errno2("realpath", argv[0]);
2825 error = got_repo_open(&repo, repo_path);
2829 error = apply_unveil(got_repo_get_path(repo), NULL);
2833 error = got_repo_match_object_id_prefix(&id1, id_str1,
2834 GOT_OBJ_TYPE_ANY, repo);
2838 error = got_repo_match_object_id_prefix(&id2, id_str2,
2839 GOT_OBJ_TYPE_ANY, repo);
2843 error = got_ref_list(&refs, repo);
2847 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2849 error = got_error_from_errno("view_open");
2852 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2855 error = view_loop(view);
2859 got_repo_close(repo);
2860 got_ref_list_free(&refs);
2868 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2873 struct tog_blame_line {
2875 struct got_object_id *id;
2878 static const struct got_error *
2879 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2880 const char *path, struct tog_blame_line *lines, int nlines,
2881 int blame_complete, int selected_line, int *first_displayed_line,
2882 int *last_displayed_line, int *eof, int max_lines)
2884 const struct got_error *err;
2885 int lineno = 0, nprinted = 0;
2890 struct tog_blame_line *blame_line;
2891 struct got_object_id *prev_id = NULL;
2894 err = got_object_id_str(&id_str, id);
2899 werase(view->window);
2901 if (asprintf(&line, "commit %s", id_str) == -1) {
2902 err = got_error_from_errno("asprintf");
2907 err = format_line(&wline, &width, line, view->ncols);
2910 if (view_needs_focus_indication(view))
2911 wstandout(view->window);
2912 waddwstr(view->window, wline);
2913 if (view_needs_focus_indication(view))
2914 wstandend(view->window);
2917 if (width < view->ncols - 1)
2918 waddch(view->window, '\n');
2920 if (asprintf(&line, "[%d/%d] %s%s",
2921 *first_displayed_line - 1 + selected_line, nlines,
2922 blame_complete ? "" : "annotating... ", path) == -1) {
2924 return got_error_from_errno("asprintf");
2927 err = format_line(&wline, &width, line, view->ncols);
2932 waddwstr(view->window, wline);
2935 if (width < view->ncols - 1)
2936 waddch(view->window, '\n');
2939 while (nprinted < max_lines - 2) {
2940 line = parse_next_line(f, &len);
2945 if (++lineno < *first_displayed_line) {
2950 wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2951 err = format_line(&wline, &width, line, wlimit);
2957 if (view->focussed && nprinted == selected_line - 1)
2958 wstandout(view->window);
2960 blame_line = &lines[lineno - 1];
2961 if (blame_line->annotated && prev_id &&
2962 got_object_id_cmp(prev_id, blame_line->id) == 0)
2963 waddstr(view->window, " ");
2964 else if (blame_line->annotated) {
2966 err = got_object_id_str(&id_str, blame_line->id);
2972 wprintw(view->window, "%.8s ", id_str);
2974 prev_id = blame_line->id;
2976 waddstr(view->window, "........ ");
2980 waddwstr(view->window, wline);
2981 while (width < wlimit) {
2982 waddch(view->window, ' ');
2985 if (view->focussed && nprinted == selected_line - 1)
2986 wstandend(view->window);
2987 if (++nprinted == 1)
2988 *first_displayed_line = lineno;
2993 *last_displayed_line = lineno;
3000 static const struct got_error *
3001 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3003 const struct got_error *err = NULL;
3004 struct tog_blame_cb_args *a = arg;
3005 struct tog_blame_line *line;
3008 if (nlines != a->nlines ||
3009 (lineno != -1 && lineno < 1) || lineno > a->nlines)
3010 return got_error(GOT_ERR_RANGE);
3012 errcode = pthread_mutex_lock(&tog_mutex);
3014 return got_error_set_errno(errcode, "pthread_mutex_lock");
3016 if (*a->quit) { /* user has quit the blame view */
3017 err = got_error(GOT_ERR_ITER_COMPLETED);
3022 goto done; /* no change in this commit */
3024 line = &a->lines[lineno - 1];
3025 if (line->annotated)
3028 line->id = got_object_id_dup(id);
3029 if (line->id == NULL) {
3030 err = got_error_from_errno("got_object_id_dup");
3033 line->annotated = 1;
3035 errcode = pthread_mutex_unlock(&tog_mutex);
3037 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3042 blame_thread(void *arg)
3044 const struct got_error *err;
3045 struct tog_blame_thread_args *ta = arg;
3046 struct tog_blame_cb_args *a = ta->cb_args;
3049 err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
3050 blame_cb, ta->cb_args);
3052 errcode = pthread_mutex_lock(&tog_mutex);
3054 return (void *)got_error_set_errno(errcode,
3055 "pthread_mutex_lock");
3057 got_repo_close(ta->repo);
3061 errcode = pthread_mutex_unlock(&tog_mutex);
3062 if (errcode && err == NULL)
3063 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3068 static struct got_object_id *
3069 get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
3072 struct tog_blame_line *line;
3074 line = &lines[first_displayed_line - 1 + selected_line - 1];
3075 if (!line->annotated)
3081 static const struct got_error *
3082 stop_blame(struct tog_blame *blame)
3084 const struct got_error *err = NULL;
3087 if (blame->thread) {
3089 errcode = pthread_mutex_unlock(&tog_mutex);
3091 return got_error_set_errno(errcode,
3092 "pthread_mutex_unlock");
3093 errcode = pthread_join(blame->thread, (void **)&err);
3095 return got_error_set_errno(errcode, "pthread_join");
3096 errcode = pthread_mutex_lock(&tog_mutex);
3098 return got_error_set_errno(errcode,
3099 "pthread_mutex_lock");
3100 if (err && err->code == GOT_ERR_ITER_COMPLETED)
3102 blame->thread = NULL;
3104 if (blame->thread_args.repo) {
3105 got_repo_close(blame->thread_args.repo);
3106 blame->thread_args.repo = NULL;
3109 if (fclose(blame->f) != 0 && err == NULL)
3110 err = got_error_from_errno("fclose");
3114 for (i = 0; i < blame->nlines; i++)
3115 free(blame->lines[i].id);
3117 blame->lines = NULL;
3119 free(blame->cb_args.commit_id);
3120 blame->cb_args.commit_id = NULL;
3125 static const struct got_error *
3126 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
3127 int *first_displayed_line, int *last_displayed_line, int *selected_line,
3128 int *done, int *eof, const char *path, struct got_object_id *commit_id,
3129 struct got_repository *repo)
3131 const struct got_error *err = NULL;
3132 struct got_blob_object *blob = NULL;
3133 struct got_repository *thread_repo = NULL;
3134 struct got_object_id *obj_id = NULL;
3137 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
3141 return got_error(GOT_ERR_NO_OBJ);
3143 err = got_object_get_type(&obj_type, repo, obj_id);
3147 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3148 err = got_error(GOT_ERR_OBJ_TYPE);
3152 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3155 blame->f = got_opentemp();
3156 if (blame->f == NULL) {
3157 err = got_error_from_errno("got_opentemp");
3160 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
3161 &blame->line_offsets, blame->f, blob);
3165 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
3166 if (blame->lines == NULL) {
3167 err = got_error_from_errno("calloc");
3171 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
3175 blame->cb_args.view = view;
3176 blame->cb_args.lines = blame->lines;
3177 blame->cb_args.nlines = blame->nlines;
3178 blame->cb_args.commit_id = got_object_id_dup(commit_id);
3179 if (blame->cb_args.commit_id == NULL) {
3180 err = got_error_from_errno("got_object_id_dup");
3183 blame->cb_args.quit = done;
3185 blame->thread_args.path = path;
3186 blame->thread_args.repo = thread_repo;
3187 blame->thread_args.cb_args = &blame->cb_args;
3188 blame->thread_args.complete = blame_complete;
3189 *blame_complete = 0;
3193 got_object_blob_close(blob);
3200 static const struct got_error *
3201 open_blame_view(struct tog_view *view, char *path,
3202 struct got_object_id *commit_id, struct got_reflist_head *refs,
3203 struct got_repository *repo)
3205 const struct got_error *err = NULL;
3206 struct tog_blame_view_state *s = &view->state.blame;
3208 SIMPLEQ_INIT(&s->blamed_commits);
3210 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
3214 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
3215 s->first_displayed_line = 1;
3216 s->last_displayed_line = view->nlines;
3217 s->selected_line = 1;
3218 s->blame_complete = 0;
3220 if (s->path == NULL)
3221 return got_error_from_errno("open_blame_view");
3224 s->commit_id = commit_id;
3225 memset(&s->blame, 0, sizeof(s->blame));
3227 view->show = show_blame_view;
3228 view->input = input_blame_view;
3229 view->close = close_blame_view;
3230 view->search_start = search_start_blame_view;
3231 view->search_next = search_next_blame_view;
3233 return run_blame(&s->blame, view, &s->blame_complete,
3234 &s->first_displayed_line, &s->last_displayed_line,
3235 &s->selected_line, &s->done, &s->eof, s->path,
3236 s->blamed_commit->id, s->repo);
3239 static const struct got_error *
3240 close_blame_view(struct tog_view *view)
3242 const struct got_error *err = NULL;
3243 struct tog_blame_view_state *s = &view->state.blame;
3245 if (s->blame.thread)
3246 err = stop_blame(&s->blame);
3248 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
3249 struct got_object_qid *blamed_commit;
3250 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
3251 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3252 got_object_qid_free(blamed_commit);
3260 static const struct got_error *
3261 search_start_blame_view(struct tog_view *view)
3263 struct tog_blame_view_state *s = &view->state.blame;
3265 s->matched_line = 0;
3270 match_line(const char *line, regex_t *regex)
3272 regmatch_t regmatch;
3274 return regexec(regex, line, 1, ®match, 0) == 0;
3278 static const struct got_error *
3279 search_next_blame_view(struct tog_view *view)
3281 struct tog_blame_view_state *s = &view->state.blame;
3284 if (!view->searching) {
3285 view->search_next_done = 1;
3289 if (s->matched_line) {
3290 if (view->searching == TOG_SEARCH_FORWARD)
3291 lineno = s->matched_line + 1;
3293 lineno = s->matched_line - 1;
3295 if (view->searching == TOG_SEARCH_FORWARD)
3298 lineno = s->blame.nlines;
3306 if (lineno <= 0 || lineno > s->blame.nlines) {
3307 if (s->matched_line == 0) {
3308 view->search_next_done = 1;
3313 if (view->searching == TOG_SEARCH_FORWARD)
3316 lineno = s->blame.nlines;
3319 offset = s->blame.line_offsets[lineno - 1];
3320 if (fseeko(s->blame.f, offset, SEEK_SET) != 0) {
3322 return got_error_from_errno("fseeko");
3325 line = parse_next_line(s->blame.f, &len);
3326 if (line && match_line(line, &view->regex)) {
3327 view->search_next_done = 1;
3328 s->matched_line = lineno;
3333 if (view->searching == TOG_SEARCH_FORWARD)
3339 if (s->matched_line) {
3340 s->first_displayed_line = s->matched_line;
3341 s->selected_line = 1;
3347 static const struct got_error *
3348 show_blame_view(struct tog_view *view)
3350 const struct got_error *err = NULL;
3351 struct tog_blame_view_state *s = &view->state.blame;
3354 if (s->blame.thread == NULL) {
3355 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
3356 &s->blame.thread_args);
3358 return got_error_set_errno(errcode, "pthread_create");
3361 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
3362 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
3363 s->selected_line, &s->first_displayed_line,
3364 &s->last_displayed_line, &s->eof, view->nlines);
3370 static const struct got_error *
3371 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
3372 struct tog_view **focus_view, struct tog_view *view, int ch)
3374 const struct got_error *err = NULL, *thread_err = NULL;
3375 struct tog_view *diff_view;
3376 struct tog_blame_view_state *s = &view->state.blame;
3385 if (s->selected_line > 1)
3387 else if (s->selected_line == 1 &&
3388 s->first_displayed_line > 1)
3389 s->first_displayed_line--;
3392 if (s->first_displayed_line == 1) {
3393 s->selected_line = 1;
3396 if (s->first_displayed_line > view->nlines - 2)
3397 s->first_displayed_line -=
3400 s->first_displayed_line = 1;
3404 if (s->selected_line < view->nlines - 2 &&
3405 s->first_displayed_line +
3406 s->selected_line <= s->blame.nlines)
3408 else if (s->last_displayed_line <
3410 s->first_displayed_line++;
3414 struct got_object_id *id = NULL;
3415 id = get_selected_commit_id(s->blame.lines,
3416 s->first_displayed_line, s->selected_line);
3420 struct got_commit_object *commit;
3421 struct got_object_qid *pid;
3422 struct got_object_id *blob_id = NULL;
3424 err = got_object_open_as_commit(&commit,
3428 pid = SIMPLEQ_FIRST(
3429 got_object_commit_get_parent_ids(commit));
3431 got_object_commit_close(commit);
3434 /* Check if path history ends here. */
3435 err = got_object_id_by_path(&blob_id, s->repo,
3438 if (err->code == GOT_ERR_NO_TREE_ENTRY)
3440 got_object_commit_close(commit);
3443 err = got_object_get_type(&obj_type, s->repo,
3446 /* Can't blame non-blob type objects. */
3447 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3448 got_object_commit_close(commit);
3451 err = got_object_qid_alloc(&s->blamed_commit,
3453 got_object_commit_close(commit);
3455 if (got_object_id_cmp(id,
3456 s->blamed_commit->id) == 0)
3458 err = got_object_qid_alloc(&s->blamed_commit,
3464 thread_err = stop_blame(&s->blame);
3468 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3469 s->blamed_commit, entry);
3470 err = run_blame(&s->blame, view, &s->blame_complete,
3471 &s->first_displayed_line, &s->last_displayed_line,
3472 &s->selected_line, &s->done, &s->eof,
3473 s->path, s->blamed_commit->id, s->repo);
3479 struct got_object_qid *first;
3480 first = SIMPLEQ_FIRST(&s->blamed_commits);
3481 if (!got_object_id_cmp(first->id, s->commit_id))
3484 thread_err = stop_blame(&s->blame);
3488 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3489 got_object_qid_free(s->blamed_commit);
3491 SIMPLEQ_FIRST(&s->blamed_commits);
3492 err = run_blame(&s->blame, view, &s->blame_complete,
3493 &s->first_displayed_line, &s->last_displayed_line,
3494 &s->selected_line, &s->done, &s->eof, s->path,
3495 s->blamed_commit->id, s->repo);
3502 struct got_object_id *id = NULL;
3503 struct got_object_qid *pid;
3504 struct got_commit_object *commit = NULL;
3505 id = get_selected_commit_id(s->blame.lines,
3506 s->first_displayed_line, s->selected_line);
3509 err = got_object_open_as_commit(&commit, s->repo, id);
3512 pid = SIMPLEQ_FIRST(
3513 got_object_commit_get_parent_ids(commit));
3514 if (view_is_parent_view(view))
3515 begin_x = view_split_begin_x(view->begin_x);
3516 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3517 if (diff_view == NULL) {
3518 got_object_commit_close(commit);
3519 err = got_error_from_errno("view_open");
3522 err = open_diff_view(diff_view, pid ? pid->id : NULL,
3523 id, NULL, s->refs, s->repo);
3524 got_object_commit_close(commit);
3526 view_close(diff_view);
3529 if (view_is_parent_view(view)) {
3530 err = view_close_child(view);
3533 err = view_set_child(view, diff_view);
3535 view_close(diff_view);
3538 *focus_view = diff_view;
3539 view->child_focussed = 1;
3541 *new_view = diff_view;
3548 if (s->last_displayed_line >= s->blame.nlines &&
3549 s->selected_line >= MIN(s->blame.nlines,
3550 view->nlines - 2)) {
3553 if (s->last_displayed_line >= s->blame.nlines &&
3554 s->selected_line < view->nlines - 2) {
3555 s->selected_line = MIN(s->blame.nlines,
3559 if (s->last_displayed_line + view->nlines - 2
3561 s->first_displayed_line +=
3564 s->first_displayed_line =
3569 if (s->selected_line > view->nlines - 2) {
3570 s->selected_line = MIN(s->blame.nlines,
3577 return thread_err ? thread_err : err;
3580 static const struct got_error *
3581 cmd_blame(int argc, char *argv[])
3583 const struct got_error *error;
3584 struct got_repository *repo = NULL;
3585 struct got_reflist_head refs;
3586 struct got_worktree *worktree = NULL;
3587 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3588 struct got_object_id *commit_id = NULL;
3589 char *commit_id_str = NULL;
3591 struct tog_view *view;
3593 SIMPLEQ_INIT(&refs);
3596 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3601 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3604 commit_id_str = optarg;
3607 repo_path = realpath(optarg, NULL);
3608 if (repo_path == NULL)
3609 err(1, "-r option");
3625 cwd = getcwd(NULL, 0);
3627 error = got_error_from_errno("getcwd");
3630 if (repo_path == NULL) {
3631 error = got_worktree_open(&worktree, cwd);
3632 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3638 strdup(got_worktree_get_repo_path(worktree));
3639 if (repo_path == NULL)
3640 error = got_error_from_errno("strdup");
3644 repo_path = strdup(cwd);
3645 if (repo_path == NULL) {
3646 error = got_error_from_errno("strdup");
3654 error = got_repo_open(&repo, repo_path);
3658 error = apply_unveil(got_repo_get_path(repo), NULL);
3663 const char *prefix = got_worktree_get_path_prefix(worktree);
3664 char *p, *worktree_subdir = cwd +
3665 strlen(got_worktree_get_root_path(worktree));
3666 if (asprintf(&p, "%s%s%s%s%s",
3667 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3668 worktree_subdir, worktree_subdir[0] ? "/" : "",
3670 error = got_error_from_errno("asprintf");
3673 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3676 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3681 if (commit_id_str == NULL) {
3682 struct got_reference *head_ref;
3683 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3686 error = got_ref_resolve(&commit_id, repo, head_ref);
3687 got_ref_close(head_ref);
3689 error = got_repo_match_object_id_prefix(&commit_id,
3690 commit_id_str, GOT_OBJ_TYPE_COMMIT, repo);
3695 error = got_ref_list(&refs, repo);
3699 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3701 error = got_error_from_errno("view_open");
3704 error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3707 error = view_loop(view);
3713 got_worktree_close(worktree);
3715 got_repo_close(repo);
3716 got_ref_list_free(&refs);
3720 static const struct got_error *
3721 draw_tree_entries(struct tog_view *view,
3722 struct got_tree_entry **first_displayed_entry,
3723 struct got_tree_entry **last_displayed_entry,
3724 struct got_tree_entry **selected_entry, int *ndisplayed,
3725 const char *label, int show_ids, const char *parent_path,
3726 const struct got_tree_entries *entries, int selected, int limit, int isroot)
3728 const struct got_error *err = NULL;
3729 struct got_tree_entry *te;
3735 werase(view->window);
3740 err = format_line(&wline, &width, label, view->ncols);
3743 if (view_needs_focus_indication(view))
3744 wstandout(view->window);
3745 waddwstr(view->window, wline);
3746 if (view_needs_focus_indication(view))
3747 wstandend(view->window);
3750 if (width < view->ncols - 1)
3751 waddch(view->window, '\n');
3754 err = format_line(&wline, &width, parent_path, view->ncols);
3757 waddwstr(view->window, wline);
3760 if (width < view->ncols - 1)
3761 waddch(view->window, '\n');
3764 waddch(view->window, '\n');
3768 te = SIMPLEQ_FIRST(&entries->head);
3769 if (*first_displayed_entry == NULL) {
3770 if (selected == 0) {
3772 wstandout(view->window);
3773 *selected_entry = NULL;
3775 waddstr(view->window, " ..\n"); /* parent directory */
3776 if (selected == 0 && view->focussed)
3777 wstandend(view->window);
3784 while (te != *first_displayed_entry)
3785 te = SIMPLEQ_NEXT(te, entry);
3789 char *line = NULL, *id_str = NULL;
3792 err = got_object_id_str(&id_str, te->id);
3794 return got_error_from_errno(
3795 "got_object_id_str");
3797 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3798 te->name, S_ISDIR(te->mode) ? "/" :
3799 ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3801 return got_error_from_errno("asprintf");
3804 err = format_line(&wline, &width, line, view->ncols);
3809 if (n == selected) {
3811 wstandout(view->window);
3812 *selected_entry = te;
3814 waddwstr(view->window, wline);
3815 if (width < view->ncols - 1)
3816 waddch(view->window, '\n');
3817 if (n == selected && view->focussed)
3818 wstandend(view->window);
3824 *last_displayed_entry = te;
3827 te = SIMPLEQ_NEXT(te, entry);
3834 tree_scroll_up(struct tog_view *view,
3835 struct got_tree_entry **first_displayed_entry, int maxscroll,
3836 const struct got_tree_entries *entries, int isroot)
3838 struct got_tree_entry *te, *prev;
3841 if (*first_displayed_entry == NULL)
3844 te = SIMPLEQ_FIRST(&entries->head);
3845 if (*first_displayed_entry == te) {
3847 *first_displayed_entry = NULL;
3851 /* XXX this is stupid... switch to TAILQ? */
3852 for (i = 0; i < maxscroll; i++) {
3853 while (te != *first_displayed_entry) {
3855 te = SIMPLEQ_NEXT(te, entry);
3857 *first_displayed_entry = prev;
3858 te = SIMPLEQ_FIRST(&entries->head);
3860 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3861 *first_displayed_entry = NULL;
3865 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3866 struct got_tree_entry *last_displayed_entry,
3867 const struct got_tree_entries *entries)
3869 struct got_tree_entry *next, *last;
3872 if (*first_displayed_entry)
3873 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3875 next = SIMPLEQ_FIRST(&entries->head);
3876 last = last_displayed_entry;
3877 while (next && last && n++ < maxscroll) {
3878 last = SIMPLEQ_NEXT(last, entry);
3880 *first_displayed_entry = next;
3881 next = SIMPLEQ_NEXT(next, entry);
3887 static const struct got_error *
3888 tree_entry_path(char **path, struct tog_parent_trees *parents,
3889 struct got_tree_entry *te)
3891 const struct got_error *err = NULL;
3892 struct tog_parent_tree *pt;
3893 size_t len = 2; /* for leading slash and NUL */
3895 TAILQ_FOREACH(pt, parents, entry)
3896 len += strlen(pt->selected_entry->name) + 1 /* slash */;
3898 len += strlen(te->name);
3900 *path = calloc(1, len);
3902 return got_error_from_errno("calloc");
3905 pt = TAILQ_LAST(parents, tog_parent_trees);
3907 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3908 err = got_error(GOT_ERR_NO_SPACE);
3911 if (strlcat(*path, "/", len) >= len) {
3912 err = got_error(GOT_ERR_NO_SPACE);
3915 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3918 if (strlcat(*path, te->name, len) >= len) {
3919 err = got_error(GOT_ERR_NO_SPACE);
3931 static const struct got_error *
3932 blame_tree_entry(struct tog_view **new_view, int begin_x,
3933 struct got_tree_entry *te, struct tog_parent_trees *parents,
3934 struct got_object_id *commit_id, struct got_reflist_head *refs,
3935 struct got_repository *repo)
3937 const struct got_error *err = NULL;
3939 struct tog_view *blame_view;
3941 err = tree_entry_path(&path, parents, te);
3945 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3946 if (blame_view == NULL)
3947 return got_error_from_errno("view_open");
3949 err = open_blame_view(blame_view, path, commit_id, refs, repo);
3951 view_close(blame_view);
3954 *new_view = blame_view;
3958 static const struct got_error *
3959 log_tree_entry(struct tog_view **new_view, int begin_x,
3960 struct got_tree_entry *te, struct tog_parent_trees *parents,
3961 struct got_object_id *commit_id, struct got_reflist_head *refs,
3962 struct got_repository *repo)
3964 struct tog_view *log_view;
3965 const struct got_error *err = NULL;
3968 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3969 if (log_view == NULL)
3970 return got_error_from_errno("view_open");
3972 err = tree_entry_path(&path, parents, te);
3976 err = open_log_view(log_view, commit_id, refs, repo, NULL, path, 0);
3978 view_close(log_view);
3980 *new_view = log_view;
3985 static const struct got_error *
3986 open_tree_view(struct tog_view *view, struct got_tree_object *root,
3987 struct got_object_id *commit_id, struct got_reflist_head *refs,
3988 struct got_repository *repo)
3990 const struct got_error *err = NULL;
3991 char *commit_id_str = NULL;
3992 struct tog_tree_view_state *s = &view->state.tree;
3994 TAILQ_INIT(&s->parents);
3996 err = got_object_id_str(&commit_id_str, commit_id);
4000 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
4001 err = got_error_from_errno("asprintf");
4005 s->root = s->tree = root;
4006 s->entries = got_object_tree_get_entries(root);
4007 s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
4008 s->commit_id = got_object_id_dup(commit_id);
4009 if (s->commit_id == NULL) {
4010 err = got_error_from_errno("got_object_id_dup");
4016 view->show = show_tree_view;
4017 view->input = input_tree_view;
4018 view->close = close_tree_view;
4019 view->search_start = search_start_tree_view;
4020 view->search_next = search_next_tree_view;
4022 free(commit_id_str);
4024 free(s->tree_label);
4025 s->tree_label = NULL;
4030 static const struct got_error *
4031 close_tree_view(struct tog_view *view)
4033 struct tog_tree_view_state *s = &view->state.tree;
4035 free(s->tree_label);
4036 s->tree_label = NULL;
4038 s->commit_id = NULL;
4039 while (!TAILQ_EMPTY(&s->parents)) {
4040 struct tog_parent_tree *parent;
4041 parent = TAILQ_FIRST(&s->parents);
4042 TAILQ_REMOVE(&s->parents, parent, entry);
4046 if (s->tree != s->root)
4047 got_object_tree_close(s->tree);
4048 got_object_tree_close(s->root);
4053 static const struct got_error *
4054 search_start_tree_view(struct tog_view *view)
4056 struct tog_tree_view_state *s = &view->state.tree;
4058 s->matched_entry = NULL;
4063 match_tree_entry(struct got_tree_entry *te, regex_t *regex)
4065 regmatch_t regmatch;
4067 return regexec(regex, te->name, 1, ®match, 0) == 0;
4070 static const struct got_error *
4071 search_next_tree_view(struct tog_view *view)
4073 struct tog_tree_view_state *s = &view->state.tree;
4074 struct got_tree_entry *entry, *te;
4076 if (!view->searching) {
4077 view->search_next_done = 1;
4081 if (s->matched_entry) {
4082 if (view->searching == TOG_SEARCH_FORWARD) {
4083 if (s->selected_entry)
4084 entry = SIMPLEQ_NEXT(s->selected_entry, entry);
4086 entry = SIMPLEQ_FIRST(&s->entries->head);
4089 if (s->selected_entry == NULL) {
4090 SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4093 SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4095 if (SIMPLEQ_NEXT(te, entry) ==
4102 if (view->searching == TOG_SEARCH_FORWARD)
4103 entry = SIMPLEQ_FIRST(&s->entries->head);
4105 SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4111 if (entry == NULL) {
4112 if (s->matched_entry == NULL) {
4113 view->search_next_done = 1;
4116 if (view->searching == TOG_SEARCH_FORWARD)
4117 entry = SIMPLEQ_FIRST(&s->entries->head);
4119 SIMPLEQ_FOREACH(te, &s->entries->head, entry)
4124 if (match_tree_entry(entry, &view->regex)) {
4125 view->search_next_done = 1;
4126 s->matched_entry = entry;
4130 if (view->searching == TOG_SEARCH_FORWARD)
4131 entry = SIMPLEQ_NEXT(entry, entry);
4133 if (SIMPLEQ_FIRST(&s->entries->head) == entry)
4136 SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
4137 if (SIMPLEQ_NEXT(te, entry) == entry) {
4146 if (s->matched_entry) {
4147 s->first_displayed_entry = s->matched_entry;
4154 static const struct got_error *
4155 show_tree_view(struct tog_view *view)
4157 const struct got_error *err = NULL;
4158 struct tog_tree_view_state *s = &view->state.tree;
4161 err = tree_entry_path(&parent_path, &s->parents, NULL);
4165 err = draw_tree_entries(view, &s->first_displayed_entry,
4166 &s->last_displayed_entry, &s->selected_entry,
4167 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
4168 s->entries, s->selected, view->nlines, s->tree == s->root);
4175 static const struct got_error *
4176 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
4177 struct tog_view **focus_view, struct tog_view *view, int ch)
4179 const struct got_error *err = NULL;
4180 struct tog_tree_view_state *s = &view->state.tree;
4181 struct tog_view *log_view;
4182 int begin_x = 0, nscrolled;
4186 s->show_ids = !s->show_ids;
4189 if (!s->selected_entry)
4191 if (view_is_parent_view(view))
4192 begin_x = view_split_begin_x(view->begin_x);
4193 err = log_tree_entry(&log_view, begin_x,
4194 s->selected_entry, &s->parents,
4195 s->commit_id, s->refs, s->repo);
4196 if (view_is_parent_view(view)) {
4197 err = view_close_child(view);
4200 err = view_set_child(view, log_view);
4202 view_close(log_view);
4205 *focus_view = log_view;
4206 view->child_focussed = 1;
4208 *new_view = log_view;
4212 if (s->selected > 0) {
4214 if (s->selected == 0)
4217 if (s->selected > 0)
4219 tree_scroll_up(view, &s->first_displayed_entry, 1,
4220 s->entries, s->tree == s->root);
4223 tree_scroll_up(view, &s->first_displayed_entry,
4224 MAX(0, view->nlines - 4 - s->selected), s->entries,
4225 s->tree == s->root);
4227 if (SIMPLEQ_FIRST(&s->entries->head) ==
4228 s->first_displayed_entry && s->tree != s->root)
4229 s->first_displayed_entry = NULL;
4233 if (s->selected < s->ndisplayed - 1) {
4237 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry) == NULL)
4238 /* can't scroll any further */
4240 tree_scroll_down(&s->first_displayed_entry, 1,
4241 s->last_displayed_entry, s->entries);
4244 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
4246 /* can't scroll any further; move cursor down */
4247 if (s->selected < s->ndisplayed - 1)
4248 s->selected = s->ndisplayed - 1;
4251 nscrolled = tree_scroll_down(&s->first_displayed_entry,
4252 view->nlines, s->last_displayed_entry, s->entries);
4253 if (nscrolled < view->nlines) {
4255 struct got_tree_entry *te;
4256 te = s->first_displayed_entry;
4259 te = SIMPLEQ_NEXT(te, entry);
4261 s->selected = ndisplayed - 1;
4267 if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
4268 struct tog_parent_tree *parent;
4269 /* user selected '..' */
4270 if (s->tree == s->root)
4272 parent = TAILQ_FIRST(&s->parents);
4273 TAILQ_REMOVE(&s->parents, parent,
4275 got_object_tree_close(s->tree);
4276 s->tree = parent->tree;
4278 got_object_tree_get_entries(s->tree);
4279 s->first_displayed_entry =
4280 parent->first_displayed_entry;
4282 parent->selected_entry;
4283 s->selected = parent->selected;
4285 } else if (S_ISDIR(s->selected_entry->mode)) {
4286 struct got_tree_object *subtree;
4287 err = got_object_open_as_tree(&subtree,
4288 s->repo, s->selected_entry->id);
4291 err = tree_view_visit_subtree(subtree, s);
4293 got_object_tree_close(subtree);
4296 } else if (S_ISREG(s->selected_entry->mode)) {
4297 struct tog_view *blame_view;
4298 int begin_x = view_is_parent_view(view) ?
4299 view_split_begin_x(view->begin_x) : 0;
4301 err = blame_tree_entry(&blame_view, begin_x,
4302 s->selected_entry, &s->parents,
4303 s->commit_id, s->refs, s->repo);
4306 if (view_is_parent_view(view)) {
4307 err = view_close_child(view);
4310 err = view_set_child(view, blame_view);
4312 view_close(blame_view);
4315 *focus_view = blame_view;
4316 view->child_focussed = 1;
4318 *new_view = blame_view;
4322 if (s->selected > view->nlines)
4323 s->selected = s->ndisplayed - 1;
4336 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
4341 static const struct got_error *
4342 cmd_tree(int argc, char *argv[])
4344 const struct got_error *error;
4345 struct got_repository *repo = NULL;
4346 struct got_reflist_head refs;
4347 char *repo_path = NULL;
4348 struct got_object_id *commit_id = NULL;
4349 char *commit_id_arg = NULL;
4350 struct got_commit_object *commit = NULL;
4351 struct got_tree_object *tree = NULL;
4353 struct tog_view *view;
4355 SIMPLEQ_INIT(&refs);
4358 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
4363 while ((ch = getopt(argc, argv, "c:")) != -1) {
4366 commit_id_arg = optarg;
4378 struct got_worktree *worktree;
4379 char *cwd = getcwd(NULL, 0);
4381 return got_error_from_errno("getcwd");
4382 error = got_worktree_open(&worktree, cwd);
4383 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4388 strdup(got_worktree_get_repo_path(worktree));
4389 got_worktree_close(worktree);
4392 if (repo_path == NULL) {
4393 error = got_error_from_errno("strdup");
4396 } else if (argc == 1) {
4397 repo_path = realpath(argv[0], NULL);
4398 if (repo_path == NULL)
4399 return got_error_from_errno2("realpath", argv[0]);
4405 error = got_repo_open(&repo, repo_path);
4409 error = apply_unveil(got_repo_get_path(repo), NULL);
4413 if (commit_id_arg == NULL)
4414 error = get_head_commit_id(&commit_id, GOT_REF_HEAD, repo);
4416 error = got_repo_match_object_id_prefix(&commit_id,
4417 commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
4421 error = got_object_open_as_commit(&commit, repo, commit_id);
4425 error = got_object_open_as_tree(&tree, repo,
4426 got_object_commit_get_tree_id(commit));
4430 error = got_ref_list(&refs, repo);
4434 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
4436 error = got_error_from_errno("view_open");
4439 error = open_tree_view(view, tree, commit_id, &refs, repo);
4442 error = view_loop(view);
4447 got_object_commit_close(commit);
4449 got_object_tree_close(tree);
4451 got_repo_close(repo);
4452 got_ref_list_free(&refs);
4459 fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n", getprogname());
4464 make_argv(const char *arg0, const char *arg1)
4467 int argc = (arg1 == NULL ? 1 : 2);
4469 argv = calloc(argc, sizeof(char *));
4472 argv[0] = strdup(arg0);
4473 if (argv[0] == NULL)
4476 argv[1] = strdup(arg1);
4477 if (argv[1] == NULL)
4485 main(int argc, char *argv[])
4487 const struct got_error *error = NULL;
4488 struct tog_cmd *cmd = NULL;
4490 char **cmd_argv = NULL;
4492 setlocale(LC_CTYPE, "");
4494 while ((ch = getopt(argc, argv, "h")) != -1) {
4513 /* Build an argument vector which runs a default command. */
4514 cmd = &tog_commands[0];
4515 cmd_argv = make_argv(cmd->name, NULL);
4520 /* Did the user specific a command? */
4521 for (i = 0; i < nitems(tog_commands); i++) {
4522 if (strncmp(tog_commands[i].name, argv[0],
4523 strlen(argv[0])) == 0) {
4524 cmd = &tog_commands[i];
4526 tog_commands[i].cmd_usage();
4531 /* Did the user specify a repository? */
4532 char *repo_path = realpath(argv[0], NULL);
4534 struct got_repository *repo;
4535 error = got_repo_open(&repo, repo_path);
4537 got_repo_close(repo);
4539 error = got_error_from_errno2("realpath",
4543 fprintf(stderr, "%s: '%s' is not a "
4544 "known command\n", getprogname(),
4548 fprintf(stderr, "%s: '%s' is neither a known "
4549 "command nor a path to a repository\n",
4550 getprogname(), argv[0]);
4554 cmd = &tog_commands[0];
4555 cmd_argv = make_argv(cmd->name, repo_path);
4561 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4568 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);