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_prefix_errno("mvwin");
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_prefix_errno("mvwin");
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_prefix_errno("wresize");
437 if (replace_panel(view->panel, view->window) == ERR)
438 return got_error_prefix_errno("replace_panel");
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->begin_x > 0;
493 * Erase all content of the view. Can be used to "flash" the view because
494 * the view loop will redraw it quickly, providing a more subtle visual
495 * effect than curs_flash(3) would provide.
498 view_flash(struct tog_view *view)
500 werase(view->window);
511 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
512 cols = 80; /* Default */
518 resize_term(lines, cols);
521 static const struct got_error *
522 view_input(struct tog_view **new, struct tog_view **dead,
523 struct tog_view **focus, int *done, struct tog_view *view,
524 struct tog_view_list_head *views)
526 const struct got_error *err = NULL;
534 nodelay(stdscr, FALSE);
535 /* Allow threads to make progress while we are waiting for input. */
536 errcode = pthread_mutex_unlock(&tog_mutex);
538 return got_error_set_errno(errcode, "pthread_mutex_unlock");
539 ch = wgetch(view->window);
540 errcode = pthread_mutex_lock(&tog_mutex);
542 return got_error_set_errno(errcode, "pthread_mutex_lock");
543 nodelay(stdscr, TRUE);
545 if (tog_sigwinch_received) {
547 tog_sigwinch_received = 0;
548 TAILQ_FOREACH(v, views, entry) {
549 err = view_resize(v);
552 err = v->input(new, dead, focus, v, KEY_RESIZE);
563 *focus = view->child;
564 view->child_focussed = 1;
565 } else if (view->parent) {
566 *focus = view->parent;
567 view->parent->child_focussed = 0;
571 err = view->input(new, dead, focus, view, ch);
578 if (view_is_parent_view(view)) {
579 if (view->child == NULL)
581 if (view_is_splitscreen(view->child)) {
582 *focus = view->child;
583 view->child_focussed = 1;
584 err = view_fullscreen(view->child);
586 err = view_splitscreen(view->child);
589 err = view->child->input(new, dead, focus,
590 view->child, KEY_RESIZE);
592 if (view_is_splitscreen(view)) {
594 view->parent->child_focussed = 1;
595 err = view_fullscreen(view);
597 err = view_splitscreen(view);
601 err = view->input(new, dead, focus, view,
608 err = view->input(new, dead, focus, view, ch);
616 view_vborder(struct tog_view *view)
619 struct tog_view *view_above;
622 return view_vborder(view->parent);
624 panel = panel_above(view->panel);
628 view_above = panel_userptr(panel);
629 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
630 got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
634 view_needs_focus_indication(struct tog_view *view)
636 if (view_is_parent_view(view)) {
637 if (view->child == NULL || view->child_focussed)
639 if (!view_is_splitscreen(view->child))
641 } else if (!view_is_splitscreen(view))
644 return view->focussed;
647 static const struct got_error *
648 view_loop(struct tog_view *view)
650 const struct got_error *err = NULL;
651 struct tog_view_list_head views;
652 struct tog_view *new_view, *dead_view, *focus_view, *main_view;
653 int fast_refresh = 10;
654 int done = 0, errcode;
656 errcode = pthread_mutex_lock(&tog_mutex);
658 return got_error_set_errno(errcode, "pthread_mutex_lock");
661 TAILQ_INSERT_HEAD(&views, view, entry);
665 err = view->show(view);
670 while (!TAILQ_EMPTY(&views) && !done) {
671 /* Refresh fast during initialization, then become slower. */
672 if (fast_refresh && fast_refresh-- == 0)
673 halfdelay(10); /* switch to once per second */
675 err = view_input(&new_view, &dead_view, &focus_view, &done,
680 struct tog_view *prev = NULL;
682 if (view_is_parent_view(dead_view))
683 prev = TAILQ_PREV(dead_view,
684 tog_view_list_head, entry);
685 else if (view->parent != dead_view)
688 if (dead_view->parent)
689 dead_view->parent->child = NULL;
691 TAILQ_REMOVE(&views, dead_view, entry);
693 err = view_close(dead_view);
694 if (err || dead_view == main_view)
697 if (view == dead_view) {
702 else if (!TAILQ_EMPTY(&views))
703 view = TAILQ_LAST(&views,
708 if (view->child && view->child_focussed)
709 focus_view = view->child;
716 struct tog_view *v, *t;
717 /* Only allow one parent view per type. */
718 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
719 if (v->type != new_view->type)
721 TAILQ_REMOVE(&views, v, entry);
727 TAILQ_INSERT_TAIL(&views, new_view, entry);
729 if (focus_view == NULL)
730 focus_view = new_view;
733 show_panel(focus_view->panel);
736 focus_view->focussed = 1;
739 show_panel(new_view->panel);
740 if (view->child && view_is_splitscreen(view->child))
741 show_panel(view->child->panel);
744 if (focus_view == NULL) {
746 show_panel(view->panel);
747 if (view->child && view_is_splitscreen(view->child))
748 show_panel(view->child->panel);
752 err = view->parent->show(view->parent);
756 err = view->show(view);
760 err = view->child->show(view->child);
769 while (!TAILQ_EMPTY(&views)) {
770 view = TAILQ_FIRST(&views);
771 TAILQ_REMOVE(&views, view, entry);
775 errcode = pthread_mutex_unlock(&tog_mutex);
777 return got_error_set_errno(errcode, "pthread_mutex_unlock");
787 "usage: %s log [-c commit] [-r repository-path] [path]\n",
792 /* Create newly allocated wide-character string equivalent to a byte string. */
793 static const struct got_error *
794 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
797 const struct got_error *err = NULL;
800 *wlen = mbstowcs(NULL, s, 0);
801 if (*wlen == (size_t)-1) {
804 return got_error_prefix_errno("mbstowcs");
806 /* byte string invalid in current encoding; try to "fix" it */
807 err = got_mbsavis(&vis, &vislen, s);
810 *wlen = mbstowcs(NULL, vis, 0);
811 if (*wlen == (size_t)-1) {
812 err = got_error_prefix_errno("mbstowcs"); /* give up */
817 *ws = calloc(*wlen + 1, sizeof(*ws));
819 err = got_error_prefix_errno("calloc");
823 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
824 err = got_error_prefix_errno("mbstowcs");
835 /* Format a line for display, ensuring that it won't overflow a width limit. */
836 static const struct got_error *
837 format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
839 const struct got_error *err = NULL;
841 wchar_t *wline = NULL;
848 err = mbs2ws(&wline, &wlen, line);
853 while (i < wlen && cols < wlimit) {
854 int width = wcwidth(wline[i]);
861 if (cols + width <= wlimit)
866 if (wline[i] == L'\t')
867 cols += TABSIZE - ((cols + 1) % TABSIZE);
871 err = got_error_prefix_errno("wcwidth");
886 static const struct got_error*
887 build_refs_str(char **refs_str, struct got_reflist_head *refs,
888 struct got_object_id *id)
890 static const struct got_error *err = NULL;
891 struct got_reflist_entry *re;
897 SIMPLEQ_FOREACH(re, refs, entry) {
898 if (got_object_id_cmp(re->id, id) != 0)
900 name = got_ref_get_name(re->ref);
901 if (strcmp(name, GOT_REF_HEAD) == 0)
903 if (strncmp(name, "refs/", 5) == 0)
905 if (strncmp(name, "got/", 4) == 0)
907 if (strncmp(name, "heads/", 6) == 0)
909 if (strncmp(name, "remotes/", 8) == 0)
912 if (asprintf(refs_str, "%s%s%s", s ? s : "",
913 s ? ", " : "", name) == -1) {
914 err = got_error_prefix_errno("asprintf");
925 static const struct got_error *
926 format_author(wchar_t **wauthor, int *author_width, char *author, int limit)
928 char *smallerthan, *at;
930 smallerthan = strchr(author, '<');
931 if (smallerthan && smallerthan[1] != '\0')
932 author = smallerthan + 1;
933 at = strchr(author, '@');
936 return format_line(wauthor, author_width, author, limit);
939 static const struct got_error *
940 draw_commit(struct tog_view *view, struct got_commit_object *commit,
941 struct got_object_id *id, struct got_reflist_head *refs,
942 int author_display_cols)
944 const struct got_error *err = NULL;
945 char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
946 char *logmsg0 = NULL, *logmsg = NULL;
948 wchar_t *wlogmsg = NULL, *wauthor = NULL;
949 int author_width, logmsg_width;
950 char *newline, *line = NULL;
952 static const size_t date_display_cols = 9;
953 const int avail = view->ncols;
955 time_t committer_time;
957 committer_time = got_object_commit_get_committer_time(commit);
958 if (localtime_r(&committer_time, &tm) == NULL)
959 return got_error_prefix_errno("localtime_r");
960 if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
962 return got_error(GOT_ERR_NO_SPACE);
964 if (avail < date_display_cols)
965 limit = MIN(sizeof(datebuf) - 1, avail);
967 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
968 waddnstr(view->window, datebuf, limit);
973 author = strdup(got_object_commit_get_author(commit));
974 if (author == NULL) {
975 err = got_error_prefix_errno("strdup");
978 err = format_author(&wauthor, &author_width, author, avail - col);
981 waddwstr(view->window, wauthor);
983 while (col <= avail && author_width < author_display_cols + 2) {
984 waddch(view->window, ' ');
991 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
992 if (logmsg0 == NULL) {
993 err = got_error_prefix_errno("strdup");
997 while (*logmsg == '\n')
999 newline = strchr(logmsg, '\n');
1002 limit = avail - col;
1003 err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
1006 waddwstr(view->window, wlogmsg);
1007 col += logmsg_width;
1008 while (col <= avail) {
1009 waddch(view->window, ' ');
1021 static struct commit_queue_entry *
1022 alloc_commit_queue_entry(struct got_commit_object *commit,
1023 struct got_object_id *id)
1025 struct commit_queue_entry *entry;
1027 entry = calloc(1, sizeof(*entry));
1032 entry->commit = commit;
1037 pop_commit(struct commit_queue *commits)
1039 struct commit_queue_entry *entry;
1041 entry = TAILQ_FIRST(&commits->head);
1042 TAILQ_REMOVE(&commits->head, entry, entry);
1043 got_object_commit_close(entry->commit);
1044 commits->ncommits--;
1045 /* Don't free entry->id! It is owned by the commit graph. */
1050 free_commits(struct commit_queue *commits)
1052 while (!TAILQ_EMPTY(&commits->head))
1053 pop_commit(commits);
1056 static const struct got_error *
1057 queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1058 int minqueue, struct got_repository *repo, const char *path)
1060 const struct got_error *err = NULL;
1064 * We keep all commits open throughout the lifetime of the log
1065 * view in order to avoid having to re-fetch commits from disk
1066 * while updating the display.
1068 while (nqueued < minqueue) {
1069 struct got_object_id *id;
1070 struct got_commit_object *commit;
1071 struct commit_queue_entry *entry;
1074 err = got_commit_graph_iter_next(&id, graph);
1076 if (err->code != GOT_ERR_ITER_NEED_MORE)
1078 err = got_commit_graph_fetch_commits(graph,
1088 err = got_object_open_as_commit(&commit, repo, id);
1091 entry = alloc_commit_queue_entry(commit, id);
1092 if (entry == NULL) {
1093 err = got_error_prefix_errno("alloc_commit_queue_entry");
1097 errcode = pthread_mutex_lock(&tog_mutex);
1099 err = got_error_set_errno(errcode, "pthread_mutex_lock");
1103 entry->idx = commits->ncommits;
1104 TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1106 commits->ncommits++;
1108 errcode = pthread_mutex_unlock(&tog_mutex);
1109 if (errcode && err == NULL)
1110 err = got_error_set_errno(errcode,
1111 "pthread_mutex_unlock");
1117 static const struct got_error *
1118 get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1120 const struct got_error *err = NULL;
1121 struct got_reference *head_ref;
1125 err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1129 err = got_ref_resolve(head_id, repo, head_ref);
1130 got_ref_close(head_ref);
1139 static const struct got_error *
1140 draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1141 struct commit_queue_entry **selected, struct commit_queue_entry *first,
1142 struct commit_queue *commits, int selected_idx, int limit,
1143 struct got_reflist_head *refs, const char *path, int commits_needed)
1145 const struct got_error *err = NULL;
1146 struct commit_queue_entry *entry;
1147 int ncommits, width;
1148 int author_cols = 10;
1149 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1150 char *refs_str = NULL;
1156 if (ncommits == selected_idx) {
1160 entry = TAILQ_NEXT(entry, entry);
1165 err = got_object_id_str(&id_str, (*selected)->id);
1169 err = build_refs_str(&refs_str, refs, (*selected)->id);
1175 if (commits_needed == 0)
1176 halfdelay(10); /* disable fast refresh */
1178 if (asprintf(&ncommits_str, " [%d/%d] %s",
1179 entry ? entry->idx + 1 : 0, commits->ncommits,
1180 commits_needed > 0 ? "loading... " :
1181 (refs_str ? refs_str : "")) == -1) {
1182 err = got_error_prefix_errno("asprintf");
1186 if (path && strcmp(path, "/") != 0) {
1187 if (asprintf(&header, "commit %s %s%s",
1188 id_str ? id_str : "........................................",
1189 path, ncommits_str) == -1) {
1190 err = got_error_prefix_errno("asprintf");
1194 } else if (asprintf(&header, "commit %s%s",
1195 id_str ? id_str : "........................................",
1196 ncommits_str) == -1) {
1197 err = got_error_prefix_errno("asprintf");
1201 err = format_line(&wline, &width, header, view->ncols);
1205 werase(view->window);
1207 if (view_needs_focus_indication(view))
1208 wstandout(view->window);
1209 waddwstr(view->window, wline);
1210 while (width < view->ncols) {
1211 waddch(view->window, ' ');
1214 if (view_needs_focus_indication(view))
1215 wstandend(view->window);
1220 /* Grow author column size if necessary. */
1227 if (ncommits >= limit - 1)
1229 author = strdup(got_object_commit_get_author(entry->commit));
1230 if (author == NULL) {
1231 err = got_error_prefix_errno("strdup");
1234 err = format_author(&wauthor, &width, author, COLS);
1235 if (author_cols < width)
1236 author_cols = width;
1239 entry = TAILQ_NEXT(entry, entry);
1246 if (ncommits >= limit - 1)
1248 if (ncommits == selected_idx)
1249 wstandout(view->window);
1250 err = draw_commit(view, entry->commit, entry->id, refs,
1252 if (ncommits == selected_idx)
1253 wstandend(view->window);
1258 entry = TAILQ_NEXT(entry, entry);
1271 scroll_up(struct tog_view *view,
1272 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1273 struct commit_queue *commits)
1275 struct commit_queue_entry *entry;
1278 entry = TAILQ_FIRST(&commits->head);
1279 if (*first_displayed_entry == entry) {
1284 entry = *first_displayed_entry;
1285 while (entry && nscrolled < maxscroll) {
1286 entry = TAILQ_PREV(entry, commit_queue_head, entry);
1288 *first_displayed_entry = entry;
1294 static const struct got_error *
1295 trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1296 pthread_cond_t *need_commits)
1301 halfdelay(1); /* fast refresh while loading commits */
1303 while (*commits_needed > 0) {
1307 /* Wake the log thread. */
1308 errcode = pthread_cond_signal(need_commits);
1310 return got_error_set_errno(errcode,
1311 "pthread_cond_signal");
1312 errcode = pthread_mutex_unlock(&tog_mutex);
1314 return got_error_set_errno(errcode,
1315 "pthread_mutex_unlock");
1317 errcode = pthread_mutex_lock(&tog_mutex);
1319 return got_error_set_errno(errcode,
1320 "pthread_mutex_lock");
1322 if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1324 * Thread is not done yet; lose a key press
1325 * and let the user retry... this way the GUI
1326 * remains interactive while logging deep paths
1327 * with few commits in history.
1336 static const struct got_error *
1337 scroll_down(struct tog_view *view,
1338 struct commit_queue_entry **first_displayed_entry, int maxscroll,
1339 struct commit_queue_entry **last_displayed_entry,
1340 struct commit_queue *commits, int *log_complete, int *commits_needed,
1341 pthread_cond_t *need_commits)
1343 const struct got_error *err = NULL;
1344 struct commit_queue_entry *pentry;
1347 if (*last_displayed_entry == NULL)
1350 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1351 if (pentry == NULL && !*log_complete) {
1353 * Ask the log thread for required amount of commits
1354 * plus some amount of pre-fetching.
1356 (*commits_needed) += maxscroll + 20;
1357 err = trigger_log_thread(0, commits_needed, log_complete,
1364 pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1365 if (pentry == NULL) {
1371 *last_displayed_entry = pentry;
1373 pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1376 *first_displayed_entry = pentry;
1377 } while (++nscrolled < maxscroll);
1382 static const struct got_error *
1383 open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1384 struct got_commit_object *commit, struct got_object_id *commit_id,
1385 struct tog_view *log_view, struct got_reflist_head *refs,
1386 struct got_repository *repo)
1388 const struct got_error *err;
1389 struct got_object_qid *parent_id;
1390 struct tog_view *diff_view;
1392 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1393 if (diff_view == NULL)
1394 return got_error_prefix_errno("view_open");
1396 parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1397 err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1398 commit_id, log_view, refs, repo);
1400 *new_view = diff_view;
1404 static const struct got_error *
1405 browse_commit(struct tog_view **new_view, int begin_x,
1406 struct commit_queue_entry *entry, struct got_reflist_head *refs,
1407 struct got_repository *repo)
1409 const struct got_error *err = NULL;
1410 struct got_tree_object *tree;
1411 struct tog_view *tree_view;
1413 err = got_object_open_as_tree(&tree, repo,
1414 got_object_commit_get_tree_id(entry->commit));
1418 tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1419 if (tree_view == NULL)
1420 return got_error_prefix_errno("view_open");
1422 err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1424 got_object_tree_close(tree);
1426 *new_view = tree_view;
1431 log_thread(void *arg)
1433 const struct got_error *err = NULL;
1435 struct tog_log_thread_args *a = arg;
1438 err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1442 while (!done && !err) {
1443 err = queue_commits(a->graph, a->commits, 1, a->repo,
1446 if (err->code != GOT_ERR_ITER_COMPLETED)
1450 } else if (a->commits_needed > 0)
1451 a->commits_needed--;
1453 errcode = pthread_mutex_lock(&tog_mutex);
1455 err = got_error_set_errno(errcode,
1456 "pthread_mutex_lock");
1458 } else if (*a->quit)
1460 else if (*a->first_displayed_entry == NULL) {
1461 *a->first_displayed_entry =
1462 TAILQ_FIRST(&a->commits->head);
1463 *a->selected_entry = *a->first_displayed_entry;
1467 a->commits_needed = 0;
1468 else if (a->commits_needed == 0) {
1469 errcode = pthread_cond_wait(&a->need_commits,
1472 err = got_error_set_errno(errcode,
1473 "pthread_cond_wait");
1476 errcode = pthread_mutex_unlock(&tog_mutex);
1477 if (errcode && err == NULL)
1478 err = got_error_set_errno(errcode,
1479 "pthread_mutex_unlock");
1481 a->log_complete = 1;
1485 static const struct got_error *
1486 stop_log_thread(struct tog_log_view_state *s)
1488 const struct got_error *err = NULL;
1493 errcode = pthread_cond_signal(&s->thread_args.need_commits);
1495 return got_error_set_errno(errcode,
1496 "pthread_cond_signal");
1497 errcode = pthread_mutex_unlock(&tog_mutex);
1499 return got_error_set_errno(errcode,
1500 "pthread_mutex_unlock");
1501 errcode = pthread_join(s->thread, (void **)&err);
1503 return got_error_set_errno(errcode, "pthread_join");
1504 errcode = pthread_mutex_lock(&tog_mutex);
1506 return got_error_set_errno(errcode,
1507 "pthread_mutex_lock");
1511 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1512 if (errcode && err == NULL)
1513 err = got_error_set_errno(errcode, "pthread_cond_destroy");
1515 if (s->thread_args.repo) {
1516 got_repo_close(s->thread_args.repo);
1517 s->thread_args.repo = NULL;
1520 if (s->thread_args.graph) {
1521 got_commit_graph_close(s->thread_args.graph);
1522 s->thread_args.graph = NULL;
1528 static const struct got_error *
1529 close_log_view(struct tog_view *view)
1531 const struct got_error *err = NULL;
1532 struct tog_log_view_state *s = &view->state.log;
1534 err = stop_log_thread(s);
1535 free_commits(&s->commits);
1536 free(s->in_repo_path);
1537 s->in_repo_path = NULL;
1543 static const struct got_error *
1544 open_log_view(struct tog_view *view, struct got_object_id *start_id,
1545 struct got_reflist_head *refs, struct got_repository *repo,
1546 const char *path, int check_disk)
1548 const struct got_error *err = NULL;
1549 struct tog_log_view_state *s = &view->state.log;
1550 struct got_repository *thread_repo = NULL;
1551 struct got_commit_graph *thread_graph = NULL;
1554 err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1558 /* The commit queue only contains commits being displayed. */
1559 TAILQ_INIT(&s->commits.head);
1560 s->commits.ncommits = 0;
1564 s->start_id = got_object_id_dup(start_id);
1565 if (s->start_id == NULL) {
1566 err = got_error_prefix_errno("got_object_id_dup");
1570 view->show = show_log_view;
1571 view->input = input_log_view;
1572 view->close = close_log_view;
1574 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1577 err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1582 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1584 err = got_error_set_errno(errcode, "pthread_cond_init");
1588 s->thread_args.commits_needed = view->nlines;
1589 s->thread_args.graph = thread_graph;
1590 s->thread_args.commits = &s->commits;
1591 s->thread_args.in_repo_path = s->in_repo_path;
1592 s->thread_args.start_id = s->start_id;
1593 s->thread_args.repo = thread_repo;
1594 s->thread_args.log_complete = 0;
1595 s->thread_args.quit = &s->quit;
1596 s->thread_args.view = view;
1597 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1598 s->thread_args.selected_entry = &s->selected_entry;
1601 close_log_view(view);
1605 static const struct got_error *
1606 show_log_view(struct tog_view *view)
1608 struct tog_log_view_state *s = &view->state.log;
1610 if (s->thread == NULL) {
1611 int errcode = pthread_create(&s->thread, NULL, log_thread,
1614 return got_error_set_errno(errcode, "pthread_create");
1617 return draw_commits(view, &s->last_displayed_entry,
1618 &s->selected_entry, s->first_displayed_entry,
1619 &s->commits, s->selected, view->nlines, s->refs,
1620 s->in_repo_path, s->thread_args.commits_needed);
1623 static const struct got_error *
1624 input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1625 struct tog_view **focus_view, struct tog_view *view, int ch)
1627 const struct got_error *err = NULL;
1628 struct tog_log_view_state *s = &view->state.log;
1630 struct tog_view *diff_view = NULL, *tree_view = NULL;
1641 if (s->first_displayed_entry == NULL)
1643 if (s->selected > 0)
1645 if (s->selected > 0)
1647 scroll_up(view, &s->first_displayed_entry, 1,
1651 if (s->first_displayed_entry == NULL)
1653 if (TAILQ_FIRST(&s->commits.head) ==
1654 s->first_displayed_entry) {
1655 if (s->selected == 0) {
1662 scroll_up(view, &s->first_displayed_entry,
1663 view->nlines, &s->commits);
1669 if (s->first_displayed_entry == NULL)
1671 if (s->selected < MIN(view->nlines - 2,
1672 s->commits.ncommits - 1)) {
1676 err = scroll_down(view, &s->first_displayed_entry, 1,
1677 &s->last_displayed_entry, &s->commits,
1678 &s->thread_args.log_complete,
1679 &s->thread_args.commits_needed,
1680 &s->thread_args.need_commits);
1683 struct commit_queue_entry *first;
1684 first = s->first_displayed_entry;
1687 err = scroll_down(view, &s->first_displayed_entry,
1688 view->nlines, &s->last_displayed_entry,
1689 &s->commits, &s->thread_args.log_complete,
1690 &s->thread_args.commits_needed,
1691 &s->thread_args.need_commits);
1692 if (first == s->first_displayed_entry &&
1693 s->selected < MIN(view->nlines - 2,
1694 s->commits.ncommits - 1)) {
1695 /* can't scroll further down */
1696 s->selected = MIN(view->nlines - 2,
1697 s->commits.ncommits - 1);
1703 if (s->selected > view->nlines - 2)
1704 s->selected = view->nlines - 2;
1705 if (s->selected > s->commits.ncommits - 1)
1706 s->selected = s->commits.ncommits - 1;
1710 if (s->selected_entry == NULL)
1712 if (view_is_parent_view(view))
1713 begin_x = view_split_begin_x(view->begin_x);
1714 err = open_diff_view_for_commit(&diff_view, begin_x,
1715 s->selected_entry->commit, s->selected_entry->id,
1716 view, s->refs, s->repo);
1719 if (view_is_parent_view(view)) {
1720 err = view_close_child(view);
1723 err = view_set_child(view, diff_view);
1725 view_close(diff_view);
1728 *focus_view = diff_view;
1729 view->child_focussed = 1;
1731 *new_view = diff_view;
1734 if (s->selected_entry == NULL)
1736 if (view_is_parent_view(view))
1737 begin_x = view_split_begin_x(view->begin_x);
1738 err = browse_commit(&tree_view, begin_x,
1739 s->selected_entry, s->refs, s->repo);
1742 if (view_is_parent_view(view)) {
1743 err = view_close_child(view);
1746 err = view_set_child(view, tree_view);
1748 view_close(tree_view);
1751 *focus_view = tree_view;
1752 view->child_focussed = 1;
1754 *new_view = tree_view;
1757 if (strcmp(s->in_repo_path, "/") == 0)
1759 parent_path = dirname(s->in_repo_path);
1760 if (parent_path && strcmp(parent_path, ".") != 0) {
1761 struct tog_view *lv;
1762 err = stop_log_thread(s);
1765 lv = view_open(view->nlines, view->ncols,
1766 view->begin_y, view->begin_x, TOG_VIEW_LOG);
1768 return got_error_prefix_errno(
1770 err = open_log_view(lv, s->start_id, s->refs,
1771 s->repo, parent_path, 0);
1774 if (view_is_parent_view(view))
1777 view_set_child(view->parent, lv);
1790 static const struct got_error *
1791 apply_unveil(const char *repo_path, const char *worktree_path)
1793 const struct got_error *error;
1795 if (repo_path && unveil(repo_path, "r") != 0)
1796 return got_error_prefix_errno2("unveil", repo_path);
1798 if (worktree_path && unveil(worktree_path, "rwc") != 0)
1799 return got_error_prefix_errno2("unveil", worktree_path);
1801 if (unveil("/tmp", "rwc") != 0)
1802 return got_error_prefix_errno2("unveil", "/tmp");
1804 error = got_privsep_unveil_exec_helpers();
1808 if (unveil(NULL, NULL) != 0)
1809 return got_error_prefix_errno("unveil");
1819 halfdelay(1); /* Do fast refresh while initial view is loading. */
1822 intrflush(stdscr, FALSE);
1823 keypad(stdscr, TRUE);
1825 signal(SIGWINCH, tog_sigwinch);
1828 static const struct got_error *
1829 cmd_log(int argc, char *argv[])
1831 const struct got_error *error;
1832 struct got_repository *repo = NULL;
1833 struct got_worktree *worktree = NULL;
1834 struct got_reflist_head refs;
1835 struct got_object_id *start_id = NULL;
1836 char *path = NULL, *repo_path = NULL, *cwd = NULL;
1837 char *start_commit = NULL;
1839 struct tog_view *view;
1841 SIMPLEQ_INIT(&refs);
1844 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1849 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1852 start_commit = optarg;
1855 repo_path = realpath(optarg, NULL);
1856 if (repo_path == NULL)
1857 err(1, "-r option");
1868 cwd = getcwd(NULL, 0);
1870 error = got_error_prefix_errno("getcwd");
1873 error = got_worktree_open(&worktree, cwd);
1874 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1881 error = got_error_prefix_errno("strdup");
1884 } else if (argc == 1) {
1886 error = got_worktree_resolve_path(&path, worktree,
1891 path = strdup(argv[0]);
1893 error = got_error_prefix_errno("strdup");
1900 repo_path = worktree ?
1901 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1902 if (repo_path == NULL) {
1903 error = got_error_prefix_errno("strdup");
1909 error = got_repo_open(&repo, repo_path);
1913 error = apply_unveil(got_repo_get_path(repo),
1914 worktree ? got_worktree_get_root_path(worktree) : NULL);
1918 if (start_commit == NULL)
1919 error = get_head_commit_id(&start_id, repo);
1921 error = got_object_resolve_id_str(&start_id, repo,
1926 error = got_ref_list(&refs, repo);
1930 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1932 error = got_error_prefix_errno("view_open");
1935 error = open_log_view(view, start_id, &refs, repo, path, 1);
1938 error = view_loop(view);
1945 got_repo_close(repo);
1947 got_worktree_close(worktree);
1948 got_ref_list_free(&refs);
1956 fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1962 parse_next_line(FILE *f, size_t *len)
1967 const char delim[3] = { '\0', '\0', '\0'};
1969 line = fparseln(f, &linelen, &lineno, delim, 0);
1975 static const struct got_error *
1976 draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1977 int *last_displayed_line, int *eof, int max_lines,
1980 const struct got_error *err;
1981 int nlines = 0, nprinted = 0;
1988 werase(view->window);
1991 err = format_line(&wline, &width, header, view->ncols);
1996 if (view_needs_focus_indication(view))
1997 wstandout(view->window);
1998 waddwstr(view->window, wline);
1999 if (view_needs_focus_indication(view))
2000 wstandend(view->window);
2001 if (width < view->ncols)
2002 waddch(view->window, '\n');
2010 while (nprinted < max_lines) {
2011 line = parse_next_line(f, &len);
2016 if (++nlines < *first_displayed_line) {
2021 err = format_line(&wline, &width, line, view->ncols);
2026 waddwstr(view->window, wline);
2027 if (width < view->ncols)
2028 waddch(view->window, '\n');
2029 if (++nprinted == 1)
2030 *first_displayed_line = nlines;
2035 *last_displayed_line = nlines;
2043 get_datestr(time_t *time, char *datebuf)
2045 char *p, *s = ctime_r(time, datebuf);
2046 p = strchr(s, '\n');
2052 static const struct got_error *
2053 write_commit_info(struct got_object_id *commit_id,
2054 struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2056 const struct got_error *err = NULL;
2058 struct got_commit_object *commit;
2059 char *id_str = NULL;
2060 time_t committer_time;
2061 const char *author, *committer;
2062 char *refs_str = NULL;
2065 err = build_refs_str(&refs_str, refs, commit_id);
2070 err = got_object_open_as_commit(&commit, repo, commit_id);
2074 err = got_object_id_str(&id_str, commit_id);
2076 err = got_error_prefix_errno("got_object_id_str");
2080 if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2081 refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2082 err = got_error_prefix_errno("fprintf");
2085 if (fprintf(outfile, "from: %s\n",
2086 got_object_commit_get_author(commit)) < 0) {
2087 err = got_error_prefix_errno("fprintf");
2090 committer_time = got_object_commit_get_committer_time(commit);
2091 if (fprintf(outfile, "date: %s UTC\n",
2092 get_datestr(&committer_time, datebuf)) < 0) {
2093 err = got_error_prefix_errno("fprintf");
2096 author = got_object_commit_get_author(commit);
2097 committer = got_object_commit_get_committer(commit);
2098 if (strcmp(author, committer) != 0 &&
2099 fprintf(outfile, "via: %s\n", committer) < 0) {
2100 err = got_error_prefix_errno("fprintf");
2103 if (fprintf(outfile, "%s\n",
2104 got_object_commit_get_logmsg(commit)) < 0) {
2105 err = got_error_prefix_errno("fprintf");
2111 got_object_commit_close(commit);
2115 static const struct got_error *
2116 create_diff(struct tog_diff_view_state *s)
2118 const struct got_error *err = NULL;
2124 err = got_error_prefix_errno("got_opentemp");
2127 if (s->f && fclose(s->f) != 0) {
2128 err = got_error_prefix_errno("fclose");
2134 err = got_object_get_type(&obj_type, s->repo, s->id1);
2136 err = got_object_get_type(&obj_type, s->repo, s->id2);
2141 case GOT_OBJ_TYPE_BLOB:
2142 err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2143 s->diff_context, s->repo, f);
2145 case GOT_OBJ_TYPE_TREE:
2146 err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2147 s->diff_context, s->repo, f);
2149 case GOT_OBJ_TYPE_COMMIT: {
2150 const struct got_object_id_queue *parent_ids;
2151 struct got_object_qid *pid;
2152 struct got_commit_object *commit2;
2154 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2157 /* Show commit info if we're diffing to a parent/root commit. */
2159 write_commit_info(s->id2, s->refs, s->repo, f);
2161 parent_ids = got_object_commit_get_parent_ids(commit2);
2162 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2163 if (got_object_id_cmp(s->id1, pid->id) == 0) {
2164 write_commit_info(s->id2, s->refs,
2170 got_object_commit_close(commit2);
2172 err = got_diff_objects_as_commits(s->id1, s->id2,
2173 s->diff_context, s->repo, f);
2177 err = got_error(GOT_ERR_OBJ_TYPE);
2181 if (f && fflush(f) != 0 && err == NULL)
2182 err = got_error_prefix_errno("fflush");
2187 diff_view_indicate_progress(struct tog_view *view)
2189 werase(view->window);
2190 waddstr(view->window, "diffing...");
2195 static const struct got_error *
2196 open_diff_view(struct tog_view *view, struct got_object_id *id1,
2197 struct got_object_id *id2, struct tog_view *log_view,
2198 struct got_reflist_head *refs, struct got_repository *repo)
2200 const struct got_error *err;
2202 if (id1 != NULL && id2 != NULL) {
2204 err = got_object_get_type(&type1, repo, id1);
2207 err = got_object_get_type(&type2, repo, id2);
2212 return got_error(GOT_ERR_OBJ_TYPE);
2216 view->state.diff.id1 = got_object_id_dup(id1);
2217 if (view->state.diff.id1 == NULL)
2218 return got_error_prefix_errno("got_object_id_dup");
2220 view->state.diff.id1 = NULL;
2222 view->state.diff.id2 = got_object_id_dup(id2);
2223 if (view->state.diff.id2 == NULL) {
2224 free(view->state.diff.id1);
2225 view->state.diff.id1 = NULL;
2226 return got_error_prefix_errno("got_object_id_dup");
2228 view->state.diff.f = NULL;
2229 view->state.diff.first_displayed_line = 1;
2230 view->state.diff.last_displayed_line = view->nlines;
2231 view->state.diff.diff_context = 3;
2232 view->state.diff.log_view = log_view;
2233 view->state.diff.repo = repo;
2234 view->state.diff.refs = refs;
2236 if (log_view && view_is_splitscreen(view))
2237 show_log_view(log_view); /* draw vborder */
2238 diff_view_indicate_progress(view);
2240 err = create_diff(&view->state.diff);
2242 free(view->state.diff.id1);
2243 view->state.diff.id1 = NULL;
2244 free(view->state.diff.id2);
2245 view->state.diff.id2 = NULL;
2249 view->show = show_diff_view;
2250 view->input = input_diff_view;
2251 view->close = close_diff_view;
2256 static const struct got_error *
2257 close_diff_view(struct tog_view *view)
2259 const struct got_error *err = NULL;
2261 free(view->state.diff.id1);
2262 view->state.diff.id1 = NULL;
2263 free(view->state.diff.id2);
2264 view->state.diff.id2 = NULL;
2265 if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2266 err = got_error_prefix_errno("fclose");
2270 static const struct got_error *
2271 show_diff_view(struct tog_view *view)
2273 const struct got_error *err;
2274 struct tog_diff_view_state *s = &view->state.diff;
2275 char *id_str1 = NULL, *id_str2, *header;
2278 err = got_object_id_str(&id_str1, s->id1);
2282 err = got_object_id_str(&id_str2, s->id2);
2286 if (asprintf(&header, "diff %s %s",
2287 id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2288 err = got_error_prefix_errno("asprintf");
2296 return draw_file(view, s->f, &s->first_displayed_line,
2297 &s->last_displayed_line, &s->eof, view->nlines,
2301 static const struct got_error *
2302 set_selected_commit(struct tog_diff_view_state *s,
2303 struct commit_queue_entry *entry)
2305 const struct got_error *err;
2306 const struct got_object_id_queue *parent_ids;
2307 struct got_commit_object *selected_commit;
2308 struct got_object_qid *pid;
2311 s->id2 = got_object_id_dup(entry->id);
2313 return got_error_prefix_errno("got_object_id_dup");
2315 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2318 parent_ids = got_object_commit_get_parent_ids(selected_commit);
2320 pid = SIMPLEQ_FIRST(parent_ids);
2321 s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2322 got_object_commit_close(selected_commit);
2326 static const struct got_error *
2327 input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2328 struct tog_view **focus_view, struct tog_view *view, int ch)
2330 const struct got_error *err = NULL;
2331 struct tog_diff_view_state *s = &view->state.diff;
2332 struct tog_log_view_state *ls;
2333 struct commit_queue_entry *entry;
2339 if (s->first_displayed_line > 1)
2340 s->first_displayed_line--;
2345 if (s->first_displayed_line == 1) {
2350 while (i++ < view->nlines - 1 &&
2351 s->first_displayed_line > 1)
2352 s->first_displayed_line--;
2357 s->first_displayed_line++;
2368 while (!s->eof && i++ < view->nlines - 1) {
2370 line = parse_next_line(s->f, NULL);
2371 s->first_displayed_line++;
2377 if (s->diff_context > 0) {
2379 diff_view_indicate_progress(view);
2380 err = create_diff(s);
2384 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2386 diff_view_indicate_progress(view);
2387 err = create_diff(s);
2392 if (s->log_view == NULL)
2394 ls = &s->log_view->state.log;
2395 entry = TAILQ_PREV(ls->selected_entry,
2396 commit_queue_head, entry);
2400 err = input_log_view(NULL, NULL, NULL, s->log_view,
2405 err = set_selected_commit(s, entry);
2409 s->first_displayed_line = 1;
2410 s->last_displayed_line = view->nlines;
2412 diff_view_indicate_progress(view);
2413 err = create_diff(s);
2417 if (s->log_view == NULL)
2419 ls = &s->log_view->state.log;
2421 if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2422 ls->thread_args.commits_needed++;
2424 /* Display "loading..." in log view. */
2425 show_log_view(s->log_view);
2429 err = trigger_log_thread(1 /* load_all */,
2430 &ls->thread_args.commits_needed,
2431 &ls->thread_args.log_complete,
2432 &ls->thread_args.need_commits);
2436 err = input_log_view(NULL, NULL, NULL, s->log_view,
2441 entry = TAILQ_NEXT(ls->selected_entry, entry);
2445 err = set_selected_commit(s, entry);
2449 s->first_displayed_line = 1;
2450 s->last_displayed_line = view->nlines;
2452 diff_view_indicate_progress(view);
2453 err = create_diff(s);
2462 static const struct got_error *
2463 cmd_diff(int argc, char *argv[])
2465 const struct got_error *error = NULL;
2466 struct got_repository *repo = NULL;
2467 struct got_reflist_head refs;
2468 struct got_object_id *id1 = NULL, *id2 = NULL;
2469 char *repo_path = NULL;
2470 char *id_str1 = NULL, *id_str2 = NULL;
2472 struct tog_view *view;
2474 SIMPLEQ_INIT(&refs);
2477 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2482 while ((ch = getopt(argc, argv, "")) != -1) {
2494 usage_diff(); /* TODO show local worktree changes */
2495 } else if (argc == 2) {
2496 repo_path = getcwd(NULL, 0);
2497 if (repo_path == NULL)
2498 return got_error_prefix_errno("getcwd");
2501 } else if (argc == 3) {
2502 repo_path = realpath(argv[0], NULL);
2503 if (repo_path == NULL)
2504 return got_error_prefix_errno2("realpath", argv[0]);
2512 error = got_repo_open(&repo, repo_path);
2516 error = apply_unveil(got_repo_get_path(repo), NULL);
2520 error = got_object_resolve_id_str(&id1, repo, id_str1);
2524 error = got_object_resolve_id_str(&id2, repo, id_str2);
2528 error = got_ref_list(&refs, repo);
2532 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2534 error = got_error_prefix_errno("view_open");
2537 error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2540 error = view_loop(view);
2543 got_repo_close(repo);
2544 got_ref_list_free(&refs);
2552 fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2557 struct tog_blame_line {
2559 struct got_object_id *id;
2562 static const struct got_error *
2563 draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2564 const char *path, struct tog_blame_line *lines, int nlines,
2565 int blame_complete, int selected_line, int *first_displayed_line,
2566 int *last_displayed_line, int *eof, int max_lines)
2568 const struct got_error *err;
2569 int lineno = 0, nprinted = 0;
2574 struct tog_blame_line *blame_line;
2575 struct got_object_id *prev_id = NULL;
2578 err = got_object_id_str(&id_str, id);
2583 werase(view->window);
2585 if (asprintf(&line, "commit %s", id_str) == -1) {
2586 err = got_error_prefix_errno("asprintf");
2591 err = format_line(&wline, &width, line, view->ncols);
2594 if (view_needs_focus_indication(view))
2595 wstandout(view->window);
2596 waddwstr(view->window, wline);
2597 if (view_needs_focus_indication(view))
2598 wstandend(view->window);
2601 if (width < view->ncols)
2602 waddch(view->window, '\n');
2604 if (asprintf(&line, "[%d/%d] %s%s",
2605 *first_displayed_line - 1 + selected_line, nlines,
2606 blame_complete ? "" : "annotating... ", path) == -1) {
2608 return got_error_prefix_errno("asprintf");
2611 err = format_line(&wline, &width, line, view->ncols);
2616 waddwstr(view->window, wline);
2619 if (width < view->ncols)
2620 waddch(view->window, '\n');
2623 while (nprinted < max_lines - 2) {
2624 line = parse_next_line(f, &len);
2629 if (++lineno < *first_displayed_line) {
2634 wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2635 err = format_line(&wline, &width, line, wlimit);
2641 if (view->focussed && nprinted == selected_line - 1)
2642 wstandout(view->window);
2644 blame_line = &lines[lineno - 1];
2645 if (blame_line->annotated && prev_id &&
2646 got_object_id_cmp(prev_id, blame_line->id) == 0)
2647 waddstr(view->window, " ");
2648 else if (blame_line->annotated) {
2650 err = got_object_id_str(&id_str, blame_line->id);
2656 wprintw(view->window, "%.8s ", id_str);
2658 prev_id = blame_line->id;
2660 waddstr(view->window, "........ ");
2664 waddwstr(view->window, wline);
2665 while (width < wlimit) {
2666 waddch(view->window, ' ');
2669 if (view->focussed && nprinted == selected_line - 1)
2670 wstandend(view->window);
2671 if (++nprinted == 1)
2672 *first_displayed_line = lineno;
2677 *last_displayed_line = lineno;
2684 static const struct got_error *
2685 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2687 const struct got_error *err = NULL;
2688 struct tog_blame_cb_args *a = arg;
2689 struct tog_blame_line *line;
2692 if (nlines != a->nlines ||
2693 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2694 return got_error(GOT_ERR_RANGE);
2696 errcode = pthread_mutex_lock(&tog_mutex);
2698 return got_error_set_errno(errcode, "pthread_mutex_lock");
2700 if (*a->quit) { /* user has quit the blame view */
2701 err = got_error(GOT_ERR_ITER_COMPLETED);
2706 goto done; /* no change in this commit */
2708 line = &a->lines[lineno - 1];
2709 if (line->annotated)
2712 line->id = got_object_id_dup(id);
2713 if (line->id == NULL) {
2714 err = got_error_prefix_errno("got_object_id_dup");
2717 line->annotated = 1;
2719 errcode = pthread_mutex_unlock(&tog_mutex);
2721 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
2726 blame_thread(void *arg)
2728 const struct got_error *err;
2729 struct tog_blame_thread_args *ta = arg;
2730 struct tog_blame_cb_args *a = ta->cb_args;
2733 err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2734 blame_cb, ta->cb_args);
2736 errcode = pthread_mutex_lock(&tog_mutex);
2738 return (void *)got_error_set_errno(errcode,
2739 "pthread_mutex_lock");
2741 got_repo_close(ta->repo);
2745 errcode = pthread_mutex_unlock(&tog_mutex);
2746 if (errcode && err == NULL)
2747 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
2752 static struct got_object_id *
2753 get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2756 struct tog_blame_line *line;
2758 line = &lines[first_displayed_line - 1 + selected_line - 1];
2759 if (!line->annotated)
2765 static const struct got_error *
2766 stop_blame(struct tog_blame *blame)
2768 const struct got_error *err = NULL;
2771 if (blame->thread) {
2773 errcode = pthread_mutex_unlock(&tog_mutex);
2775 return got_error_set_errno(errcode,
2776 "pthread_mutex_unlock");
2777 errcode = pthread_join(blame->thread, (void **)&err);
2779 return got_error_set_errno(errcode, "pthread_join");
2780 errcode = pthread_mutex_lock(&tog_mutex);
2782 return got_error_set_errno(errcode,
2783 "pthread_mutex_lock");
2784 if (err && err->code == GOT_ERR_ITER_COMPLETED)
2786 blame->thread = NULL;
2788 if (blame->thread_args.repo) {
2789 got_repo_close(blame->thread_args.repo);
2790 blame->thread_args.repo = NULL;
2793 if (fclose(blame->f) != 0 && err == NULL)
2794 err = got_error_prefix_errno("fclose");
2798 for (i = 0; i < blame->nlines; i++)
2799 free(blame->lines[i].id);
2801 blame->lines = NULL;
2803 free(blame->cb_args.commit_id);
2804 blame->cb_args.commit_id = NULL;
2809 static const struct got_error *
2810 run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2811 int *first_displayed_line, int *last_displayed_line, int *selected_line,
2812 int *done, int *eof, const char *path, struct got_object_id *commit_id,
2813 struct got_repository *repo)
2815 const struct got_error *err = NULL;
2816 struct got_blob_object *blob = NULL;
2817 struct got_repository *thread_repo = NULL;
2818 struct got_object_id *obj_id = NULL;
2821 err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2825 return got_error(GOT_ERR_NO_OBJ);
2827 err = got_object_get_type(&obj_type, repo, obj_id);
2831 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2832 err = got_error(GOT_ERR_OBJ_TYPE);
2836 err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2839 blame->f = got_opentemp();
2840 if (blame->f == NULL) {
2841 err = got_error_prefix_errno("got_opentemp");
2844 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2849 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2850 if (blame->lines == NULL) {
2851 err = got_error_prefix_errno("calloc");
2855 err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2859 blame->cb_args.view = view;
2860 blame->cb_args.lines = blame->lines;
2861 blame->cb_args.nlines = blame->nlines;
2862 blame->cb_args.commit_id = got_object_id_dup(commit_id);
2863 if (blame->cb_args.commit_id == NULL) {
2864 err = got_error_prefix_errno("got_object_id_dup");
2867 blame->cb_args.quit = done;
2869 blame->thread_args.path = path;
2870 blame->thread_args.repo = thread_repo;
2871 blame->thread_args.cb_args = &blame->cb_args;
2872 blame->thread_args.complete = blame_complete;
2873 *blame_complete = 0;
2877 got_object_blob_close(blob);
2884 static const struct got_error *
2885 open_blame_view(struct tog_view *view, char *path,
2886 struct got_object_id *commit_id, struct got_reflist_head *refs,
2887 struct got_repository *repo)
2889 const struct got_error *err = NULL;
2890 struct tog_blame_view_state *s = &view->state.blame;
2892 SIMPLEQ_INIT(&s->blamed_commits);
2894 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2898 SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2899 s->first_displayed_line = 1;
2900 s->last_displayed_line = view->nlines;
2901 s->selected_line = 1;
2902 s->blame_complete = 0;
2904 if (s->path == NULL)
2905 return got_error_prefix_errno("open_blame_view");
2908 s->commit_id = commit_id;
2909 memset(&s->blame, 0, sizeof(s->blame));
2911 view->show = show_blame_view;
2912 view->input = input_blame_view;
2913 view->close = close_blame_view;
2915 return run_blame(&s->blame, view, &s->blame_complete,
2916 &s->first_displayed_line, &s->last_displayed_line,
2917 &s->selected_line, &s->done, &s->eof, s->path,
2918 s->blamed_commit->id, s->repo);
2921 static const struct got_error *
2922 close_blame_view(struct tog_view *view)
2924 const struct got_error *err = NULL;
2925 struct tog_blame_view_state *s = &view->state.blame;
2927 if (s->blame.thread)
2928 err = stop_blame(&s->blame);
2930 while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2931 struct got_object_qid *blamed_commit;
2932 blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2933 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2934 got_object_qid_free(blamed_commit);
2942 static const struct got_error *
2943 show_blame_view(struct tog_view *view)
2945 const struct got_error *err = NULL;
2946 struct tog_blame_view_state *s = &view->state.blame;
2949 if (s->blame.thread == NULL) {
2950 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2951 &s->blame.thread_args);
2953 return got_error_set_errno(errcode, "pthread_create");
2956 err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2957 s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2958 s->selected_line, &s->first_displayed_line,
2959 &s->last_displayed_line, &s->eof, view->nlines);
2965 static const struct got_error *
2966 input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2967 struct tog_view **focus_view, struct tog_view *view, int ch)
2969 const struct got_error *err = NULL, *thread_err = NULL;
2970 struct tog_view *diff_view;
2971 struct tog_blame_view_state *s = &view->state.blame;
2980 if (s->selected_line > 1)
2982 else if (s->selected_line == 1 &&
2983 s->first_displayed_line > 1)
2984 s->first_displayed_line--;
2989 if (s->first_displayed_line == 1) {
2990 if (s->selected_line == 1) {
2994 s->selected_line = 1;
2997 if (s->first_displayed_line > view->nlines - 2)
2998 s->first_displayed_line -=
3001 s->first_displayed_line = 1;
3005 if (s->selected_line < view->nlines - 2 &&
3006 s->first_displayed_line +
3007 s->selected_line <= s->blame.nlines)
3009 else if (s->last_displayed_line <
3011 s->first_displayed_line++;
3017 struct got_object_id *id = NULL;
3018 id = get_selected_commit_id(s->blame.lines,
3019 s->first_displayed_line, s->selected_line);
3023 struct got_commit_object *commit;
3024 struct got_object_qid *pid;
3025 struct got_object_id *blob_id = NULL;
3027 err = got_object_open_as_commit(&commit,
3031 pid = SIMPLEQ_FIRST(
3032 got_object_commit_get_parent_ids(commit));
3034 got_object_commit_close(commit);
3037 /* Check if path history ends here. */
3038 err = got_object_id_by_path(&blob_id, s->repo,
3041 if (err->code == GOT_ERR_NO_TREE_ENTRY)
3043 got_object_commit_close(commit);
3046 err = got_object_get_type(&obj_type, s->repo,
3049 /* Can't blame non-blob type objects. */
3050 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3051 got_object_commit_close(commit);
3054 err = got_object_qid_alloc(&s->blamed_commit,
3056 got_object_commit_close(commit);
3058 if (got_object_id_cmp(id,
3059 s->blamed_commit->id) == 0)
3061 err = got_object_qid_alloc(&s->blamed_commit,
3067 thread_err = stop_blame(&s->blame);
3071 SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3072 s->blamed_commit, entry);
3073 err = run_blame(&s->blame, view, &s->blame_complete,
3074 &s->first_displayed_line, &s->last_displayed_line,
3075 &s->selected_line, &s->done, &s->eof,
3076 s->path, s->blamed_commit->id, s->repo);
3082 struct got_object_qid *first;
3083 first = SIMPLEQ_FIRST(&s->blamed_commits);
3084 if (!got_object_id_cmp(first->id, s->commit_id))
3087 thread_err = stop_blame(&s->blame);
3091 SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3092 got_object_qid_free(s->blamed_commit);
3094 SIMPLEQ_FIRST(&s->blamed_commits);
3095 err = run_blame(&s->blame, view, &s->blame_complete,
3096 &s->first_displayed_line, &s->last_displayed_line,
3097 &s->selected_line, &s->done, &s->eof, s->path,
3098 s->blamed_commit->id, s->repo);
3105 struct got_object_id *id = NULL;
3106 struct got_object_qid *pid;
3107 struct got_commit_object *commit = NULL;
3108 id = get_selected_commit_id(s->blame.lines,
3109 s->first_displayed_line, s->selected_line);
3112 err = got_object_open_as_commit(&commit, s->repo, id);
3115 pid = SIMPLEQ_FIRST(
3116 got_object_commit_get_parent_ids(commit));
3117 if (view_is_parent_view(view))
3118 begin_x = view_split_begin_x(view->begin_x);
3119 diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3120 if (diff_view == NULL) {
3121 got_object_commit_close(commit);
3122 err = got_error_prefix_errno("view_open");
3125 err = open_diff_view(diff_view, pid ? pid->id : NULL,
3126 id, NULL, s->refs, s->repo);
3127 got_object_commit_close(commit);
3129 view_close(diff_view);
3132 if (view_is_parent_view(view)) {
3133 err = view_close_child(view);
3136 err = view_set_child(view, diff_view);
3138 view_close(diff_view);
3141 *focus_view = diff_view;
3142 view->child_focussed = 1;
3144 *new_view = diff_view;
3151 if (s->last_displayed_line >= s->blame.nlines &&
3152 s->selected_line >= MIN(s->blame.nlines,
3153 view->nlines - 2)) {
3157 if (s->last_displayed_line >= s->blame.nlines &&
3158 s->selected_line < view->nlines - 2) {
3159 s->selected_line = MIN(s->blame.nlines,
3163 if (s->last_displayed_line + view->nlines - 2
3165 s->first_displayed_line +=
3168 s->first_displayed_line =
3173 if (s->selected_line > view->nlines - 2) {
3174 s->selected_line = MIN(s->blame.nlines,
3181 return thread_err ? thread_err : err;
3184 static const struct got_error *
3185 cmd_blame(int argc, char *argv[])
3187 const struct got_error *error;
3188 struct got_repository *repo = NULL;
3189 struct got_reflist_head refs;
3190 struct got_worktree *worktree = NULL;
3191 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3192 struct got_object_id *commit_id = NULL;
3193 char *commit_id_str = NULL;
3195 struct tog_view *view;
3197 SIMPLEQ_INIT(&refs);
3200 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3205 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3208 commit_id_str = optarg;
3211 repo_path = realpath(optarg, NULL);
3212 if (repo_path == NULL)
3213 err(1, "-r option");
3229 cwd = getcwd(NULL, 0);
3231 error = got_error_prefix_errno("getcwd");
3234 if (repo_path == NULL) {
3235 error = got_worktree_open(&worktree, cwd);
3236 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3242 strdup(got_worktree_get_repo_path(worktree));
3243 if (repo_path == NULL)
3244 error = got_error_prefix_errno("strdup");
3248 repo_path = strdup(cwd);
3249 if (repo_path == NULL) {
3250 error = got_error_prefix_errno("strdup");
3258 error = got_repo_open(&repo, repo_path);
3262 error = apply_unveil(got_repo_get_path(repo), NULL);
3267 const char *prefix = got_worktree_get_path_prefix(worktree);
3268 char *p, *worktree_subdir = cwd +
3269 strlen(got_worktree_get_root_path(worktree));
3270 if (asprintf(&p, "%s%s%s%s%s",
3271 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3272 worktree_subdir, worktree_subdir[0] ? "/" : "",
3274 error = got_error_prefix_errno("asprintf");
3277 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3280 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3285 if (commit_id_str == NULL) {
3286 struct got_reference *head_ref;
3287 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
3290 error = got_ref_resolve(&commit_id, repo, head_ref);
3291 got_ref_close(head_ref);
3293 error = got_object_resolve_id_str(&commit_id, repo,
3299 error = got_ref_list(&refs, repo);
3303 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3305 error = got_error_prefix_errno("view_open");
3308 error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3311 error = view_loop(view);
3317 got_worktree_close(worktree);
3319 got_repo_close(repo);
3320 got_ref_list_free(&refs);
3324 static const struct got_error *
3325 draw_tree_entries(struct tog_view *view,
3326 struct got_tree_entry **first_displayed_entry,
3327 struct got_tree_entry **last_displayed_entry,
3328 struct got_tree_entry **selected_entry, int *ndisplayed,
3329 const char *label, int show_ids, const char *parent_path,
3330 const struct got_tree_entries *entries, int selected, int limit, int isroot)
3332 const struct got_error *err = NULL;
3333 struct got_tree_entry *te;
3339 werase(view->window);
3344 err = format_line(&wline, &width, label, view->ncols);
3347 if (view_needs_focus_indication(view))
3348 wstandout(view->window);
3349 waddwstr(view->window, wline);
3350 if (view_needs_focus_indication(view))
3351 wstandend(view->window);
3354 if (width < view->ncols)
3355 waddch(view->window, '\n');
3358 err = format_line(&wline, &width, parent_path, view->ncols);
3361 waddwstr(view->window, wline);
3364 if (width < view->ncols)
3365 waddch(view->window, '\n');
3368 waddch(view->window, '\n');
3372 te = SIMPLEQ_FIRST(&entries->head);
3373 if (*first_displayed_entry == NULL) {
3374 if (selected == 0) {
3376 wstandout(view->window);
3377 *selected_entry = NULL;
3379 waddstr(view->window, " ..\n"); /* parent directory */
3380 if (selected == 0 && view->focussed)
3381 wstandend(view->window);
3388 while (te != *first_displayed_entry)
3389 te = SIMPLEQ_NEXT(te, entry);
3393 char *line = NULL, *id_str = NULL;
3396 err = got_object_id_str(&id_str, te->id);
3398 return got_error_prefix_errno(
3399 "got_object_id_str");
3401 if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3402 te->name, S_ISDIR(te->mode) ? "/" :
3403 ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3405 return got_error_prefix_errno("asprintf");
3408 err = format_line(&wline, &width, line, view->ncols);
3413 if (n == selected) {
3415 wstandout(view->window);
3416 *selected_entry = te;
3418 waddwstr(view->window, wline);
3419 if (width < view->ncols)
3420 waddch(view->window, '\n');
3421 if (n == selected && view->focussed)
3422 wstandend(view->window);
3428 *last_displayed_entry = te;
3431 te = SIMPLEQ_NEXT(te, entry);
3438 tree_scroll_up(struct tog_view *view,
3439 struct got_tree_entry **first_displayed_entry, int maxscroll,
3440 const struct got_tree_entries *entries, int isroot)
3442 struct got_tree_entry *te, *prev;
3445 if (*first_displayed_entry == NULL) {
3450 te = SIMPLEQ_FIRST(&entries->head);
3451 if (*first_displayed_entry == te) {
3454 *first_displayed_entry = NULL;
3458 /* XXX this is stupid... switch to TAILQ? */
3459 for (i = 0; i < maxscroll; i++) {
3460 while (te != *first_displayed_entry) {
3462 te = SIMPLEQ_NEXT(te, entry);
3464 *first_displayed_entry = prev;
3465 te = SIMPLEQ_FIRST(&entries->head);
3467 if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3468 *first_displayed_entry = NULL;
3472 tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3473 struct got_tree_entry *last_displayed_entry,
3474 const struct got_tree_entries *entries)
3476 struct got_tree_entry *next, *last;
3479 if (*first_displayed_entry)
3480 next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3482 next = SIMPLEQ_FIRST(&entries->head);
3483 last = last_displayed_entry;
3484 while (next && last && n++ < maxscroll) {
3485 last = SIMPLEQ_NEXT(last, entry);
3487 *first_displayed_entry = next;
3488 next = SIMPLEQ_NEXT(next, entry);
3494 static const struct got_error *
3495 tree_entry_path(char **path, struct tog_parent_trees *parents,
3496 struct got_tree_entry *te)
3498 const struct got_error *err = NULL;
3499 struct tog_parent_tree *pt;
3500 size_t len = 2; /* for leading slash and NUL */
3502 TAILQ_FOREACH(pt, parents, entry)
3503 len += strlen(pt->selected_entry->name) + 1 /* slash */;
3505 len += strlen(te->name);
3507 *path = calloc(1, len);
3509 return got_error_prefix_errno("calloc");
3512 pt = TAILQ_LAST(parents, tog_parent_trees);
3514 if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3515 err = got_error(GOT_ERR_NO_SPACE);
3518 if (strlcat(*path, "/", len) >= len) {
3519 err = got_error(GOT_ERR_NO_SPACE);
3522 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3525 if (strlcat(*path, te->name, len) >= len) {
3526 err = got_error(GOT_ERR_NO_SPACE);
3538 static const struct got_error *
3539 blame_tree_entry(struct tog_view **new_view, int begin_x,
3540 struct got_tree_entry *te, struct tog_parent_trees *parents,
3541 struct got_object_id *commit_id, struct got_reflist_head *refs,
3542 struct got_repository *repo)
3544 const struct got_error *err = NULL;
3546 struct tog_view *blame_view;
3548 err = tree_entry_path(&path, parents, te);
3552 blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3553 if (blame_view == NULL)
3554 return got_error_prefix_errno("view_open");
3556 err = open_blame_view(blame_view, path, commit_id, refs, repo);
3558 view_close(blame_view);
3561 *new_view = blame_view;
3565 static const struct got_error *
3566 log_tree_entry(struct tog_view **new_view, int begin_x,
3567 struct got_tree_entry *te, struct tog_parent_trees *parents,
3568 struct got_object_id *commit_id, struct got_reflist_head *refs,
3569 struct got_repository *repo)
3571 struct tog_view *log_view;
3572 const struct got_error *err = NULL;
3575 log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3576 if (log_view == NULL)
3577 return got_error_prefix_errno("view_open");
3579 err = tree_entry_path(&path, parents, te);
3583 err = open_log_view(log_view, commit_id, refs, repo, path, 0);
3585 view_close(log_view);
3587 *new_view = log_view;
3592 static const struct got_error *
3593 open_tree_view(struct tog_view *view, struct got_tree_object *root,
3594 struct got_object_id *commit_id, struct got_reflist_head *refs,
3595 struct got_repository *repo)
3597 const struct got_error *err = NULL;
3598 char *commit_id_str = NULL;
3599 struct tog_tree_view_state *s = &view->state.tree;
3601 TAILQ_INIT(&s->parents);
3603 err = got_object_id_str(&commit_id_str, commit_id);
3607 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3608 err = got_error_prefix_errno("asprintf");
3612 s->root = s->tree = root;
3613 s->entries = got_object_tree_get_entries(root);
3614 s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3615 s->commit_id = got_object_id_dup(commit_id);
3616 if (s->commit_id == NULL) {
3617 err = got_error_prefix_errno("got_object_id_dup");
3623 view->show = show_tree_view;
3624 view->input = input_tree_view;
3625 view->close = close_tree_view;
3627 free(commit_id_str);
3629 free(s->tree_label);
3630 s->tree_label = NULL;
3635 static const struct got_error *
3636 close_tree_view(struct tog_view *view)
3638 struct tog_tree_view_state *s = &view->state.tree;
3640 free(s->tree_label);
3641 s->tree_label = NULL;
3643 s->commit_id = NULL;
3644 while (!TAILQ_EMPTY(&s->parents)) {
3645 struct tog_parent_tree *parent;
3646 parent = TAILQ_FIRST(&s->parents);
3647 TAILQ_REMOVE(&s->parents, parent, entry);
3651 if (s->tree != s->root)
3652 got_object_tree_close(s->tree);
3653 got_object_tree_close(s->root);
3658 static const struct got_error *
3659 show_tree_view(struct tog_view *view)
3661 const struct got_error *err = NULL;
3662 struct tog_tree_view_state *s = &view->state.tree;
3665 err = tree_entry_path(&parent_path, &s->parents, NULL);
3669 err = draw_tree_entries(view, &s->first_displayed_entry,
3670 &s->last_displayed_entry, &s->selected_entry,
3671 &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3672 s->entries, s->selected, view->nlines, s->tree == s->root);
3679 static const struct got_error *
3680 input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3681 struct tog_view **focus_view, struct tog_view *view, int ch)
3683 const struct got_error *err = NULL;
3684 struct tog_tree_view_state *s = &view->state.tree;
3685 struct tog_view *log_view;
3686 int begin_x = 0, nscrolled;
3690 s->show_ids = !s->show_ids;
3693 if (!s->selected_entry)
3695 if (view_is_parent_view(view))
3696 begin_x = view_split_begin_x(view->begin_x);
3697 err = log_tree_entry(&log_view, begin_x,
3698 s->selected_entry, &s->parents,
3699 s->commit_id, s->refs, s->repo);
3700 if (view_is_parent_view(view)) {
3701 err = view_close_child(view);
3704 err = view_set_child(view, log_view);
3706 view_close(log_view);
3709 *focus_view = log_view;
3710 view->child_focussed = 1;
3712 *new_view = log_view;
3716 if (s->selected > 0) {
3718 if (s->selected == 0)
3721 if (s->selected > 0)
3723 tree_scroll_up(view, &s->first_displayed_entry, 1,
3724 s->entries, s->tree == s->root);
3727 tree_scroll_up(view, &s->first_displayed_entry,
3728 MAX(0, view->nlines - 4 - s->selected), s->entries,
3729 s->tree == s->root);
3731 if (SIMPLEQ_FIRST(&s->entries->head) ==
3732 s->first_displayed_entry && s->tree != s->root)
3733 s->first_displayed_entry = NULL;
3737 if (s->selected < s->ndisplayed - 1) {
3741 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3743 /* can't scroll any further */
3747 tree_scroll_down(&s->first_displayed_entry, 1,
3748 s->last_displayed_entry, s->entries);
3751 if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3753 /* can't scroll any further; move cursor down */
3754 if (s->selected < s->ndisplayed - 1)
3755 s->selected = s->ndisplayed - 1;
3760 nscrolled = tree_scroll_down(&s->first_displayed_entry,
3761 view->nlines, s->last_displayed_entry, s->entries);
3762 if (nscrolled < view->nlines) {
3764 struct got_tree_entry *te;
3765 te = s->first_displayed_entry;
3768 te = SIMPLEQ_NEXT(te, entry);
3770 s->selected = ndisplayed - 1;
3775 if (s->selected_entry == NULL) {
3776 struct tog_parent_tree *parent;
3778 /* user selected '..' */
3779 if (s->tree == s->root)
3781 parent = TAILQ_FIRST(&s->parents);
3782 TAILQ_REMOVE(&s->parents, parent,
3784 got_object_tree_close(s->tree);
3785 s->tree = parent->tree;
3787 got_object_tree_get_entries(s->tree);
3788 s->first_displayed_entry =
3789 parent->first_displayed_entry;
3791 parent->selected_entry;
3792 s->selected = parent->selected;
3794 } else if (S_ISDIR(s->selected_entry->mode)) {
3795 struct tog_parent_tree *parent;
3796 struct got_tree_object *child;
3797 err = got_object_open_as_tree(&child,
3798 s->repo, s->selected_entry->id);
3801 parent = calloc(1, sizeof(*parent));
3802 if (parent == NULL) {
3803 err = got_error_prefix_errno("calloc");
3806 parent->tree = s->tree;
3807 parent->first_displayed_entry =
3808 s->first_displayed_entry;
3809 parent->selected_entry = s->selected_entry;
3810 parent->selected = s->selected;
3811 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3814 got_object_tree_get_entries(s->tree);
3816 s->first_displayed_entry = NULL;
3817 } else if (S_ISREG(s->selected_entry->mode)) {
3818 struct tog_view *blame_view;
3819 int begin_x = view_is_parent_view(view) ?
3820 view_split_begin_x(view->begin_x) : 0;
3822 err = blame_tree_entry(&blame_view, begin_x,
3823 s->selected_entry, &s->parents,
3824 s->commit_id, s->refs, s->repo);
3827 if (view_is_parent_view(view)) {
3828 err = view_close_child(view);
3831 err = view_set_child(view, blame_view);
3833 view_close(blame_view);
3836 *focus_view = blame_view;
3837 view->child_focussed = 1;
3839 *new_view = blame_view;
3843 if (s->selected > view->nlines)
3844 s->selected = s->ndisplayed - 1;
3857 fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3862 static const struct got_error *
3863 cmd_tree(int argc, char *argv[])
3865 const struct got_error *error;
3866 struct got_repository *repo = NULL;
3867 struct got_reflist_head refs;
3868 char *repo_path = NULL;
3869 struct got_object_id *commit_id = NULL;
3870 char *commit_id_arg = NULL;
3871 struct got_commit_object *commit = NULL;
3872 struct got_tree_object *tree = NULL;
3874 struct tog_view *view;
3876 SIMPLEQ_INIT(&refs);
3879 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3884 while ((ch = getopt(argc, argv, "c:")) != -1) {
3887 commit_id_arg = optarg;
3899 struct got_worktree *worktree;
3900 char *cwd = getcwd(NULL, 0);
3902 return got_error_prefix_errno("getcwd");
3903 error = got_worktree_open(&worktree, cwd);
3904 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3909 strdup(got_worktree_get_repo_path(worktree));
3910 got_worktree_close(worktree);
3913 if (repo_path == NULL) {
3914 error = got_error_prefix_errno("strdup");
3917 } else if (argc == 1) {
3918 repo_path = realpath(argv[0], NULL);
3919 if (repo_path == NULL)
3920 return got_error_prefix_errno2("realpath", argv[0]);
3926 error = got_repo_open(&repo, repo_path);
3930 error = apply_unveil(got_repo_get_path(repo), NULL);
3934 if (commit_id_arg == NULL)
3935 error = get_head_commit_id(&commit_id, repo);
3937 error = got_object_resolve_id_str(&commit_id, repo,
3942 error = got_object_open_as_commit(&commit, repo, commit_id);
3946 error = got_object_open_as_tree(&tree, repo,
3947 got_object_commit_get_tree_id(commit));
3951 error = got_ref_list(&refs, repo);
3955 view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3957 error = got_error_prefix_errno("view_open");
3960 error = open_tree_view(view, tree, commit_id, &refs, repo);
3963 error = view_loop(view);
3968 got_object_commit_close(commit);
3970 got_object_tree_close(tree);
3972 got_repo_close(repo);
3973 got_ref_list_free(&refs);
3982 fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3983 "Available commands:\n", getprogname());
3984 for (i = 0; i < nitems(tog_commands); i++) {
3985 struct tog_cmd *cmd = &tog_commands[i];
3986 fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3992 make_argv(const char *arg0, const char *arg1)
3995 int argc = (arg1 == NULL ? 1 : 2);
3997 argv = calloc(argc, sizeof(char *));
4000 argv[0] = strdup(arg0);
4001 if (argv[0] == NULL)
4004 argv[1] = strdup(arg1);
4005 if (argv[1] == NULL)
4013 main(int argc, char *argv[])
4015 const struct got_error *error = NULL;
4016 struct tog_cmd *cmd = NULL;
4018 char **cmd_argv = NULL;
4020 setlocale(LC_CTYPE, "");
4022 while ((ch = getopt(argc, argv, "h")) != -1) {
4041 /* Build an argument vector which runs a default command. */
4042 cmd = &tog_commands[0];
4043 cmd_argv = make_argv(cmd->name, NULL);
4048 /* Did the user specific a command? */
4049 for (i = 0; i < nitems(tog_commands); i++) {
4050 if (strncmp(tog_commands[i].name, argv[0],
4051 strlen(argv[0])) == 0) {
4052 cmd = &tog_commands[i];
4054 tog_commands[i].cmd_usage();
4059 /* Did the user specify a repository? */
4060 char *repo_path = realpath(argv[0], NULL);
4062 struct got_repository *repo;
4063 error = got_repo_open(&repo, repo_path);
4065 got_repo_close(repo);
4067 error = got_error_prefix_errno2("realpath",
4071 fprintf(stderr, "%s: '%s' is not a "
4072 "known command\n", getprogname(),
4076 fprintf(stderr, "%s: '%s' is neither a known "
4077 "command nor a path to a repository\n",
4078 getprogname(), argv[0]);
4082 cmd = &tog_commands[0];
4083 cmd_argv = make_argv(cmd->name, repo_path);
4089 error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4096 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);