2 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 #include <sys/queue.h>
19 #include <sys/ioctl.h>
23 #define _XOPEN_SOURCE_EXTENDED /* for ncurses wide-character functions */
45 #include "got_version.h"
46 #include "got_error.h"
47 #include "got_object.h"
48 #include "got_reference.h"
49 #include "got_repository.h"
51 #include "got_opentemp.h"
53 #include "got_cancel.h"
54 #include "got_commit_graph.h"
55 #include "got_blame.h"
56 #include "got_privsep.h"
58 #include "got_worktree.h"
61 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
65 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
68 #define CTRL(x) ((x) & 0x1f)
71 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
76 const struct got_error *(*cmd_main)(int, char *[]);
77 void (*cmd_usage)(void);
80 __dead static void usage(int, int);
81 __dead static void usage_log(void);
82 __dead static void usage_diff(void);
83 __dead static void usage_blame(void);
84 __dead static void usage_tree(void);
85 __dead static void usage_ref(void);
87 static const struct got_error* cmd_log(int, char *[]);
88 static const struct got_error* cmd_diff(int, char *[]);
89 static const struct got_error* cmd_blame(int, char *[]);
90 static const struct got_error* cmd_tree(int, char *[]);
91 static const struct got_error* cmd_ref(int, char *[]);
93 static const struct tog_cmd tog_commands[] = {
94 { "log", cmd_log, usage_log },
95 { "diff", cmd_diff, usage_diff },
96 { "blame", cmd_blame, usage_blame },
97 { "tree", cmd_tree, usage_tree },
98 { "ref", cmd_ref, usage_ref },
110 /* Match _DIFF to _HELP with enum tog_view_type TOG_VIEW_* counterparts. */
111 enum tog_keymap_type {
112 TOG_KEYMAP_KEYS = -2,
128 #define HSPLIT_SCALE 0.3f /* default horizontal split scale */
130 #define TOG_EOF_STRING "(END)"
132 struct commit_queue_entry {
133 TAILQ_ENTRY(commit_queue_entry) entry;
134 struct got_object_id *id;
135 struct got_commit_object *commit;
138 TAILQ_HEAD(commit_queue_head, commit_queue_entry);
139 struct commit_queue {
141 struct commit_queue_head head;
145 STAILQ_ENTRY(tog_color) entry;
149 STAILQ_HEAD(tog_colors, tog_color);
151 static struct got_reflist_head tog_refs = TAILQ_HEAD_INITIALIZER(tog_refs);
152 static struct got_reflist_object_id_map *tog_refs_idmap;
153 static enum got_diff_algorithm tog_diff_algo = GOT_DIFF_ALGORITHM_MYERS;
155 static const struct got_error *
156 tog_ref_cmp_by_name(void *arg, int *cmp, struct got_reference *re1,
157 struct got_reference* re2)
159 const char *name1 = got_ref_get_name(re1);
160 const char *name2 = got_ref_get_name(re2);
161 int isbackup1, isbackup2;
163 /* Sort backup refs towards the bottom of the list. */
164 isbackup1 = strncmp(name1, "refs/got/backup/", 16) == 0;
165 isbackup2 = strncmp(name2, "refs/got/backup/", 16) == 0;
166 if (!isbackup1 && isbackup2) {
169 } else if (isbackup1 && !isbackup2) {
174 *cmp = got_path_cmp(name1, name2, strlen(name1), strlen(name2));
178 static const struct got_error *
179 tog_load_refs(struct got_repository *repo, int sort_by_date)
181 const struct got_error *err;
183 err = got_ref_list(&tog_refs, repo, NULL, sort_by_date ?
184 got_ref_cmp_by_commit_timestamp_descending : tog_ref_cmp_by_name,
189 return got_reflist_object_id_map_create(&tog_refs_idmap, &tog_refs,
196 if (tog_refs_idmap) {
197 got_reflist_object_id_map_free(tog_refs_idmap);
198 tog_refs_idmap = NULL;
200 got_ref_list_free(&tog_refs);
203 static const struct got_error *
204 add_color(struct tog_colors *colors, const char *pattern,
205 int idx, short color)
207 const struct got_error *err = NULL;
208 struct tog_color *tc;
211 if (idx < 1 || idx > COLOR_PAIRS - 1)
214 init_pair(idx, color, -1);
216 tc = calloc(1, sizeof(*tc));
218 return got_error_from_errno("calloc");
219 regerr = regcomp(&tc->regex, pattern,
220 REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
222 static char regerr_msg[512];
223 static char err_msg[512];
224 regerror(regerr, &tc->regex, regerr_msg,
226 snprintf(err_msg, sizeof(err_msg), "regcomp: %s",
228 err = got_error_msg(GOT_ERR_REGEX, err_msg);
233 STAILQ_INSERT_HEAD(colors, tc, entry);
238 free_colors(struct tog_colors *colors)
240 struct tog_color *tc;
242 while (!STAILQ_EMPTY(colors)) {
243 tc = STAILQ_FIRST(colors);
244 STAILQ_REMOVE_HEAD(colors, entry);
250 static struct tog_color *
251 get_color(struct tog_colors *colors, int colorpair)
253 struct tog_color *tc = NULL;
255 STAILQ_FOREACH(tc, colors, entry) {
256 if (tc->colorpair == colorpair)
264 default_color_value(const char *envvar)
266 if (strcmp(envvar, "TOG_COLOR_DIFF_MINUS") == 0)
267 return COLOR_MAGENTA;
268 if (strcmp(envvar, "TOG_COLOR_DIFF_PLUS") == 0)
270 if (strcmp(envvar, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
272 if (strcmp(envvar, "TOG_COLOR_DIFF_META") == 0)
274 if (strcmp(envvar, "TOG_COLOR_TREE_SUBMODULE") == 0)
275 return COLOR_MAGENTA;
276 if (strcmp(envvar, "TOG_COLOR_TREE_SYMLINK") == 0)
277 return COLOR_MAGENTA;
278 if (strcmp(envvar, "TOG_COLOR_TREE_DIRECTORY") == 0)
280 if (strcmp(envvar, "TOG_COLOR_TREE_EXECUTABLE") == 0)
282 if (strcmp(envvar, "TOG_COLOR_COMMIT") == 0)
284 if (strcmp(envvar, "TOG_COLOR_AUTHOR") == 0)
286 if (strcmp(envvar, "TOG_COLOR_DATE") == 0)
288 if (strcmp(envvar, "TOG_COLOR_REFS_HEADS") == 0)
290 if (strcmp(envvar, "TOG_COLOR_REFS_TAGS") == 0)
291 return COLOR_MAGENTA;
292 if (strcmp(envvar, "TOG_COLOR_REFS_REMOTES") == 0)
294 if (strcmp(envvar, "TOG_COLOR_REFS_BACKUP") == 0)
301 get_color_value(const char *envvar)
303 const char *val = getenv(envvar);
306 return default_color_value(envvar);
308 if (strcasecmp(val, "black") == 0)
310 if (strcasecmp(val, "red") == 0)
312 if (strcasecmp(val, "green") == 0)
314 if (strcasecmp(val, "yellow") == 0)
316 if (strcasecmp(val, "blue") == 0)
318 if (strcasecmp(val, "magenta") == 0)
319 return COLOR_MAGENTA;
320 if (strcasecmp(val, "cyan") == 0)
322 if (strcasecmp(val, "white") == 0)
324 if (strcasecmp(val, "default") == 0)
327 return default_color_value(envvar);
330 struct tog_diff_view_state {
331 struct got_object_id *id1, *id2;
332 const char *label1, *label2;
336 int first_displayed_line;
337 int last_displayed_line;
340 int ignore_whitespace;
342 struct got_repository *repo;
343 struct got_diff_line *lines;
348 /* passed from log or blame view; may be NULL */
349 struct tog_view *parent_view;
352 pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
353 static volatile sig_atomic_t tog_thread_error;
355 struct tog_log_thread_args {
356 pthread_cond_t need_commits;
357 pthread_cond_t commit_loaded;
360 struct got_commit_graph *graph;
361 struct commit_queue *real_commits;
362 const char *in_repo_path;
363 struct got_object_id *start_id;
364 struct got_repository *repo;
368 struct commit_queue_entry **first_displayed_entry;
369 struct commit_queue_entry **selected_entry;
371 int *search_next_done;
375 regex_t *limit_regex;
376 struct commit_queue *limit_commits;
379 struct tog_log_view_state {
380 struct commit_queue *commits;
381 struct commit_queue_entry *first_displayed_entry;
382 struct commit_queue_entry *last_displayed_entry;
383 struct commit_queue_entry *selected_entry;
384 struct commit_queue real_commits;
389 struct got_repository *repo;
390 struct got_object_id *start_id;
393 struct tog_log_thread_args thread_args;
394 struct commit_queue_entry *matched_entry;
395 struct commit_queue_entry *search_entry;
396 struct tog_colors colors;
400 struct commit_queue limit_commits;
403 #define TOG_COLOR_DIFF_MINUS 1
404 #define TOG_COLOR_DIFF_PLUS 2
405 #define TOG_COLOR_DIFF_CHUNK_HEADER 3
406 #define TOG_COLOR_DIFF_META 4
407 #define TOG_COLOR_TREE_SUBMODULE 5
408 #define TOG_COLOR_TREE_SYMLINK 6
409 #define TOG_COLOR_TREE_DIRECTORY 7
410 #define TOG_COLOR_TREE_EXECUTABLE 8
411 #define TOG_COLOR_COMMIT 9
412 #define TOG_COLOR_AUTHOR 10
413 #define TOG_COLOR_DATE 11
414 #define TOG_COLOR_REFS_HEADS 12
415 #define TOG_COLOR_REFS_TAGS 13
416 #define TOG_COLOR_REFS_REMOTES 14
417 #define TOG_COLOR_REFS_BACKUP 15
419 struct tog_blame_cb_args {
420 struct tog_blame_line *lines; /* one per line */
423 struct tog_view *view;
424 struct got_object_id *commit_id;
428 struct tog_blame_thread_args {
430 struct got_repository *repo;
431 struct tog_blame_cb_args *cb_args;
433 got_cancel_cb cancel_cb;
435 pthread_cond_t blame_complete;
441 struct tog_blame_line *lines;
445 struct tog_blame_thread_args thread_args;
446 struct tog_blame_cb_args cb_args;
451 struct tog_blame_view_state {
452 int first_displayed_line;
453 int last_displayed_line;
455 int last_diffed_line;
459 struct got_object_id_queue blamed_commits;
460 struct got_object_qid *blamed_commit;
462 struct got_repository *repo;
463 struct got_object_id *commit_id;
464 struct got_object_id *id_to_log;
465 struct tog_blame blame;
467 struct tog_colors colors;
470 struct tog_parent_tree {
471 TAILQ_ENTRY(tog_parent_tree) entry;
472 struct got_tree_object *tree;
473 struct got_tree_entry *first_displayed_entry;
474 struct got_tree_entry *selected_entry;
478 TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
480 struct tog_tree_view_state {
482 struct got_object_id *commit_id;/* commit which this tree belongs to */
483 struct got_tree_object *root; /* the commit's root tree entry */
484 struct got_tree_object *tree; /* currently displayed (sub-)tree */
485 struct got_tree_entry *first_displayed_entry;
486 struct got_tree_entry *last_displayed_entry;
487 struct got_tree_entry *selected_entry;
488 int ndisplayed, selected, show_ids;
489 struct tog_parent_trees parents; /* parent trees of current sub-tree */
491 struct got_repository *repo;
492 struct got_tree_entry *matched_entry;
493 struct tog_colors colors;
496 struct tog_reflist_entry {
497 TAILQ_ENTRY(tog_reflist_entry) entry;
498 struct got_reference *ref;
502 TAILQ_HEAD(tog_reflist_head, tog_reflist_entry);
504 struct tog_ref_view_state {
505 struct tog_reflist_head refs;
506 struct tog_reflist_entry *first_displayed_entry;
507 struct tog_reflist_entry *last_displayed_entry;
508 struct tog_reflist_entry *selected_entry;
509 int nrefs, ndisplayed, selected, show_date, show_ids, sort_by_date;
510 struct got_repository *repo;
511 struct tog_reflist_entry *matched_entry;
512 struct tog_colors colors;
515 struct tog_help_view_state {
520 int first_displayed_line;
521 int last_displayed_line;
526 enum tog_keymap_type type;
529 #define GENERATE_HELP \
530 KEYMAP_("Global", TOG_KEYMAP_GLOBAL), \
531 KEY_("H F1", "Open view-specific help (double tap for all help)"), \
532 KEY_("k C-p Up", "Move cursor or page up one line"), \
533 KEY_("j C-n Down", "Move cursor or page down one line"), \
534 KEY_("C-b b PgUp", "Scroll the view up one page"), \
535 KEY_("C-f f PgDn Space", "Scroll the view down one page"), \
536 KEY_("C-u u", "Scroll the view up one half page"), \
537 KEY_("C-d d", "Scroll the view down one half page"), \
538 KEY_("g", "Go to line N (default: first line)"), \
539 KEY_("Home =", "Go to the first line"), \
540 KEY_("G", "Go to line N (default: last line)"), \
541 KEY_("End *", "Go to the last line"), \
542 KEY_("l Right", "Scroll the view right"), \
543 KEY_("h Left", "Scroll the view left"), \
544 KEY_("$", "Scroll view to the rightmost position"), \
545 KEY_("0", "Scroll view to the leftmost position"), \
546 KEY_("-", "Decrease size of the focussed split"), \
547 KEY_("+", "Increase size of the focussed split"), \
548 KEY_("Tab", "Switch focus between views"), \
549 KEY_("F", "Toggle fullscreen mode"), \
550 KEY_("S", "Switch split-screen layout"), \
551 KEY_("/", "Open prompt to enter search term"), \
552 KEY_("n", "Find next line/token matching the current search term"), \
553 KEY_("N", "Find previous line/token matching the current search term"),\
554 KEY_("q", "Quit the focussed view; Quit help screen"), \
555 KEY_("Q", "Quit tog"), \
557 KEYMAP_("Log view", TOG_KEYMAP_LOG), \
558 KEY_("< ,", "Move cursor up one commit"), \
559 KEY_("> .", "Move cursor down one commit"), \
560 KEY_("Enter", "Open diff view of the selected commit"), \
561 KEY_("B", "Reload the log view and toggle display of merged commits"), \
562 KEY_("R", "Open ref view of all repository references"), \
563 KEY_("T", "Display tree view of the repository from the selected" \
565 KEY_("@", "Toggle between displaying author and committer name"), \
566 KEY_("&", "Open prompt to enter term to limit commits displayed"), \
567 KEY_("C-g Backspace", "Cancel current search or log operation"), \
568 KEY_("C-l", "Reload the log view with new commits in the repository"), \
570 KEYMAP_("Diff view", TOG_KEYMAP_DIFF), \
571 KEY_("K < ,", "Display diff of next line in the file/log entry"), \
572 KEY_("J > .", "Display diff of previous line in the file/log entry"), \
573 KEY_("A", "Toggle between Myers and Patience diff algorithm"), \
574 KEY_("a", "Toggle treatment of file as ASCII irrespective of binary" \
576 KEY_("(", "Go to the previous file in the diff"), \
577 KEY_(")", "Go to the next file in the diff"), \
578 KEY_("{", "Go to the previous hunk in the diff"), \
579 KEY_("}", "Go to the next hunk in the diff"), \
580 KEY_("[", "Decrease the number of context lines"), \
581 KEY_("]", "Increase the number of context lines"), \
582 KEY_("w", "Toggle ignore whitespace-only changes in the diff"), \
584 KEYMAP_("Blame view", TOG_KEYMAP_BLAME), \
585 KEY_("Enter", "Display diff view of the selected line's commit"), \
586 KEY_("A", "Toggle diff algorithm between Myers and Patience"), \
587 KEY_("L", "Open log view for the currently selected annotated line"), \
588 KEY_("C", "Reload view with the previously blamed commit"), \
589 KEY_("c", "Reload view with the version of the file found in the" \
590 " selected line's commit"), \
591 KEY_("p", "Reload view with the version of the file found in the" \
592 " selected line's parent commit"), \
594 KEYMAP_("Tree view", TOG_KEYMAP_TREE), \
595 KEY_("Enter", "Enter selected directory or open blame view of the" \
597 KEY_("L", "Open log view for the selected entry"), \
598 KEY_("R", "Open ref view of all repository references"), \
599 KEY_("i", "Show object IDs for all tree entries"), \
600 KEY_("Backspace", "Return to the parent directory"), \
602 KEYMAP_("Ref view", TOG_KEYMAP_REF), \
603 KEY_("Enter", "Display log view of the selected reference"), \
604 KEY_("T", "Display tree view of the selected reference"), \
605 KEY_("i", "Toggle display of IDs for all non-symbolic references"), \
606 KEY_("m", "Toggle display of last modified date for each reference"), \
607 KEY_("o", "Toggle reference sort order (name -> timestamp)"), \
608 KEY_("C-l", "Reload view with all repository references")
613 enum tog_keymap_type type;
616 /* curses io for tog regress */
624 static int using_mock_io;
626 #define TOG_KEY_SCRDUMP SHRT_MIN
629 * We implement two types of views: parent views and child views.
631 * The 'Tab' key switches focus between a parent view and its child view.
632 * Child views are shown side-by-side to their parent view, provided
633 * there is enough screen estate.
635 * When a new view is opened from within a parent view, this new view
636 * becomes a child view of the parent view, replacing any existing child.
638 * When a new view is opened from within a child view, this new view
639 * becomes a parent view which will obscure the views below until the
640 * user quits the new parent view by typing 'q'.
642 * This list of views contains parent views only.
643 * Child views are only pointed to by their parent view.
645 TAILQ_HEAD(tog_view_list_head, tog_view);
648 TAILQ_ENTRY(tog_view) entry;
651 int nlines, ncols, begin_y, begin_x; /* based on split height/width */
652 int resized_y, resized_x; /* begin_y/x based on user resizing */
653 int maxx, x; /* max column and current start column */
654 int lines, cols; /* copies of LINES and COLS */
655 int nscrolled, offset; /* lines scrolled and hsplit line offset */
656 int gline, hiline; /* navigate to and highlight this nG line */
657 int ch, count; /* current keymap and count prefix */
658 int resized; /* set when in a resize event */
659 int focussed; /* Only set on one parent or child view at a time. */
661 struct tog_view *parent;
662 struct tog_view *child;
665 * This flag is initially set on parent views when a new child view
666 * is created. It gets toggled when the 'Tab' key switches focus
667 * between parent and child.
668 * The flag indicates whether focus should be passed on to our child
669 * view if this parent view gets picked for focus after another parent
670 * view was closed. This prevents child views from losing focus in such
675 enum tog_view_mode mode;
676 /* type-specific state */
677 enum tog_view_type type;
679 struct tog_diff_view_state diff;
680 struct tog_log_view_state log;
681 struct tog_blame_view_state blame;
682 struct tog_tree_view_state tree;
683 struct tog_ref_view_state ref;
684 struct tog_help_view_state help;
687 const struct got_error *(*show)(struct tog_view *);
688 const struct got_error *(*input)(struct tog_view **,
689 struct tog_view *, int);
690 const struct got_error *(*reset)(struct tog_view *);
691 const struct got_error *(*resize)(struct tog_view *, int);
692 const struct got_error *(*close)(struct tog_view *);
694 const struct got_error *(*search_start)(struct tog_view *);
695 const struct got_error *(*search_next)(struct tog_view *);
696 void (*search_setup)(struct tog_view *, FILE **, off_t **, size_t *,
697 int **, int **, int **, int **);
700 #define TOG_SEARCH_FORWARD 1
701 #define TOG_SEARCH_BACKWARD 2
702 int search_next_done;
703 #define TOG_SEARCH_HAVE_MORE 1
704 #define TOG_SEARCH_NO_MORE 2
705 #define TOG_SEARCH_HAVE_NONE 3
711 static const struct got_error *open_diff_view(struct tog_view *,
712 struct got_object_id *, struct got_object_id *,
713 const char *, const char *, int, int, int, struct tog_view *,
714 struct got_repository *);
715 static const struct got_error *show_diff_view(struct tog_view *);
716 static const struct got_error *input_diff_view(struct tog_view **,
717 struct tog_view *, int);
718 static const struct got_error *reset_diff_view(struct tog_view *);
719 static const struct got_error* close_diff_view(struct tog_view *);
720 static const struct got_error *search_start_diff_view(struct tog_view *);
721 static void search_setup_diff_view(struct tog_view *, FILE **, off_t **,
722 size_t *, int **, int **, int **, int **);
723 static const struct got_error *search_next_view_match(struct tog_view *);
725 static const struct got_error *open_log_view(struct tog_view *,
726 struct got_object_id *, struct got_repository *,
727 const char *, const char *, int);
728 static const struct got_error * show_log_view(struct tog_view *);
729 static const struct got_error *input_log_view(struct tog_view **,
730 struct tog_view *, int);
731 static const struct got_error *resize_log_view(struct tog_view *, int);
732 static const struct got_error *close_log_view(struct tog_view *);
733 static const struct got_error *search_start_log_view(struct tog_view *);
734 static const struct got_error *search_next_log_view(struct tog_view *);
736 static const struct got_error *open_blame_view(struct tog_view *, char *,
737 struct got_object_id *, struct got_repository *);
738 static const struct got_error *show_blame_view(struct tog_view *);
739 static const struct got_error *input_blame_view(struct tog_view **,
740 struct tog_view *, int);
741 static const struct got_error *reset_blame_view(struct tog_view *);
742 static const struct got_error *close_blame_view(struct tog_view *);
743 static const struct got_error *search_start_blame_view(struct tog_view *);
744 static void search_setup_blame_view(struct tog_view *, FILE **, off_t **,
745 size_t *, int **, int **, int **, int **);
747 static const struct got_error *open_tree_view(struct tog_view *,
748 struct got_object_id *, const char *, struct got_repository *);
749 static const struct got_error *show_tree_view(struct tog_view *);
750 static const struct got_error *input_tree_view(struct tog_view **,
751 struct tog_view *, int);
752 static const struct got_error *close_tree_view(struct tog_view *);
753 static const struct got_error *search_start_tree_view(struct tog_view *);
754 static const struct got_error *search_next_tree_view(struct tog_view *);
756 static const struct got_error *open_ref_view(struct tog_view *,
757 struct got_repository *);
758 static const struct got_error *show_ref_view(struct tog_view *);
759 static const struct got_error *input_ref_view(struct tog_view **,
760 struct tog_view *, int);
761 static const struct got_error *close_ref_view(struct tog_view *);
762 static const struct got_error *search_start_ref_view(struct tog_view *);
763 static const struct got_error *search_next_ref_view(struct tog_view *);
765 static const struct got_error *open_help_view(struct tog_view *,
767 static const struct got_error *show_help_view(struct tog_view *);
768 static const struct got_error *input_help_view(struct tog_view **,
769 struct tog_view *, int);
770 static const struct got_error *reset_help_view(struct tog_view *);
771 static const struct got_error* close_help_view(struct tog_view *);
772 static const struct got_error *search_start_help_view(struct tog_view *);
773 static void search_setup_help_view(struct tog_view *, FILE **, off_t **,
774 size_t *, int **, int **, int **, int **);
776 static volatile sig_atomic_t tog_sigwinch_received;
777 static volatile sig_atomic_t tog_sigpipe_received;
778 static volatile sig_atomic_t tog_sigcont_received;
779 static volatile sig_atomic_t tog_sigint_received;
780 static volatile sig_atomic_t tog_sigterm_received;
783 tog_sigwinch(int signo)
785 tog_sigwinch_received = 1;
789 tog_sigpipe(int signo)
791 tog_sigpipe_received = 1;
795 tog_sigcont(int signo)
797 tog_sigcont_received = 1;
801 tog_sigint(int signo)
803 tog_sigint_received = 1;
807 tog_sigterm(int signo)
809 tog_sigterm_received = 1;
813 tog_fatal_signal_received(void)
815 return (tog_sigpipe_received ||
816 tog_sigint_received || tog_sigterm_received);
819 static const struct got_error *
820 view_close(struct tog_view *view)
822 const struct got_error *err = NULL, *child_err = NULL;
825 child_err = view_close(view->child);
829 err = view->close(view);
831 del_panel(view->panel);
833 delwin(view->window);
835 return err ? err : child_err;
838 static struct tog_view *
839 view_open(int nlines, int ncols, int begin_y, int begin_x,
840 enum tog_view_type type)
842 struct tog_view *view = calloc(1, sizeof(*view));
850 view->nlines = nlines ? nlines : LINES - begin_y;
851 view->ncols = ncols ? ncols : COLS - begin_x;
852 view->begin_y = begin_y;
853 view->begin_x = begin_x;
854 view->window = newwin(nlines, ncols, begin_y, begin_x);
855 if (view->window == NULL) {
859 view->panel = new_panel(view->window);
860 if (view->panel == NULL ||
861 set_panel_userptr(view->panel, view) != OK) {
866 keypad(view->window, TRUE);
871 view_split_begin_x(int begin_x)
873 if (begin_x > 0 || COLS < 120)
875 return (COLS - MAX(COLS / 2, 80));
878 /* XXX Stub till we decide what to do. */
880 view_split_begin_y(int lines)
882 return lines * HSPLIT_SCALE;
885 static const struct got_error *view_resize(struct tog_view *);
887 static const struct got_error *
888 view_splitscreen(struct tog_view *view)
890 const struct got_error *err = NULL;
892 if (!view->resized && view->mode == TOG_VIEW_SPLIT_HRZN) {
893 if (view->resized_y && view->resized_y < view->lines)
894 view->begin_y = view->resized_y;
896 view->begin_y = view_split_begin_y(view->nlines);
898 } else if (!view->resized) {
899 if (view->resized_x && view->resized_x < view->cols - 1 &&
901 view->begin_x = view->resized_x;
903 view->begin_x = view_split_begin_x(0);
906 view->nlines = LINES - view->begin_y;
907 view->ncols = COLS - view->begin_x;
910 err = view_resize(view);
914 if (view->parent && view->mode == TOG_VIEW_SPLIT_HRZN)
915 view->parent->nlines = view->begin_y;
917 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
918 return got_error_from_errno("mvwin");
923 static const struct got_error *
924 view_fullscreen(struct tog_view *view)
926 const struct got_error *err = NULL;
929 view->begin_y = view->resized ? view->begin_y : 0;
930 view->nlines = view->resized ? view->nlines : LINES;
934 err = view_resize(view);
938 if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
939 return got_error_from_errno("mvwin");
945 view_is_parent_view(struct tog_view *view)
947 return view->parent == NULL;
951 view_is_splitscreen(struct tog_view *view)
953 return view->begin_x > 0 || view->begin_y > 0;
957 view_is_fullscreen(struct tog_view *view)
959 return view->nlines == LINES && view->ncols == COLS;
963 view_is_hsplit_top(struct tog_view *view)
965 return view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
966 view_is_splitscreen(view->child);
970 view_border(struct tog_view *view)
973 const struct tog_view *view_above;
976 return view_border(view->parent);
978 panel = panel_above(view->panel);
982 view_above = panel_userptr(panel);
983 if (view->mode == TOG_VIEW_SPLIT_HRZN)
984 mvwhline(view->window, view_above->begin_y - 1,
985 view->begin_x, ACS_HLINE, view->ncols);
987 mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
988 ACS_VLINE, view->nlines);
991 static const struct got_error *view_init_hsplit(struct tog_view *, int);
992 static const struct got_error *request_log_commits(struct tog_view *);
993 static const struct got_error *offset_selection_down(struct tog_view *);
994 static void offset_selection_up(struct tog_view *);
995 static void view_get_split(struct tog_view *, int *, int *);
997 static const struct got_error *
998 view_resize(struct tog_view *view)
1000 const struct got_error *err = NULL;
1001 int dif, nlines, ncols;
1003 dif = LINES - view->lines; /* line difference */
1005 if (view->lines > LINES)
1006 nlines = view->nlines - (view->lines - LINES);
1008 nlines = view->nlines + (LINES - view->lines);
1009 if (view->cols > COLS)
1010 ncols = view->ncols - (view->cols - COLS);
1012 ncols = view->ncols + (COLS - view->cols);
1015 int hs = view->child->begin_y;
1017 if (!view_is_fullscreen(view))
1018 view->child->begin_x = view_split_begin_x(view->begin_x);
1019 if (view->mode == TOG_VIEW_SPLIT_HRZN ||
1020 view->child->begin_x == 0) {
1023 view_fullscreen(view->child);
1024 if (view->child->focussed)
1025 show_panel(view->child->panel);
1027 show_panel(view->panel);
1029 ncols = view->child->begin_x;
1031 view_splitscreen(view->child);
1032 show_panel(view->child->panel);
1035 * XXX This is ugly and needs to be moved into the above
1036 * logic but "works" for now and my attempts at moving it
1037 * break either 'tab' or 'F' key maps in horizontal splits.
1040 err = view_splitscreen(view->child);
1043 if (dif < 0) { /* top split decreased */
1044 err = offset_selection_down(view);
1051 show_panel(view->child->panel);
1052 nlines = view->nlines;
1054 } else if (view->parent == NULL)
1057 if (view->resize && dif > 0) {
1058 err = view->resize(view, dif);
1063 if (wresize(view->window, nlines, ncols) == ERR)
1064 return got_error_from_errno("wresize");
1065 if (replace_panel(view->panel, view->window) == ERR)
1066 return got_error_from_errno("replace_panel");
1067 wclear(view->window);
1069 view->nlines = nlines;
1070 view->ncols = ncols;
1071 view->lines = LINES;
1077 static const struct got_error *
1078 resize_log_view(struct tog_view *view, int increase)
1080 struct tog_log_view_state *s = &view->state.log;
1081 const struct got_error *err = NULL;
1084 if (s->selected_entry)
1085 n = s->selected_entry->idx + view->lines - s->selected;
1088 * Request commits to account for the increased
1089 * height so we have enough to populate the view.
1091 if (s->commits->ncommits < n) {
1092 view->nscrolled = n - s->commits->ncommits + increase + 1;
1093 err = request_log_commits(view);
1100 view_adjust_offset(struct tog_view *view, int n)
1105 if (view->parent && view->parent->offset) {
1106 if (view->parent->offset + n >= 0)
1107 view->parent->offset += n;
1109 view->parent->offset = 0;
1110 } else if (view->offset) {
1111 if (view->offset - n >= 0)
1118 static const struct got_error *
1119 view_resize_split(struct tog_view *view, int resize)
1121 const struct got_error *err = NULL;
1122 struct tog_view *v = NULL;
1129 if (!v->child || !view_is_splitscreen(v->child))
1132 v->resized = v->child->resized = resize; /* lock for resize event */
1134 if (view->mode == TOG_VIEW_SPLIT_HRZN) {
1135 if (v->child->resized_y)
1136 v->child->begin_y = v->child->resized_y;
1138 v->child->begin_y -= resize;
1140 v->child->begin_y += resize;
1141 if (v->child->begin_y < 3) {
1143 v->child->begin_y = 3;
1144 } else if (v->child->begin_y > LINES - 1) {
1146 v->child->begin_y = LINES - 1;
1149 v->child->ncols = COLS;
1150 view_adjust_offset(view, resize);
1151 err = view_init_hsplit(v, v->child->begin_y);
1154 v->child->resized_y = v->child->begin_y;
1156 if (v->child->resized_x)
1157 v->child->begin_x = v->child->resized_x;
1159 v->child->begin_x -= resize;
1161 v->child->begin_x += resize;
1162 if (v->child->begin_x < 11) {
1164 v->child->begin_x = 11;
1165 } else if (v->child->begin_x > COLS - 1) {
1167 v->child->begin_x = COLS - 1;
1169 v->child->resized_x = v->child->begin_x;
1172 v->child->mode = v->mode;
1173 v->child->nlines = v->lines - v->child->begin_y;
1174 v->child->ncols = v->cols - v->child->begin_x;
1177 err = view_fullscreen(v);
1180 err = view_splitscreen(v->child);
1184 if (v->mode == TOG_VIEW_SPLIT_HRZN) {
1185 err = offset_selection_down(v->child);
1191 err = v->resize(v, 0);
1192 else if (v->child->resize)
1193 err = v->child->resize(v->child, 0);
1195 v->resized = v->child->resized = 0;
1201 view_transfer_size(struct tog_view *dst, struct tog_view *src)
1203 struct tog_view *v = src->child ? src->child : src;
1205 dst->resized_x = v->resized_x;
1206 dst->resized_y = v->resized_y;
1209 static const struct got_error *
1210 view_close_child(struct tog_view *view)
1212 const struct got_error *err = NULL;
1214 if (view->child == NULL)
1217 err = view_close(view->child);
1222 static const struct got_error *
1223 view_set_child(struct tog_view *view, struct tog_view *child)
1225 const struct got_error *err = NULL;
1227 view->child = child;
1228 child->parent = view;
1230 err = view_resize(view);
1234 if (view->child->resized_x || view->child->resized_y)
1235 err = view_resize_split(view, 0);
1240 static const struct got_error *view_dispatch_request(struct tog_view **,
1241 struct tog_view *, enum tog_view_type, int, int);
1243 static const struct got_error *
1244 view_request_new(struct tog_view **requested, struct tog_view *view,
1245 enum tog_view_type request)
1247 struct tog_view *new_view = NULL;
1248 const struct got_error *err;
1253 if (view_is_parent_view(view) && request != TOG_VIEW_HELP)
1254 view_get_split(view, &y, &x);
1256 err = view_dispatch_request(&new_view, view, request, y, x);
1260 if (view_is_parent_view(view) && view->mode == TOG_VIEW_SPLIT_HRZN &&
1261 request != TOG_VIEW_HELP) {
1262 err = view_init_hsplit(view, y);
1268 new_view->focussed = 1;
1269 new_view->mode = view->mode;
1270 new_view->nlines = request == TOG_VIEW_HELP ?
1271 view->lines : view->lines - y;
1273 if (view_is_parent_view(view) && request != TOG_VIEW_HELP) {
1274 view_transfer_size(new_view, view);
1275 err = view_close_child(view);
1278 err = view_set_child(view, new_view);
1281 view->focus_child = 1;
1283 *requested = new_view;
1289 tog_resizeterm(void)
1292 struct winsize size;
1294 if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
1295 cols = 80; /* Default */
1299 lines = size.ws_row;
1301 resize_term(lines, cols);
1304 static const struct got_error *
1305 view_search_start(struct tog_view *view, int fast_refresh)
1307 const struct got_error *err = NULL;
1308 struct tog_view *v = view;
1312 if (view->search_started) {
1313 regfree(&view->regex);
1314 view->searching = 0;
1315 memset(&view->regmatch, 0, sizeof(view->regmatch));
1317 view->search_started = 0;
1319 if (view->nlines < 1)
1322 if (view_is_hsplit_top(view))
1324 else if (view->mode == TOG_VIEW_SPLIT_VERT && view->parent)
1327 mvwaddstr(v->window, v->nlines - 1, 0, "/");
1328 wclrtoeol(v->window);
1330 nodelay(v->window, FALSE); /* block for search term input */
1333 ret = wgetnstr(v->window, pattern, sizeof(pattern));
1334 wrefresh(v->window);
1337 nodelay(v->window, TRUE);
1338 if (!fast_refresh && !using_mock_io)
1343 if (regcomp(&view->regex, pattern, REG_EXTENDED | REG_NEWLINE) == 0) {
1344 err = view->search_start(view);
1346 regfree(&view->regex);
1349 view->search_started = 1;
1350 view->searching = TOG_SEARCH_FORWARD;
1351 view->search_next_done = 0;
1352 view->search_next(view);
1358 /* Switch split mode. If view is a parent or child, draw the new splitscreen. */
1359 static const struct got_error *
1360 switch_split(struct tog_view *view)
1362 const struct got_error *err = NULL;
1363 struct tog_view *v = NULL;
1370 if (v->mode == TOG_VIEW_SPLIT_HRZN)
1371 v->mode = TOG_VIEW_SPLIT_VERT;
1373 v->mode = TOG_VIEW_SPLIT_HRZN;
1377 else if (v->mode == TOG_VIEW_SPLIT_VERT && v->cols < 120)
1378 v->mode = TOG_VIEW_SPLIT_NONE;
1380 view_get_split(v, &v->child->begin_y, &v->child->begin_x);
1381 if (v->mode == TOG_VIEW_SPLIT_HRZN && v->child->resized_y)
1382 v->child->begin_y = v->child->resized_y;
1383 else if (v->mode == TOG_VIEW_SPLIT_VERT && v->child->resized_x)
1384 v->child->begin_x = v->child->resized_x;
1387 if (v->mode == TOG_VIEW_SPLIT_HRZN) {
1389 v->child->ncols = COLS;
1390 v->child->nscrolled = LINES - v->child->nlines;
1392 err = view_init_hsplit(v, v->child->begin_y);
1396 v->child->mode = v->mode;
1397 v->child->nlines = v->lines - v->child->begin_y;
1400 err = view_fullscreen(v);
1403 err = view_splitscreen(v->child);
1407 if (v->mode == TOG_VIEW_SPLIT_NONE)
1408 v->mode = TOG_VIEW_SPLIT_VERT;
1409 if (v->mode == TOG_VIEW_SPLIT_HRZN) {
1410 err = offset_selection_down(v);
1413 err = offset_selection_down(v->child);
1417 offset_selection_up(v);
1418 offset_selection_up(v->child);
1421 err = v->resize(v, 0);
1422 else if (v->child->resize)
1423 err = v->child->resize(v->child, 0);
1429 * Strip trailing whitespace from str starting at byte *n;
1430 * if *n < 0, use strlen(str). Return new str length in *n.
1433 strip_trailing_ws(char *str, int *n)
1437 if (str == NULL || *str == '\0')
1443 while (x-- > 0 && isspace((unsigned char)str[x]))
1450 * Extract visible substring of line y from the curses screen
1451 * and strip trailing whitespace. If vline is set, overwrite
1452 * line[vline] with '|' because the ACS_VLINE character is
1453 * written out as 'x'. Write the line to file f.
1455 static const struct got_error *
1456 view_write_line(FILE *f, int y, int vline)
1458 char line[COLS * MB_LEN_MAX]; /* allow for multibyte chars */
1461 r = mvwinnstr(curscr, y, 0, line, sizeof(line));
1463 return got_error_fmt(GOT_ERR_RANGE,
1464 "failed to extract line %d", y);
1467 * In some views, lines are padded with blanks to COLS width.
1468 * Strip them so we can diff without the -b flag when testing.
1470 strip_trailing_ws(line, &r);
1475 w = fprintf(f, "%s\n", line);
1476 if (w != r + 1) /* \n */
1477 return got_ferror(f, GOT_ERR_IO);
1483 * Capture the visible curses screen by writing each line to the
1484 * file at the path set via the TOG_SCR_DUMP environment variable.
1486 static const struct got_error *
1487 screendump(struct tog_view *view)
1489 const struct got_error *err;
1492 err = got_opentemp_truncate(tog_io.sdump);
1496 if ((view->child && view->child->begin_x) ||
1497 (view->parent && view->begin_x)) {
1498 int ncols = view->child ? view->ncols : view->parent->ncols;
1500 /* vertical splitscreen */
1501 for (i = 0; i < view->nlines; ++i) {
1502 err = view_write_line(tog_io.sdump, i, ncols - 1);
1509 /* fullscreen or horizontal splitscreen */
1510 if ((view->child && view->child->begin_y) ||
1511 (view->parent && view->begin_y)) /* hsplit */
1512 hline = view->child ?
1513 view->child->begin_y : view->begin_y;
1515 for (i = 0; i < view->lines; i++) {
1516 if (hline && i == hline - 1) {
1519 /* ACS_HLINE writes out as 'q', overwrite it */
1520 for (c = 0; c < view->cols; ++c)
1521 fputc('-', tog_io.sdump);
1522 fputc('\n', tog_io.sdump);
1526 err = view_write_line(tog_io.sdump, i, 0);
1537 * Compute view->count from numeric input. Assign total to view->count and
1538 * return first non-numeric key entered.
1541 get_compound_key(struct tog_view *view, int c)
1543 struct tog_view *v = view;
1546 if (view_is_hsplit_top(view))
1548 else if (view->mode == TOG_VIEW_SPLIT_VERT && view->parent)
1552 cbreak(); /* block for input */
1553 nodelay(view->window, FALSE);
1554 wmove(v->window, v->nlines - 1, 0);
1555 wclrtoeol(v->window);
1556 waddch(v->window, ':');
1559 x = getcurx(v->window);
1560 if (x != ERR && x < view->ncols) {
1561 waddch(v->window, c);
1562 wrefresh(v->window);
1566 * Don't overflow. Max valid request should be the greatest
1567 * between the longest and total lines; cap at 10 million.
1572 n = n * 10 + (c - '0');
1573 } while (((c = wgetch(view->window))) >= '0' && c <= '9' && c != ERR);
1575 if (c == 'G' || c == 'g') { /* nG key map */
1576 view->gline = view->hiline = n;
1581 /* Massage excessive or inapplicable values at the input handler. */
1588 action_report(struct tog_view *view)
1590 struct tog_view *v = view;
1592 if (view_is_hsplit_top(view))
1594 else if (view->mode == TOG_VIEW_SPLIT_VERT && view->parent)
1597 wmove(v->window, v->nlines - 1, 0);
1598 wclrtoeol(v->window);
1599 wprintw(v->window, ":%s", view->action);
1600 wrefresh(v->window);
1603 * Clear action status report. Only clear in blame view
1604 * once annotating is complete, otherwise it's too fast.
1606 if (view->type == TOG_VIEW_BLAME) {
1607 if (view->state.blame.blame_complete)
1608 view->action = NULL;
1610 view->action = NULL;
1614 * Read the next line from the test script and assign
1615 * key instruction to *ch. If at EOF, set the *done flag.
1617 static const struct got_error *
1618 tog_read_script_key(FILE *script, struct tog_view *view, int *ch, int *done)
1620 const struct got_error *err = NULL;
1624 if (view->count && --view->count) {
1630 if (getline(&line, &linesz, script) == -1) {
1635 err = got_ferror(script, GOT_ERR_IO);
1640 if (strncasecmp(line, "WAIT_FOR_UI", 11) == 0)
1641 tog_io.wait_for_ui = 1;
1642 else if (strncasecmp(line, "KEY_ENTER", 9) == 0)
1644 else if (strncasecmp(line, "KEY_RIGHT", 9) == 0)
1646 else if (strncasecmp(line, "KEY_LEFT", 8) == 0)
1648 else if (strncasecmp(line, "KEY_DOWN", 8) == 0)
1650 else if (strncasecmp(line, "KEY_UP", 6) == 0)
1652 else if (strncasecmp(line, "TAB", 3) == 0)
1654 else if (strncasecmp(line, "SCREENDUMP", 10) == 0)
1655 *ch = TOG_KEY_SCRDUMP;
1656 else if (isdigit((unsigned char)*line)) {
1659 while (isdigit((unsigned char)*t))
1661 view->ch = *ch = *t;
1663 /* ignore error, view->count is 0 if instruction is invalid */
1664 view->count = strtonum(line, 0, INT_MAX, NULL);
1673 static const struct got_error *
1674 view_input(struct tog_view **new, int *done, struct tog_view *view,
1675 struct tog_view_list_head *views, int fast_refresh)
1677 const struct got_error *err = NULL;
1684 action_report(view);
1686 /* Clear "no matches" indicator. */
1687 if (view->search_next_done == TOG_SEARCH_NO_MORE ||
1688 view->search_next_done == TOG_SEARCH_HAVE_NONE) {
1689 view->search_next_done = TOG_SEARCH_HAVE_MORE;
1693 if (view->searching && !view->search_next_done) {
1694 errcode = pthread_mutex_unlock(&tog_mutex);
1696 return got_error_set_errno(errcode,
1697 "pthread_mutex_unlock");
1699 errcode = pthread_mutex_lock(&tog_mutex);
1701 return got_error_set_errno(errcode,
1702 "pthread_mutex_lock");
1703 view->search_next(view);
1707 /* Allow threads to make progress while we are waiting for input. */
1708 errcode = pthread_mutex_unlock(&tog_mutex);
1710 return got_error_set_errno(errcode, "pthread_mutex_unlock");
1712 if (using_mock_io) {
1713 err = tog_read_script_key(tog_io.f, view, &ch, done);
1715 errcode = pthread_mutex_lock(&tog_mutex);
1718 } else if (view->count && --view->count) {
1720 nodelay(view->window, TRUE);
1721 ch = wgetch(view->window);
1722 /* let C-g or backspace abort unfinished count */
1723 if (ch == CTRL('g') || ch == KEY_BACKSPACE)
1728 ch = wgetch(view->window);
1729 if (ch >= '1' && ch <= '9')
1730 view->ch = ch = get_compound_key(view, ch);
1732 if (view->hiline && ch != ERR && ch != 0)
1733 view->hiline = 0; /* key pressed, clear line highlight */
1734 nodelay(view->window, TRUE);
1735 errcode = pthread_mutex_lock(&tog_mutex);
1737 return got_error_set_errno(errcode, "pthread_mutex_lock");
1739 if (tog_sigwinch_received || tog_sigcont_received) {
1741 tog_sigwinch_received = 0;
1742 tog_sigcont_received = 0;
1743 TAILQ_FOREACH(v, views, entry) {
1744 err = view_resize(v);
1747 err = v->input(new, v, KEY_RESIZE);
1751 err = view_resize(v->child);
1754 err = v->child->input(new, v->child,
1758 if (v->child->resized_x || v->child->resized_y) {
1759 err = view_resize_split(v, 0);
1771 if (view->type == TOG_VIEW_HELP)
1772 err = view->reset(view);
1774 err = view_request_new(new, view, TOG_VIEW_HELP);
1780 view->child->focussed = 1;
1781 view->focus_child = 1;
1782 } else if (view->parent) {
1784 view->parent->focussed = 1;
1785 view->parent->focus_child = 0;
1786 if (!view_is_splitscreen(view)) {
1787 if (view->parent->resize) {
1788 err = view->parent->resize(view->parent,
1793 offset_selection_up(view->parent);
1794 err = view_fullscreen(view->parent);
1801 if (view->parent && view->mode == TOG_VIEW_SPLIT_HRZN) {
1802 if (view->parent->resize) {
1803 /* might need more commits to fill fullscreen */
1804 err = view->parent->resize(view->parent, 0);
1808 offset_selection_up(view->parent);
1810 err = view->input(new, view, ch);
1818 if (view_is_parent_view(view)) {
1819 if (view->child == NULL)
1821 if (view_is_splitscreen(view->child)) {
1823 view->child->focussed = 1;
1824 err = view_fullscreen(view->child);
1826 err = view_splitscreen(view->child);
1828 err = view_resize_split(view, 0);
1832 err = view->child->input(new, view->child,
1835 if (view_is_splitscreen(view)) {
1836 view->parent->focussed = 0;
1838 err = view_fullscreen(view);
1840 err = view_splitscreen(view);
1841 if (!err && view->mode != TOG_VIEW_SPLIT_HRZN)
1842 err = view_resize(view->parent);
1844 err = view_resize_split(view, 0);
1848 err = view->input(new, view, KEY_RESIZE);
1853 err = view->resize(view, 0);
1858 if (view->parent->resize) {
1859 err = view->parent->resize(view->parent, 0);
1863 err = offset_selection_down(view->parent);
1867 err = offset_selection_down(view);
1871 err = switch_split(view);
1874 err = view_resize_split(view, -1);
1877 err = view_resize_split(view, 1);
1883 if (view->search_start)
1884 view_search_start(view, fast_refresh);
1886 err = view->input(new, view, ch);
1890 if (view->search_started && view->search_next) {
1891 view->searching = (ch == 'n' ?
1892 TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
1893 view->search_next_done = 0;
1894 view->search_next(view);
1896 err = view->input(new, view, ch);
1899 if (tog_diff_algo == GOT_DIFF_ALGORITHM_MYERS) {
1900 tog_diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
1901 view->action = "Patience diff algorithm";
1903 tog_diff_algo = GOT_DIFF_ALGORITHM_MYERS;
1904 view->action = "Myers diff algorithm";
1906 TAILQ_FOREACH(v, views, entry) {
1912 if (v->child && v->child->reset) {
1913 err = v->child->reset(v->child);
1919 case TOG_KEY_SCRDUMP:
1920 err = screendump(view);
1923 err = view->input(new, view, ch);
1931 view_needs_focus_indication(struct tog_view *view)
1933 if (view_is_parent_view(view)) {
1934 if (view->child == NULL || view->child->focussed)
1936 if (!view_is_splitscreen(view->child))
1938 } else if (!view_is_splitscreen(view))
1941 return view->focussed;
1944 static const struct got_error *
1947 const struct got_error *err = NULL;
1949 if (tog_io.cin && fclose(tog_io.cin) == EOF)
1950 err = got_ferror(tog_io.cin, GOT_ERR_IO);
1951 if (tog_io.cout && fclose(tog_io.cout) == EOF && err == NULL)
1952 err = got_ferror(tog_io.cout, GOT_ERR_IO);
1953 if (tog_io.f && fclose(tog_io.f) == EOF && err == NULL)
1954 err = got_ferror(tog_io.f, GOT_ERR_IO);
1955 if (tog_io.sdump && fclose(tog_io.sdump) == EOF && err == NULL)
1956 err = got_ferror(tog_io.sdump, GOT_ERR_IO);
1961 static const struct got_error *
1962 view_loop(struct tog_view *view)
1964 const struct got_error *err = NULL;
1965 struct tog_view_list_head views;
1966 struct tog_view *new_view;
1968 int fast_refresh = 10;
1969 int done = 0, errcode;
1971 mode = getenv("TOG_VIEW_SPLIT_MODE");
1972 if (!mode || !(*mode == 'h' || *mode == 'H'))
1973 view->mode = TOG_VIEW_SPLIT_VERT;
1975 view->mode = TOG_VIEW_SPLIT_HRZN;
1977 errcode = pthread_mutex_lock(&tog_mutex);
1979 return got_error_set_errno(errcode, "pthread_mutex_lock");
1982 TAILQ_INSERT_HEAD(&views, view, entry);
1985 err = view->show(view);
1990 while (!TAILQ_EMPTY(&views) && !done && !tog_thread_error &&
1991 !tog_fatal_signal_received()) {
1992 /* Refresh fast during initialization, then become slower. */
1993 if (fast_refresh && --fast_refresh == 0 && !using_mock_io)
1994 halfdelay(10); /* switch to once per second */
1996 err = view_input(&new_view, &done, view, &views, fast_refresh);
2000 if (view->dying && view == TAILQ_FIRST(&views) &&
2001 TAILQ_NEXT(view, entry) == NULL)
2007 * When we quit, scroll the screen up a single line
2008 * so we don't lose any information.
2010 TAILQ_FOREACH(v, &views, entry) {
2011 wmove(v->window, 0, 0);
2012 wdeleteln(v->window);
2013 wnoutrefresh(v->window);
2014 if (v->child && !view_is_fullscreen(v)) {
2015 wmove(v->child->window, 0, 0);
2016 wdeleteln(v->child->window);
2017 wnoutrefresh(v->child->window);
2024 struct tog_view *v, *prev = NULL;
2026 if (view_is_parent_view(view))
2027 prev = TAILQ_PREV(view, tog_view_list_head,
2029 else if (view->parent)
2030 prev = view->parent;
2033 view->parent->child = NULL;
2034 view->parent->focus_child = 0;
2035 /* Restore fullscreen line height. */
2036 view->parent->nlines = view->parent->lines;
2037 err = view_resize(view->parent);
2040 /* Make resized splits persist. */
2041 view_transfer_size(view->parent, view);
2043 TAILQ_REMOVE(&views, view, entry);
2045 err = view_close(view);
2050 TAILQ_FOREACH(v, &views, entry) {
2054 if (view == NULL && new_view == NULL) {
2055 /* No view has focus. Try to pick one. */
2058 else if (!TAILQ_EMPTY(&views)) {
2059 view = TAILQ_LAST(&views,
2060 tog_view_list_head);
2063 if (view->focus_child) {
2064 view->child->focussed = 1;
2072 struct tog_view *v, *t;
2073 /* Only allow one parent view per type. */
2074 TAILQ_FOREACH_SAFE(v, &views, entry, t) {
2075 if (v->type != new_view->type)
2077 TAILQ_REMOVE(&views, v, entry);
2078 err = view_close(v);
2083 TAILQ_INSERT_TAIL(&views, new_view, entry);
2086 if (view && !done) {
2087 if (view_is_parent_view(view)) {
2088 if (view->child && view->child->focussed)
2091 if (view->parent && view->parent->focussed)
2092 view = view->parent;
2094 show_panel(view->panel);
2095 if (view->child && view_is_splitscreen(view->child))
2096 show_panel(view->child->panel);
2097 if (view->parent && view_is_splitscreen(view)) {
2098 err = view->parent->show(view->parent);
2102 err = view->show(view);
2106 err = view->child->show(view->child);
2115 while (!TAILQ_EMPTY(&views)) {
2116 const struct got_error *close_err;
2117 view = TAILQ_FIRST(&views);
2118 TAILQ_REMOVE(&views, view, entry);
2119 close_err = view_close(view);
2120 if (close_err && err == NULL)
2124 errcode = pthread_mutex_unlock(&tog_mutex);
2125 if (errcode && err == NULL)
2126 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
2136 "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
2141 /* Create newly allocated wide-character string equivalent to a byte string. */
2142 static const struct got_error *
2143 mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
2146 const struct got_error *err = NULL;
2149 *wlen = mbstowcs(NULL, s, 0);
2150 if (*wlen == (size_t)-1) {
2152 if (errno != EILSEQ)
2153 return got_error_from_errno("mbstowcs");
2155 /* byte string invalid in current encoding; try to "fix" it */
2156 err = got_mbsavis(&vis, &vislen, s);
2159 *wlen = mbstowcs(NULL, vis, 0);
2160 if (*wlen == (size_t)-1) {
2161 err = got_error_from_errno("mbstowcs"); /* give up */
2166 *ws = calloc(*wlen + 1, sizeof(**ws));
2168 err = got_error_from_errno("calloc");
2172 if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
2173 err = got_error_from_errno("mbstowcs");
2184 static const struct got_error *
2185 expand_tab(char **ptr, const char *src)
2188 size_t len, n, idx = 0, sz = 0;
2191 n = len = strlen(src);
2192 dst = malloc(n + 1);
2194 return got_error_from_errno("malloc");
2196 while (idx < len && src[idx]) {
2197 const char c = src[idx];
2200 size_t nb = TABSIZE - sz % TABSIZE;
2203 p = realloc(dst, n + nb);
2206 return got_error_from_errno("realloc");
2211 memset(dst + sz, ' ', nb);
2214 dst[sz++] = src[idx];
2224 * Advance at most n columns from wline starting at offset off.
2225 * Return the index to the first character after the span operation.
2226 * Return the combined column width of all spanned wide characters in
2230 span_wline(int *rcol, int off, wchar_t *wline, int n, int col_tab_align)
2232 int width, i, cols = 0;
2239 for (i = off; wline[i] != L'\0'; ++i) {
2240 if (wline[i] == L'\t')
2241 width = TABSIZE - ((cols + col_tab_align) % TABSIZE);
2243 width = wcwidth(wline[i]);
2250 if (cols + width > n)
2260 * Format a line for display, ensuring that it won't overflow a width limit.
2261 * With scrolling, the width returned refers to the scrolled version of the
2262 * line, which starts at (*wlinep)[*scrollxp]. The caller must free *wlinep.
2264 static const struct got_error *
2265 format_line(wchar_t **wlinep, int *widthp, int *scrollxp,
2266 const char *line, int nscroll, int wlimit, int col_tab_align, int expand)
2268 const struct got_error *err = NULL;
2270 wchar_t *wline = NULL;
2279 err = expand_tab(&exstr, line);
2284 err = mbs2ws(&wline, &wlen, expand ? exstr : line);
2289 scrollx = span_wline(&cols, 0, wline, nscroll, col_tab_align);
2291 if (wlen > 0 && wline[wlen - 1] == L'\n') {
2292 wline[wlen - 1] = L'\0';
2295 if (wlen > 0 && wline[wlen - 1] == L'\r') {
2296 wline[wlen - 1] = L'\0';
2300 i = span_wline(&cols, scrollx, wline, wlimit, col_tab_align);
2306 *scrollxp = scrollx;
2314 static const struct got_error*
2315 build_refs_str(char **refs_str, struct got_reflist_head *refs,
2316 struct got_object_id *id, struct got_repository *repo)
2318 static const struct got_error *err = NULL;
2319 struct got_reflist_entry *re;
2328 TAILQ_FOREACH(re, refs, entry) {
2329 struct got_tag_object *tag = NULL;
2330 struct got_object_id *ref_id;
2333 name = got_ref_get_name(re->ref);
2334 if (strcmp(name, GOT_REF_HEAD) == 0)
2336 if (strncmp(name, "refs/", 5) == 0)
2338 if (strncmp(name, "got/", 4) == 0)
2340 if (strncmp(name, "heads/", 6) == 0)
2342 if (strncmp(name, "remotes/", 8) == 0) {
2344 s = strstr(name, "/" GOT_REF_HEAD);
2345 if (s != NULL && s[strlen(s)] == '\0')
2348 err = got_ref_resolve(&ref_id, repo, re->ref);
2351 if (strncmp(name, "tags/", 5) == 0) {
2352 err = got_object_open_as_tag(&tag, repo, ref_id);
2354 if (err->code != GOT_ERR_OBJ_TYPE) {
2358 /* Ref points at something other than a tag. */
2363 cmp = got_object_id_cmp(tag ?
2364 got_object_tag_get_object_id(tag) : ref_id, id);
2367 got_object_tag_close(tag);
2371 if (asprintf(refs_str, "%s%s%s", s ? s : "",
2372 s ? ", " : "", name) == -1) {
2373 err = got_error_from_errno("asprintf");
2384 static const struct got_error *
2385 format_author(wchar_t **wauthor, int *author_width, char *author, int limit,
2390 smallerthan = strchr(author, '<');
2391 if (smallerthan && smallerthan[1] != '\0')
2392 author = smallerthan + 1;
2393 author[strcspn(author, "@>")] = '\0';
2394 return format_line(wauthor, author_width, NULL, author, 0, limit,
2398 static const struct got_error *
2399 draw_commit(struct tog_view *view, struct got_commit_object *commit,
2400 struct got_object_id *id, const size_t date_display_cols,
2401 int author_display_cols)
2403 struct tog_log_view_state *s = &view->state.log;
2404 const struct got_error *err = NULL;
2405 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
2406 char *refs_str = NULL;
2407 char *logmsg0 = NULL, *logmsg = NULL;
2408 char *author = NULL;
2409 wchar_t *wlogmsg = NULL, *wauthor = NULL;
2410 int author_width, logmsg_width;
2411 size_t wrefstr_len = 0;
2412 char *newline, *line = NULL;
2413 int col, limit, scrollx;
2414 const int avail = view->ncols;
2416 time_t committer_time;
2417 struct tog_color *tc;
2418 struct got_reflist_head *refs;
2420 committer_time = got_object_commit_get_committer_time(commit);
2421 if (gmtime_r(&committer_time, &tm) == NULL)
2422 return got_error_from_errno("gmtime_r");
2423 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0)
2424 return got_error(GOT_ERR_NO_SPACE);
2426 if (avail <= date_display_cols)
2427 limit = MIN(sizeof(datebuf) - 1, avail);
2429 limit = MIN(date_display_cols, sizeof(datebuf) - 1);
2430 tc = get_color(&s->colors, TOG_COLOR_DATE);
2432 wattr_on(view->window,
2433 COLOR_PAIR(tc->colorpair), NULL);
2434 waddnstr(view->window, datebuf, limit);
2436 wattr_off(view->window,
2437 COLOR_PAIR(tc->colorpair), NULL);
2444 err = got_object_id_str(&id_str, id);
2447 tc = get_color(&s->colors, TOG_COLOR_COMMIT);
2449 wattr_on(view->window,
2450 COLOR_PAIR(tc->colorpair), NULL);
2451 wprintw(view->window, "%.8s ", id_str);
2453 wattr_off(view->window,
2454 COLOR_PAIR(tc->colorpair), NULL);
2461 if (s->use_committer)
2462 author = strdup(got_object_commit_get_committer(commit));
2464 author = strdup(got_object_commit_get_author(commit));
2465 if (author == NULL) {
2466 err = got_error_from_errno("strdup");
2469 err = format_author(&wauthor, &author_width, author, avail - col, col);
2472 tc = get_color(&s->colors, TOG_COLOR_AUTHOR);
2474 wattr_on(view->window,
2475 COLOR_PAIR(tc->colorpair), NULL);
2476 waddwstr(view->window, wauthor);
2477 col += author_width;
2478 while (col < avail && author_width < author_display_cols + 2) {
2479 waddch(view->window, ' ');
2484 wattr_off(view->window,
2485 COLOR_PAIR(tc->colorpair), NULL);
2489 err = got_object_commit_get_logmsg(&logmsg0, commit);
2493 while (*logmsg == '\n')
2495 newline = strchr(logmsg, '\n');
2499 /* Prepend reference labels to log message if possible .*/
2500 refs = got_reflist_object_id_map_lookup(tog_refs_idmap, id);
2501 err = build_refs_str(&refs_str, refs, id, s->repo);
2509 * The length of this wide-char sub-string will be
2510 * needed later for colorization.
2512 err = mbs2ws(&ws, &wrefstr_len, refs_str);
2517 wrefstr_len += 2; /* account for '[' and ']' */
2519 if (asprintf(&newlogmsg, "[%s] %s", refs_str, logmsg) == -1) {
2520 err = got_error_from_errno("asprintf");
2525 logmsg0 = newlogmsg;
2529 limit = avail - col;
2530 if (view->child && !view_is_hsplit_top(view) && limit > 0)
2531 limit--; /* for the border */
2532 err = format_line(&wlogmsg, &logmsg_width, &scrollx, logmsg, view->x,
2536 if (wrefstr_len > 0 && scrollx < wrefstr_len) {
2537 tc = get_color(&s->colors, TOG_COLOR_COMMIT);
2539 wattr_on(view->window,
2540 COLOR_PAIR(tc->colorpair), NULL);
2541 waddnwstr(view->window, &wlogmsg[scrollx],
2542 MIN(logmsg_width, wrefstr_len - scrollx));
2544 wattr_off(view->window,
2545 COLOR_PAIR(tc->colorpair), NULL);
2546 if (col + MIN(logmsg_width, wrefstr_len - scrollx) < avail)
2547 waddwstr(view->window, &wlogmsg[wrefstr_len]);
2549 waddwstr(view->window, &wlogmsg[scrollx]);
2550 col += MAX(logmsg_width, 0);
2551 while (col < avail) {
2552 waddch(view->window, ' ');
2565 static struct commit_queue_entry *
2566 alloc_commit_queue_entry(struct got_commit_object *commit,
2567 struct got_object_id *id)
2569 struct commit_queue_entry *entry;
2570 struct got_object_id *dup;
2572 entry = calloc(1, sizeof(*entry));
2576 dup = got_object_id_dup(id);
2583 entry->commit = commit;
2588 pop_commit(struct commit_queue *commits)
2590 struct commit_queue_entry *entry;
2592 entry = TAILQ_FIRST(&commits->head);
2593 TAILQ_REMOVE(&commits->head, entry, entry);
2594 got_object_commit_close(entry->commit);
2595 commits->ncommits--;
2601 free_commits(struct commit_queue *commits)
2603 while (!TAILQ_EMPTY(&commits->head))
2604 pop_commit(commits);
2607 static const struct got_error *
2608 match_commit(int *have_match, struct got_object_id *id,
2609 struct got_commit_object *commit, regex_t *regex)
2611 const struct got_error *err = NULL;
2612 regmatch_t regmatch;
2613 char *id_str = NULL, *logmsg = NULL;
2617 err = got_object_id_str(&id_str, id);
2621 err = got_object_commit_get_logmsg(&logmsg, commit);
2625 if (regexec(regex, got_object_commit_get_author(commit), 1,
2626 ®match, 0) == 0 ||
2627 regexec(regex, got_object_commit_get_committer(commit), 1,
2628 ®match, 0) == 0 ||
2629 regexec(regex, id_str, 1, ®match, 0) == 0 ||
2630 regexec(regex, logmsg, 1, ®match, 0) == 0)
2638 static const struct got_error *
2639 queue_commits(struct tog_log_thread_args *a)
2641 const struct got_error *err = NULL;
2644 * We keep all commits open throughout the lifetime of the log
2645 * view in order to avoid having to re-fetch commits from disk
2646 * while updating the display.
2649 struct got_object_id id;
2650 struct got_commit_object *commit;
2651 struct commit_queue_entry *entry;
2652 int limit_match = 0;
2655 err = got_commit_graph_iter_next(&id, a->graph, a->repo,
2660 err = got_object_open_as_commit(&commit, a->repo, &id);
2663 entry = alloc_commit_queue_entry(commit, &id);
2664 if (entry == NULL) {
2665 err = got_error_from_errno("alloc_commit_queue_entry");
2669 errcode = pthread_mutex_lock(&tog_mutex);
2671 err = got_error_set_errno(errcode,
2672 "pthread_mutex_lock");
2676 entry->idx = a->real_commits->ncommits;
2677 TAILQ_INSERT_TAIL(&a->real_commits->head, entry, entry);
2678 a->real_commits->ncommits++;
2681 err = match_commit(&limit_match, &id, commit,
2687 struct commit_queue_entry *matched;
2689 matched = alloc_commit_queue_entry(
2690 entry->commit, entry->id);
2691 if (matched == NULL) {
2692 err = got_error_from_errno(
2693 "alloc_commit_queue_entry");
2696 matched->commit = entry->commit;
2697 got_object_commit_retain(entry->commit);
2699 matched->idx = a->limit_commits->ncommits;
2700 TAILQ_INSERT_TAIL(&a->limit_commits->head,
2702 a->limit_commits->ncommits++;
2706 * This is how we signal log_thread() that we
2707 * have found a match, and that it should be
2708 * counted as a new entry for the view.
2710 a->limit_match = limit_match;
2713 if (*a->searching == TOG_SEARCH_FORWARD &&
2714 !*a->search_next_done) {
2716 err = match_commit(&have_match, &id, commit, a->regex);
2721 if (limit_match && have_match)
2722 *a->search_next_done =
2723 TOG_SEARCH_HAVE_MORE;
2724 } else if (have_match)
2725 *a->search_next_done = TOG_SEARCH_HAVE_MORE;
2728 errcode = pthread_mutex_unlock(&tog_mutex);
2729 if (errcode && err == NULL)
2730 err = got_error_set_errno(errcode,
2731 "pthread_mutex_unlock");
2734 } while (*a->searching == TOG_SEARCH_FORWARD && !*a->search_next_done);
2740 select_commit(struct tog_log_view_state *s)
2742 struct commit_queue_entry *entry;
2745 entry = s->first_displayed_entry;
2747 if (ncommits == s->selected) {
2748 s->selected_entry = entry;
2751 entry = TAILQ_NEXT(entry, entry);
2756 static const struct got_error *
2757 draw_commits(struct tog_view *view)
2759 const struct got_error *err = NULL;
2760 struct tog_log_view_state *s = &view->state.log;
2761 struct commit_queue_entry *entry = s->selected_entry;
2762 int limit = view->nlines;
2764 int ncommits, author_cols = 4;
2765 char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
2766 char *refs_str = NULL;
2768 struct tog_color *tc;
2769 static const size_t date_display_cols = 12;
2771 if (view_is_hsplit_top(view))
2772 --limit; /* account for border */
2774 if (s->selected_entry &&
2775 !(view->searching && view->search_next_done == 0)) {
2776 struct got_reflist_head *refs;
2777 err = got_object_id_str(&id_str, s->selected_entry->id);
2780 refs = got_reflist_object_id_map_lookup(tog_refs_idmap,
2781 s->selected_entry->id);
2782 err = build_refs_str(&refs_str, refs, s->selected_entry->id,
2788 if (s->thread_args.commits_needed == 0 && !using_mock_io)
2789 halfdelay(10); /* disable fast refresh */
2791 if (s->thread_args.commits_needed > 0 || s->thread_args.load_all) {
2792 if (asprintf(&ncommits_str, " [%d/%d] %s",
2793 entry ? entry->idx + 1 : 0, s->commits->ncommits,
2794 (view->searching && !view->search_next_done) ?
2795 "searching..." : "loading...") == -1) {
2796 err = got_error_from_errno("asprintf");
2800 const char *search_str = NULL;
2801 const char *limit_str = NULL;
2803 if (view->searching) {
2804 if (view->search_next_done == TOG_SEARCH_NO_MORE)
2805 search_str = "no more matches";
2806 else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
2807 search_str = "no matches found";
2808 else if (!view->search_next_done)
2809 search_str = "searching...";
2812 if (s->limit_view && s->commits->ncommits == 0)
2813 limit_str = "no matches found";
2815 if (asprintf(&ncommits_str, " [%d/%d] %s %s",
2816 entry ? entry->idx + 1 : 0, s->commits->ncommits,
2817 search_str ? search_str : (refs_str ? refs_str : ""),
2818 limit_str ? limit_str : "") == -1) {
2819 err = got_error_from_errno("asprintf");
2824 if (s->in_repo_path && strcmp(s->in_repo_path, "/") != 0) {
2825 if (asprintf(&header, "commit %s %s%s", id_str ? id_str :
2826 "........................................",
2827 s->in_repo_path, ncommits_str) == -1) {
2828 err = got_error_from_errno("asprintf");
2832 } else if (asprintf(&header, "commit %s%s",
2833 id_str ? id_str : "........................................",
2834 ncommits_str) == -1) {
2835 err = got_error_from_errno("asprintf");
2839 err = format_line(&wline, &width, NULL, header, 0, view->ncols, 0, 0);
2843 werase(view->window);
2845 if (view_needs_focus_indication(view))
2846 wstandout(view->window);
2847 tc = get_color(&s->colors, TOG_COLOR_COMMIT);
2849 wattr_on(view->window, COLOR_PAIR(tc->colorpair), NULL);
2850 waddwstr(view->window, wline);
2851 while (width < view->ncols) {
2852 waddch(view->window, ' ');
2856 wattr_off(view->window, COLOR_PAIR(tc->colorpair), NULL);
2857 if (view_needs_focus_indication(view))
2858 wstandend(view->window);
2863 /* Grow author column size if necessary, and set view->maxx. */
2864 entry = s->first_displayed_entry;
2868 struct got_commit_object *c = entry->commit;
2869 char *author, *eol, *msg, *msg0;
2870 wchar_t *wauthor, *wmsg;
2872 if (ncommits >= limit - 1)
2874 if (s->use_committer)
2875 author = strdup(got_object_commit_get_committer(c));
2877 author = strdup(got_object_commit_get_author(c));
2878 if (author == NULL) {
2879 err = got_error_from_errno("strdup");
2882 err = format_author(&wauthor, &width, author, COLS,
2884 if (author_cols < width)
2885 author_cols = width;
2890 err = got_object_commit_get_logmsg(&msg0, c);
2894 while (*msg == '\n')
2896 if ((eol = strchr(msg, '\n')))
2898 err = format_line(&wmsg, &width, NULL, msg, 0, INT_MAX,
2899 date_display_cols + author_cols, 0);
2902 view->maxx = MAX(view->maxx, width);
2906 entry = TAILQ_NEXT(entry, entry);
2909 entry = s->first_displayed_entry;
2910 s->last_displayed_entry = s->first_displayed_entry;
2913 if (ncommits >= limit - 1)
2915 if (ncommits == s->selected)
2916 wstandout(view->window);
2917 err = draw_commit(view, entry->commit, entry->id,
2918 date_display_cols, author_cols);
2919 if (ncommits == s->selected)
2920 wstandend(view->window);
2924 s->last_displayed_entry = entry;
2925 entry = TAILQ_NEXT(entry, entry);
2938 log_scroll_up(struct tog_log_view_state *s, int maxscroll)
2940 struct commit_queue_entry *entry;
2943 entry = TAILQ_FIRST(&s->commits->head);
2944 if (s->first_displayed_entry == entry)
2947 entry = s->first_displayed_entry;
2948 while (entry && nscrolled < maxscroll) {
2949 entry = TAILQ_PREV(entry, commit_queue_head, entry);
2951 s->first_displayed_entry = entry;
2957 static const struct got_error *
2958 trigger_log_thread(struct tog_view *view, int wait)
2960 struct tog_log_thread_args *ta = &view->state.log.thread_args;
2964 halfdelay(1); /* fast refresh while loading commits */
2966 while (!ta->log_complete && !tog_thread_error &&
2967 (ta->commits_needed > 0 || ta->load_all)) {
2968 /* Wake the log thread. */
2969 errcode = pthread_cond_signal(&ta->need_commits);
2971 return got_error_set_errno(errcode,
2972 "pthread_cond_signal");
2975 * The mutex will be released while the view loop waits
2976 * in wgetch(), at which time the log thread will run.
2981 /* Display progress update in log view. */
2982 show_log_view(view);
2986 /* Wait right here while next commit is being loaded. */
2987 errcode = pthread_cond_wait(&ta->commit_loaded, &tog_mutex);
2989 return got_error_set_errno(errcode,
2990 "pthread_cond_wait");
2992 /* Display progress update in log view. */
2993 show_log_view(view);
3001 static const struct got_error *
3002 request_log_commits(struct tog_view *view)
3004 struct tog_log_view_state *state = &view->state.log;
3005 const struct got_error *err = NULL;
3007 if (state->thread_args.log_complete)
3010 state->thread_args.commits_needed += view->nscrolled;
3011 err = trigger_log_thread(view, 1);
3012 view->nscrolled = 0;
3017 static const struct got_error *
3018 log_scroll_down(struct tog_view *view, int maxscroll)
3020 struct tog_log_view_state *s = &view->state.log;
3021 const struct got_error *err = NULL;
3022 struct commit_queue_entry *pentry;
3023 int nscrolled = 0, ncommits_needed;
3025 if (s->last_displayed_entry == NULL)
3028 ncommits_needed = s->last_displayed_entry->idx + 1 + maxscroll;
3029 if (s->commits->ncommits < ncommits_needed &&
3030 !s->thread_args.log_complete) {
3032 * Ask the log thread for required amount of commits.
3034 s->thread_args.commits_needed +=
3035 ncommits_needed - s->commits->ncommits;
3036 err = trigger_log_thread(view, 1);
3042 pentry = TAILQ_NEXT(s->last_displayed_entry, entry);
3043 if (pentry == NULL && view->mode != TOG_VIEW_SPLIT_HRZN)
3046 s->last_displayed_entry = pentry ?
3047 pentry : s->last_displayed_entry;
3049 pentry = TAILQ_NEXT(s->first_displayed_entry, entry);
3052 s->first_displayed_entry = pentry;
3053 } while (++nscrolled < maxscroll);
3055 if (view->mode == TOG_VIEW_SPLIT_HRZN && !s->thread_args.log_complete)
3056 view->nscrolled += nscrolled;
3058 view->nscrolled = 0;
3063 static const struct got_error *
3064 open_diff_view_for_commit(struct tog_view **new_view, int begin_y, int begin_x,
3065 struct got_commit_object *commit, struct got_object_id *commit_id,
3066 struct tog_view *log_view, struct got_repository *repo)
3068 const struct got_error *err;
3069 struct got_object_qid *parent_id;
3070 struct tog_view *diff_view;
3072 diff_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_DIFF);
3073 if (diff_view == NULL)
3074 return got_error_from_errno("view_open");
3076 parent_id = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3077 err = open_diff_view(diff_view, parent_id ? &parent_id->id : NULL,
3078 commit_id, NULL, NULL, 3, 0, 0, log_view, repo);
3080 *new_view = diff_view;
3084 static const struct got_error *
3085 tree_view_visit_subtree(struct tog_tree_view_state *s,
3086 struct got_tree_object *subtree)
3088 struct tog_parent_tree *parent;
3090 parent = calloc(1, sizeof(*parent));
3092 return got_error_from_errno("calloc");
3094 parent->tree = s->tree;
3095 parent->first_displayed_entry = s->first_displayed_entry;
3096 parent->selected_entry = s->selected_entry;
3097 parent->selected = s->selected;
3098 TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3101 s->first_displayed_entry = NULL;
3105 static const struct got_error *
3106 tree_view_walk_path(struct tog_tree_view_state *s,
3107 struct got_commit_object *commit, const char *path)
3109 const struct got_error *err = NULL;
3110 struct got_tree_object *tree = NULL;
3112 char *slash, *subpath = NULL;
3114 /* Walk the path and open corresponding tree objects. */
3117 struct got_tree_entry *te;
3118 struct got_object_id *tree_id;
3124 /* Ensure the correct subtree entry is selected. */
3125 slash = strchr(p, '/');
3127 te_name = strdup(p);
3129 te_name = strndup(p, slash - p);
3130 if (te_name == NULL) {
3131 err = got_error_from_errno("strndup");
3134 te = got_object_tree_find_entry(s->tree, te_name);
3136 err = got_error_path(te_name, GOT_ERR_NO_TREE_ENTRY);
3141 s->first_displayed_entry = s->selected_entry = te;
3143 if (!S_ISDIR(got_tree_entry_get_mode(s->selected_entry)))
3144 break; /* jump to this file's entry */
3146 slash = strchr(p, '/');
3148 subpath = strndup(path, slash - path);
3150 subpath = strdup(path);
3151 if (subpath == NULL) {
3152 err = got_error_from_errno("strdup");
3156 err = got_object_id_by_path(&tree_id, s->repo, commit,
3161 err = got_object_open_as_tree(&tree, s->repo, tree_id);
3166 err = tree_view_visit_subtree(s, tree);
3168 got_object_tree_close(tree);
3182 static const struct got_error *
3183 browse_commit_tree(struct tog_view **new_view, int begin_y, int begin_x,
3184 struct commit_queue_entry *entry, const char *path,
3185 const char *head_ref_name, struct got_repository *repo)
3187 const struct got_error *err = NULL;
3188 struct tog_tree_view_state *s;
3189 struct tog_view *tree_view;
3191 tree_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_TREE);
3192 if (tree_view == NULL)
3193 return got_error_from_errno("view_open");
3195 err = open_tree_view(tree_view, entry->id, head_ref_name, repo);
3198 s = &tree_view->state.tree;
3200 *new_view = tree_view;
3202 if (got_path_is_root_dir(path))
3205 return tree_view_walk_path(s, entry->commit, path);
3208 static const struct got_error *
3209 block_signals_used_by_main_thread(void)
3214 if (sigemptyset(&sigset) == -1)
3215 return got_error_from_errno("sigemptyset");
3217 /* tog handles SIGWINCH, SIGCONT, SIGINT, SIGTERM */
3218 if (sigaddset(&sigset, SIGWINCH) == -1)
3219 return got_error_from_errno("sigaddset");
3220 if (sigaddset(&sigset, SIGCONT) == -1)
3221 return got_error_from_errno("sigaddset");
3222 if (sigaddset(&sigset, SIGINT) == -1)
3223 return got_error_from_errno("sigaddset");
3224 if (sigaddset(&sigset, SIGTERM) == -1)
3225 return got_error_from_errno("sigaddset");
3227 /* ncurses handles SIGTSTP */
3228 if (sigaddset(&sigset, SIGTSTP) == -1)
3229 return got_error_from_errno("sigaddset");
3231 errcode = pthread_sigmask(SIG_BLOCK, &sigset, NULL);
3233 return got_error_set_errno(errcode, "pthread_sigmask");
3239 log_thread(void *arg)
3241 const struct got_error *err = NULL;
3243 struct tog_log_thread_args *a = arg;
3247 * Sync startup with main thread such that we begin our
3248 * work once view_input() has released the mutex.
3250 errcode = pthread_mutex_lock(&tog_mutex);
3252 err = got_error_set_errno(errcode, "pthread_mutex_lock");
3256 err = block_signals_used_by_main_thread();
3258 pthread_mutex_unlock(&tog_mutex);
3262 while (!done && !err && !tog_fatal_signal_received()) {
3263 errcode = pthread_mutex_unlock(&tog_mutex);
3265 err = got_error_set_errno(errcode,
3266 "pthread_mutex_unlock");
3269 err = queue_commits(a);
3271 if (err->code != GOT_ERR_ITER_COMPLETED)
3275 } else if (a->commits_needed > 0 && !a->load_all) {
3278 a->commits_needed--;
3280 a->commits_needed--;
3283 errcode = pthread_mutex_lock(&tog_mutex);
3285 err = got_error_set_errno(errcode,
3286 "pthread_mutex_lock");
3288 } else if (*a->quit)
3290 else if (*a->limiting && *a->first_displayed_entry == NULL) {
3291 *a->first_displayed_entry =
3292 TAILQ_FIRST(&a->limit_commits->head);
3293 *a->selected_entry = *a->first_displayed_entry;
3294 } else if (*a->first_displayed_entry == NULL) {
3295 *a->first_displayed_entry =
3296 TAILQ_FIRST(&a->real_commits->head);
3297 *a->selected_entry = *a->first_displayed_entry;
3300 errcode = pthread_cond_signal(&a->commit_loaded);
3302 err = got_error_set_errno(errcode,
3303 "pthread_cond_signal");
3304 pthread_mutex_unlock(&tog_mutex);
3309 a->commits_needed = 0;
3311 if (a->commits_needed == 0 && !a->load_all) {
3312 errcode = pthread_cond_wait(&a->need_commits,
3315 err = got_error_set_errno(errcode,
3316 "pthread_cond_wait");
3317 pthread_mutex_unlock(&tog_mutex);
3325 a->log_complete = 1;
3326 errcode = pthread_mutex_unlock(&tog_mutex);
3328 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
3331 tog_thread_error = 1;
3332 pthread_cond_signal(&a->commit_loaded);
3337 static const struct got_error *
3338 stop_log_thread(struct tog_log_view_state *s)
3340 const struct got_error *err = NULL, *thread_err = NULL;
3345 errcode = pthread_cond_signal(&s->thread_args.need_commits);
3347 return got_error_set_errno(errcode,
3348 "pthread_cond_signal");
3349 errcode = pthread_mutex_unlock(&tog_mutex);
3351 return got_error_set_errno(errcode,
3352 "pthread_mutex_unlock");
3353 errcode = pthread_join(s->thread, (void **)&thread_err);
3355 return got_error_set_errno(errcode, "pthread_join");
3356 errcode = pthread_mutex_lock(&tog_mutex);
3358 return got_error_set_errno(errcode,
3359 "pthread_mutex_lock");
3363 if (s->thread_args.repo) {
3364 err = got_repo_close(s->thread_args.repo);
3365 s->thread_args.repo = NULL;
3368 if (s->thread_args.pack_fds) {
3369 const struct got_error *pack_err =
3370 got_repo_pack_fds_close(s->thread_args.pack_fds);
3373 s->thread_args.pack_fds = NULL;
3376 if (s->thread_args.graph) {
3377 got_commit_graph_close(s->thread_args.graph);
3378 s->thread_args.graph = NULL;
3381 return err ? err : thread_err;
3384 static const struct got_error *
3385 close_log_view(struct tog_view *view)
3387 const struct got_error *err = NULL;
3388 struct tog_log_view_state *s = &view->state.log;
3391 err = stop_log_thread(s);
3393 errcode = pthread_cond_destroy(&s->thread_args.need_commits);
3394 if (errcode && err == NULL)
3395 err = got_error_set_errno(errcode, "pthread_cond_destroy");
3397 errcode = pthread_cond_destroy(&s->thread_args.commit_loaded);
3398 if (errcode && err == NULL)
3399 err = got_error_set_errno(errcode, "pthread_cond_destroy");
3401 free_commits(&s->limit_commits);
3402 free_commits(&s->real_commits);
3403 free(s->in_repo_path);
3404 s->in_repo_path = NULL;
3407 free(s->head_ref_name);
3408 s->head_ref_name = NULL;
3413 * We use two queues to implement the limit feature: first consists of
3414 * commits matching the current limit_regex; second is the real queue
3415 * of all known commits (real_commits). When the user starts limiting,
3416 * we swap queues such that all movement and displaying functionality
3417 * works with very slight change.
3419 static const struct got_error *
3420 limit_log_view(struct tog_view *view)
3422 struct tog_log_view_state *s = &view->state.log;
3423 struct commit_queue_entry *entry;
3424 struct tog_view *v = view;
3425 const struct got_error *err = NULL;
3429 if (view_is_hsplit_top(view))
3431 else if (view->mode == TOG_VIEW_SPLIT_VERT && view->parent)
3434 /* Get the pattern */
3435 wmove(v->window, v->nlines - 1, 0);
3436 wclrtoeol(v->window);
3437 mvwaddstr(v->window, v->nlines - 1, 0, "&/");
3438 nodelay(v->window, FALSE);
3441 ret = wgetnstr(v->window, pattern, sizeof(pattern));
3444 nodelay(v->window, TRUE);
3448 if (*pattern == '\0') {
3450 * Safety measure for the situation where the user
3451 * resets limit without previously limiting anything.
3457 * User could have pressed Ctrl+L, which refreshed the
3458 * commit queues, it means we can't save previously
3459 * (before limit took place) displayed entries,
3460 * because they would point to already free'ed memory,
3461 * so we are forced to always select first entry of
3464 s->commits = &s->real_commits;
3465 s->first_displayed_entry = TAILQ_FIRST(&s->real_commits.head);
3466 s->selected_entry = s->first_displayed_entry;
3473 if (regcomp(&s->limit_regex, pattern, REG_EXTENDED | REG_NEWLINE))
3478 /* Clear the screen while loading limit view */
3479 s->first_displayed_entry = NULL;
3480 s->last_displayed_entry = NULL;
3481 s->selected_entry = NULL;
3482 s->commits = &s->limit_commits;
3484 /* Prepare limit queue for new search */
3485 free_commits(&s->limit_commits);
3486 s->limit_commits.ncommits = 0;
3488 /* First process commits, which are in queue already */
3489 TAILQ_FOREACH(entry, &s->real_commits.head, entry) {
3492 err = match_commit(&have_match, entry->id,
3493 entry->commit, &s->limit_regex);
3498 struct commit_queue_entry *matched;
3500 matched = alloc_commit_queue_entry(entry->commit,
3502 if (matched == NULL) {
3503 err = got_error_from_errno(
3504 "alloc_commit_queue_entry");
3507 matched->commit = entry->commit;
3508 got_object_commit_retain(entry->commit);
3510 matched->idx = s->limit_commits.ncommits;
3511 TAILQ_INSERT_TAIL(&s->limit_commits.head,
3513 s->limit_commits.ncommits++;
3517 /* Second process all the commits, until we fill the screen */
3518 if (s->limit_commits.ncommits < view->nlines - 1 &&
3519 !s->thread_args.log_complete) {
3520 s->thread_args.commits_needed +=
3521 view->nlines - s->limit_commits.ncommits - 1;
3522 err = trigger_log_thread(view, 1);
3527 s->first_displayed_entry = TAILQ_FIRST(&s->commits->head);
3528 s->selected_entry = TAILQ_FIRST(&s->commits->head);
3534 static const struct got_error *
3535 search_start_log_view(struct tog_view *view)
3537 struct tog_log_view_state *s = &view->state.log;
3539 s->matched_entry = NULL;
3540 s->search_entry = NULL;
3544 static const struct got_error *
3545 search_next_log_view(struct tog_view *view)
3547 const struct got_error *err = NULL;
3548 struct tog_log_view_state *s = &view->state.log;
3549 struct commit_queue_entry *entry;
3551 /* Display progress update in log view. */
3552 show_log_view(view);
3556 if (s->search_entry) {
3558 errcode = pthread_mutex_unlock(&tog_mutex);
3560 return got_error_set_errno(errcode,
3561 "pthread_mutex_unlock");
3562 ch = wgetch(view->window);
3563 errcode = pthread_mutex_lock(&tog_mutex);
3565 return got_error_set_errno(errcode,
3566 "pthread_mutex_lock");
3567 if (ch == CTRL('g') || ch == KEY_BACKSPACE) {
3568 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3571 if (view->searching == TOG_SEARCH_FORWARD)
3572 entry = TAILQ_NEXT(s->search_entry, entry);
3574 entry = TAILQ_PREV(s->search_entry,
3575 commit_queue_head, entry);
3576 } else if (s->matched_entry) {
3578 * If the user has moved the cursor after we hit a match,
3579 * the position from where we should continue searching
3580 * might have changed.
3582 if (view->searching == TOG_SEARCH_FORWARD)
3583 entry = TAILQ_NEXT(s->selected_entry, entry);
3585 entry = TAILQ_PREV(s->selected_entry, commit_queue_head,
3588 entry = s->selected_entry;
3594 if (entry == NULL) {
3595 if (s->thread_args.log_complete ||
3596 view->searching == TOG_SEARCH_BACKWARD) {
3597 view->search_next_done =
3598 (s->matched_entry == NULL ?
3599 TOG_SEARCH_HAVE_NONE : TOG_SEARCH_NO_MORE);
3600 s->search_entry = NULL;
3604 * Poke the log thread for more commits and return,
3605 * allowing the main loop to make progress. Search
3606 * will resume at s->search_entry once we come back.
3608 s->thread_args.commits_needed++;
3609 return trigger_log_thread(view, 0);
3612 err = match_commit(&have_match, entry->id, entry->commit,
3617 view->search_next_done = TOG_SEARCH_HAVE_MORE;
3618 s->matched_entry = entry;
3622 s->search_entry = entry;
3623 if (view->searching == TOG_SEARCH_FORWARD)
3624 entry = TAILQ_NEXT(entry, entry);
3626 entry = TAILQ_PREV(entry, commit_queue_head, entry);
3629 if (s->matched_entry) {
3630 int cur = s->selected_entry->idx;
3631 while (cur < s->matched_entry->idx) {
3632 err = input_log_view(NULL, view, KEY_DOWN);
3637 while (cur > s->matched_entry->idx) {
3638 err = input_log_view(NULL, view, KEY_UP);
3645 s->search_entry = NULL;
3650 static const struct got_error *
3651 open_log_view(struct tog_view *view, struct got_object_id *start_id,
3652 struct got_repository *repo, const char *head_ref_name,
3653 const char *in_repo_path, int log_branches)
3655 const struct got_error *err = NULL;
3656 struct tog_log_view_state *s = &view->state.log;
3657 struct got_repository *thread_repo = NULL;
3658 struct got_commit_graph *thread_graph = NULL;
3661 if (in_repo_path != s->in_repo_path) {
3662 free(s->in_repo_path);
3663 s->in_repo_path = strdup(in_repo_path);
3664 if (s->in_repo_path == NULL) {
3665 err = got_error_from_errno("strdup");
3670 /* The commit queue only contains commits being displayed. */
3671 TAILQ_INIT(&s->real_commits.head);
3672 s->real_commits.ncommits = 0;
3673 s->commits = &s->real_commits;
3675 TAILQ_INIT(&s->limit_commits.head);
3677 s->limit_commits.ncommits = 0;
3680 if (head_ref_name) {
3681 s->head_ref_name = strdup(head_ref_name);
3682 if (s->head_ref_name == NULL) {
3683 err = got_error_from_errno("strdup");
3687 s->start_id = got_object_id_dup(start_id);
3688 if (s->start_id == NULL) {
3689 err = got_error_from_errno("got_object_id_dup");
3692 s->log_branches = log_branches;
3693 s->use_committer = 1;
3695 STAILQ_INIT(&s->colors);
3696 if (has_colors() && getenv("TOG_COLORS") != NULL) {
3697 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
3698 get_color_value("TOG_COLOR_COMMIT"));
3701 err = add_color(&s->colors, "^$", TOG_COLOR_AUTHOR,
3702 get_color_value("TOG_COLOR_AUTHOR"));
3704 free_colors(&s->colors);
3707 err = add_color(&s->colors, "^$", TOG_COLOR_DATE,
3708 get_color_value("TOG_COLOR_DATE"));
3710 free_colors(&s->colors);
3715 view->show = show_log_view;
3716 view->input = input_log_view;
3717 view->resize = resize_log_view;
3718 view->close = close_log_view;
3719 view->search_start = search_start_log_view;
3720 view->search_next = search_next_log_view;
3722 if (s->thread_args.pack_fds == NULL) {
3723 err = got_repo_pack_fds_open(&s->thread_args.pack_fds);
3727 err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL,
3728 s->thread_args.pack_fds);
3731 err = got_commit_graph_open(&thread_graph, s->in_repo_path,
3735 err = got_commit_graph_iter_start(thread_graph, s->start_id,
3736 s->repo, NULL, NULL);
3740 errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
3742 err = got_error_set_errno(errcode, "pthread_cond_init");
3745 errcode = pthread_cond_init(&s->thread_args.commit_loaded, NULL);
3747 err = got_error_set_errno(errcode, "pthread_cond_init");
3751 s->thread_args.commits_needed = view->nlines;
3752 s->thread_args.graph = thread_graph;
3753 s->thread_args.real_commits = &s->real_commits;
3754 s->thread_args.limit_commits = &s->limit_commits;
3755 s->thread_args.in_repo_path = s->in_repo_path;
3756 s->thread_args.start_id = s->start_id;
3757 s->thread_args.repo = thread_repo;
3758 s->thread_args.log_complete = 0;
3759 s->thread_args.quit = &s->quit;
3760 s->thread_args.first_displayed_entry = &s->first_displayed_entry;
3761 s->thread_args.selected_entry = &s->selected_entry;
3762 s->thread_args.searching = &view->searching;
3763 s->thread_args.search_next_done = &view->search_next_done;
3764 s->thread_args.regex = &view->regex;
3765 s->thread_args.limiting = &s->limit_view;
3766 s->thread_args.limit_regex = &s->limit_regex;
3767 s->thread_args.limit_commits = &s->limit_commits;
3770 if (view->close == NULL)
3771 close_log_view(view);
3777 static const struct got_error *
3778 show_log_view(struct tog_view *view)
3780 const struct got_error *err;
3781 struct tog_log_view_state *s = &view->state.log;
3783 if (s->thread == NULL) {
3784 int errcode = pthread_create(&s->thread, NULL, log_thread,
3787 return got_error_set_errno(errcode, "pthread_create");
3788 if (s->thread_args.commits_needed > 0) {
3789 err = trigger_log_thread(view, 1);
3795 return draw_commits(view);
3799 log_move_cursor_up(struct tog_view *view, int page, int home)
3801 struct tog_log_view_state *s = &view->state.log;
3803 if (s->first_displayed_entry == NULL)
3805 if (s->selected_entry->idx == 0)
3808 if ((page && TAILQ_FIRST(&s->commits->head) == s->first_displayed_entry)
3810 s->selected = home ? 0 : MAX(0, s->selected - page - 1);
3812 if (!page && !home && s->selected > 0)
3815 log_scroll_up(s, home ? s->commits->ncommits : MAX(page, 1));
3821 static const struct got_error *
3822 log_move_cursor_down(struct tog_view *view, int page)
3824 struct tog_log_view_state *s = &view->state.log;
3825 const struct got_error *err = NULL;
3826 int eos = view->nlines - 2;
3828 if (s->first_displayed_entry == NULL)
3831 if (s->thread_args.log_complete &&
3832 s->selected_entry->idx >= s->commits->ncommits - 1)
3835 if (view_is_hsplit_top(view))
3836 --eos; /* border consumes the last line */
3839 if (s->selected < MIN(eos, s->commits->ncommits - 1))
3842 err = log_scroll_down(view, 1);
3843 } else if (s->thread_args.load_all && s->thread_args.log_complete) {
3844 struct commit_queue_entry *entry;
3848 entry = TAILQ_LAST(&s->commits->head, commit_queue_head);
3849 s->last_displayed_entry = entry;
3850 for (n = 0; n <= eos; n++) {
3853 s->first_displayed_entry = entry;
3854 entry = TAILQ_PREV(entry, commit_queue_head, entry);
3857 s->selected = n - 1;
3859 if (s->last_displayed_entry->idx == s->commits->ncommits - 1 &&
3860 s->thread_args.log_complete)
3861 s->selected += MIN(page,
3862 s->commits->ncommits - s->selected_entry->idx - 1);
3864 err = log_scroll_down(view, page);
3870 * We might necessarily overshoot in horizontal
3871 * splits; if so, select the last displayed commit.
3873 if (s->first_displayed_entry && s->last_displayed_entry) {
3874 s->selected = MIN(s->selected,
3875 s->last_displayed_entry->idx -
3876 s->first_displayed_entry->idx);
3881 if (s->thread_args.log_complete &&
3882 s->selected_entry->idx == s->commits->ncommits - 1)
3889 view_get_split(struct tog_view *view, int *y, int *x)
3894 if (view->mode == TOG_VIEW_SPLIT_HRZN) {
3895 if (view->child && view->child->resized_y)
3896 *y = view->child->resized_y;
3897 else if (view->resized_y)
3898 *y = view->resized_y;
3900 *y = view_split_begin_y(view->lines);
3901 } else if (view->mode == TOG_VIEW_SPLIT_VERT) {
3902 if (view->child && view->child->resized_x)
3903 *x = view->child->resized_x;
3904 else if (view->resized_x)
3905 *x = view->resized_x;
3907 *x = view_split_begin_x(view->begin_x);
3911 /* Split view horizontally at y and offset view->state->selected line. */
3912 static const struct got_error *
3913 view_init_hsplit(struct tog_view *view, int y)
3915 const struct got_error *err = NULL;
3919 err = view_resize(view);
3923 err = offset_selection_down(view);
3928 static const struct got_error *
3929 log_goto_line(struct tog_view *view, int nlines)
3931 const struct got_error *err = NULL;
3932 struct tog_log_view_state *s = &view->state.log;
3933 int g, idx = s->selected_entry->idx;
3935 if (s->first_displayed_entry == NULL || s->last_displayed_entry == NULL)
3941 if (g >= s->first_displayed_entry->idx + 1 &&
3942 g <= s->last_displayed_entry->idx + 1 &&
3943 g - s->first_displayed_entry->idx - 1 < nlines) {
3944 s->selected = g - s->first_displayed_entry->idx - 1;
3950 err = log_move_cursor_down(view, g - idx - 1);
3951 if (!err && g > s->selected_entry->idx + 1)
3952 err = log_move_cursor_down(view,
3953 g - s->first_displayed_entry->idx - 1);
3956 } else if (idx + 1 > g)
3957 log_move_cursor_up(view, idx - g + 1, 0);
3959 if (g < nlines && s->first_displayed_entry->idx == 0)
3960 s->selected = g - 1;
3968 horizontal_scroll_input(struct tog_view *view, int ch)
3974 view->x -= MIN(view->x, 2);
3980 if (view->x + view->ncols / 2 < view->maxx)
3989 view->x = MAX(view->maxx - view->ncols / 2, 0);
3997 static const struct got_error *
3998 input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
4000 const struct got_error *err = NULL;
4001 struct tog_log_view_state *s = &view->state.log;
4004 if (s->thread_args.load_all) {
4005 if (ch == CTRL('g') || ch == KEY_BACKSPACE)
4006 s->thread_args.load_all = 0;
4007 else if (s->thread_args.log_complete) {
4008 err = log_move_cursor_down(view, s->commits->ncommits);
4009 s->thread_args.load_all = 0;
4015 eos = nscroll = view->nlines - 1;
4016 if (view_is_hsplit_top(view))
4020 return log_goto_line(view, eos);
4024 err = limit_log_view(view);
4035 horizontal_scroll_input(view, ch);
4042 log_move_cursor_up(view, 0, 0);
4047 log_move_cursor_up(view, 0, 1);
4057 log_move_cursor_up(view, nscroll, 0);
4064 err = log_move_cursor_down(view, 0);
4067 s->use_committer = !s->use_committer;
4068 view->action = s->use_committer ?
4069 "show committer" : "show commit author";
4074 /* We don't know yet how many commits, so we're forced to
4075 * traverse them all. */
4077 s->thread_args.load_all = 1;
4078 if (!s->thread_args.log_complete)
4079 return trigger_log_thread(view, 0);
4080 err = log_move_cursor_down(view, s->commits->ncommits);
4081 s->thread_args.load_all = 0;
4092 err = log_move_cursor_down(view, nscroll);
4095 if (s->selected > view->nlines - 2)
4096 s->selected = view->nlines - 2;
4097 if (s->selected > s->commits->ncommits - 1)
4098 s->selected = s->commits->ncommits - 1;
4100 if (s->commits->ncommits < view->nlines - 1 &&
4101 !s->thread_args.log_complete) {
4102 s->thread_args.commits_needed += (view->nlines - 1) -
4103 s->commits->ncommits;
4104 err = trigger_log_thread(view, 1);
4110 if (s->selected_entry == NULL)
4112 err = view_request_new(new_view, view, TOG_VIEW_DIFF);
4116 if (s->selected_entry == NULL)
4118 err = view_request_new(new_view, view, TOG_VIEW_TREE);
4124 if (ch == KEY_BACKSPACE &&
4125 got_path_is_root_dir(s->in_repo_path))
4127 err = stop_log_thread(s);
4130 if (ch == KEY_BACKSPACE) {
4132 err = got_path_dirname(&parent_path, s->in_repo_path);
4135 free(s->in_repo_path);
4136 s->in_repo_path = parent_path;
4137 s->thread_args.in_repo_path = s->in_repo_path;
4138 } else if (ch == CTRL('l')) {
4139 struct got_object_id *start_id;
4140 err = got_repo_match_object_id(&start_id, NULL,
4141 s->head_ref_name ? s->head_ref_name : GOT_REF_HEAD,
4142 GOT_OBJ_TYPE_COMMIT, &tog_refs, s->repo);
4144 if (s->head_ref_name == NULL ||
4145 err->code != GOT_ERR_NOT_REF)
4147 /* Try to cope with deleted references. */
4148 free(s->head_ref_name);
4149 s->head_ref_name = NULL;
4150 err = got_repo_match_object_id(&start_id,
4151 NULL, GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT,
4152 &tog_refs, s->repo);
4157 s->start_id = start_id;
4158 s->thread_args.start_id = s->start_id;
4160 s->log_branches = !s->log_branches;
4162 if (s->thread_args.pack_fds == NULL) {
4163 err = got_repo_pack_fds_open(&s->thread_args.pack_fds);
4167 err = got_repo_open(&s->thread_args.repo,
4168 got_repo_get_path(s->repo), NULL,
4169 s->thread_args.pack_fds);
4173 err = tog_load_refs(s->repo, 0);
4176 err = got_commit_graph_open(&s->thread_args.graph,
4177 s->in_repo_path, !s->log_branches);
4180 err = got_commit_graph_iter_start(s->thread_args.graph,
4181 s->start_id, s->repo, NULL, NULL);
4184 free_commits(&s->real_commits);
4185 free_commits(&s->limit_commits);
4186 s->first_displayed_entry = NULL;
4187 s->last_displayed_entry = NULL;
4188 s->selected_entry = NULL;
4190 s->thread_args.log_complete = 0;
4192 s->thread_args.commits_needed = view->lines;
4193 s->matched_entry = NULL;
4194 s->search_entry = NULL;
4199 err = view_request_new(new_view, view, TOG_VIEW_REF);
4209 static const struct got_error *
4210 apply_unveil(const char *repo_path, const char *worktree_path)
4212 const struct got_error *error;
4215 if (unveil("gmon.out", "rwc") != 0)
4216 return got_error_from_errno2("unveil", "gmon.out");
4218 if (repo_path && unveil(repo_path, "r") != 0)
4219 return got_error_from_errno2("unveil", repo_path);
4221 if (worktree_path && unveil(worktree_path, "rwc") != 0)
4222 return got_error_from_errno2("unveil", worktree_path);
4224 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
4225 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
4227 error = got_privsep_unveil_exec_helpers();
4231 if (unveil(NULL, NULL) != 0)
4232 return got_error_from_errno("unveil");
4237 static const struct got_error *
4238 init_mock_term(const char *test_script_path)
4240 const struct got_error *err = NULL;
4241 const char *screen_dump_path;
4244 if (test_script_path == NULL || *test_script_path == '\0')
4245 return got_error_msg(GOT_ERR_IO, "TOG_TEST_SCRIPT not defined");
4247 tog_io.f = fopen(test_script_path, "re");
4248 if (tog_io.f == NULL) {
4249 err = got_error_from_errno_fmt("fopen: %s",
4254 /* test mode, we don't want any output */
4255 tog_io.cout = fopen("/dev/null", "w+");
4256 if (tog_io.cout == NULL) {
4257 err = got_error_from_errno2("fopen", "/dev/null");
4261 in = dup(fileno(tog_io.cout));
4263 err = got_error_from_errno("dup");
4266 tog_io.cin = fdopen(in, "r");
4267 if (tog_io.cin == NULL) {
4268 err = got_error_from_errno("fdopen");
4273 screen_dump_path = getenv("TOG_SCR_DUMP");
4274 if (screen_dump_path == NULL || *screen_dump_path == '\0')
4275 return got_error_msg(GOT_ERR_IO, "TOG_SCR_DUMP not defined");
4276 tog_io.sdump = fopen(screen_dump_path, "wex");
4277 if (tog_io.sdump == NULL) {
4278 err = got_error_from_errno2("fopen", screen_dump_path);
4282 if (fseeko(tog_io.f, 0L, SEEK_SET) == -1) {
4283 err = got_error_from_errno("fseeko");
4287 if (newterm(NULL, tog_io.cout, tog_io.cin) == NULL)
4288 err = got_error_msg(GOT_ERR_IO,
4289 "newterm: failed to initialise curses");
4303 * Override default signal handlers before starting ncurses.
4304 * This should prevent ncurses from installing its own
4305 * broken cleanup() signal handler.
4307 signal(SIGWINCH, tog_sigwinch);
4308 signal(SIGPIPE, tog_sigpipe);
4309 signal(SIGCONT, tog_sigcont);
4310 signal(SIGINT, tog_sigint);
4311 signal(SIGTERM, tog_sigterm);
4313 if (using_mock_io) /* In test mode we use a fake terminal */
4319 halfdelay(1); /* Fast refresh while initial view is loading. */
4322 intrflush(stdscr, FALSE);
4323 keypad(stdscr, TRUE);
4325 if (getenv("TOG_COLORS") != NULL) {
4327 use_default_colors();
4333 static const struct got_error *
4334 get_in_repo_path_from_argv0(char **in_repo_path, int argc, char *argv[],
4335 struct got_repository *repo, struct got_worktree *worktree)
4337 const struct got_error *err = NULL;
4340 *in_repo_path = strdup("/");
4341 if (*in_repo_path == NULL)
4342 return got_error_from_errno("strdup");
4347 const char *prefix = got_worktree_get_path_prefix(worktree);
4350 err = got_worktree_resolve_path(&p, worktree, argv[0]);
4353 if (asprintf(in_repo_path, "%s%s%s", prefix,
4354 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4356 err = got_error_from_errno("asprintf");
4357 *in_repo_path = NULL;
4361 err = got_repo_map_path(in_repo_path, repo, argv[0]);
4366 static const struct got_error *
4367 cmd_log(int argc, char *argv[])
4369 const struct got_error *error;
4370 struct got_repository *repo = NULL;
4371 struct got_worktree *worktree = NULL;
4372 struct got_object_id *start_id = NULL;
4373 char *in_repo_path = NULL, *repo_path = NULL, *cwd = NULL;
4374 char *start_commit = NULL, *label = NULL;
4375 struct got_reference *ref = NULL;
4376 const char *head_ref_name = NULL;
4377 int ch, log_branches = 0;
4378 struct tog_view *view;
4379 int *pack_fds = NULL;
4381 while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
4387 start_commit = optarg;
4390 repo_path = realpath(optarg, NULL);
4391 if (repo_path == NULL)
4392 return got_error_from_errno2("realpath",
4407 error = got_repo_pack_fds_open(&pack_fds);
4411 if (repo_path == NULL) {
4412 cwd = getcwd(NULL, 0);
4414 return got_error_from_errno("getcwd");
4415 error = got_worktree_open(&worktree, cwd);
4416 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4420 strdup(got_worktree_get_repo_path(worktree));
4422 repo_path = strdup(cwd);
4423 if (repo_path == NULL) {
4424 error = got_error_from_errno("strdup");
4429 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4433 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
4440 error = apply_unveil(got_repo_get_path(repo),
4441 worktree ? got_worktree_get_root_path(worktree) : NULL);
4445 /* already loaded by tog_log_with_path()? */
4446 if (TAILQ_EMPTY(&tog_refs)) {
4447 error = tog_load_refs(repo, 0);
4452 if (start_commit == NULL) {
4453 error = got_repo_match_object_id(&start_id, &label,
4454 worktree ? got_worktree_get_head_ref_name(worktree) :
4455 GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
4458 head_ref_name = label;
4460 error = got_ref_open(&ref, repo, start_commit, 0);
4462 head_ref_name = got_ref_get_name(ref);
4463 else if (error->code != GOT_ERR_NOT_REF)
4465 error = got_repo_match_object_id(&start_id, NULL,
4466 start_commit, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
4471 view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
4473 error = got_error_from_errno("view_open");
4476 error = open_log_view(view, start_id, repo, head_ref_name,
4477 in_repo_path, log_branches);
4481 /* Release work tree lock. */
4482 got_worktree_close(worktree);
4485 error = view_loop(view);
4495 const struct got_error *close_err = got_repo_close(repo);
4500 got_worktree_close(worktree);
4502 const struct got_error *pack_err =
4503 got_repo_pack_fds_close(pack_fds);
4515 fprintf(stderr, "usage: %s diff [-aw] [-C number] [-r repository-path] "
4516 "object1 object2\n", getprogname());
4521 match_line(const char *line, regex_t *regex, size_t nmatch,
4522 regmatch_t *regmatch)
4524 return regexec(regex, line, nmatch, regmatch, 0) == 0;
4527 static struct tog_color *
4528 match_color(struct tog_colors *colors, const char *line)
4530 struct tog_color *tc = NULL;
4532 STAILQ_FOREACH(tc, colors, entry) {
4533 if (match_line(line, &tc->regex, 0, NULL))
4540 static const struct got_error *
4541 add_matched_line(int *wtotal, const char *line, int wlimit, int col_tab_align,
4542 WINDOW *window, int skipcol, regmatch_t *regmatch)
4544 const struct got_error *err = NULL;
4546 wchar_t *wline = NULL;
4547 int rme, rms, n, width, scrollx;
4548 int width0 = 0, width1 = 0, width2 = 0;
4549 char *seg0 = NULL, *seg1 = NULL, *seg2 = NULL;
4553 rms = regmatch->rm_so;
4554 rme = regmatch->rm_eo;
4556 err = expand_tab(&exstr, line);
4560 /* Split the line into 3 segments, according to match offsets. */
4561 seg0 = strndup(exstr, rms);
4563 err = got_error_from_errno("strndup");
4566 seg1 = strndup(exstr + rms, rme - rms);
4568 err = got_error_from_errno("strndup");
4571 seg2 = strdup(exstr + rme);
4573 err = got_error_from_errno("strndup");
4577 /* draw up to matched token if we haven't scrolled past it */
4578 err = format_line(&wline, &width0, NULL, seg0, 0, wlimit,
4582 n = MAX(width0 - skipcol, 0);
4585 err = format_line(&wline, &width, &scrollx, seg0, skipcol,
4586 wlimit, col_tab_align, 1);
4589 waddwstr(window, &wline[scrollx]);
4599 err = format_line(&wline, &width1, NULL, seg1, 0, wlimit,
4603 wlen = wcslen(wline);
4605 width = wcwidth(wline[i]);
4607 /* should not happen, tabs are expanded */
4608 err = got_error(GOT_ERR_RANGE);
4611 if (width0 + w + width > skipcol)
4616 /* draw (visible part of) matched token (if scrolled into it) */
4617 if (width1 - w > 0) {
4618 wattron(window, A_STANDOUT);
4619 waddwstr(window, &wline[i]);
4620 wattroff(window, A_STANDOUT);
4621 wlimit -= (width1 - w);
4622 *wtotal += (width1 - w);
4626 if (wlimit > 0) { /* draw rest of line */
4628 if (skipcol > width0 + width1) {
4629 err = format_line(&wline, &width2, &scrollx, seg2,
4630 skipcol - (width0 + width1), wlimit,
4634 waddwstr(window, &wline[scrollx]);
4636 err = format_line(&wline, &width2, NULL, seg2, 0,
4637 wlimit, col_tab_align, 1);
4640 waddwstr(window, wline);
4654 gotoline(struct tog_view *view, int *lineno, int *nprinted)
4657 int *eof, *first, *selected;
4659 if (view->type == TOG_VIEW_DIFF) {
4660 struct tog_diff_view_state *s = &view->state.diff;
4662 first = &s->first_displayed_line;
4666 } else if (view->type == TOG_VIEW_HELP) {
4667 struct tog_help_view_state *s = &view->state.help;
4669 first = &s->first_displayed_line;
4673 } else if (view->type == TOG_VIEW_BLAME) {
4674 struct tog_blame_view_state *s = &view->state.blame;
4676 first = &s->first_displayed_line;
4677 selected = &s->selected_line;
4683 /* Center gline in the middle of the page like vi(1). */
4684 if (*lineno < view->gline - (view->nlines - 3) / 2)
4686 if (*first != 1 && (*lineno > view->gline - (view->nlines - 3) / 2)) {
4695 *selected = view->gline <= (view->nlines - 3) / 2 ?
4696 view->gline : (view->nlines - 3) / 2 + 1;
4702 static const struct got_error *
4703 draw_file(struct tog_view *view, const char *header)
4705 struct tog_diff_view_state *s = &view->state.diff;
4706 regmatch_t *regmatch = &view->regmatch;
4707 const struct got_error *err;
4710 size_t linesize = 0;
4714 int max_lines = view->nlines;
4715 int nlines = s->nlines;
4718 s->lineno = s->first_displayed_line - 1;
4719 line_offset = s->lines[s->first_displayed_line - 1].offset;
4720 if (fseeko(s->f, line_offset, SEEK_SET) == -1)
4721 return got_error_from_errno("fseek");
4723 werase(view->window);
4725 if (view->gline > s->nlines - 1)
4726 view->gline = s->nlines - 1;
4729 int ln = view->gline ? view->gline <= (view->nlines - 3) / 2 ?
4730 1 : view->gline - (view->nlines - 3) / 2 :
4731 s->lineno + s->selected_line;
4733 if (asprintf(&line, "[%d/%d] %s", ln, nlines, header) == -1)
4734 return got_error_from_errno("asprintf");
4735 err = format_line(&wline, &width, NULL, line, 0, view->ncols,
4741 if (view_needs_focus_indication(view))
4742 wstandout(view->window);
4743 waddwstr(view->window, wline);
4746 while (width++ < view->ncols)
4747 waddch(view->window, ' ');
4748 if (view_needs_focus_indication(view))
4749 wstandend(view->window);
4759 while (max_lines > 0 && nprinted < max_lines) {
4760 enum got_diff_line_type linetype;
4763 linelen = getline(&line, &linesize, s->f);
4764 if (linelen == -1) {
4770 return got_ferror(s->f, GOT_ERR_IO);
4773 if (++s->lineno < s->first_displayed_line)
4775 if (view->gline && !gotoline(view, &s->lineno, &nprinted))
4777 if (s->lineno == view->hiline)
4780 /* Set view->maxx based on full line length. */
4781 err = format_line(&wline, &width, NULL, line, 0, INT_MAX, 0,
4787 view->maxx = MAX(view->maxx, width);
4791 linetype = s->lines[s->lineno].type;
4792 if (linetype > GOT_DIFF_LINE_LOGMSG &&
4793 linetype < GOT_DIFF_LINE_CONTEXT)
4794 attr |= COLOR_PAIR(linetype);
4796 wattron(view->window, attr);
4797 if (s->first_displayed_line + nprinted == s->matched_line &&
4798 regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
4799 err = add_matched_line(&width, line, view->ncols, 0,
4800 view->window, view->x, regmatch);
4807 err = format_line(&wline, &width, &skip, line,
4808 view->x, view->ncols, 0, view->x ? 1 : 0);
4813 waddwstr(view->window, &wline[skip]);
4817 if (s->lineno == view->hiline) {
4818 /* highlight full gline length */
4819 while (width++ < view->ncols)
4820 waddch(view->window, ' ');
4822 if (width <= view->ncols - 1)
4823 waddch(view->window, '\n');
4826 wattroff(view->window, attr);
4827 if (++nprinted == 1)
4828 s->first_displayed_line = s->lineno;
4832 s->last_displayed_line = s->first_displayed_line +
4835 s->last_displayed_line = s->first_displayed_line;
4840 while (nprinted < view->nlines) {
4841 waddch(view->window, '\n');
4845 err = format_line(&wline, &width, NULL, TOG_EOF_STRING, 0,
4851 wstandout(view->window);
4852 waddwstr(view->window, wline);
4855 wstandend(view->window);
4862 get_datestr(time_t *time, char *datebuf)
4864 struct tm mytm, *tm;
4867 tm = gmtime_r(time, &mytm);
4870 s = asctime_r(tm, datebuf);
4873 p = strchr(s, '\n');
4879 static const struct got_error *
4880 add_line_metadata(struct got_diff_line **lines, size_t *nlines,
4881 off_t off, uint8_t type)
4883 struct got_diff_line *p;
4885 p = reallocarray(*lines, *nlines + 1, sizeof(**lines));
4887 return got_error_from_errno("reallocarray");
4889 (*lines)[*nlines].offset = off;
4890 (*lines)[*nlines].type = type;
4896 static const struct got_error *
4897 cat_diff(FILE *dst, FILE *src, struct got_diff_line **d_lines, size_t *d_nlines,
4898 struct got_diff_line *s_lines, size_t s_nlines)
4900 struct got_diff_line *p;
4904 if (fseeko(src, 0L, SEEK_SET) == -1)
4905 return got_error_from_errno("fseeko");
4908 r = fread(buf, 1, sizeof(buf), src);
4911 return got_error_from_errno("fread");
4915 if (fwrite(buf, 1, r, dst) != r)
4916 return got_ferror(dst, GOT_ERR_IO);
4919 if (s_nlines == 0 && *d_nlines == 0)
4923 * If commit info was in dst, increment line offsets
4924 * of the appended diff content, but skip s_lines[0]
4925 * because offset zero is already in *d_lines.
4927 if (*d_nlines > 0) {
4928 for (i = 1; i < s_nlines; ++i)
4929 s_lines[i].offset += (*d_lines)[*d_nlines - 1].offset;
4937 p = reallocarray(*d_lines, *d_nlines + s_nlines, sizeof(*p));
4939 /* d_lines is freed in close_diff_view() */
4940 return got_error_from_errno("reallocarray");
4945 memcpy(*d_lines + *d_nlines, s_lines, s_nlines * sizeof(*s_lines));
4946 *d_nlines += s_nlines;
4951 static const struct got_error *
4952 write_commit_info(struct got_diff_line **lines, size_t *nlines,
4953 struct got_object_id *commit_id, struct got_reflist_head *refs,
4954 struct got_repository *repo, int ignore_ws, int force_text_diff,
4955 struct got_diffstat_cb_arg *dsa, FILE *outfile)
4957 const struct got_error *err = NULL;
4958 char datebuf[26], *datestr;
4959 struct got_commit_object *commit;
4960 char *id_str = NULL, *logmsg = NULL, *s = NULL, *line;
4961 time_t committer_time;
4962 const char *author, *committer;
4963 char *refs_str = NULL;
4964 struct got_pathlist_entry *pe;
4968 err = build_refs_str(&refs_str, refs, commit_id, repo);
4972 err = got_object_open_as_commit(&commit, repo, commit_id);
4976 err = got_object_id_str(&id_str, commit_id);
4978 err = got_error_from_errno("got_object_id_str");
4982 err = add_line_metadata(lines, nlines, 0, GOT_DIFF_LINE_NONE);
4986 n = fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4987 refs_str ? refs_str : "", refs_str ? ")" : "");
4989 err = got_error_from_errno("fprintf");
4993 err = add_line_metadata(lines, nlines, outoff, GOT_DIFF_LINE_META);
4997 n = fprintf(outfile, "from: %s\n",
4998 got_object_commit_get_author(commit));
5000 err = got_error_from_errno("fprintf");
5004 err = add_line_metadata(lines, nlines, outoff, GOT_DIFF_LINE_AUTHOR);
5008 author = got_object_commit_get_author(commit);
5009 committer = got_object_commit_get_committer(commit);
5010 if (strcmp(author, committer) != 0) {
5011 n = fprintf(outfile, "via: %s\n", committer);
5013 err = got_error_from_errno("fprintf");
5017 err = add_line_metadata(lines, nlines, outoff,
5018 GOT_DIFF_LINE_AUTHOR);
5022 committer_time = got_object_commit_get_committer_time(commit);
5023 datestr = get_datestr(&committer_time, datebuf);
5025 n = fprintf(outfile, "date: %s UTC\n", datestr);
5027 err = got_error_from_errno("fprintf");
5031 err = add_line_metadata(lines, nlines, outoff,
5032 GOT_DIFF_LINE_DATE);
5036 if (got_object_commit_get_nparents(commit) > 1) {
5037 const struct got_object_id_queue *parent_ids;
5038 struct got_object_qid *qid;
5040 parent_ids = got_object_commit_get_parent_ids(commit);
5041 STAILQ_FOREACH(qid, parent_ids, entry) {
5042 err = got_object_id_str(&id_str, &qid->id);
5045 n = fprintf(outfile, "parent %d: %s\n", pn++, id_str);
5047 err = got_error_from_errno("fprintf");
5051 err = add_line_metadata(lines, nlines, outoff,
5052 GOT_DIFF_LINE_META);
5060 err = got_object_commit_get_logmsg(&logmsg, commit);
5064 while ((line = strsep(&s, "\n")) != NULL) {
5065 n = fprintf(outfile, "%s\n", line);
5067 err = got_error_from_errno("fprintf");
5071 err = add_line_metadata(lines, nlines, outoff,
5072 GOT_DIFF_LINE_LOGMSG);
5077 TAILQ_FOREACH(pe, dsa->paths, entry) {
5078 struct got_diff_changed_path *cp = pe->data;
5079 int pad = dsa->max_path_len - pe->path_len + 1;
5081 n = fprintf(outfile, "%c %s%*c | %*d+ %*d-\n", cp->status,
5082 pe->path, pad, ' ', dsa->add_cols + 1, cp->add,
5083 dsa->rm_cols + 1, cp->rm);
5085 err = got_error_from_errno("fprintf");
5089 err = add_line_metadata(lines, nlines, outoff,
5090 GOT_DIFF_LINE_CHANGES);
5095 fputc('\n', outfile);
5097 err = add_line_metadata(lines, nlines, outoff, GOT_DIFF_LINE_NONE);
5101 n = fprintf(outfile,
5102 "%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n",
5103 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
5104 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
5106 err = got_error_from_errno("fprintf");
5110 err = add_line_metadata(lines, nlines, outoff, GOT_DIFF_LINE_NONE);
5114 fputc('\n', outfile);
5116 err = add_line_metadata(lines, nlines, outoff, GOT_DIFF_LINE_NONE);
5121 got_object_commit_close(commit);
5130 static const struct got_error *
5131 create_diff(struct tog_diff_view_state *s)
5133 const struct got_error *err = NULL;
5134 FILE *f = NULL, *tmp_diff_file = NULL;
5136 struct got_diff_line *lines = NULL;
5137 struct got_pathlist_head changed_paths;
5139 TAILQ_INIT(&changed_paths);
5142 s->lines = malloc(sizeof(*s->lines));
5143 if (s->lines == NULL)
5144 return got_error_from_errno("malloc");
5149 err = got_error_from_errno("got_opentemp");
5152 tmp_diff_file = got_opentemp();
5153 if (tmp_diff_file == NULL) {
5154 err = got_error_from_errno("got_opentemp");
5157 if (s->f && fclose(s->f) == EOF) {
5158 err = got_error_from_errno("fclose");
5164 err = got_object_get_type(&obj_type, s->repo, s->id1);
5166 err = got_object_get_type(&obj_type, s->repo, s->id2);
5171 case GOT_OBJ_TYPE_BLOB:
5172 err = got_diff_objects_as_blobs(&s->lines, &s->nlines,
5173 s->f1, s->f2, s->fd1, s->fd2, s->id1, s->id2,
5174 s->label1, s->label2, tog_diff_algo, s->diff_context,
5175 s->ignore_whitespace, s->force_text_diff, NULL, s->repo,
5178 case GOT_OBJ_TYPE_TREE:
5179 err = got_diff_objects_as_trees(&s->lines, &s->nlines,
5180 s->f1, s->f2, s->fd1, s->fd2, s->id1, s->id2, NULL, "", "",
5181 tog_diff_algo, s->diff_context, s->ignore_whitespace,
5182 s->force_text_diff, NULL, s->repo, s->f);
5184 case GOT_OBJ_TYPE_COMMIT: {
5185 const struct got_object_id_queue *parent_ids;
5186 struct got_object_qid *pid;
5187 struct got_commit_object *commit2;
5188 struct got_reflist_head *refs;
5190 struct got_diffstat_cb_arg dsa = {
5193 s->ignore_whitespace,
5198 lines = malloc(sizeof(*lines));
5199 if (lines == NULL) {
5200 err = got_error_from_errno("malloc");
5204 /* build diff first in tmp file then append to commit info */
5205 err = got_diff_objects_as_commits(&lines, &nlines,
5206 s->f1, s->f2, s->fd1, s->fd2, s->id1, s->id2, NULL,
5207 tog_diff_algo, s->diff_context, s->ignore_whitespace,
5208 s->force_text_diff, &dsa, s->repo, tmp_diff_file);
5212 err = got_object_open_as_commit(&commit2, s->repo, s->id2);
5215 refs = got_reflist_object_id_map_lookup(tog_refs_idmap, s->id2);
5216 /* Show commit info if we're diffing to a parent/root commit. */
5217 if (s->id1 == NULL) {
5218 err = write_commit_info(&s->lines, &s->nlines, s->id2,
5219 refs, s->repo, s->ignore_whitespace,
5220 s->force_text_diff, &dsa, s->f);
5224 parent_ids = got_object_commit_get_parent_ids(commit2);
5225 STAILQ_FOREACH(pid, parent_ids, entry) {
5226 if (got_object_id_cmp(s->id1, &pid->id) == 0) {
5227 err = write_commit_info(&s->lines,
5228 &s->nlines, s->id2, refs, s->repo,
5229 s->ignore_whitespace,
5230 s->force_text_diff, &dsa, s->f);
5237 got_object_commit_close(commit2);
5239 err = cat_diff(s->f, tmp_diff_file, &s->lines, &s->nlines,
5244 err = got_error(GOT_ERR_OBJ_TYPE);
5249 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
5250 if (s->f && fflush(s->f) != 0 && err == NULL)
5251 err = got_error_from_errno("fflush");
5252 if (tmp_diff_file && fclose(tmp_diff_file) == EOF && err == NULL)
5253 err = got_error_from_errno("fclose");
5258 diff_view_indicate_progress(struct tog_view *view)
5260 mvwaddstr(view->window, 0, 0, "diffing...");
5265 static const struct got_error *
5266 search_start_diff_view(struct tog_view *view)
5268 struct tog_diff_view_state *s = &view->state.diff;
5270 s->matched_line = 0;
5275 search_setup_diff_view(struct tog_view *view, FILE **f, off_t **line_offsets,
5276 size_t *nlines, int **first, int **last, int **match, int **selected)
5278 struct tog_diff_view_state *s = &view->state.diff;
5281 *nlines = s->nlines;
5282 *line_offsets = NULL;
5283 *match = &s->matched_line;
5284 *first = &s->first_displayed_line;
5285 *last = &s->last_displayed_line;
5286 *selected = &s->selected_line;
5289 static const struct got_error *
5290 search_next_view_match(struct tog_view *view)
5292 const struct got_error *err = NULL;
5296 size_t linesize = 0;
5298 off_t *line_offsets;
5300 int *first, *last, *match, *selected;
5302 if (!view->search_setup)
5303 return got_error_msg(GOT_ERR_NOT_IMPL,
5304 "view search not supported");
5305 view->search_setup(view, &f, &line_offsets, &nlines, &first, &last,
5308 if (!view->searching) {
5309 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5314 if (view->searching == TOG_SEARCH_FORWARD)
5315 lineno = *first + 1;
5317 lineno = *first - 1;
5319 lineno = *first - 1 + *selected;
5324 if (lineno <= 0 || lineno > nlines) {
5326 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5330 if (view->searching == TOG_SEARCH_FORWARD)
5336 offset = view->type == TOG_VIEW_DIFF ?
5337 view->state.diff.lines[lineno - 1].offset :
5338 line_offsets[lineno - 1];
5339 if (fseeko(f, offset, SEEK_SET) != 0) {
5341 return got_error_from_errno("fseeko");
5343 linelen = getline(&line, &linesize, f);
5344 if (linelen != -1) {
5346 err = expand_tab(&exstr, line);
5349 if (match_line(exstr, &view->regex, 1,
5351 view->search_next_done = TOG_SEARCH_HAVE_MORE;
5358 if (view->searching == TOG_SEARCH_FORWARD)
5373 static const struct got_error *
5374 close_diff_view(struct tog_view *view)
5376 const struct got_error *err = NULL;
5377 struct tog_diff_view_state *s = &view->state.diff;
5383 if (s->f && fclose(s->f) == EOF)
5384 err = got_error_from_errno("fclose");
5386 if (s->f1 && fclose(s->f1) == EOF && err == NULL)
5387 err = got_error_from_errno("fclose");
5389 if (s->f2 && fclose(s->f2) == EOF && err == NULL)
5390 err = got_error_from_errno("fclose");
5392 if (s->fd1 != -1 && close(s->fd1) == -1 && err == NULL)
5393 err = got_error_from_errno("close");
5395 if (s->fd2 != -1 && close(s->fd2) == -1 && err == NULL)
5396 err = got_error_from_errno("close");
5404 static const struct got_error *
5405 open_diff_view(struct tog_view *view, struct got_object_id *id1,
5406 struct got_object_id *id2, const char *label1, const char *label2,
5407 int diff_context, int ignore_whitespace, int force_text_diff,
5408 struct tog_view *parent_view, struct got_repository *repo)
5410 const struct got_error *err;
5411 struct tog_diff_view_state *s = &view->state.diff;
5413 memset(s, 0, sizeof(*s));
5417 if (id1 != NULL && id2 != NULL) {
5420 err = got_object_get_type(&type1, repo, id1);
5423 err = got_object_get_type(&type2, repo, id2);
5427 if (type1 != type2) {
5428 err = got_error(GOT_ERR_OBJ_TYPE);
5432 s->first_displayed_line = 1;
5433 s->last_displayed_line = view->nlines;
5434 s->selected_line = 1;
5442 s->id1 = got_object_id_dup(id1);
5443 if (s->id1 == NULL) {
5444 err = got_error_from_errno("got_object_id_dup");
5450 s->id2 = got_object_id_dup(id2);
5451 if (s->id2 == NULL) {
5452 err = got_error_from_errno("got_object_id_dup");
5456 s->f1 = got_opentemp();
5457 if (s->f1 == NULL) {
5458 err = got_error_from_errno("got_opentemp");
5462 s->f2 = got_opentemp();
5463 if (s->f2 == NULL) {
5464 err = got_error_from_errno("got_opentemp");
5468 s->fd1 = got_opentempfd();
5470 err = got_error_from_errno("got_opentempfd");
5474 s->fd2 = got_opentempfd();
5476 err = got_error_from_errno("got_opentempfd");
5480 s->diff_context = diff_context;
5481 s->ignore_whitespace = ignore_whitespace;
5482 s->force_text_diff = force_text_diff;
5483 s->parent_view = parent_view;
5486 if (has_colors() && getenv("TOG_COLORS") != NULL && !using_mock_io) {
5489 rc = init_pair(GOT_DIFF_LINE_MINUS,
5490 get_color_value("TOG_COLOR_DIFF_MINUS"), -1);
5492 rc = init_pair(GOT_DIFF_LINE_PLUS,
5493 get_color_value("TOG_COLOR_DIFF_PLUS"), -1);
5495 rc = init_pair(GOT_DIFF_LINE_HUNK,
5496 get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"), -1);
5498 rc = init_pair(GOT_DIFF_LINE_META,
5499 get_color_value("TOG_COLOR_DIFF_META"), -1);
5501 rc = init_pair(GOT_DIFF_LINE_CHANGES,
5502 get_color_value("TOG_COLOR_DIFF_META"), -1);
5504 rc = init_pair(GOT_DIFF_LINE_BLOB_MIN,
5505 get_color_value("TOG_COLOR_DIFF_META"), -1);
5507 rc = init_pair(GOT_DIFF_LINE_BLOB_PLUS,
5508 get_color_value("TOG_COLOR_DIFF_META"), -1);
5510 rc = init_pair(GOT_DIFF_LINE_AUTHOR,
5511 get_color_value("TOG_COLOR_AUTHOR"), -1);
5513 rc = init_pair(GOT_DIFF_LINE_DATE,
5514 get_color_value("TOG_COLOR_DATE"), -1);
5516 err = got_error(GOT_ERR_RANGE);
5521 if (parent_view && parent_view->type == TOG_VIEW_LOG &&
5522 view_is_splitscreen(view))
5523 show_log_view(parent_view); /* draw border */
5524 diff_view_indicate_progress(view);
5526 err = create_diff(s);
5528 view->show = show_diff_view;
5529 view->input = input_diff_view;
5530 view->reset = reset_diff_view;
5531 view->close = close_diff_view;
5532 view->search_start = search_start_diff_view;
5533 view->search_setup = search_setup_diff_view;
5534 view->search_next = search_next_view_match;
5537 if (view->close == NULL)
5538 close_diff_view(view);
5544 static const struct got_error *
5545 show_diff_view(struct tog_view *view)
5547 const struct got_error *err;
5548 struct tog_diff_view_state *s = &view->state.diff;
5549 char *id_str1 = NULL, *id_str2, *header;
5550 const char *label1, *label2;
5553 err = got_object_id_str(&id_str1, s->id1);
5556 label1 = s->label1 ? s->label1 : id_str1;
5558 label1 = "/dev/null";
5560 err = got_object_id_str(&id_str2, s->id2);
5563 label2 = s->label2 ? s->label2 : id_str2;
5565 if (asprintf(&header, "diff %s %s", label1, label2) == -1) {
5566 err = got_error_from_errno("asprintf");
5574 err = draw_file(view, header);
5579 static const struct got_error *
5580 set_selected_commit(struct tog_diff_view_state *s,
5581 struct commit_queue_entry *entry)
5583 const struct got_error *err;
5584 const struct got_object_id_queue *parent_ids;
5585 struct got_commit_object *selected_commit;
5586 struct got_object_qid *pid;
5589 s->id2 = got_object_id_dup(entry->id);
5591 return got_error_from_errno("got_object_id_dup");
5593 err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
5596 parent_ids = got_object_commit_get_parent_ids(selected_commit);
5598 pid = STAILQ_FIRST(parent_ids);
5599 s->id1 = pid ? got_object_id_dup(&pid->id) : NULL;
5600 got_object_commit_close(selected_commit);
5604 static const struct got_error *
5605 reset_diff_view(struct tog_view *view)
5607 struct tog_diff_view_state *s = &view->state.diff;
5610 wclear(view->window);
5611 s->first_displayed_line = 1;
5612 s->last_displayed_line = view->nlines;
5613 s->matched_line = 0;
5614 diff_view_indicate_progress(view);
5615 return create_diff(s);
5619 diff_prev_index(struct tog_diff_view_state *s, enum got_diff_line_type type)
5623 i = start = s->first_displayed_line - 1;
5625 while (s->lines[i].type != type) {
5629 return; /* do nothing, requested type not in file */
5632 s->selected_line = 1;
5633 s->first_displayed_line = i;
5637 diff_next_index(struct tog_diff_view_state *s, enum got_diff_line_type type)
5641 i = start = s->first_displayed_line + 1;
5643 while (s->lines[i].type != type) {
5644 if (i == s->nlines - 1)
5647 return; /* do nothing, requested type not in file */
5650 s->selected_line = 1;
5651 s->first_displayed_line = i;
5654 static struct got_object_id *get_selected_commit_id(struct tog_blame_line *,
5656 static struct got_object_id *get_annotation_for_line(struct tog_blame_line *,
5659 static const struct got_error *
5660 input_diff_view(struct tog_view **new_view, struct tog_view *view, int ch)
5662 const struct got_error *err = NULL;
5663 struct tog_diff_view_state *s = &view->state.diff;
5664 struct tog_log_view_state *ls;
5665 struct commit_queue_entry *old_selected_entry;
5667 size_t linesize = 0;
5669 int i, nscroll = view->nlines - 1, up = 0;
5671 s->lineno = s->first_displayed_line - 1 + s->selected_line;
5680 horizontal_scroll_input(view, ch);
5685 s->force_text_diff = !s->force_text_diff;
5686 view->action = s->force_text_diff ?
5687 "force ASCII text enabled" :
5688 "force ASCII text disabled";
5690 else if (ch == 'w') {
5691 s->ignore_whitespace = !s->ignore_whitespace;
5692 view->action = s->ignore_whitespace ?
5693 "ignore whitespace enabled" :
5694 "ignore whitespace disabled";
5696 err = reset_diff_view(view);
5700 s->first_displayed_line = 1;
5709 s->first_displayed_line = (s->nlines - view->nlines) + 2;
5715 if (s->first_displayed_line > 1)
5716 s->first_displayed_line--;
5727 if (s->first_displayed_line == 1) {
5732 while (i++ < nscroll && s->first_displayed_line > 1)
5733 s->first_displayed_line--;
5739 s->first_displayed_line++;
5756 while (!s->eof && i++ < nscroll) {
5757 linelen = getline(&line, &linesize, s->f);
5758 s->first_displayed_line++;
5759 if (linelen == -1) {
5763 err = got_ferror(s->f, GOT_ERR_IO);
5770 diff_prev_index(s, GOT_DIFF_LINE_BLOB_MIN);
5773 diff_next_index(s, GOT_DIFF_LINE_BLOB_MIN);
5776 diff_prev_index(s, GOT_DIFF_LINE_HUNK);
5779 diff_next_index(s, GOT_DIFF_LINE_HUNK);
5782 if (s->diff_context > 0) {
5784 s->matched_line = 0;
5785 diff_view_indicate_progress(view);
5786 err = create_diff(s);
5787 if (s->first_displayed_line + view->nlines - 1 >
5789 s->first_displayed_line = 1;
5790 s->last_displayed_line = view->nlines;
5796 if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
5798 s->matched_line = 0;
5799 diff_view_indicate_progress(view);
5800 err = create_diff(s);
5812 if (s->parent_view == NULL) {
5816 s->parent_view->count = view->count;
5818 if (s->parent_view->type == TOG_VIEW_LOG) {
5819 ls = &s->parent_view->state.log;
5820 old_selected_entry = ls->selected_entry;
5822 err = input_log_view(NULL, s->parent_view,
5823 up ? KEY_UP : KEY_DOWN);
5826 view->count = s->parent_view->count;
5828 if (old_selected_entry == ls->selected_entry)
5831 err = set_selected_commit(s, ls->selected_entry);
5834 } else if (s->parent_view->type == TOG_VIEW_BLAME) {
5835 struct tog_blame_view_state *bs;
5836 struct got_object_id *id, *prev_id;
5838 bs = &s->parent_view->state.blame;
5839 prev_id = get_annotation_for_line(bs->blame.lines,
5840 bs->blame.nlines, bs->last_diffed_line);
5842 err = input_blame_view(&view, s->parent_view,
5843 up ? KEY_UP : KEY_DOWN);
5846 view->count = s->parent_view->count;
5848 if (prev_id == NULL)
5850 id = get_selected_commit_id(bs->blame.lines,
5851 bs->blame.nlines, bs->first_displayed_line,
5856 if (!got_object_id_cmp(prev_id, id))
5859 err = input_blame_view(&view, s->parent_view, KEY_ENTER);
5863 s->first_displayed_line = 1;
5864 s->last_displayed_line = view->nlines;
5865 s->matched_line = 0;
5868 diff_view_indicate_progress(view);
5869 err = create_diff(s);
5879 static const struct got_error *
5880 cmd_diff(int argc, char *argv[])
5882 const struct got_error *error;
5883 struct got_repository *repo = NULL;
5884 struct got_worktree *worktree = NULL;
5885 struct got_object_id *id1 = NULL, *id2 = NULL;
5886 char *repo_path = NULL, *cwd = NULL;
5887 char *id_str1 = NULL, *id_str2 = NULL;
5888 char *label1 = NULL, *label2 = NULL;
5889 int diff_context = 3, ignore_whitespace = 0;
5890 int ch, force_text_diff = 0;
5892 struct tog_view *view;
5893 int *pack_fds = NULL;
5895 while ((ch = getopt(argc, argv, "aC:r:w")) != -1) {
5898 force_text_diff = 1;
5901 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5904 errx(1, "number of context lines is %s: %s",
5908 repo_path = realpath(optarg, NULL);
5909 if (repo_path == NULL)
5910 return got_error_from_errno2("realpath",
5912 got_path_strip_trailing_slashes(repo_path);
5915 ignore_whitespace = 1;
5927 usage_diff(); /* TODO show local worktree changes */
5928 } else if (argc == 2) {
5934 error = got_repo_pack_fds_open(&pack_fds);
5938 if (repo_path == NULL) {
5939 cwd = getcwd(NULL, 0);
5941 return got_error_from_errno("getcwd");
5942 error = got_worktree_open(&worktree, cwd);
5943 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5947 strdup(got_worktree_get_repo_path(worktree));
5949 repo_path = strdup(cwd);
5950 if (repo_path == NULL) {
5951 error = got_error_from_errno("strdup");
5956 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5962 error = apply_unveil(got_repo_get_path(repo), NULL);
5966 error = tog_load_refs(repo, 0);
5970 error = got_repo_match_object_id(&id1, &label1, id_str1,
5971 GOT_OBJ_TYPE_ANY, &tog_refs, repo);
5975 error = got_repo_match_object_id(&id2, &label2, id_str2,
5976 GOT_OBJ_TYPE_ANY, &tog_refs, repo);
5980 view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
5982 error = got_error_from_errno("view_open");
5985 error = open_diff_view(view, id1, id2, label1, label2, diff_context,
5986 ignore_whitespace, force_text_diff, NULL, repo);
5989 error = view_loop(view);
5996 const struct got_error *close_err = got_repo_close(repo);
6001 got_worktree_close(worktree);
6003 const struct got_error *pack_err =
6004 got_repo_pack_fds_close(pack_fds);
6017 "usage: %s blame [-c commit] [-r repository-path] path\n",
6022 struct tog_blame_line {
6024 struct got_object_id *id;
6027 static const struct got_error *
6028 draw_blame(struct tog_view *view)
6030 struct tog_blame_view_state *s = &view->state.blame;
6031 struct tog_blame *blame = &s->blame;
6032 regmatch_t *regmatch = &view->regmatch;
6033 const struct got_error *err;
6034 int lineno = 0, nprinted = 0;
6036 size_t linesize = 0;
6040 struct tog_blame_line *blame_line;
6041 struct got_object_id *prev_id = NULL;
6043 struct tog_color *tc;
6045 err = got_object_id_str(&id_str, &s->blamed_commit->id);
6050 werase(view->window);
6052 if (asprintf(&line, "commit %s", id_str) == -1) {
6053 err = got_error_from_errno("asprintf");
6058 err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
6063 if (view_needs_focus_indication(view))
6064 wstandout(view->window);
6065 tc = get_color(&s->colors, TOG_COLOR_COMMIT);
6067 wattr_on(view->window, COLOR_PAIR(tc->colorpair), NULL);
6068 waddwstr(view->window, wline);
6069 while (width++ < view->ncols)
6070 waddch(view->window, ' ');
6072 wattr_off(view->window, COLOR_PAIR(tc->colorpair), NULL);
6073 if (view_needs_focus_indication(view))
6074 wstandend(view->window);
6078 if (view->gline > blame->nlines)
6079 view->gline = blame->nlines;
6081 if (tog_io.wait_for_ui) {
6082 struct tog_blame_thread_args *bta = &s->blame.thread_args;
6085 rc = pthread_cond_wait(&bta->blame_complete, &tog_mutex);
6087 return got_error_set_errno(rc, "pthread_cond_wait");
6088 tog_io.wait_for_ui = 0;
6091 if (asprintf(&line, "[%d/%d] %s%s", view->gline ? view->gline :
6092 s->first_displayed_line - 1 + s->selected_line, blame->nlines,
6093 s->blame_complete ? "" : "annotating... ", s->path) == -1) {
6095 return got_error_from_errno("asprintf");
6098 err = format_line(&wline, &width, NULL, line, 0, view->ncols, 0, 0);
6103 waddwstr(view->window, wline);
6106 if (width < view->ncols - 1)
6107 waddch(view->window, '\n');
6111 while (nprinted < view->nlines - 2) {
6112 linelen = getline(&line, &linesize, blame->f);
6113 if (linelen == -1) {
6114 if (feof(blame->f)) {
6119 return got_ferror(blame->f, GOT_ERR_IO);
6121 if (++lineno < s->first_displayed_line)
6123 if (view->gline && !gotoline(view, &lineno, &nprinted))
6126 /* Set view->maxx based on full line length. */
6127 err = format_line(&wline, &width, NULL, line, 0, INT_MAX, 9, 1);
6134 view->maxx = MAX(view->maxx, width);
6136 if (nprinted == s->selected_line - 1)
6137 wstandout(view->window);
6139 if (blame->nlines > 0) {
6140 blame_line = &blame->lines[lineno - 1];
6141 if (blame_line->annotated && prev_id &&
6142 got_object_id_cmp(prev_id, blame_line->id) == 0 &&
6143 !(nprinted == s->selected_line - 1)) {
6144 waddstr(view->window, " ");
6145 } else if (blame_line->annotated) {
6147 err = got_object_id_str(&id_str,
6153 tc = get_color(&s->colors, TOG_COLOR_COMMIT);
6155 wattr_on(view->window,
6156 COLOR_PAIR(tc->colorpair), NULL);
6157 wprintw(view->window, "%.8s", id_str);
6159 wattr_off(view->window,
6160 COLOR_PAIR(tc->colorpair), NULL);
6162 prev_id = blame_line->id;
6164 waddstr(view->window, "........");
6168 waddstr(view->window, "........");
6172 if (nprinted == s->selected_line - 1)
6173 wstandend(view->window);
6174 waddstr(view->window, " ");
6176 if (view->ncols <= 9) {
6178 } else if (s->first_displayed_line + nprinted ==
6180 regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) {
6181 err = add_matched_line(&width, line, view->ncols - 9, 9,
6182 view->window, view->x, regmatch);
6190 err = format_line(&wline, &width, &skip, line,
6191 view->x, view->ncols - 9, 9, 1);
6196 waddwstr(view->window, &wline[skip]);
6202 if (width <= view->ncols - 1)
6203 waddch(view->window, '\n');
6204 if (++nprinted == 1)
6205 s->first_displayed_line = lineno;
6208 s->last_displayed_line = lineno;
6215 static const struct got_error *
6216 blame_cb(void *arg, int nlines, int lineno,
6217 struct got_commit_object *commit, struct got_object_id *id)
6219 const struct got_error *err = NULL;
6220 struct tog_blame_cb_args *a = arg;
6221 struct tog_blame_line *line;
6224 if (nlines != a->nlines ||
6225 (lineno != -1 && lineno < 1) || lineno > a->nlines)
6226 return got_error(GOT_ERR_RANGE);
6228 errcode = pthread_mutex_lock(&tog_mutex);
6230 return got_error_set_errno(errcode, "pthread_mutex_lock");
6232 if (*a->quit) { /* user has quit the blame view */
6233 err = got_error(GOT_ERR_ITER_COMPLETED);
6238 goto done; /* no change in this commit */
6240 line = &a->lines[lineno - 1];
6241 if (line->annotated)
6244 line->id = got_object_id_dup(id);
6245 if (line->id == NULL) {
6246 err = got_error_from_errno("got_object_id_dup");
6249 line->annotated = 1;
6251 errcode = pthread_mutex_unlock(&tog_mutex);
6253 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
6258 blame_thread(void *arg)
6260 const struct got_error *err, *close_err;
6261 struct tog_blame_thread_args *ta = arg;
6262 struct tog_blame_cb_args *a = ta->cb_args;
6263 int errcode, fd1 = -1, fd2 = -1;
6264 FILE *f1 = NULL, *f2 = NULL;
6266 fd1 = got_opentempfd();
6268 return (void *)got_error_from_errno("got_opentempfd");
6270 fd2 = got_opentempfd();
6272 err = got_error_from_errno("got_opentempfd");
6276 f1 = got_opentemp();
6278 err = (void *)got_error_from_errno("got_opentemp");
6281 f2 = got_opentemp();
6283 err = (void *)got_error_from_errno("got_opentemp");
6287 err = block_signals_used_by_main_thread();
6291 err = got_blame(ta->path, a->commit_id, ta->repo,
6292 tog_diff_algo, blame_cb, ta->cb_args,
6293 ta->cancel_cb, ta->cancel_arg, fd1, fd2, f1, f2);
6294 if (err && err->code == GOT_ERR_CANCELLED)
6297 errcode = pthread_mutex_lock(&tog_mutex);
6299 err = got_error_set_errno(errcode, "pthread_mutex_lock");
6303 close_err = got_repo_close(ta->repo);
6309 if (tog_io.wait_for_ui) {
6310 errcode = pthread_cond_signal(&ta->blame_complete);
6311 if (errcode && err == NULL)
6312 err = got_error_set_errno(errcode,
6313 "pthread_cond_signal");
6316 errcode = pthread_mutex_unlock(&tog_mutex);
6317 if (errcode && err == NULL)
6318 err = got_error_set_errno(errcode, "pthread_mutex_unlock");
6321 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
6322 err = got_error_from_errno("close");
6323 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
6324 err = got_error_from_errno("close");
6325 if (f1 && fclose(f1) == EOF && err == NULL)
6326 err = got_error_from_errno("fclose");
6327 if (f2 && fclose(f2) == EOF && err == NULL)
6328 err = got_error_from_errno("fclose");
6333 static struct got_object_id *
6334 get_selected_commit_id(struct tog_blame_line *lines, int nlines,
6335 int first_displayed_line, int selected_line)
6337 struct tog_blame_line *line;
6342 line = &lines[first_displayed_line - 1 + selected_line - 1];
6343 if (!line->annotated)
6349 static struct got_object_id *
6350 get_annotation_for_line(struct tog_blame_line *lines, int nlines,
6353 struct tog_blame_line *line;
6355 if (nlines <= 0 || lineno >= nlines)
6358 line = &lines[lineno - 1];
6359 if (!line->annotated)
6365 static const struct got_error *
6366 stop_blame(struct tog_blame *blame)
6368 const struct got_error *err = NULL;
6371 if (blame->thread) {
6373 errcode = pthread_mutex_unlock(&tog_mutex);
6375 return got_error_set_errno(errcode,
6376 "pthread_mutex_unlock");
6377 errcode = pthread_join(blame->thread, (void **)&err);
6379 return got_error_set_errno(errcode, "pthread_join");
6380 errcode = pthread_mutex_lock(&tog_mutex);
6382 return got_error_set_errno(errcode,
6383 "pthread_mutex_lock");
6384 if (err && err->code == GOT_ERR_ITER_COMPLETED)
6386 blame->thread = NULL;
6388 if (blame->thread_args.repo) {
6389 const struct got_error *close_err;
6390 close_err = got_repo_close(blame->thread_args.repo);
6393 blame->thread_args.repo = NULL;
6396 if (fclose(blame->f) == EOF && err == NULL)
6397 err = got_error_from_errno("fclose");
6401 for (i = 0; i < blame->nlines; i++)
6402 free(blame->lines[i].id);
6404 blame->lines = NULL;
6406 free(blame->cb_args.commit_id);
6407 blame->cb_args.commit_id = NULL;
6408 if (blame->pack_fds) {
6409 const struct got_error *pack_err =
6410 got_repo_pack_fds_close(blame->pack_fds);
6413 blame->pack_fds = NULL;
6418 static const struct got_error *
6419 cancel_blame_view(void *arg)
6421 const struct got_error *err = NULL;
6425 errcode = pthread_mutex_lock(&tog_mutex);
6427 return got_error_set_errno(errcode,
6428 "pthread_mutex_unlock");
6431 err = got_error(GOT_ERR_CANCELLED);
6433 errcode = pthread_mutex_unlock(&tog_mutex);
6435 return got_error_set_errno(errcode,
6436 "pthread_mutex_lock");
6441 static const struct got_error *
6442 run_blame(struct tog_view *view)
6444 struct tog_blame_view_state *s = &view->state.blame;
6445 struct tog_blame *blame = &s->blame;
6446 const struct got_error *err = NULL;
6447 struct got_commit_object *commit = NULL;
6448 struct got_blob_object *blob = NULL;
6449 struct got_repository *thread_repo = NULL;
6450 struct got_object_id *obj_id = NULL;
6451 int obj_type, fd = -1;
6452 int *pack_fds = NULL;
6454 err = got_object_open_as_commit(&commit, s->repo,
6455 &s->blamed_commit->id);
6459 fd = got_opentempfd();
6461 err = got_error_from_errno("got_opentempfd");
6465 err = got_object_id_by_path(&obj_id, s->repo, commit, s->path);
6469 err = got_object_get_type(&obj_type, s->repo, obj_id);
6473 if (obj_type != GOT_OBJ_TYPE_BLOB) {
6474 err = got_error(GOT_ERR_OBJ_TYPE);
6478 err = got_object_open_as_blob(&blob, s->repo, obj_id, 8192, fd);
6481 blame->f = got_opentemp();
6482 if (blame->f == NULL) {
6483 err = got_error_from_errno("got_opentemp");
6486 err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
6487 &blame->line_offsets, blame->f, blob);
6490 if (blame->nlines == 0) {
6491 s->blame_complete = 1;
6495 /* Don't include \n at EOF in the blame line count. */
6496 if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
6499 blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
6500 if (blame->lines == NULL) {
6501 err = got_error_from_errno("calloc");
6505 err = got_repo_pack_fds_open(&pack_fds);
6508 err = got_repo_open(&thread_repo, got_repo_get_path(s->repo), NULL,
6513 blame->pack_fds = pack_fds;
6514 blame->cb_args.view = view;
6515 blame->cb_args.lines = blame->lines;
6516 blame->cb_args.nlines = blame->nlines;
6517 blame->cb_args.commit_id = got_object_id_dup(&s->blamed_commit->id);
6518 if (blame->cb_args.commit_id == NULL) {
6519 err = got_error_from_errno("got_object_id_dup");
6522 blame->cb_args.quit = &s->done;
6524 blame->thread_args.path = s->path;
6525 blame->thread_args.repo = thread_repo;
6526 blame->thread_args.cb_args = &blame->cb_args;
6527 blame->thread_args.complete = &s->blame_complete;
6528 blame->thread_args.cancel_cb = cancel_blame_view;
6529 blame->thread_args.cancel_arg = &s->done;
6530 s->blame_complete = 0;
6532 if (s->first_displayed_line + view->nlines - 1 > blame->nlines) {
6533 s->first_displayed_line = 1;
6534 s->last_displayed_line = view->nlines;
6535 s->selected_line = 1;
6537 s->matched_line = 0;
6541 got_object_commit_close(commit);
6542 if (fd != -1 && close(fd) == -1 && err == NULL)
6543 err = got_error_from_errno("close");
6545 got_object_blob_close(blob);
6552 static const struct got_error *
6553 open_blame_view(struct tog_view *view, char *path,
6554 struct got_object_id *commit_id, struct got_repository *repo)
6556 const struct got_error *err = NULL;
6557 struct tog_blame_view_state *s = &view->state.blame;
6559 STAILQ_INIT(&s->blamed_commits);
6561 s->path = strdup(path);
6562 if (s->path == NULL)
6563 return got_error_from_errno("strdup");
6565 err = got_object_qid_alloc(&s->blamed_commit, commit_id);
6571 STAILQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
6572 s->first_displayed_line = 1;
6573 s->last_displayed_line = view->nlines;
6574 s->selected_line = 1;
6575 s->blame_complete = 0;
6577 s->commit_id = commit_id;
6578 memset(&s->blame, 0, sizeof(s->blame));
6580 STAILQ_INIT(&s->colors);
6581 if (has_colors() && getenv("TOG_COLORS") != NULL) {
6582 err = add_color(&s->colors, "^", TOG_COLOR_COMMIT,
6583 get_color_value("TOG_COLOR_COMMIT"));
6588 view->show = show_blame_view;
6589 view->input = input_blame_view;
6590 view->reset = reset_blame_view;
6591 view->close = close_blame_view;
6592 view->search_start = search_start_blame_view;
6593 view->search_setup = search_setup_blame_view;
6594 view->search_next = search_next_view_match;
6596 if (using_mock_io) {
6597 struct tog_blame_thread_args *bta = &s->blame.thread_args;
6600 rc = pthread_cond_init(&bta->blame_complete, NULL);
6602 return got_error_set_errno(rc, "pthread_cond_init");
6605 return run_blame(view);
6608 static const struct got_error *
6609 close_blame_view(struct tog_view *view)
6611 const struct got_error *err = NULL;
6612 struct tog_blame_view_state *s = &view->state.blame;
6614 if (s->blame.thread)
6615 err = stop_blame(&s->blame);
6617 while (!STAILQ_EMPTY(&s->blamed_commits)) {
6618 struct got_object_qid *blamed_commit;
6619 blamed_commit = STAILQ_FIRST(&s->blamed_commits);
6620 STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
6621 got_object_qid_free(blamed_commit);
6624 if (using_mock_io) {
6625 struct tog_blame_thread_args *bta = &s->blame.thread_args;
6628 rc = pthread_cond_destroy(&bta->blame_complete);
6629 if (rc && err == NULL)
6630 err = got_error_set_errno(rc, "pthread_cond_destroy");
6634 free_colors(&s->colors);
6638 static const struct got_error *
6639 search_start_blame_view(struct tog_view *view)
6641 struct tog_blame_view_state *s = &view->state.blame;
6643 s->matched_line = 0;
6648 search_setup_blame_view(struct tog_view *view, FILE **f, off_t **line_offsets,
6649 size_t *nlines, int **first, int **last, int **match, int **selected)
6651 struct tog_blame_view_state *s = &view->state.blame;
6654 *nlines = s->blame.nlines;
6655 *line_offsets = s->blame.line_offsets;
6656 *match = &s->matched_line;
6657 *first = &s->first_displayed_line;
6658 *last = &s->last_displayed_line;
6659 *selected = &s->selected_line;
6662 static const struct got_error *
6663 show_blame_view(struct tog_view *view)
6665 const struct got_error *err = NULL;
6666 struct tog_blame_view_state *s = &view->state.blame;
6669 if (s->blame.thread == NULL && !s->blame_complete) {
6670 errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
6671 &s->blame.thread_args);
6673 return got_error_set_errno(errcode, "pthread_create");
6676 halfdelay(1); /* fast refresh while annotating */
6679 if (s->blame_complete && !using_mock_io)
6680 halfdelay(10); /* disable fast refresh */
6682 err = draw_blame(view);
6688 static const struct got_error *
6689 log_annotated_line(struct tog_view **new_view, int begin_y, int begin_x,
6690 struct got_repository *repo, struct got_object_id *id)
6692 struct tog_view *log_view;
6693 const struct got_error *err = NULL;
6697 log_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_LOG);
6698 if (log_view == NULL)
6699 return got_error_from_errno("view_open");
6701 err = open_log_view(log_view, id, repo, GOT_REF_HEAD, "", 0);
6703 view_close(log_view);
6705 *new_view = log_view;
6710 static const struct got_error *
6711 input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
6713 const struct got_error *err = NULL, *thread_err = NULL;
6714 struct tog_view *diff_view;
6715 struct tog_blame_view_state *s = &view->state.blame;
6716 int eos, nscroll, begin_y = 0, begin_x = 0;
6718 eos = nscroll = view->nlines - 2;
6719 if (view_is_hsplit_top(view))
6729 horizontal_scroll_input(view, ch);
6736 s->selected_line = 1;
6737 s->first_displayed_line = 1;
6742 if (s->blame.nlines < eos) {
6743 s->selected_line = s->blame.nlines;
6744 s->first_displayed_line = 1;
6746 s->selected_line = eos;
6747 s->first_displayed_line = s->blame.nlines - (eos - 1);
6754 if (s->selected_line > 1)
6756 else if (s->selected_line == 1 &&
6757 s->first_displayed_line > 1)
6758 s->first_displayed_line--;
6769 if (s->first_displayed_line == 1) {
6770 if (view->count > 1)
6772 s->selected_line = MAX(1, s->selected_line - nscroll);
6776 if (s->first_displayed_line > nscroll)
6777 s->first_displayed_line -= nscroll;
6779 s->first_displayed_line = 1;
6784 if (s->selected_line < eos && s->first_displayed_line +
6785 s->selected_line <= s->blame.nlines)
6787 else if (s->first_displayed_line < s->blame.nlines - (eos - 1))
6788 s->first_displayed_line++;
6794 struct got_object_id *id = NULL;
6797 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
6798 s->first_displayed_line, s->selected_line);
6802 struct got_commit_object *commit, *pcommit;
6803 struct got_object_qid *pid;
6804 struct got_object_id *blob_id = NULL;
6806 err = got_object_open_as_commit(&commit,
6811 got_object_commit_get_parent_ids(commit));
6813 got_object_commit_close(commit);
6816 /* Check if path history ends here. */
6817 err = got_object_open_as_commit(&pcommit,
6821 err = got_object_id_by_path(&blob_id, s->repo,
6823 got_object_commit_close(pcommit);
6825 if (err->code == GOT_ERR_NO_TREE_ENTRY)
6827 got_object_commit_close(commit);
6830 err = got_object_get_type(&obj_type, s->repo,
6833 /* Can't blame non-blob type objects. */
6834 if (obj_type != GOT_OBJ_TYPE_BLOB) {
6835 got_object_commit_close(commit);
6838 err = got_object_qid_alloc(&s->blamed_commit,
6840 got_object_commit_close(commit);
6842 if (got_object_id_cmp(id,
6843 &s->blamed_commit->id) == 0)
6845 err = got_object_qid_alloc(&s->blamed_commit,
6851 thread_err = stop_blame(&s->blame);
6855 STAILQ_INSERT_HEAD(&s->blamed_commits,
6856 s->blamed_commit, entry);
6857 err = run_blame(view);
6863 struct got_object_qid *first;
6866 first = STAILQ_FIRST(&s->blamed_commits);
6867 if (!got_object_id_cmp(&first->id, s->commit_id))
6870 thread_err = stop_blame(&s->blame);
6874 STAILQ_REMOVE_HEAD(&s->blamed_commits, entry);
6875 got_object_qid_free(s->blamed_commit);
6877 STAILQ_FIRST(&s->blamed_commits);
6878 err = run_blame(view);
6885 s->id_to_log = get_selected_commit_id(s->blame.lines,
6886 s->blame.nlines, s->first_displayed_line, s->selected_line);
6888 err = view_request_new(new_view, view, TOG_VIEW_LOG);
6892 struct got_object_id *id = NULL;
6893 struct got_object_qid *pid;
6894 struct got_commit_object *commit = NULL;
6897 id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
6898 s->first_displayed_line, s->selected_line);
6901 err = got_object_open_as_commit(&commit, s->repo, id);
6904 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
6906 /* traversed from diff view, release diff resources */
6907 err = close_diff_view(*new_view);
6910 diff_view = *new_view;
6912 if (view_is_parent_view(view))
6913 view_get_split(view, &begin_y, &begin_x);
6915 diff_view = view_open(0, 0, begin_y, begin_x,
6917 if (diff_view == NULL) {
6918 got_object_commit_close(commit);
6919 err = got_error_from_errno("view_open");
6923 err = open_diff_view(diff_view, pid ? &pid->id : NULL,
6924 id, NULL, NULL, 3, 0, 0, view, s->repo);
6925 got_object_commit_close(commit);
6927 view_close(diff_view);
6930 s->last_diffed_line = s->first_displayed_line - 1 +
6933 break; /* still open from active diff view */
6934 if (view_is_parent_view(view) &&
6935 view->mode == TOG_VIEW_SPLIT_HRZN) {
6936 err = view_init_hsplit(view, begin_y);
6942 diff_view->focussed = 1;
6943 diff_view->mode = view->mode;
6944 diff_view->nlines = view->lines - begin_y;
6945 if (view_is_parent_view(view)) {
6946 view_transfer_size(diff_view, view);
6947 err = view_close_child(view);
6950 err = view_set_child(view, diff_view);
6953 view->focus_child = 1;
6955 *new_view = diff_view;
6968 if (s->last_displayed_line >= s->blame.nlines &&
6969 s->selected_line >= MIN(s->blame.nlines,
6970 view->nlines - 2)) {
6974 if (s->last_displayed_line >= s->blame.nlines &&
6975 s->selected_line < view->nlines - 2) {
6977 MIN(nscroll, s->last_displayed_line -
6978 s->first_displayed_line - s->selected_line + 1);
6980 if (s->last_displayed_line + nscroll <= s->blame.nlines)
6981 s->first_displayed_line += nscroll;
6983 s->first_displayed_line =
6984 s->blame.nlines - (view->nlines - 3);
6987 if (s->selected_line > view->nlines - 2) {
6988 s->selected_line = MIN(s->blame.nlines,
6996 return thread_err ? thread_err : err;
6999 static const struct got_error *
7000 reset_blame_view(struct tog_view *view)
7002 const struct got_error *err;
7003 struct tog_blame_view_state *s = &view->state.blame;
7007 err = stop_blame(&s->blame);
7011 return run_blame(view);
7014 static const struct got_error *
7015 cmd_blame(int argc, char *argv[])
7017 const struct got_error *error;
7018 struct got_repository *repo = NULL;
7019 struct got_worktree *worktree = NULL;
7020 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
7021 char *link_target = NULL;
7022 struct got_object_id *commit_id = NULL;
7023 struct got_commit_object *commit = NULL;
7024 char *commit_id_str = NULL;
7026 struct tog_view *view = NULL;
7027 int *pack_fds = NULL;
7029 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
7032 commit_id_str = optarg;
7035 repo_path = realpath(optarg, NULL);
7036 if (repo_path == NULL)
7037 return got_error_from_errno2("realpath",
7052 error = got_repo_pack_fds_open(&pack_fds);
7056 if (repo_path == NULL) {
7057 cwd = getcwd(NULL, 0);
7059 return got_error_from_errno("getcwd");
7060 error = got_worktree_open(&worktree, cwd);
7061 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7065 strdup(got_worktree_get_repo_path(worktree));
7067 repo_path = strdup(cwd);
7068 if (repo_path == NULL) {
7069 error = got_error_from_errno("strdup");
7074 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7078 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv, repo,
7085 error = apply_unveil(got_repo_get_path(repo), NULL);
7089 error = tog_load_refs(repo, 0);
7093 if (commit_id_str == NULL) {
7094 struct got_reference *head_ref;
7095 error = got_ref_open(&head_ref, repo, worktree ?
7096 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
7099 error = got_ref_resolve(&commit_id, repo, head_ref);
7100 got_ref_close(head_ref);
7102 error = got_repo_match_object_id(&commit_id, NULL,
7103 commit_id_str, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
7108 error = got_object_open_as_commit(&commit, repo, commit_id);
7112 error = got_object_resolve_symlinks(&link_target, in_repo_path,
7117 view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
7119 error = got_error_from_errno("view_open");
7122 error = open_blame_view(view, link_target ? link_target : in_repo_path,
7124 if (error != NULL) {
7125 if (view->close == NULL)
7126 close_blame_view(view);
7131 /* Release work tree lock. */
7132 got_worktree_close(worktree);
7135 error = view_loop(view);
7143 got_object_commit_close(commit);
7145 got_worktree_close(worktree);
7147 const struct got_error *close_err = got_repo_close(repo);
7152 const struct got_error *pack_err =
7153 got_repo_pack_fds_close(pack_fds);
7161 static const struct got_error *
7162 draw_tree_entries(struct tog_view *view, const char *parent_path)
7164 struct tog_tree_view_state *s = &view->state.tree;
7165 const struct got_error *err = NULL;
7166 struct got_tree_entry *te;
7169 struct tog_color *tc;
7170 int width, n, nentries, scrollx, i = 1;
7171 int limit = view->nlines;
7174 if (view_is_hsplit_top(view))
7175 --limit; /* border */
7177 werase(view->window);
7182 err = format_line(&wline, &width, NULL, s->tree_label, 0, view->ncols,
7186 if (view_needs_focus_indication(view))
7187 wstandout(view->window);
7188 tc = get_color(&s->colors, TOG_COLOR_COMMIT);
7190 wattr_on(view->window, COLOR_PAIR(tc->colorpair), NULL);
7191 waddwstr(view->window, wline);
7194 while (width++ < view->ncols)
7195 waddch(view->window, ' ');
7197 wattr_off(view->window, COLOR_PAIR(tc->colorpair), NULL);
7198 if (view_needs_focus_indication(view))
7199 wstandend(view->window);
7204 if (s->first_displayed_entry) {
7205 i += got_tree_entry_get_index(s->first_displayed_entry);
7206 if (s->tree != s->root)
7207 ++i; /* account for ".." entry */
7209 nentries = got_object_tree_get_nentries(s->tree);
7210 if (asprintf(&index, "[%d/%d] %s",
7211 i, nentries + (s->tree == s->root ? 0 : 1), parent_path) == -1)
7212 return got_error_from_errno("asprintf");
7213 err = format_line(&wline, &width, NULL, index, 0, view->ncols, 0, 0);
7217 waddwstr(view->window, wline);
7220 if (width < view->ncols - 1)
7221 waddch(view->window, '\n');
7224 waddch(view->window, '\n');
7228 if (s->first_displayed_entry == NULL) {
7229 te = got_object_tree_get_first_entry(s->tree);
7230 if (s->selected == 0) {
7232 wstandout(view->window);
7233 s->selected_entry = NULL;
7235 waddstr(view->window, " ..\n"); /* parent directory */
7236 if (s->selected == 0 && view->focussed)
7237 wstandend(view->window);
7244 te = s->first_displayed_entry;
7248 for (i = got_tree_entry_get_index(te); i < nentries; i++) {
7249 char *line = NULL, *id_str = NULL, *link_target = NULL;
7250 const char *modestr = "";
7253 te = got_object_tree_get_entry(s->tree, i);
7254 mode = got_tree_entry_get_mode(te);
7257 err = got_object_id_str(&id_str,
7258 got_tree_entry_get_id(te));
7260 return got_error_from_errno(
7261 "got_object_id_str");
7263 if (got_object_tree_entry_is_submodule(te))
7265 else if (S_ISLNK(mode)) {
7268 err = got_tree_entry_get_symlink_target(&link_target,
7274 for (i = 0; i < strlen(link_target); i++) {
7275 if (!isprint((unsigned char)link_target[i]))
7276 link_target[i] = '?';
7280 else if (S_ISDIR(mode))
7282 else if (mode & S_IXUSR)
7284 if (asprintf(&line, "%s %s%s%s%s", id_str ? id_str : "",
7285 got_tree_entry_get_name(te), modestr,
7286 link_target ? " -> ": "",
7287 link_target ? link_target : "") == -1) {
7290 return got_error_from_errno("asprintf");
7295 /* use full line width to determine view->maxx */
7296 err = format_line(&wline, &width, NULL, line, 0, INT_MAX, 0, 0);
7301 view->maxx = MAX(view->maxx, width);
7305 err = format_line(&wline, &width, &scrollx, line, view->x,
7311 if (n == s->selected) {
7313 wstandout(view->window);
7314 s->selected_entry = te;
7316 tc = match_color(&s->colors, line);
7318 wattr_on(view->window,
7319 COLOR_PAIR(tc->colorpair), NULL);
7320 waddwstr(view->window, &wline[scrollx]);
7322 wattr_off(view->window,
7323 COLOR_PAIR(tc->colorpair), NULL);
7324 if (width < view->ncols)
7325 waddch(view->window, '\n');
7326 if (n == s->selected && view->focussed)
7327 wstandend(view->window);
7333 s->last_displayed_entry = te;
7342 tree_scroll_up(struct tog_tree_view_state *s, int maxscroll)
7344 struct got_tree_entry *te;
7345 int isroot = s->tree == s->root;
7348 if (s->first_displayed_entry == NULL)
7351 te = got_tree_entry_get_prev(s->tree, s->first_displayed_entry);
7352 while (i++ < maxscroll) {
7355 s->first_displayed_entry = NULL;
7358 s->first_displayed_entry = te;
7359 te = got_tree_entry_get_prev(s->tree, te);
7363 static const struct got_error *
7364 tree_scroll_down(struct tog_view *view, int maxscroll)
7366 struct tog_tree_view_state *s = &view->state.tree;
7367 struct got_tree_entry *next, *last;
7370 if (s->first_displayed_entry)
7371 next = got_tree_entry_get_next(s->tree,
7372 s->first_displayed_entry);
7374 next = got_object_tree_get_first_entry(s->tree);
7376 last = s->last_displayed_entry;
7377 while (next && n++ < maxscroll) {
7379 s->last_displayed_entry = last;
7380 last = got_tree_entry_get_next(s->tree, last);
7382 if (last || (view->mode == TOG_VIEW_SPLIT_HRZN && next)) {
7383 s->first_displayed_entry = next;
7384 next = got_tree_entry_get_next(s->tree, next);
7391 static const struct got_error *
7392 tree_entry_path(char **path, struct tog_parent_trees *parents,
7393 struct got_tree_entry *te)
7395 const struct got_error *err = NULL;
7396 struct tog_parent_tree *pt;
7397 size_t len = 2; /* for leading slash and NUL */
7399 TAILQ_FOREACH(pt, parents, entry)
7400 len += strlen(got_tree_entry_get_name(pt->selected_entry))
7403 len += strlen(got_tree_entry_get_name(te));
7405 *path = calloc(1, len);
7407 return got_error_from_errno("calloc");
7410 pt = TAILQ_LAST(parents, tog_parent_trees);
7412 const char *name = got_tree_entry_get_name(pt->selected_entry);
7413 if (strlcat(*path, name, len) >= len) {
7414 err = got_error(GOT_ERR_NO_SPACE);
7417 if (strlcat(*path, "/", len) >= len) {
7418 err = got_error(GOT_ERR_NO_SPACE);
7421 pt = TAILQ_PREV(pt, tog_parent_trees, entry);
7424 if (strlcat(*path, got_tree_entry_get_name(te), len) >= len) {
7425 err = got_error(GOT_ERR_NO_SPACE);
7437 static const struct got_error *
7438 blame_tree_entry(struct tog_view **new_view, int begin_y, int begin_x,
7439 struct got_tree_entry *te, struct tog_parent_trees *parents,
7440 struct got_object_id *commit_id, struct got_repository *repo)
7442 const struct got_error *err = NULL;
7444 struct tog_view *blame_view;
7448 err = tree_entry_path(&path, parents, te);
7452 blame_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_BLAME);
7453 if (blame_view == NULL) {
7454 err = got_error_from_errno("view_open");
7458 err = open_blame_view(blame_view, path, commit_id, repo);
7460 if (err->code == GOT_ERR_CANCELLED)
7462 view_close(blame_view);
7464 *new_view = blame_view;
7470 static const struct got_error *
7471 log_selected_tree_entry(struct tog_view **new_view, int begin_y, int begin_x,
7472 struct tog_tree_view_state *s)
7474 struct tog_view *log_view;
7475 const struct got_error *err = NULL;
7480 log_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_LOG);
7481 if (log_view == NULL)
7482 return got_error_from_errno("view_open");
7484 err = tree_entry_path(&path, &s->parents, s->selected_entry);
7488 err = open_log_view(log_view, s->commit_id, s->repo, s->head_ref_name,
7491 view_close(log_view);
7493 *new_view = log_view;
7498 static const struct got_error *
7499 open_tree_view(struct tog_view *view, struct got_object_id *commit_id,
7500 const char *head_ref_name, struct got_repository *repo)
7502 const struct got_error *err = NULL;
7503 char *commit_id_str = NULL;
7504 struct tog_tree_view_state *s = &view->state.tree;
7505 struct got_commit_object *commit = NULL;
7507 TAILQ_INIT(&s->parents);
7508 STAILQ_INIT(&s->colors);
7510 s->commit_id = got_object_id_dup(commit_id);
7511 if (s->commit_id == NULL) {
7512 err = got_error_from_errno("got_object_id_dup");
7516 err = got_object_open_as_commit(&commit, repo, commit_id);
7521 * The root is opened here and will be closed when the view is closed.
7522 * Any visited subtrees and their path-wise parents are opened and
7525 err = got_object_open_as_tree(&s->root, repo,
7526 got_object_commit_get_tree_id(commit));
7531 err = got_object_id_str(&commit_id_str, commit_id);
7535 if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
7536 err = got_error_from_errno("asprintf");
7540 s->first_displayed_entry = got_object_tree_get_entry(s->tree, 0);
7541 s->selected_entry = got_object_tree_get_entry(s->tree, 0);
7542 if (head_ref_name) {
7543 s->head_ref_name = strdup(head_ref_name);
7544 if (s->head_ref_name == NULL) {
7545 err = got_error_from_errno("strdup");
7551 if (has_colors() && getenv("TOG_COLORS") != NULL) {
7552 err = add_color(&s->colors, "\\$$",
7553 TOG_COLOR_TREE_SUBMODULE,
7554 get_color_value("TOG_COLOR_TREE_SUBMODULE"));
7557 err = add_color(&s->colors, "@$", TOG_COLOR_TREE_SYMLINK,
7558 get_color_value("TOG_COLOR_TREE_SYMLINK"));
7561 err = add_color(&s->colors, "/$",
7562 TOG_COLOR_TREE_DIRECTORY,
7563 get_color_value("TOG_COLOR_TREE_DIRECTORY"));
7567 err = add_color(&s->colors, "\\*$",
7568 TOG_COLOR_TREE_EXECUTABLE,
7569 get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
7573 err = add_color(&s->colors, "^$", TOG_COLOR_COMMIT,
7574 get_color_value("TOG_COLOR_COMMIT"));
7579 view->show = show_tree_view;
7580 view->input = input_tree_view;
7581 view->close = close_tree_view;
7582 view->search_start = search_start_tree_view;
7583 view->search_next = search_next_tree_view;
7585 free(commit_id_str);
7587 got_object_commit_close(commit);
7589 if (view->close == NULL)
7590 close_tree_view(view);
7596 static const struct got_error *
7597 close_tree_view(struct tog_view *view)
7599 struct tog_tree_view_state *s = &view->state.tree;
7601 free_colors(&s->colors);
7602 free(s->tree_label);
7603 s->tree_label = NULL;
7605 s->commit_id = NULL;
7606 free(s->head_ref_name);
7607 s->head_ref_name = NULL;
7608 while (!TAILQ_EMPTY(&s->parents)) {
7609 struct tog_parent_tree *parent;
7610 parent = TAILQ_FIRST(&s->parents);
7611 TAILQ_REMOVE(&s->parents, parent, entry);
7612 if (parent->tree != s->root)
7613 got_object_tree_close(parent->tree);
7617 if (s->tree != NULL && s->tree != s->root)
7618 got_object_tree_close(s->tree);
7620 got_object_tree_close(s->root);
7624 static const struct got_error *
7625 search_start_tree_view(struct tog_view *view)
7627 struct tog_tree_view_state *s = &view->state.tree;
7629 s->matched_entry = NULL;
7634 match_tree_entry(struct got_tree_entry *te, regex_t *regex)
7636 regmatch_t regmatch;
7638 return regexec(regex, got_tree_entry_get_name(te), 1, ®match,
7642 static const struct got_error *
7643 search_next_tree_view(struct tog_view *view)
7645 struct tog_tree_view_state *s = &view->state.tree;
7646 struct got_tree_entry *te = NULL;
7648 if (!view->searching) {
7649 view->search_next_done = TOG_SEARCH_HAVE_MORE;
7653 if (s->matched_entry) {
7654 if (view->searching == TOG_SEARCH_FORWARD) {
7655 if (s->selected_entry)
7656 te = got_tree_entry_get_next(s->tree,
7659 te = got_object_tree_get_first_entry(s->tree);
7661 if (s->selected_entry == NULL)
7662 te = got_object_tree_get_last_entry(s->tree);
7664 te = got_tree_entry_get_prev(s->tree,
7668 if (s->selected_entry)
7669 te = s->selected_entry;
7670 else if (view->searching == TOG_SEARCH_FORWARD)
7671 te = got_object_tree_get_first_entry(s->tree);
7673 te = got_object_tree_get_last_entry(s->tree);
7678 if (s->matched_entry == NULL) {
7679 view->search_next_done = TOG_SEARCH_HAVE_MORE;
7682 if (view->searching == TOG_SEARCH_FORWARD)
7683 te = got_object_tree_get_first_entry(s->tree);
7685 te = got_object_tree_get_last_entry(s->tree);
7688 if (match_tree_entry(te, &view->regex)) {
7689 view->search_next_done = TOG_SEARCH_HAVE_MORE;
7690 s->matched_entry = te;
7694 if (view->searching == TOG_SEARCH_FORWARD)
7695 te = got_tree_entry_get_next(s->tree, te);
7697 te = got_tree_entry_get_prev(s->tree, te);
7700 if (s->matched_entry) {
7701 s->first_displayed_entry = s->matched_entry;
7708 static const struct got_error *
7709 show_tree_view(struct tog_view *view)
7711 const struct got_error *err = NULL;
7712 struct tog_tree_view_state *s = &view->state.tree;
7715 err = tree_entry_path(&parent_path, &s->parents, NULL);
7719 err = draw_tree_entries(view, parent_path);
7726 static const struct got_error *
7727 tree_goto_line(struct tog_view *view, int nlines)
7729 const struct got_error *err = NULL;
7730 struct tog_tree_view_state *s = &view->state.tree;
7731 struct got_tree_entry **fte, **lte, **ste;
7732 int g, last, first = 1, i = 1;
7733 int root = s->tree == s->root;
7734 int off = root ? 1 : 2;
7741 else if (g > got_object_tree_get_nentries(s->tree))
7742 g = got_object_tree_get_nentries(s->tree) + (root ? 0 : 1);
7744 fte = &s->first_displayed_entry;
7745 lte = &s->last_displayed_entry;
7746 ste = &s->selected_entry;
7749 first = got_tree_entry_get_index(*fte);
7750 first += off; /* account for ".." */
7752 last = got_tree_entry_get_index(*lte);
7755 if (g >= first && g <= last && g - first < nlines) {
7756 s->selected = g - first;
7757 return NULL; /* gline is on the current page */
7761 i = got_tree_entry_get_index(*ste);
7766 err = tree_scroll_down(view, g - i);
7769 if (got_tree_entry_get_index(*lte) >=
7770 got_object_tree_get_nentries(s->tree) - 1 &&
7771 first + s->selected < g &&
7772 s->selected < s->ndisplayed - 1) {
7773 first = got_tree_entry_get_index(*fte);
7775 s->selected = g - first;
7778 tree_scroll_up(s, i - g);
7781 (*fte == NULL || (root && !got_tree_entry_get_index(*fte))))
7782 s->selected = g - 1;
7787 static const struct got_error *
7788 input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
7790 const struct got_error *err = NULL;
7791 struct tog_tree_view_state *s = &view->state.tree;
7792 struct got_tree_entry *te;
7793 int n, nscroll = view->nlines - 3;
7796 return tree_goto_line(view, nscroll);
7805 horizontal_scroll_input(view, ch);
7808 s->show_ids = !s->show_ids;
7813 if (!s->selected_entry)
7815 err = view_request_new(new_view, view, TOG_VIEW_LOG);
7819 err = view_request_new(new_view, view, TOG_VIEW_REF);
7826 if (s->tree == s->root)
7827 s->first_displayed_entry =
7828 got_object_tree_get_first_entry(s->tree);
7830 s->first_displayed_entry = NULL;
7835 int eos = view->nlines - 3;
7837 if (view->mode == TOG_VIEW_SPLIT_HRZN)
7841 te = got_object_tree_get_last_entry(s->tree);
7842 for (n = 0; n < eos; n++) {
7844 if (s->tree != s->root) {
7845 s->first_displayed_entry = NULL;
7850 s->first_displayed_entry = te;
7851 te = got_tree_entry_get_prev(s->tree, te);
7854 s->selected = n - 1;
7860 if (s->selected > 0) {
7864 tree_scroll_up(s, 1);
7865 if (s->selected_entry == NULL ||
7866 (s->tree == s->root && s->selected_entry ==
7867 got_object_tree_get_first_entry(s->tree)))
7877 if (s->tree == s->root) {
7878 if (got_object_tree_get_first_entry(s->tree) ==
7879 s->first_displayed_entry)
7880 s->selected -= MIN(s->selected, nscroll);
7882 if (s->first_displayed_entry == NULL)
7883 s->selected -= MIN(s->selected, nscroll);
7885 tree_scroll_up(s, MAX(0, nscroll));
7886 if (s->selected_entry == NULL ||
7887 (s->tree == s->root && s->selected_entry ==
7888 got_object_tree_get_first_entry(s->tree)))
7894 if (s->selected < s->ndisplayed - 1) {
7898 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
7900 /* can't scroll any further */
7904 tree_scroll_down(view, 1);
7914 if (got_tree_entry_get_next(s->tree, s->last_displayed_entry)
7916 /* can't scroll any further; move cursor down */
7917 if (s->selected < s->ndisplayed - 1)
7918 s->selected += MIN(nscroll,
7919 s->ndisplayed - s->selected - 1);
7924 tree_scroll_down(view, nscroll);
7929 if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
7930 struct tog_parent_tree *parent;
7931 /* user selected '..' */
7932 if (s->tree == s->root) {
7936 parent = TAILQ_FIRST(&s->parents);
7937 TAILQ_REMOVE(&s->parents, parent,
7939 got_object_tree_close(s->tree);
7940 s->tree = parent->tree;
7941 s->first_displayed_entry =
7942 parent->first_displayed_entry;
7944 parent->selected_entry;
7945 s->selected = parent->selected;
7946 if (s->selected > view->nlines - 3) {
7947 err = offset_selection_down(view);
7952 } else if (S_ISDIR(got_tree_entry_get_mode(
7953 s->selected_entry))) {
7954 struct got_tree_object *subtree;
7956 err = got_object_open_as_tree(&subtree, s->repo,
7957 got_tree_entry_get_id(s->selected_entry));
7960 err = tree_view_visit_subtree(s, subtree);
7962 got_object_tree_close(subtree);
7965 } else if (S_ISREG(got_tree_entry_get_mode(s->selected_entry)))
7966 err = view_request_new(new_view, view, TOG_VIEW_BLAME);
7969 if (view->nlines >= 4 && s->selected >= view->nlines - 3)
7970 s->selected = view->nlines - 4;
7986 "usage: %s tree [-c commit] [-r repository-path] [path]\n",
7991 static const struct got_error *
7992 cmd_tree(int argc, char *argv[])
7994 const struct got_error *error;
7995 struct got_repository *repo = NULL;
7996 struct got_worktree *worktree = NULL;
7997 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
7998 struct got_object_id *commit_id = NULL;
7999 struct got_commit_object *commit = NULL;
8000 const char *commit_id_arg = NULL;
8002 struct got_reference *ref = NULL;
8003 const char *head_ref_name = NULL;
8005 struct tog_view *view;
8006 int *pack_fds = NULL;
8008 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
8011 commit_id_arg = optarg;
8014 repo_path = realpath(optarg, NULL);
8015 if (repo_path == NULL)
8016 return got_error_from_errno2("realpath",
8031 error = got_repo_pack_fds_open(&pack_fds);
8035 if (repo_path == NULL) {
8036 cwd = getcwd(NULL, 0);
8038 return got_error_from_errno("getcwd");
8039 error = got_worktree_open(&worktree, cwd);
8040 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8044 strdup(got_worktree_get_repo_path(worktree));
8046 repo_path = strdup(cwd);
8047 if (repo_path == NULL) {
8048 error = got_error_from_errno("strdup");
8053 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8057 error = get_in_repo_path_from_argv0(&in_repo_path, argc, argv,
8064 error = apply_unveil(got_repo_get_path(repo), NULL);
8068 error = tog_load_refs(repo, 0);
8072 if (commit_id_arg == NULL) {
8073 error = got_repo_match_object_id(&commit_id, &label,
8074 worktree ? got_worktree_get_head_ref_name(worktree) :
8075 GOT_REF_HEAD, GOT_OBJ_TYPE_COMMIT, &tog_refs, repo);
8078 head_ref_name = label;
8080 error = got_ref_open(&ref, repo, commit_id_arg, 0);
8082 head_ref_name = got_ref_get_name(ref);
8083 else if (error->code != GOT_ERR_NOT_REF)
8085 error = got_repo_match_object_id(&commit_id, NULL,