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
40 #include "got_error.h"
41 #include "got_object.h"
42 #include "got_reference.h"
43 #include "got_repository.h"
45 #include "got_opentemp.h"
46 #include "got_commit_graph.h"
48 #include "got_blame.h"
49 #include "got_privsep.h"
50 #include "got_worktree.h"
53 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
57 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
62 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
67 const struct got_error *(*cmd_main)(int, char *[]);
68 void (*cmd_usage)(void);
72 __dead static void usage(void);
73 __dead static void usage_log(void);
74 __dead static void usage_diff(void);
75 __dead static void usage_blame(void);
76 __dead static void usage_tree(void);
78 static const struct got_error* cmd_log(int, char *[]);
79 static const struct got_error* cmd_diff(int, char *[]);
80 static const struct got_error* cmd_blame(int, char *[]);
81 static const struct got_error* cmd_tree(int, char *[]);
83 static struct tog_cmd tog_commands[] = {
84 { "log", cmd_log, usage_log,
85 "show repository history" },
86 { "diff", cmd_diff, usage_diff,
87 "compare files and directories" },
88 { "blame", cmd_blame, usage_blame,
89 "show line-by-line file history" },
90 { "tree", cmd_tree, usage_tree,
91 "browse trees in repository" },
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 struct got_repository *repo;
152 struct got_reflist_head *refs;
153 struct got_object_id *start_id;
156 struct tog_log_thread_args thread_args;
159 struct tog_blame_cb_args {
160 struct tog_blame_line *lines; /* one per line */
163 struct tog_view *view;
164 struct got_object_id *commit_id;
168 struct tog_blame_thread_args {
170 struct got_repository *repo;
171 struct tog_blame_cb_args *cb_args;
178 struct tog_blame_line *lines;
181 struct tog_blame_thread_args thread_args;
182 struct tog_blame_cb_args cb_args;
186 struct tog_blame_view_state {
187 int first_displayed_line;
188 int last_displayed_line;
193 struct got_object_id_queue blamed_commits;
194 struct got_object_qid *blamed_commit;
196 struct got_repository *repo;
197 struct got_reflist_head *refs;
198 struct got_object_id *commit_id;
199 struct tog_blame blame;
202 struct tog_parent_tree {
203 TAILQ_ENTRY(tog_parent_tree) entry;
204 struct got_tree_object *tree;
205 struct got_tree_entry *first_displayed_entry;
206 struct got_tree_entry *selected_entry;
210 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
212 struct tog_tree_view_state {
214 struct got_tree_object *root;
215 struct got_tree_object *tree;
216 const struct got_tree_entries *entries;
217 struct got_tree_entry *first_displayed_entry;
218 struct got_tree_entry *last_displayed_entry;
219 struct got_tree_entry *selected_entry;
220 int ndisplayed, selected, show_ids;
221 struct tog_parent_trees parents;
222 struct got_object_id *commit_id;
223 struct got_repository *repo;
224 struct got_reflist_head *refs;
228 * We implement two types of views: parent views and child views.
230 * The 'Tab' key switches between a parent view and its child view.
231 * Child views are shown side-by-side to their parent view, provided
232 * there is enough screen estate.
234 * When a new view is opened from within a parent view, this new view
235 * becomes a child view of the parent view, replacing any existing child.
237 * When a new view is opened from within a child view, this new view
238 * becomes a parent view which will obscure the views below until the
239 * user quits the new parent view by typing 'q'.
241 * This list of views contains parent views only.
242 * Child views are only pointed to by their parent view.
244 TAILQ_HEAD(tog_view_list_head, tog_view);
247 TAILQ_ENTRY(tog_view) entry;
250 int nlines, ncols, begin_y, begin_x;
251 int lines, cols; /* copies of LINES and COLS */
253 struct tog_view *parent;
254 struct tog_view *child;
257 /* type-specific state */
258 enum tog_view_type type;
260 struct tog_diff_view_state diff;
261 struct tog_log_view_state log;
262 struct tog_blame_view_state blame;
263 struct tog_tree_view_state tree;
266 const struct got_error *(*show)(struct tog_view *);
267 const struct got_error *(*input)(struct tog_view **,
268 struct tog_view **, struct tog_view**, struct tog_view *, int);
269 const struct got_error *(*close)(struct tog_view *);
272 static const struct got_error *open_diff_view(struct tog_view *,
273 struct got_object_id *, struct got_object_id *, struct tog_view *,
274 struct got_reflist_head *, struct got_repository *);
275 static const struct got_error *show_diff_view(struct tog_view *);
276 static const struct got_error *input_diff_view(struct tog_view **,
277 struct tog_view **, struct tog_view **, struct tog_view *, int);
278 static const struct got_error* close_diff_view(struct tog_view *);
280 static const struct got_error *open_log_view(struct tog_view *,
281 struct got_object_id *, struct got_reflist_head *,
282 struct got_repository *, const char *, int);
283 static const struct got_error * show_log_view(struct tog_view *);
284 static const struct got_error *input_log_view(struct tog_view **,
285 struct tog_view **, struct tog_view **, struct tog_view *, int);
286 static const struct got_error *close_log_view(struct tog_view *);
288 static const struct got_error *open_blame_view(struct tog_view *, char *,
289 struct got_object_id *, struct got_reflist_head *, struct got_repository *);
290 static const struct got_error *show_blame_view(struct tog_view *);
291 static const struct got_error *input_blame_view(struct tog_view **,
292 struct tog_view **, struct tog_view **, struct tog_view *, int);
293 static const struct got_error *close_blame_view(struct tog_view *);
295 static const struct got_error *open_tree_view(struct tog_view *,
296 struct got_tree_object *, struct got_object_id *,
297 struct got_reflist_head *, struct got_repository *);
298 static const struct got_error *show_tree_view(struct tog_view *);
299 static const struct got_error *input_tree_view(struct tog_view **,
300 struct tog_view **, struct tog_view **, struct tog_view *, int);
301 static const struct got_error *close_tree_view(struct tog_view *);
303 static volatile sig_atomic_t tog_sigwinch_received;
306 tog_sigwinch(int signo)
308 tog_sigwinch_received = 1;
311 static const struct got_error *
312 view_close(struct tog_view *view)
314 const struct got_error *err = NULL;
317 view_close(view->child);
321 err = view->close(view);
323 del_panel(view->panel);
325 delwin(view->window);
330 static struct tog_view *
331 view_open(int nlines, int ncols, int begin_y, int begin_x,
332 enum tog_view_type type)
334 struct tog_view *view = calloc(1, sizeof(*view));
342 view->nlines = nlines ? nlines : LINES - begin_y;
343 view->ncols = ncols ? ncols : COLS - begin_x;
344 view->begin_y = begin_y;
345 view->begin_x = begin_x;
346 view->window = newwin(nlines, ncols, begin_y, begin_x);
347 if (view->window == NULL) {
351 view->panel = new_panel(view->window);
352 if (view->panel == NULL ||
353 set_panel_userptr(view->panel, view) != OK) {
358 keypad(view->window, TRUE);
363 view_split_begin_x(int begin_x)
365 if (begin_x > 0 || COLS < 120)
367 return (COLS - MAX(COLS / 2, 80));
370 static const struct got_error *view_resize(struct tog_view *);
372 static const struct got_error *
373 view_splitscreen(struct tog_view *view)
375 const struct got_error *err = NULL;
378 view->begin_x = view_split_begin_x(0);
379 view->nlines = LINES;
380 view->ncols = COLS - view->begin_x;
383 err = view_resize(view);
387 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
388 return got_error_from_errno();
393 static const struct got_error *
394 view_fullscreen(struct tog_view *view)
396 const struct got_error *err = NULL;
400 view->nlines = LINES;
404 err = view_resize(view);
408 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
409 return got_error_from_errno();
415 view_is_parent_view(struct tog_view *view)
417 return view->parent == NULL;
420 static const struct got_error *
421 view_resize(struct tog_view *view)
425 if (view->lines > LINES)
426 nlines = view->nlines - (view->lines - LINES);
428 nlines = view->nlines + (LINES - view->lines);
430 if (view->cols > COLS)
431 ncols = view->ncols - (view->cols - COLS);
433 ncols = view->ncols + (COLS - view->cols);
435 if (wresize(view->window, nlines, ncols) == ERR)
436 return got_error_from_errno();
437 if (replace_panel(view->panel, view->window) == ERR)
438 return got_error_from_errno();
439 wclear(view->window);
441 view->nlines = nlines;
447 view->child->begin_x = view_split_begin_x(view->begin_x);
448 if (view->child->begin_x == 0) {
449 view_fullscreen(view->child);
450 if (view->child->focussed)
451 show_panel(view->child->panel);
453 show_panel(view->panel);
455 view_splitscreen(view->child);
456 show_panel(view->child->panel);
463 static const struct got_error *
464 view_close_child(struct tog_view *view)
466 const struct got_error *err = NULL;
468 if (view->child == NULL)
471 err = view_close(view->child);
476 static const struct got_error *
477 view_set_child(struct tog_view *view, struct tog_view *child)
479 const struct got_error *err = NULL;
482 child->parent = view;
487 view_is_splitscreen(struct tog_view *view)
489 return !view_is_parent_view(view) && view->begin_x > 0;
498 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
499 cols = 80; /* Default */
505 resize_term(lines, cols);
508 static const struct got_error *
509 view_input(struct tog_view **new, struct tog_view **dead,
510 struct tog_view **focus, int *done, struct tog_view *view,
511 struct tog_view_list_head *views)
513 const struct got_error *err = NULL;
521 nodelay(stdscr, FALSE);
522 /* Allow threads to make progress while we are waiting for input. */
523 errcode = pthread_mutex_unlock(&tog_mutex);
525 return got_error_set_errno(errcode);
526 ch = wgetch(view->window);
527 errcode = pthread_mutex_lock(&tog_mutex);
529 return got_error_set_errno(errcode);
530 nodelay(stdscr, TRUE);
532 if (tog_sigwinch_received) {
534 tog_sigwinch_received = 0;
535 TAILQ_FOREACH(v, views, entry) {
536 err = view_resize(v);
539 err = v->input(new, dead, focus, v, KEY_RESIZE);
550 *focus = view->child;
551 view->child_focussed = 1;
552 } else if (view->parent) {
553 *focus = view->parent;
554 view->parent->child_focussed = 0;
558 err = view->input(new, dead, focus, view, ch);
565 if (view_is_parent_view(view)) {
566 if (view->child == NULL)
568 if (view_is_splitscreen(view->child)) {
569 *focus = view->child;
570 view->child_focussed = 1;
571 err = view_fullscreen(view->child);
573 err = view_splitscreen(view->child);
576 err = view->child->input(new, dead, focus,
577 view->child, KEY_RESIZE);
579 if (view_is_splitscreen(view)) {
581 view->parent->child_focussed = 1;
582 err = view_fullscreen(view);
584 err = view_splitscreen(view);
588 err = view->input(new, dead, focus, view,
595 err = view->input(new, dead, focus, view, ch);
603 view_vborder(struct tog_view *view)
606 struct tog_view *view_above;
609 return view_vborder(view->parent);
611 panel = panel_above(view->panel);
615 view_above = panel_userptr(panel);
616 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
617 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
621 view_needs_focus_indication(struct tog_view *view)
623 if (view_is_parent_view(view)) {
624 if (view->child == NULL || view->child_focussed)
626 if (!view_is_splitscreen(view->child))
628 } else if (!view_is_splitscreen(view))
631 return view->focussed;
634 static const struct got_error *
635 view_loop(struct tog_view *view)
637 const struct got_error *err = NULL;
638 struct tog_view_list_head views;
639 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
640 int fast_refresh = 10;
641 int done = 0, errcode;
643 errcode = pthread_mutex_lock(&tog_mutex);
645 return got_error_set_errno(errcode);
648 TAILQ_INSERT_HEAD(&views, view, entry);
652 err = view->show(view);
657 while (!TAILQ_EMPTY(&views) && !done) {
658 /* Refresh fast during initialization, then become slower. */
659 if (fast_refresh && fast_refresh-- == 0)
660 halfdelay(10); /* switch to once per second */
662 err = view_input(&new_view, &dead_view, &focus_view, &done,
667 struct tog_view *prev = NULL;
669 if (view_is_parent_view(dead_view))
670 prev = TAILQ_PREV(dead_view,
671 tog_view_list_head, entry);
672 else if (view->parent != dead_view)
675 if (dead_view->parent)
676 dead_view->parent->child = NULL;
678 TAILQ_REMOVE(&views, dead_view, entry);
680 err = view_close(dead_view);
681 if (err || dead_view == main_view)
684 if (view == dead_view) {
689 else if (!TAILQ_EMPTY(&views))
690 view = TAILQ_LAST(&views,
695 if (view->child && view->child_focussed)
696 focus_view = view->child;
703 struct tog_view *v, *t;
704 /* Only allow one parent view per type. */
705 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
706 if (v->type != new_view->type)
708 TAILQ_REMOVE(&views, v, entry);
714 TAILQ_INSERT_TAIL(&views, new_view, entry);
716 if (focus_view == NULL)
717 focus_view = new_view;
720 show_panel(focus_view->panel);
723 focus_view->focussed = 1;
726 show_panel(new_view->panel);
727 if (view->child && view_is_splitscreen(view->child))
728 show_panel(view->child->panel);
731 if (focus_view == NULL) {
733 show_panel(view->panel);
734 if (view->child && view_is_splitscreen(view->child))
735 show_panel(view->child->panel);
739 err = view->parent->show(view->parent);
743 err = view->show(view);
747 err = view->child->show(view->child);
756 while (!TAILQ_EMPTY(&views)) {
757 view = TAILQ_FIRST(&views);
758 TAILQ_REMOVE(&views, view, entry);
762 errcode = pthread_mutex_unlock(&tog_mutex);
764 return got_error_set_errno(errcode);
774 "usage: %s log [-c commit] [-r repository-path] [path]\n",
779 /* Create newly allocated wide-character string equivalent to a byte string. */
780 static const struct got_error *
781 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
784 const struct got_error *err = NULL;
787 *wlen = mbstowcs(NULL, s, 0);
788 if (*wlen == (size_t)-1) {
791 return got_error_from_errno();
793 /* byte string invalid in current encoding; try to "fix" it */
794 err = got_mbsavis(&vis, &vislen, s);
797 *wlen = mbstowcs(NULL, vis, 0);
798 if (*wlen == (size_t)-1) {
799 err = got_error_from_errno(); /* give up */
804 *ws = calloc(*wlen + 1, sizeof(*ws));
806 err = got_error_from_errno();
810 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
811 err = got_error_from_errno();
822 /* Format a line for display, ensuring that it won't overflow a width limit. */
823 static const struct got_error *
824 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
826 const struct got_error *err = NULL;
828 wchar_t *wline = NULL;
835 err = mbs2ws(&wline, &wlen, line);
840 while (i < wlen && cols < wlimit) {
841 int width = wcwidth(wline[i]);
848 if (cols + width <= wlimit)
853 if (wline[i] == L'\t')
854 cols += TABSIZE - ((cols + 1) % TABSIZE);
858 err = got_error_from_errno();
873 static const struct got_error*
874 build_refs_str(char **refs_str, struct got_reflist_head *refs,
875 struct got_object_id *id)
877 static const struct got_error *err = NULL;
878 struct got_reflist_entry *re;
884 SIMPLEQ_FOREACH(re, refs, entry) {
885 if (got_object_id_cmp(re->id, id) != 0)
887 name = got_ref_get_name(re->ref);
888 if (strcmp(name, GOT_REF_HEAD) == 0)
890 if (strncmp(name, "refs/", 5) == 0)
892 if (strncmp(name, "heads/", 6) == 0)
894 if (strncmp(name, "remotes/", 8) == 0)
897 if (asprintf(refs_str, "%s%s%s", s ? s : "",
898 s ? ", " : "", name) == -1) {
899 err = got_error_from_errno();
910 static const struct got_error *
911 draw_commit(struct tog_view *view, struct got_commit_object *commit,
912 struct got_object_id *id, struct got_reflist_head *refs)
914 const struct got_error *err = NULL;
915 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
916 char *logmsg0 = NULL, *logmsg = NULL;
917 char *author0 = NULL, *author = NULL;
918 wchar_t *wlogmsg = NULL, *wauthor = NULL;
919 int author_width, logmsg_width;
920 char *newline, *smallerthan;
923 static const size_t date_display_cols = 9;
924 static const size_t author_display_cols = 16;
925 const int avail = view->ncols;
927 time_t committer_time;
929 committer_time = got_object_commit_get_committer_time(commit);
930 if (localtime_r(&committer_time, &tm) == NULL)
931 return got_error_from_errno();
932 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
934 return got_error(GOT_ERR_NO_SPACE);
936 if (avail < date_display_cols)
937 limit = MIN(sizeof(datebuf) - 1, avail);
939 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
940 waddnstr(view->window, datebuf, limit);
945 author0 = strdup(got_object_commit_get_author(commit));
946 if (author0 == NULL) {
947 err = got_error_from_errno();
951 smallerthan = strchr(author, '<');
955 char *at = strchr(author, '@');
960 err = format_line(&wauthor, &author_width, author, limit);
963 waddwstr(view->window, wauthor);
965 while (col <= avail && author_width < author_display_cols + 1) {
966 waddch(view->window, ' ');
973 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
974 if (logmsg0 == NULL) {
975 err = got_error_from_errno();
979 while (*logmsg == '\n')
981 newline = strchr(logmsg, '\n');
985 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
988 waddwstr(view->window, wlogmsg);
990 while (col <= avail) {
991 waddch(view->window, ' ');
1003 static struct commit_queue_entry *
1004 alloc_commit_queue_entry(struct got_commit_object *commit,
1005 struct got_object_id *id)
1007 struct commit_queue_entry *entry;
1009 entry = calloc(1, sizeof(*entry));
1014 entry->commit = commit;
1019 pop_commit(struct commit_queue *commits)
1021 struct commit_queue_entry *entry;
1023 entry = TAILQ_FIRST(&commits->head);
1024 TAILQ_REMOVE(&commits->head, entry, entry);
1025 got_object_commit_close(entry->commit);
1026 commits->ncommits--;
1027 /* Don't free entry->id! It is owned by the commit graph. */
1032 free_commits(struct commit_queue *commits)
1034 while (!TAILQ_EMPTY(&commits->head))
1035 pop_commit(commits);
1038 static const struct got_error *
1039 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1040 int minqueue, struct got_repository *repo, const char *path)
1042 const struct got_error *err = NULL;
1046 * We keep all commits open throughout the lifetime of the log
1047 * view in order to avoid having to re-fetch commits from disk
1048 * while updating the display.
1050 while (nqueued < minqueue) {
1051 struct got_object_id *id;
1052 struct got_commit_object *commit;
1053 struct commit_queue_entry *entry;
1056 err = got_commit_graph_iter_next(&id, graph);
1058 if (err->code != GOT_ERR_ITER_NEED_MORE)
1060 err = got_commit_graph_fetch_commits(graph,
1070 err = got_object_open_as_commit(&commit, repo, id);
1073 entry = alloc_commit_queue_entry(commit, id);
1074 if (entry == NULL) {
1075 err = got_error_from_errno();
1079 errcode = pthread_mutex_lock(&tog_mutex);
1081 err = got_error_set_errno(errcode);
1085 entry->idx = commits->ncommits;
1086 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1088 commits->ncommits++;
1090 errcode = pthread_mutex_unlock(&tog_mutex);
1091 if (errcode && err == NULL)
1092 err = got_error_set_errno(errcode);
1098 static const struct got_error *
1099 get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1101 const struct got_error *err = NULL;
1102 struct got_reference *head_ref;
1106 err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1110 err = got_ref_resolve(head_id, repo, head_ref);
1111 got_ref_close(head_ref);
1120 static const struct got_error *
1121 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1122 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1123 struct commit_queue *commits, int selected_idx, int limit,
1124 struct got_reflist_head *refs, const char *path, int commits_needed)
1126 const struct got_error *err = NULL;
1127 struct commit_queue_entry *entry;
1128 int ncommits, width;
1129 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1130 char *refs_str = NULL;
1136 if (ncommits == selected_idx) {
1140 entry = TAILQ_NEXT(entry, entry);
1145 err = got_object_id_str(&id_str, (*selected)->id);
1149 err = build_refs_str(&refs_str, refs, (*selected)->id);
1155 if (asprintf(&ncommits_str, " [%d/%d] %s",
1156 entry ? entry->idx + 1 : 0, commits->ncommits,
1157 commits_needed > 0 ? "loading... " :
1158 (refs_str ? refs_str : "")) == -1) {
1159 err = got_error_from_errno();
1163 if (path && strcmp(path, "/") != 0) {
1164 if (asprintf(&header, "commit %s %s%s",
1165 id_str ? id_str : "........................................",
1166 path, ncommits_str) == -1) {
1167 err = got_error_from_errno();
1171 } else if (asprintf(&header, "commit %s%s",
1172 id_str ? id_str : "........................................",
1173 ncommits_str) == -1) {
1174 err = got_error_from_errno();
1178 err = format_line(&wline, &width, header, view->ncols);
1182 werase(view->window);
1184 if (view_needs_focus_indication(view))
1185 wstandout(view->window);
1186 waddwstr(view->window, wline);
1187 while (width < view->ncols) {
1188 waddch(view->window, ' ');
1191 if (view_needs_focus_indication(view))
1192 wstandend(view->window);
1201 if (ncommits >= limit - 1)
1203 if (view->focussed && ncommits == selected_idx)
1204 wstandout(view->window);
1205 err = draw_commit(view, entry->commit, entry->id, refs);
1206 if (view->focussed && ncommits == selected_idx)
1207 wstandend(view->window);
1212 entry = TAILQ_NEXT(entry, entry);
1225 scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1226 struct commit_queue *commits)
1228 struct commit_queue_entry *entry;
1231 entry = TAILQ_FIRST(&commits->head);
1232 if (*first_displayed_entry == entry)
1235 entry = *first_displayed_entry;
1236 while (entry && nscrolled < maxscroll) {
1237 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1239 *first_displayed_entry = entry;
1245 static const struct got_error *
1246 scroll_down(struct tog_view *view,
1247 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1248 struct commit_queue_entry **last_displayed_entry,
1249 struct commit_queue *commits, int *log_complete, int *commits_needed,
1250 pthread_cond_t *need_commits)
1252 const struct got_error *err = NULL;
1253 struct commit_queue_entry *pentry;
1256 if (*last_displayed_entry == NULL)
1260 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1261 if (pentry == NULL && !*log_complete) {
1262 *commits_needed = maxscroll;
1264 /* Redraw screen for "loading..." message. */
1265 err = show_log_view(view);
1271 while (*commits_needed > 0) {
1273 errcode = pthread_cond_signal(need_commits);
1275 return got_error_set_errno(errcode);
1276 errcode = pthread_mutex_unlock(&tog_mutex);
1278 return got_error_set_errno(errcode);
1280 errcode = pthread_mutex_lock(&tog_mutex);
1282 return got_error_set_errno(errcode);
1285 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1289 *last_displayed_entry = pentry;
1291 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1294 *first_displayed_entry = pentry;
1295 } while (++nscrolled < maxscroll);
1300 static const struct got_error *
1301 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1302 struct got_commit_object *commit, struct got_object_id *commit_id,
1303 struct tog_view *log_view, struct got_reflist_head *refs,
1304 struct got_repository *repo)
1306 const struct got_error *err;
1307 struct got_object_qid *parent_id;
1308 struct tog_view *diff_view;
1310 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1311 if (diff_view == NULL)
1312 return got_error_from_errno();
1314 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1315 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1316 commit_id, log_view, refs, repo);
1318 *new_view = diff_view;
1322 static const struct got_error *
1323 browse_commit(struct tog_view **new_view, int begin_x,
1324 struct commit_queue_entry *entry, struct got_reflist_head *refs,
1325 struct got_repository *repo)
1327 const struct got_error *err = NULL;
1328 struct got_tree_object *tree;
1329 struct tog_view *tree_view;
1331 err = got_object_open_as_tree(&tree, repo,
1332 got_object_commit_get_tree_id(entry->commit));
1336 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1337 if (tree_view == NULL)
1338 return got_error_from_errno();
1340 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1342 got_object_tree_close(tree);
1344 *new_view = tree_view;
1349 log_thread(void *arg)
1351 const struct got_error *err = NULL;
1353 struct tog_log_thread_args *a = arg;
1356 err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1360 while (!done && !err) {
1361 err = queue_commits(a->graph, a->commits, 1, a->repo,
1364 if (err->code != GOT_ERR_ITER_COMPLETED)
1368 } else if (a->commits_needed > 0)
1369 a->commits_needed--;
1371 errcode = pthread_mutex_lock(&tog_mutex);
1373 return (void *)got_error_set_errno(errcode);
1376 a->log_complete = 1;
1377 else if (*a->quit) {
1379 a->log_complete = 1;
1380 } else if (*a->first_displayed_entry == NULL) {
1381 *a->first_displayed_entry =
1382 TAILQ_FIRST(&a->commits->head);
1383 *a->selected_entry = *a->first_displayed_entry;
1387 a->commits_needed = 0;
1388 else if (a->commits_needed == 0) {
1389 errcode = pthread_cond_wait(&a->need_commits,
1392 err = got_error_set_errno(errcode);
1395 errcode = pthread_mutex_unlock(&tog_mutex);
1396 if (errcode && err == NULL)
1397 err = got_error_set_errno(errcode);
1402 static const struct got_error *
1403 stop_log_thread(struct tog_log_view_state *s)
1405 const struct got_error *err = NULL;
1410 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1412 return got_error_set_errno(errcode);
1413 errcode = pthread_mutex_unlock(&tog_mutex);
1415 return got_error_set_errno(errcode);
1416 errcode = pthread_join(s->thread, (void **)&err);
1418 return got_error_set_errno(errcode);
1419 errcode = pthread_mutex_lock(&tog_mutex);
1421 return got_error_set_errno(errcode);
1425 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1426 if (errcode && err == NULL)
1427 err = got_error_set_errno(errcode);
1429 if (s->thread_args.repo) {
1430 got_repo_close(s->thread_args.repo);
1431 s->thread_args.repo = NULL;
1434 if (s->thread_args.graph) {
1435 got_commit_graph_close(s->thread_args.graph);
1436 s->thread_args.graph = NULL;
1442 static const struct got_error *
1443 close_log_view(struct tog_view *view)
1445 const struct got_error *err = NULL;
1446 struct tog_log_view_state *s = &view->state.log;
1448 err = stop_log_thread(s);
1449 free_commits(&s->commits);
1450 free(s->in_repo_path);
1451 s->in_repo_path = NULL;
1457 static const struct got_error *
1458 open_log_view(struct tog_view *view, struct got_object_id *start_id,
1459 struct got_reflist_head *refs, struct got_repository *repo,
1460 const char *path, int check_disk)
1462 const struct got_error *err = NULL;
1463 struct tog_log_view_state *s = &view->state.log;
1464 struct got_repository *thread_repo = NULL;
1465 struct got_commit_graph *thread_graph = NULL;
1468 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1472 /* The commit queue only contains commits being displayed. */
1473 TAILQ_INIT(&s->commits.head);
1474 s->commits.ncommits = 0;
1478 s->start_id = got_object_id_dup(start_id);
1479 if (s->start_id == NULL) {
1480 err = got_error_from_errno();
1484 view->show = show_log_view;
1485 view->input = input_log_view;
1486 view->close = close_log_view;
1488 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1491 err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1496 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1498 err = got_error_set_errno(errcode);
1502 s->thread_args.commits_needed = view->nlines;
1503 s->thread_args.graph = thread_graph;
1504 s->thread_args.commits = &s->commits;
1505 s->thread_args.in_repo_path = s->in_repo_path;
1506 s->thread_args.start_id = s->start_id;
1507 s->thread_args.repo = thread_repo;
1508 s->thread_args.log_complete = 0;
1509 s->thread_args.quit = &s->quit;
1510 s->thread_args.view = view;
1511 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1512 s->thread_args.selected_entry = &s->selected_entry;
1515 close_log_view(view);
1519 static const struct got_error *
1520 show_log_view(struct tog_view *view)
1522 struct tog_log_view_state *s = &view->state.log;
1524 if (s->thread == NULL) {
1525 int errcode = pthread_create(&s->thread, NULL, log_thread,
1528 return got_error_set_errno(errcode);
1531 return draw_commits(view, &s->last_displayed_entry,
1532 &s->selected_entry, s->first_displayed_entry,
1533 &s->commits, s->selected, view->nlines, s->refs,
1534 s->in_repo_path, s->thread_args.commits_needed);
1537 static const struct got_error *
1538 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1539 struct tog_view **focus_view, struct tog_view *view, int ch)
1541 const struct got_error *err = NULL;
1542 struct tog_log_view_state *s = &view->state.log;
1544 struct tog_view *diff_view = NULL, *tree_view = NULL;
1555 if (s->first_displayed_entry == NULL)
1557 if (s->selected > 0)
1559 if (s->selected > 0)
1561 scroll_up(&s->first_displayed_entry, 1,
1565 if (s->first_displayed_entry == NULL)
1567 if (TAILQ_FIRST(&s->commits.head) ==
1568 s->first_displayed_entry) {
1572 scroll_up(&s->first_displayed_entry,
1573 view->nlines, &s->commits);
1579 if (s->first_displayed_entry == NULL)
1581 if (s->selected < MIN(view->nlines - 2,
1582 s->commits.ncommits - 1)) {
1586 err = scroll_down(view, &s->first_displayed_entry, 1,
1587 &s->last_displayed_entry, &s->commits,
1588 &s->thread_args.log_complete,
1589 &s->thread_args.commits_needed,
1590 &s->thread_args.need_commits);
1593 struct commit_queue_entry *first;
1594 first = s->first_displayed_entry;
1597 err = scroll_down(view, &s->first_displayed_entry,
1598 view->nlines, &s->last_displayed_entry,
1599 &s->commits, &s->thread_args.log_complete,
1600 &s->thread_args.commits_needed,
1601 &s->thread_args.need_commits);
1602 if (first == s->first_displayed_entry &&
1603 s->selected < MIN(view->nlines - 2,
1604 s->commits.ncommits - 1)) {
1605 /* can't scroll further down */
1606 s->selected = MIN(view->nlines - 2,
1607 s->commits.ncommits - 1);
1613 if (s->selected > view->nlines - 2)
1614 s->selected = view->nlines - 2;
1615 if (s->selected > s->commits.ncommits - 1)
1616 s->selected = s->commits.ncommits - 1;
1620 if (s->selected_entry == NULL)
1622 if (view_is_parent_view(view))
1623 begin_x = view_split_begin_x(view->begin_x);
1624 err = open_diff_view_for_commit(&diff_view, begin_x,
1625 s->selected_entry->commit, s->selected_entry->id,
1626 view, s->refs, s->repo);
1629 if (view_is_parent_view(view)) {
1630 err = view_close_child(view);
1633 err = view_set_child(view, diff_view);
1635 view_close(diff_view);
1638 *focus_view = diff_view;
1639 view->child_focussed = 1;
1641 *new_view = diff_view;
1644 if (s->selected_entry == NULL)
1646 if (view_is_parent_view(view))
1647 begin_x = view_split_begin_x(view->begin_x);
1648 err = browse_commit(&tree_view, begin_x,
1649 s->selected_entry, s->refs, s->repo);
1652 if (view_is_parent_view(view)) {
1653 err = view_close_child(view);
1656 err = view_set_child(view, tree_view);
1658 view_close(tree_view);
1661 *focus_view = tree_view;
1662 view->child_focussed = 1;
1664 *new_view = tree_view;
1667 if (strcmp(s->in_repo_path, "/") == 0)
1669 parent_path = dirname(s->in_repo_path);
1670 if (parent_path && strcmp(parent_path, ".") != 0) {
1671 struct tog_view *lv;
1672 err = stop_log_thread(s);
1675 lv = view_open(view->nlines, view->ncols,
1676 view->begin_y, view->begin_x, TOG_VIEW_LOG);
1678 return got_error_from_errno();
1679 err = open_log_view(lv, s->start_id, s->refs,
1680 s->repo, parent_path, 0);
1683 if (view_is_parent_view(view))
1686 view_set_child(view->parent, lv);
1699 static const struct got_error *
1700 apply_unveil(const char *repo_path, const char *worktree_path)
1702 const struct got_error *error;
1704 if (repo_path && unveil(repo_path, "r") != 0)
1705 return got_error_from_errno();
1707 if (worktree_path && unveil(worktree_path, "rwc") != 0)
1708 return got_error_from_errno();
1710 if (unveil("/tmp", "rwc") != 0)
1711 return got_error_from_errno();
1713 error = got_privsep_unveil_exec_helpers();
1717 if (unveil(NULL, NULL) != 0)
1718 return got_error_from_errno();
1728 halfdelay(1); /* Do fast refresh while initial view is loading. */
1731 intrflush(stdscr, FALSE);
1732 keypad(stdscr, TRUE);
1734 signal(SIGWINCH, tog_sigwinch);
1737 static const struct got_error *
1738 cmd_log(int argc, char *argv[])
1740 const struct got_error *error;
1741 struct got_repository *repo = NULL;
1742 struct got_reflist_head refs;
1743 struct got_object_id *start_id = NULL;
1744 char *path = NULL, *repo_path = NULL, *cwd = NULL;
1745 char *start_commit = NULL;
1747 struct tog_view *view;
1750 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1755 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1758 start_commit = optarg;
1761 repo_path = realpath(optarg, NULL);
1762 if (repo_path == NULL)
1763 err(1, "-r option");
1777 path = strdup(argv[0]);
1781 return got_error_from_errno();
1783 cwd = getcwd(NULL, 0);
1785 error = got_error_from_errno();
1788 if (repo_path == NULL) {
1789 struct got_worktree *worktree;
1790 error = got_worktree_open(&worktree, cwd);
1791 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1795 strdup(got_worktree_get_repo_path(worktree));
1796 got_worktree_close(worktree);
1798 repo_path = strdup(cwd);
1799 if (repo_path == NULL) {
1800 error = got_error_from_errno();
1807 error = apply_unveil(repo_path, NULL);
1811 error = got_repo_open(&repo, repo_path);
1815 if (start_commit == NULL)
1816 error = get_head_commit_id(&start_id, repo);
1818 error = got_object_resolve_id_str(&start_id, repo,
1823 SIMPLEQ_INIT(&refs);
1824 error = got_ref_list(&refs, repo);
1828 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1830 error = got_error_from_errno();
1833 error = open_log_view(view, start_id, &refs, repo, path, 1);
1836 error = view_loop(view);
1843 got_repo_close(repo);
1851 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1857 parse_next_line(FILE *f, size_t *len)
1862 const char delim[3] = { '\0', '\0', '\0'};
1864 line = fparseln(f, &linelen, &lineno, delim, 0);
1870 static const struct got_error *
1871 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1872 int *last_displayed_line, int *eof, int max_lines,
1875 const struct got_error *err;
1876 int nlines = 0, nprinted = 0;
1883 werase(view->window);
1886 err = format_line(&wline, &width, header, view->ncols);
1891 if (view_needs_focus_indication(view))
1892 wstandout(view->window);
1893 waddwstr(view->window, wline);
1894 if (view_needs_focus_indication(view))
1895 wstandend(view->window);
1896 if (width < view->ncols)
1897 waddch(view->window, '\n');
1905 while (nprinted < max_lines) {
1906 line = parse_next_line(f, &len);
1911 if (++nlines < *first_displayed_line) {
1916 err = format_line(&wline, &width, line, view->ncols);
1921 waddwstr(view->window, wline);
1922 if (width < view->ncols)
1923 waddch(view->window, '\n');
1924 if (++nprinted == 1)
1925 *first_displayed_line = nlines;
1930 *last_displayed_line = nlines;
1938 get_datestr(time_t *time, char *datebuf)
1940 char *p, *s = ctime_r(time, datebuf);
1941 p = strchr(s, '\n');
1947 static const struct got_error *
1948 write_commit_info(struct got_object_id *commit_id,
1949 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
1951 const struct got_error *err = NULL;
1953 struct got_commit_object *commit;
1954 char *id_str = NULL;
1955 time_t committer_time;
1956 const char *author, *committer;
1957 char *refs_str = NULL;
1960 err = build_refs_str(&refs_str, refs, commit_id);
1965 err = got_object_open_as_commit(&commit, repo, commit_id);
1969 err = got_object_id_str(&id_str, commit_id);
1971 err = got_error_from_errno();
1975 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1976 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
1977 err = got_error_from_errno();
1980 if (fprintf(outfile, "from: %s\n",
1981 got_object_commit_get_author(commit)) < 0) {
1982 err = got_error_from_errno();
1985 committer_time = got_object_commit_get_committer_time(commit);
1986 if (fprintf(outfile, "date: %s UTC\n",
1987 get_datestr(&committer_time, datebuf)) < 0) {
1988 err = got_error_from_errno();
1991 author = got_object_commit_get_author(commit);
1992 committer = got_object_commit_get_committer(commit);
1993 if (strcmp(author, committer) != 0 &&
1994 fprintf(outfile, "via: %s\n", committer) < 0) {
1995 err = got_error_from_errno();
1998 if (fprintf(outfile, "%s\n",
1999 got_object_commit_get_logmsg(commit)) < 0) {
2000 err = got_error_from_errno();
2006 got_object_commit_close(commit);
2010 static const struct got_error *
2011 create_diff(struct tog_diff_view_state *s)
2013 const struct got_error *err = NULL;
2019 err = got_error_from_errno();
2022 if (s->f && fclose(s->f) != 0) {
2023 err = got_error_from_errno();
2029 err = got_object_get_type(&obj_type, s->repo, s->id1);
2031 err = got_object_get_type(&obj_type, s->repo, s->id2);
2036 case GOT_OBJ_TYPE_BLOB:
2037 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2038 s->diff_context, s->repo, f);
2040 case GOT_OBJ_TYPE_TREE:
2041 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2042 s->diff_context, s->repo, f);
2044 case GOT_OBJ_TYPE_COMMIT: {
2045 const struct got_object_id_queue *parent_ids;
2046 struct got_object_qid *pid;
2047 struct got_commit_object *commit2;
2049 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2052 /* Show commit info if we're diffing to a parent/root commit. */
2054 write_commit_info(s->id2, s->refs, s->repo, f);
2056 parent_ids = got_object_commit_get_parent_ids(commit2);
2057 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2058 if (got_object_id_cmp(s->id1, pid->id) == 0) {
2059 write_commit_info(s->id2, s->refs,
2065 got_object_commit_close(commit2);
2067 err = got_diff_objects_as_commits(s->id1, s->id2,
2068 s->diff_context, s->repo, f);
2072 err = got_error(GOT_ERR_OBJ_TYPE);
2076 if (f && fflush(f) != 0 && err == NULL)
2077 err = got_error_from_errno();
2081 static const struct got_error *
2082 open_diff_view(struct tog_view *view, struct got_object_id *id1,
2083 struct got_object_id *id2, struct tog_view *log_view,
2084 struct got_reflist_head *refs, struct got_repository *repo)
2086 const struct got_error *err;
2088 if (id1 != NULL && id2 != NULL) {
2090 err = got_object_get_type(&type1, repo, id1);
2093 err = got_object_get_type(&type2, repo, id2);
2098 return got_error(GOT_ERR_OBJ_TYPE);
2102 view->state.diff.id1 = got_object_id_dup(id1);
2103 if (view->state.diff.id1 == NULL)
2104 return got_error_from_errno();
2106 view->state.diff.id1 = NULL;
2108 view->state.diff.id2 = got_object_id_dup(id2);
2109 if (view->state.diff.id2 == NULL) {
2110 free(view->state.diff.id1);
2111 view->state.diff.id1 = NULL;
2112 return got_error_from_errno();
2114 view->state.diff.f = NULL;
2115 view->state.diff.first_displayed_line = 1;
2116 view->state.diff.last_displayed_line = view->nlines;
2117 view->state.diff.diff_context = 3;
2118 view->state.diff.log_view = log_view;
2119 view->state.diff.repo = repo;
2120 view->state.diff.refs = refs;
2122 err = create_diff(&view->state.diff);
2124 free(view->state.diff.id1);
2125 view->state.diff.id1 = NULL;
2126 free(view->state.diff.id2);
2127 view->state.diff.id2 = NULL;
2131 view->show = show_diff_view;
2132 view->input = input_diff_view;
2133 view->close = close_diff_view;
2138 static const struct got_error *
2139 close_diff_view(struct tog_view *view)
2141 const struct got_error *err = NULL;
2143 free(view->state.diff.id1);
2144 view->state.diff.id1 = NULL;
2145 free(view->state.diff.id2);
2146 view->state.diff.id2 = NULL;
2147 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2148 err = got_error_from_errno();
2152 static const struct got_error *
2153 show_diff_view(struct tog_view *view)
2155 const struct got_error *err;
2156 struct tog_diff_view_state *s = &view->state.diff;
2157 char *id_str1 = NULL, *id_str2, *header;
2160 err = got_object_id_str(&id_str1, s->id1);
2164 err = got_object_id_str(&id_str2, s->id2);
2168 if (asprintf(&header, "diff %s %s",
2169 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2170 err = got_error_from_errno();
2178 return draw_file(view, s->f, &s->first_displayed_line,
2179 &s->last_displayed_line, &s->eof, view->nlines,
2183 static const struct got_error *
2184 set_selected_commit(struct tog_diff_view_state *s,
2185 struct commit_queue_entry *entry)
2187 const struct got_error *err;
2188 const struct got_object_id_queue *parent_ids;
2189 struct got_commit_object *selected_commit;
2190 struct got_object_qid *pid;
2193 s->id2 = got_object_id_dup(entry->id);
2195 return got_error_from_errno();
2197 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2200 parent_ids = got_object_commit_get_parent_ids(selected_commit);
2202 pid = SIMPLEQ_FIRST(parent_ids);
2203 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2204 got_object_commit_close(selected_commit);
2208 static const struct got_error *
2209 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2210 struct tog_view **focus_view, struct tog_view *view, int ch)
2212 const struct got_error *err = NULL;
2213 struct tog_diff_view_state *s = &view->state.diff;
2214 struct tog_log_view_state *ls;
2215 struct commit_queue_entry *entry;
2221 if (s->first_displayed_line > 1)
2222 s->first_displayed_line--;
2226 while (i++ < view->nlines - 1 &&
2227 s->first_displayed_line > 1)
2228 s->first_displayed_line--;
2233 s->first_displayed_line++;
2238 while (!s->eof && i++ < view->nlines - 1) {
2240 line = parse_next_line(s->f, NULL);
2241 s->first_displayed_line++;
2247 if (s->diff_context > 0) {
2249 err = create_diff(s);
2253 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2255 err = create_diff(s);
2260 if (s->log_view == NULL)
2262 ls = &s->log_view->state.log;
2263 entry = TAILQ_PREV(ls->selected_entry,
2264 commit_queue_head, entry);
2268 err = input_log_view(NULL, NULL, NULL, s->log_view,
2273 err = set_selected_commit(s, entry);
2277 s->first_displayed_line = 1;
2278 s->last_displayed_line = view->nlines;
2280 err = create_diff(s);
2284 if (s->log_view == NULL)
2286 ls = &s->log_view->state.log;
2287 err = input_log_view(NULL, NULL, NULL, s->log_view,
2292 /* Hack: Ensure two commits get loaded. */
2293 if (!ls->thread_args.log_complete) {
2294 err = input_log_view(NULL, NULL, NULL,
2295 s->log_view, KEY_DOWN);
2298 err = input_log_view(NULL, NULL, NULL,
2299 s->log_view, KEY_UP);
2304 entry = TAILQ_NEXT(ls->selected_entry, entry);
2308 err = set_selected_commit(s, entry);
2312 s->first_displayed_line = 1;
2313 s->last_displayed_line = view->nlines;
2315 err = create_diff(s);
2324 static const struct got_error *
2325 cmd_diff(int argc, char *argv[])
2327 const struct got_error *error = NULL;
2328 struct got_repository *repo = NULL;
2329 struct got_reflist_head refs;
2330 struct got_object_id *id1 = NULL, *id2 = NULL;
2331 char *repo_path = NULL;
2332 char *id_str1 = NULL, *id_str2 = NULL;
2334 struct tog_view *view;
2337 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2342 while ((ch = getopt(argc, argv, "")) != -1) {
2354 usage_diff(); /* TODO show local worktree changes */
2355 } else if (argc == 2) {
2356 repo_path = getcwd(NULL, 0);
2357 if (repo_path == NULL)
2358 return got_error_from_errno();
2361 } else if (argc == 3) {
2362 repo_path = realpath(argv[0], NULL);
2363 if (repo_path == NULL)
2364 return got_error_from_errno();
2372 error = apply_unveil(repo_path, NULL);
2376 error = got_repo_open(&repo, repo_path);
2381 error = got_object_resolve_id_str(&id1, repo, id_str1);
2385 error = got_object_resolve_id_str(&id2, repo, id_str2);
2389 SIMPLEQ_INIT(&refs);
2390 error = got_ref_list(&refs, repo);
2394 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2396 error = got_error_from_errno();
2399 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2402 error = view_loop(view);
2404 got_repo_close(repo);
2412 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2417 struct tog_blame_line {
2419 struct got_object_id *id;
2422 static const struct got_error *
2423 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2424 const char *path, struct tog_blame_line *lines, int nlines,
2425 int blame_complete, int selected_line, int *first_displayed_line,
2426 int *last_displayed_line, int *eof, int max_lines)
2428 const struct got_error *err;
2429 int lineno = 0, nprinted = 0;
2434 struct tog_blame_line *blame_line;
2435 struct got_object_id *prev_id = NULL;
2438 err = got_object_id_str(&id_str, id);
2443 werase(view->window);
2445 if (asprintf(&line, "commit %s", id_str) == -1) {
2446 err = got_error_from_errno();
2451 err = format_line(&wline, &width, line, view->ncols);
2454 if (view_needs_focus_indication(view))
2455 wstandout(view->window);
2456 waddwstr(view->window, wline);
2457 if (view_needs_focus_indication(view))
2458 wstandend(view->window);
2461 if (width < view->ncols)
2462 waddch(view->window, '\n');
2464 if (asprintf(&line, "[%d/%d] %s%s",
2465 *first_displayed_line - 1 + selected_line, nlines,
2466 blame_complete ? "" : "annotating... ", path) == -1) {
2468 return got_error_from_errno();
2471 err = format_line(&wline, &width, line, view->ncols);
2476 waddwstr(view->window, wline);
2479 if (width < view->ncols)
2480 waddch(view->window, '\n');
2483 while (nprinted < max_lines - 2) {
2484 line = parse_next_line(f, &len);
2489 if (++lineno < *first_displayed_line) {
2494 wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2495 err = format_line(&wline, &width, line, wlimit);
2501 if (view->focussed && nprinted == selected_line - 1)
2502 wstandout(view->window);
2504 blame_line = &lines[lineno - 1];
2505 if (blame_line->annotated && prev_id &&
2506 got_object_id_cmp(prev_id, blame_line->id) == 0)
2507 waddstr(view->window, " ");
2508 else if (blame_line->annotated) {
2510 err = got_object_id_str(&id_str, blame_line->id);
2516 wprintw(view->window, "%.8s ", id_str);
2518 prev_id = blame_line->id;
2520 waddstr(view->window, "........ ");
2524 waddwstr(view->window, wline);
2525 while (width < wlimit) {
2526 waddch(view->window, ' ');
2529 if (view->focussed && nprinted == selected_line - 1)
2530 wstandend(view->window);
2531 if (++nprinted == 1)
2532 *first_displayed_line = lineno;
2537 *last_displayed_line = lineno;
2544 static const struct got_error *
2545 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2547 const struct got_error *err = NULL;
2548 struct tog_blame_cb_args *a = arg;
2549 struct tog_blame_line *line;
2552 if (nlines != a->nlines ||
2553 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2554 return got_error(GOT_ERR_RANGE);
2556 errcode = pthread_mutex_lock(&tog_mutex);
2558 return got_error_set_errno(errcode);
2560 if (*a->quit) { /* user has quit the blame view */
2561 err = got_error(GOT_ERR_ITER_COMPLETED);
2566 goto done; /* no change in this commit */
2568 line = &a->lines[lineno - 1];
2569 if (line->annotated)
2572 line->id = got_object_id_dup(id);
2573 if (line->id == NULL) {
2574 err = got_error_from_errno();
2577 line->annotated = 1;
2579 errcode = pthread_mutex_unlock(&tog_mutex);
2581 err = got_error_set_errno(errcode);
2586 blame_thread(void *arg)
2588 const struct got_error *err;
2589 struct tog_blame_thread_args *ta = arg;
2590 struct tog_blame_cb_args *a = ta->cb_args;
2593 err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2594 blame_cb, ta->cb_args);
2596 errcode = pthread_mutex_lock(&tog_mutex);
2598 return (void *)got_error_set_errno(errcode);
2600 got_repo_close(ta->repo);
2604 errcode = pthread_mutex_unlock(&tog_mutex);
2605 if (errcode && err == NULL)
2606 err = got_error_set_errno(errcode);
2611 static struct got_object_id *
2612 get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2615 struct tog_blame_line *line;
2617 line = &lines[first_displayed_line - 1 + selected_line - 1];
2618 if (!line->annotated)
2624 static const struct got_error *
2625 stop_blame(struct tog_blame *blame)
2627 const struct got_error *err = NULL;
2630 if (blame->thread) {
2632 errcode = pthread_mutex_unlock(&tog_mutex);
2634 return got_error_set_errno(errcode);
2635 errcode = pthread_join(blame->thread, (void **)&err);
2637 return got_error_set_errno(errcode);
2638 errcode = pthread_mutex_lock(&tog_mutex);
2640 return got_error_set_errno(errcode);
2641 if (err && err->code == GOT_ERR_ITER_COMPLETED)
2643 blame->thread = NULL;
2645 if (blame->thread_args.repo) {
2646 got_repo_close(blame->thread_args.repo);
2647 blame->thread_args.repo = NULL;
2650 if (fclose(blame->f) != 0 && err == NULL)
2651 err = got_error_from_errno();
2655 for (i = 0; i < blame->nlines; i++)
2656 free(blame->lines[i].id);
2658 blame->lines = NULL;
2660 free(blame->cb_args.commit_id);
2661 blame->cb_args.commit_id = NULL;
2666 static const struct got_error *
2667 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2668 int *first_displayed_line, int *last_displayed_line, int *selected_line,
2669 int *done, int *eof, const char *path, struct got_object_id *commit_id,
2670 struct got_repository *repo)
2672 const struct got_error *err = NULL;
2673 struct got_blob_object *blob = NULL;
2674 struct got_repository *thread_repo = NULL;
2675 struct got_object_id *obj_id = NULL;
2678 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2682 return got_error(GOT_ERR_NO_OBJ);
2684 err = got_object_get_type(&obj_type, repo, obj_id);
2688 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2689 err = got_error(GOT_ERR_OBJ_TYPE);
2693 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2696 blame->f = got_opentemp();
2697 if (blame->f == NULL) {
2698 err = got_error_from_errno();
2701 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2706 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2707 if (blame->lines == NULL) {
2708 err = got_error_from_errno();
2712 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2716 blame->cb_args.view = view;
2717 blame->cb_args.lines = blame->lines;
2718 blame->cb_args.nlines = blame->nlines;
2719 blame->cb_args.commit_id = got_object_id_dup(commit_id);
2720 if (blame->cb_args.commit_id == NULL) {
2721 err = got_error_from_errno();
2724 blame->cb_args.quit = done;
2726 blame->thread_args.path = path;
2727 blame->thread_args.repo = thread_repo;
2728 blame->thread_args.cb_args = &blame->cb_args;
2729 blame->thread_args.complete = blame_complete;
2730 *blame_complete = 0;
2734 got_object_blob_close(blob);
2741 static const struct got_error *
2742 open_blame_view(struct tog_view *view, char *path,
2743 struct got_object_id *commit_id, struct got_reflist_head *refs,
2744 struct got_repository *repo)
2746 const struct got_error *err = NULL;
2747 struct tog_blame_view_state *s = &view->state.blame;
2749 SIMPLEQ_INIT(&s->blamed_commits);
2751 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2755 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2756 s->first_displayed_line = 1;
2757 s->last_displayed_line = view->nlines;
2758 s->selected_line = 1;
2759 s->blame_complete = 0;
2761 if (s->path == NULL)
2762 return got_error_from_errno();
2765 s->commit_id = commit_id;
2766 memset(&s->blame, 0, sizeof(s->blame));
2768 view->show = show_blame_view;
2769 view->input = input_blame_view;
2770 view->close = close_blame_view;
2772 return run_blame(&s->blame, view, &s->blame_complete,
2773 &s->first_displayed_line, &s->last_displayed_line,
2774 &s->selected_line, &s->done, &s->eof, s->path,
2775 s->blamed_commit->id, s->repo);
2778 static const struct got_error *
2779 close_blame_view(struct tog_view *view)
2781 const struct got_error *err = NULL;
2782 struct tog_blame_view_state *s = &view->state.blame;
2784 if (s->blame.thread)
2785 err = stop_blame(&s->blame);
2787 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2788 struct got_object_qid *blamed_commit;
2789 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2790 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2791 got_object_qid_free(blamed_commit);
2799 static const struct got_error *
2800 show_blame_view(struct tog_view *view)
2802 const struct got_error *err = NULL;
2803 struct tog_blame_view_state *s = &view->state.blame;
2806 if (s->blame.thread == NULL) {
2807 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2808 &s->blame.thread_args);
2810 return got_error_set_errno(errcode);
2813 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2814 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2815 s->selected_line, &s->first_displayed_line,
2816 &s->last_displayed_line, &s->eof, view->nlines);
2822 static const struct got_error *
2823 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2824 struct tog_view **focus_view, struct tog_view *view, int ch)
2826 const struct got_error *err = NULL, *thread_err = NULL;
2827 struct tog_view *diff_view;
2828 struct tog_blame_view_state *s = &view->state.blame;
2837 if (s->selected_line > 1)
2839 else if (s->selected_line == 1 &&
2840 s->first_displayed_line > 1)
2841 s->first_displayed_line--;
2844 if (s->first_displayed_line == 1) {
2845 s->selected_line = 1;
2848 if (s->first_displayed_line > view->nlines - 2)
2849 s->first_displayed_line -=
2852 s->first_displayed_line = 1;
2856 if (s->selected_line < view->nlines - 2 &&
2857 s->first_displayed_line +
2858 s->selected_line <= s->blame.nlines)
2860 else if (s->last_displayed_line <
2862 s->first_displayed_line++;
2866 struct got_object_id *id = NULL;
2867 id = get_selected_commit_id(s->blame.lines,
2868 s->first_displayed_line, s->selected_line);
2872 struct got_commit_object *commit;
2873 struct got_object_qid *pid;
2874 struct got_object_id *blob_id = NULL;
2876 err = got_object_open_as_commit(&commit,
2880 pid = SIMPLEQ_FIRST(
2881 got_object_commit_get_parent_ids(commit));
2883 got_object_commit_close(commit);
2886 /* Check if path history ends here. */
2887 err = got_object_id_by_path(&blob_id, s->repo,
2890 if (err->code == GOT_ERR_NO_TREE_ENTRY)
2892 got_object_commit_close(commit);
2895 err = got_object_get_type(&obj_type, s->repo,
2898 /* Can't blame non-blob type objects. */
2899 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2900 got_object_commit_close(commit);
2903 err = got_object_qid_alloc(&s->blamed_commit,
2905 got_object_commit_close(commit);
2907 if (got_object_id_cmp(id,
2908 s->blamed_commit->id) == 0)
2910 err = got_object_qid_alloc(&s->blamed_commit,
2916 thread_err = stop_blame(&s->blame);
2920 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2921 s->blamed_commit, entry);
2922 err = run_blame(&s->blame, view, &s->blame_complete,
2923 &s->first_displayed_line, &s->last_displayed_line,
2924 &s->selected_line, &s->done, &s->eof,
2925 s->path, s->blamed_commit->id, s->repo);
2931 struct got_object_qid *first;
2932 first = SIMPLEQ_FIRST(&s->blamed_commits);
2933 if (!got_object_id_cmp(first->id, s->commit_id))
2936 thread_err = stop_blame(&s->blame);
2940 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2941 got_object_qid_free(s->blamed_commit);
2943 SIMPLEQ_FIRST(&s->blamed_commits);
2944 err = run_blame(&s->blame, view, &s->blame_complete,
2945 &s->first_displayed_line, &s->last_displayed_line,
2946 &s->selected_line, &s->done, &s->eof, s->path,
2947 s->blamed_commit->id, s->repo);
2954 struct got_object_id *id = NULL;
2955 struct got_object_qid *pid;
2956 struct got_commit_object *commit = NULL;
2957 id = get_selected_commit_id(s->blame.lines,
2958 s->first_displayed_line, s->selected_line);
2961 err = got_object_open_as_commit(&commit, s->repo, id);
2964 pid = SIMPLEQ_FIRST(
2965 got_object_commit_get_parent_ids(commit));
2966 if (view_is_parent_view(view))
2967 begin_x = view_split_begin_x(view->begin_x);
2968 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
2969 if (diff_view == NULL) {
2970 got_object_commit_close(commit);
2971 err = got_error_from_errno();
2974 err = open_diff_view(diff_view, pid ? pid->id : NULL,
2975 id, NULL, s->refs, s->repo);
2976 got_object_commit_close(commit);
2978 view_close(diff_view);
2981 if (view_is_parent_view(view)) {
2982 err = view_close_child(view);
2985 err = view_set_child(view, diff_view);
2987 view_close(diff_view);
2990 *focus_view = diff_view;
2991 view->child_focussed = 1;
2993 *new_view = diff_view;
3000 if (s->last_displayed_line >= s->blame.nlines &&
3001 s->selected_line < view->nlines - 2) {
3002 s->selected_line = MIN(s->blame.nlines,
3006 if (s->last_displayed_line + view->nlines - 2
3008 s->first_displayed_line +=
3011 s->first_displayed_line =
3016 if (s->selected_line > view->nlines - 2) {
3017 s->selected_line = MIN(s->blame.nlines,
3024 return thread_err ? thread_err : err;
3027 static const struct got_error *
3028 cmd_blame(int argc, char *argv[])
3030 const struct got_error *error;
3031 struct got_repository *repo = NULL;
3032 struct got_reflist_head refs;
3033 struct got_worktree *worktree = NULL;
3034 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3035 struct got_object_id *commit_id = NULL;
3036 char *commit_id_str = NULL;
3038 struct tog_view *view;
3041 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3046 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3049 commit_id_str = optarg;
3052 repo_path = realpath(optarg, NULL);
3053 if (repo_path == NULL)
3054 err(1, "-r option");
3070 cwd = getcwd(NULL, 0);
3072 error = got_error_from_errno();
3075 if (repo_path == NULL) {
3076 error = got_worktree_open(&worktree, cwd);
3077 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3083 strdup(got_worktree_get_repo_path(worktree));
3084 if (repo_path == NULL)
3085 error = got_error_from_errno();
3089 repo_path = strdup(cwd);
3090 if (repo_path == NULL) {
3091 error = got_error_from_errno();
3099 error = apply_unveil(repo_path, NULL);
3103 error = got_repo_open(&repo, repo_path);
3108 const char *prefix = got_worktree_get_path_prefix(worktree);
3109 char *p, *worktree_subdir = cwd +
3110 strlen(got_worktree_get_root_path(worktree));
3111 if (asprintf(&p, "%s%s%s%s%s",
3112 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3113 worktree_subdir, worktree_subdir[0] ? "/" : "",
3115 error = got_error_from_errno();
3118 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3121 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3126 if (commit_id_str == NULL) {
3127 struct got_reference *head_ref;
3128 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
3131 error = got_ref_resolve(&commit_id, repo, head_ref);
3132 got_ref_close(head_ref);
3134 error = got_object_resolve_id_str(&commit_id, repo,
3140 SIMPLEQ_INIT(&refs);
3141 error = got_ref_list(&refs, repo);
3145 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3147 error = got_error_from_errno();
3150 error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3153 error = view_loop(view);
3159 got_worktree_close(worktree);
3161 got_repo_close(repo);
3165 static const struct got_error *
3166 draw_tree_entries(struct tog_view *view,
3167 struct got_tree_entry **first_displayed_entry,
3168 struct got_tree_entry **last_displayed_entry,
3169 struct got_tree_entry **selected_entry, int *ndisplayed,
3170 const char *label, int show_ids, const char *parent_path,
3171 const struct got_tree_entries *entries, int selected, int limit, int isroot)
3173 const struct got_error *err = NULL;
3174 struct got_tree_entry *te;
3180 werase(view->window);
3185 err = format_line(&wline, &width, label, view->ncols);
3188 if (view_needs_focus_indication(view))
3189 wstandout(view->window);
3190 waddwstr(view->window, wline);
3191 if (view_needs_focus_indication(view))
3192 wstandend(view->window);
3195 if (width < view->ncols)
3196 waddch(view->window, '\n');
3199 err = format_line(&wline, &width, parent_path, view->ncols);
3202 waddwstr(view->window, wline);
3205 if (width < view->ncols)
3206 waddch(view->window, '\n');
3209 waddch(view->window, '\n');
3213 te = SIMPLEQ_FIRST(&entries->head);
3214 if (*first_displayed_entry == NULL) {
3215 if (selected == 0) {
3217 wstandout(view->window);
3218 *selected_entry = NULL;
3220 waddstr(view->window, " ..\n"); /* parent directory */
3221 if (selected == 0 && view->focussed)
3222 wstandend(view->window);
3229 while (te != *first_displayed_entry)
3230 te = SIMPLEQ_NEXT(te, entry);
3234 char *line = NULL, *id_str = NULL;
3237 err = got_object_id_str(&id_str, te->id);
3239 return got_error_from_errno();
3241 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3242 te->name, S_ISDIR(te->mode) ? "/" :
3243 ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3245 return got_error_from_errno();
3248 err = format_line(&wline, &width, line, view->ncols);
3253 if (n == selected) {
3255 wstandout(view->window);
3256 *selected_entry = te;
3258 waddwstr(view->window, wline);
3259 if (width < view->ncols)
3260 waddch(view->window, '\n');
3261 if (n == selected && view->focussed)
3262 wstandend(view->window);
3268 *last_displayed_entry = te;
3271 te = SIMPLEQ_NEXT(te, entry);
3278 tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
3279 const struct got_tree_entries *entries, int isroot)
3281 struct got_tree_entry *te, *prev;
3284 if (*first_displayed_entry == NULL)
3287 te = SIMPLEQ_FIRST(&entries->head);
3288 if (*first_displayed_entry == te) {
3290 *first_displayed_entry = NULL;
3294 /* XXX this is stupid... switch to TAILQ? */
3295 for (i = 0; i < maxscroll; i++) {
3296 while (te != *first_displayed_entry) {
3298 te = SIMPLEQ_NEXT(te, entry);
3300 *first_displayed_entry = prev;
3301 te = SIMPLEQ_FIRST(&entries->head);
3303 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3304 *first_displayed_entry = NULL;
3308 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3309 struct got_tree_entry *last_displayed_entry,
3310 const struct got_tree_entries *entries)
3312 struct got_tree_entry *next, *last;
3315 if (*first_displayed_entry)
3316 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3318 next = SIMPLEQ_FIRST(&entries->head);
3319 last = last_displayed_entry;
3320 while (next && last && n++ < maxscroll) {
3321 last = SIMPLEQ_NEXT(last, entry);
3323 *first_displayed_entry = next;
3324 next = SIMPLEQ_NEXT(next, entry);
3330 static const struct got_error *
3331 tree_entry_path(char **path, struct tog_parent_trees *parents,
3332 struct got_tree_entry *te)
3334 const struct got_error *err = NULL;
3335 struct tog_parent_tree *pt;
3336 size_t len = 2; /* for leading slash and NUL */
3338 TAILQ_FOREACH(pt, parents, entry)
3339 len += strlen(pt->selected_entry->name) + 1 /* slash */;
3341 len += strlen(te->name);
3343 *path = calloc(1, len);
3345 return got_error_from_errno();
3348 pt = TAILQ_LAST(parents, tog_parent_trees);
3350 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3351 err = got_error(GOT_ERR_NO_SPACE);
3354 if (strlcat(*path, "/", len) >= len) {
3355 err = got_error(GOT_ERR_NO_SPACE);
3358 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3361 if (strlcat(*path, te->name, len) >= len) {
3362 err = got_error(GOT_ERR_NO_SPACE);
3374 static const struct got_error *
3375 blame_tree_entry(struct tog_view **new_view, int begin_x,
3376 struct got_tree_entry *te, struct tog_parent_trees *parents,
3377 struct got_object_id *commit_id, struct got_reflist_head *refs,
3378 struct got_repository *repo)
3380 const struct got_error *err = NULL;
3382 struct tog_view *blame_view;
3384 err = tree_entry_path(&path, parents, te);
3388 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3389 if (blame_view == NULL)
3390 return got_error_from_errno();
3392 err = open_blame_view(blame_view, path, commit_id, refs, repo);
3394 view_close(blame_view);
3397 *new_view = blame_view;
3401 static const struct got_error *
3402 log_tree_entry(struct tog_view **new_view, int begin_x,
3403 struct got_tree_entry *te, struct tog_parent_trees *parents,
3404 struct got_object_id *commit_id, struct got_reflist_head *refs,
3405 struct got_repository *repo)
3407 struct tog_view *log_view;
3408 const struct got_error *err = NULL;
3411 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3412 if (log_view == NULL)
3413 return got_error_from_errno();
3415 err = tree_entry_path(&path, parents, te);
3419 err = open_log_view(log_view, commit_id, refs, repo, path, 0);
3421 view_close(log_view);
3423 *new_view = log_view;
3428 static const struct got_error *
3429 open_tree_view(struct tog_view *view, struct got_tree_object *root,
3430 struct got_object_id *commit_id, struct got_reflist_head *refs,
3431 struct got_repository *repo)
3433 const struct got_error *err = NULL;
3434 char *commit_id_str = NULL;
3435 struct tog_tree_view_state *s = &view->state.tree;
3437 TAILQ_INIT(&s->parents);
3439 err = got_object_id_str(&commit_id_str, commit_id);
3443 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3444 err = got_error_from_errno();
3448 s->root = s->tree = root;
3449 s->entries = got_object_tree_get_entries(root);
3450 s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3451 s->commit_id = got_object_id_dup(commit_id);
3452 if (s->commit_id == NULL) {
3453 err = got_error_from_errno();
3459 view->show = show_tree_view;
3460 view->input = input_tree_view;
3461 view->close = close_tree_view;
3463 free(commit_id_str);
3465 free(s->tree_label);
3466 s->tree_label = NULL;
3471 static const struct got_error *
3472 close_tree_view(struct tog_view *view)
3474 struct tog_tree_view_state *s = &view->state.tree;
3476 free(s->tree_label);
3477 s->tree_label = NULL;
3479 s->commit_id = NULL;
3480 while (!TAILQ_EMPTY(&s->parents)) {
3481 struct tog_parent_tree *parent;
3482 parent = TAILQ_FIRST(&s->parents);
3483 TAILQ_REMOVE(&s->parents, parent, entry);
3487 if (s->tree != s->root)
3488 got_object_tree_close(s->tree);
3489 got_object_tree_close(s->root);
3494 static const struct got_error *
3495 show_tree_view(struct tog_view *view)
3497 const struct got_error *err = NULL;
3498 struct tog_tree_view_state *s = &view->state.tree;
3501 err = tree_entry_path(&parent_path, &s->parents, NULL);
3505 err = draw_tree_entries(view, &s->first_displayed_entry,
3506 &s->last_displayed_entry, &s->selected_entry,
3507 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3508 s->entries, s->selected, view->nlines, s->tree == s->root);
3515 static const struct got_error *
3516 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3517 struct tog_view **focus_view, struct tog_view *view, int ch)
3519 const struct got_error *err = NULL;
3520 struct tog_tree_view_state *s = &view->state.tree;
3521 struct tog_view *log_view;
3522 int begin_x = 0, nscrolled;
3526 s->show_ids = !s->show_ids;
3529 if (!s->selected_entry)
3531 if (view_is_parent_view(view))
3532 begin_x = view_split_begin_x(view->begin_x);
3533 err = log_tree_entry(&log_view, begin_x,
3534 s->selected_entry, &s->parents,
3535 s->commit_id, s->refs, s->repo);
3536 if (view_is_parent_view(view)) {
3537 err = view_close_child(view);
3540 err = view_set_child(view, log_view);
3542 view_close(log_view);
3545 *focus_view = log_view;
3546 view->child_focussed = 1;
3548 *new_view = log_view;
3552 if (s->selected > 0) {
3554 if (s->selected == 0)
3557 if (s->selected > 0)
3559 tree_scroll_up(&s->first_displayed_entry, 1,
3560 s->entries, s->tree == s->root);
3563 tree_scroll_up(&s->first_displayed_entry,
3564 MAX(0, view->nlines - 4 - s->selected), s->entries,
3565 s->tree == s->root);
3567 if (SIMPLEQ_FIRST(&s->entries->head) ==
3568 s->first_displayed_entry && s->tree != s->root)
3569 s->first_displayed_entry = NULL;
3573 if (s->selected < s->ndisplayed - 1) {
3577 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3579 /* can't scroll any further */
3582 tree_scroll_down(&s->first_displayed_entry, 1,
3583 s->last_displayed_entry, s->entries);
3586 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3588 /* can't scroll any further; move cursor down */
3589 if (s->selected < s->ndisplayed - 1)
3590 s->selected = s->ndisplayed - 1;
3593 nscrolled = tree_scroll_down(&s->first_displayed_entry,
3594 view->nlines, s->last_displayed_entry, s->entries);
3595 if (nscrolled < view->nlines) {
3597 struct got_tree_entry *te;
3598 te = s->first_displayed_entry;
3601 te = SIMPLEQ_NEXT(te, entry);
3603 s->selected = ndisplayed - 1;
3608 if (s->selected_entry == NULL) {
3609 struct tog_parent_tree *parent;
3611 /* user selected '..' */
3612 if (s->tree == s->root)
3614 parent = TAILQ_FIRST(&s->parents);
3615 TAILQ_REMOVE(&s->parents, parent,
3617 got_object_tree_close(s->tree);
3618 s->tree = parent->tree;
3620 got_object_tree_get_entries(s->tree);
3621 s->first_displayed_entry =
3622 parent->first_displayed_entry;
3624 parent->selected_entry;
3625 s->selected = parent->selected;
3627 } else if (S_ISDIR(s->selected_entry->mode)) {
3628 struct tog_parent_tree *parent;
3629 struct got_tree_object *child;
3630 err = got_object_open_as_tree(&child,
3631 s->repo, s->selected_entry->id);
3634 parent = calloc(1, sizeof(*parent));
3635 if (parent == NULL) {
3636 err = got_error_from_errno();
3639 parent->tree = s->tree;
3640 parent->first_displayed_entry =
3641 s->first_displayed_entry;
3642 parent->selected_entry = s->selected_entry;
3643 parent->selected = s->selected;
3644 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3647 got_object_tree_get_entries(s->tree);
3649 s->first_displayed_entry = NULL;
3650 } else if (S_ISREG(s->selected_entry->mode)) {
3651 struct tog_view *blame_view;
3652 int begin_x = view_is_parent_view(view) ?
3653 view_split_begin_x(view->begin_x) : 0;
3655 err = blame_tree_entry(&blame_view, begin_x,
3656 s->selected_entry, &s->parents,
3657 s->commit_id, s->refs, s->repo);
3660 if (view_is_parent_view(view)) {
3661 err = view_close_child(view);
3664 err = view_set_child(view, blame_view);
3666 view_close(blame_view);
3669 *focus_view = blame_view;
3670 view->child_focussed = 1;
3672 *new_view = blame_view;
3676 if (s->selected > view->nlines)
3677 s->selected = s->ndisplayed - 1;
3690 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3695 static const struct got_error *
3696 cmd_tree(int argc, char *argv[])
3698 const struct got_error *error;
3699 struct got_repository *repo = NULL;
3700 struct got_reflist_head refs;
3701 char *repo_path = NULL;
3702 struct got_object_id *commit_id = NULL;
3703 char *commit_id_arg = NULL;
3704 struct got_commit_object *commit = NULL;
3705 struct got_tree_object *tree = NULL;
3707 struct tog_view *view;
3710 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3715 while ((ch = getopt(argc, argv, "c:")) != -1) {
3718 commit_id_arg = optarg;
3730 struct got_worktree *worktree;
3731 char *cwd = getcwd(NULL, 0);
3733 return got_error_from_errno();
3734 error = got_worktree_open(&worktree, cwd);
3735 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3740 strdup(got_worktree_get_repo_path(worktree));
3741 got_worktree_close(worktree);
3744 if (repo_path == NULL) {
3745 error = got_error_from_errno();
3748 } else if (argc == 1) {
3749 repo_path = realpath(argv[0], NULL);
3750 if (repo_path == NULL)
3751 return got_error_from_errno();
3757 error = apply_unveil(repo_path, NULL);
3761 error = got_repo_open(&repo, repo_path);
3765 if (commit_id_arg == NULL)
3766 error = get_head_commit_id(&commit_id, repo);
3768 error = got_object_resolve_id_str(&commit_id, repo,
3773 error = got_object_open_as_commit(&commit, repo, commit_id);
3777 error = got_object_open_as_tree(&tree, repo,
3778 got_object_commit_get_tree_id(commit));
3782 SIMPLEQ_INIT(&refs);
3783 error = got_ref_list(&refs, repo);
3787 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3789 error = got_error_from_errno();
3792 error = open_tree_view(view, tree, commit_id, &refs, repo);
3795 error = view_loop(view);
3800 got_object_commit_close(commit);
3802 got_object_tree_close(tree);
3804 got_repo_close(repo);
3813 fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3814 "Available commands:\n", getprogname());
3815 for (i = 0; i < nitems(tog_commands); i++) {
3816 struct tog_cmd *cmd = &tog_commands[i];
3817 fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3823 make_argv(const char *arg0, const char *arg1)
3826 int argc = (arg1 == NULL ? 1 : 2);
3828 argv = calloc(argc, sizeof(char *));
3831 argv[0] = strdup(arg0);
3832 if (argv[0] == NULL)
3835 argv[1] = strdup(arg1);
3836 if (argv[1] == NULL)
3844 main(int argc, char *argv[])
3846 const struct got_error *error = NULL;
3847 struct tog_cmd *cmd = NULL;
3849 char **cmd_argv = NULL;
3851 setlocale(LC_CTYPE, "");
3853 while ((ch = getopt(argc, argv, "h")) != -1) {
3872 /* Build an argument vector which runs a default command. */
3873 cmd = &tog_commands[0];
3874 cmd_argv = make_argv(cmd->name, NULL);
3879 /* Did the user specific a command? */
3880 for (i = 0; i < nitems(tog_commands); i++) {
3881 if (strncmp(tog_commands[i].name, argv[0],
3882 strlen(argv[0])) == 0) {
3883 cmd = &tog_commands[i];
3885 tog_commands[i].cmd_usage();
3890 /* Did the user specify a repository? */
3891 char *repo_path = realpath(argv[0], NULL);
3893 struct got_repository *repo;
3894 error = got_repo_open(&repo, repo_path);
3896 got_repo_close(repo);
3898 error = got_error_from_errno();
3901 fprintf(stderr, "%s: '%s' is not a "
3902 "known command\n", getprogname(),
3906 fprintf(stderr, "%s: '%s' is neither a known "
3907 "command nor a path to a repository\n",
3908 getprogname(), argv[0]);
3912 cmd = &tog_commands[0];
3913 cmd_argv = make_argv(cmd->name, repo_path);
3919 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3926 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);