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 "got_compat.h"
19 #include <sys/queue.h>
21 #include <sys/ioctl.h>
25 #if defined(__FreeBSD__) || defined(__APPLE__)
26 #define _XOPEN_SOURCE_EXTENDED /* for ncurses wide-character functions */
47 #include "got_version.h"
48 #include "got_error.h"
49 #include "got_object.h"
50 #include "got_reference.h"
51 #include "got_repository.h"
53 #include "got_opentemp.h"
55 #include "got_cancel.h"
56 #include "got_commit_graph.h"
57 #include "got_blame.h"
58 #include "got_privsep.h"
60 #include "got_worktree.h"
61 #include "got_keyword.h"
64 #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
68 #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
72 #define CTRL(x) ((x) & 0x1f)
76 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
81 const struct got_error
*(*cmd_main
)(int, char *[]);
82 void (*cmd_usage
)(void);
85 __dead
static void usage(int, int);
86 __dead
static void usage_log(void);
87 __dead
static void usage_diff(void);
88 __dead
static void usage_blame(void);
89 __dead
static void usage_tree(void);
90 __dead
static void usage_ref(void);
92 static const struct got_error
* cmd_log(int, char *[]);
93 static const struct got_error
* cmd_diff(int, char *[]);
94 static const struct got_error
* cmd_blame(int, char *[]);
95 static const struct got_error
* cmd_tree(int, char *[]);
96 static const struct got_error
* cmd_ref(int, char *[]);
98 static const struct tog_cmd tog_commands
[] = {
99 { "log", cmd_log
, usage_log
},
100 { "diff", cmd_diff
, usage_diff
},
101 { "blame", cmd_blame
, usage_blame
},
102 { "tree", cmd_tree
, usage_tree
},
103 { "ref", cmd_ref
, usage_ref
},
115 /* Match _DIFF to _HELP with enum tog_view_type TOG_VIEW_* counterparts. */
116 enum tog_keymap_type
{
117 TOG_KEYMAP_KEYS
= -2,
133 #define HSPLIT_SCALE 0.3f /* default horizontal split scale */
135 #define TOG_EOF_STRING "(END)"
137 struct commit_queue_entry
{
138 TAILQ_ENTRY(commit_queue_entry
) entry
;
139 struct got_object_id
*id
;
140 struct got_commit_object
*commit
;
143 TAILQ_HEAD(commit_queue_head
, commit_queue_entry
);
144 struct commit_queue
{
146 struct commit_queue_head head
;
150 STAILQ_ENTRY(tog_color
) entry
;
154 STAILQ_HEAD(tog_colors
, tog_color
);
156 static struct got_reflist_head tog_refs
= TAILQ_HEAD_INITIALIZER(tog_refs
);
157 static struct got_reflist_object_id_map
*tog_refs_idmap
;
159 struct got_object_id
*id
;
163 static enum got_diff_algorithm tog_diff_algo
= GOT_DIFF_ALGORITHM_MYERS
;
165 static const struct got_error
*
166 tog_ref_cmp_by_name(void *arg
, int *cmp
, struct got_reference
*re1
,
167 struct got_reference
* re2
)
169 const char *name1
= got_ref_get_name(re1
);
170 const char *name2
= got_ref_get_name(re2
);
171 int isbackup1
, isbackup2
;
173 /* Sort backup refs towards the bottom of the list. */
174 isbackup1
= strncmp(name1
, "refs/got/backup/", 16) == 0;
175 isbackup2
= strncmp(name2
, "refs/got/backup/", 16) == 0;
176 if (!isbackup1
&& isbackup2
) {
179 } else if (isbackup1
&& !isbackup2
) {
184 *cmp
= got_path_cmp(name1
, name2
, strlen(name1
), strlen(name2
));
188 static const struct got_error
*
189 tog_load_refs(struct got_repository
*repo
, int sort_by_date
)
191 const struct got_error
*err
;
193 err
= got_ref_list(&tog_refs
, repo
, NULL
, sort_by_date
?
194 got_ref_cmp_by_commit_timestamp_descending
: tog_ref_cmp_by_name
,
199 return got_reflist_object_id_map_create(&tog_refs_idmap
, &tog_refs
,
206 if (tog_refs_idmap
) {
207 got_reflist_object_id_map_free(tog_refs_idmap
);
208 tog_refs_idmap
= NULL
;
210 got_ref_list_free(&tog_refs
);
213 static const struct got_error
*
214 add_color(struct tog_colors
*colors
, const char *pattern
,
215 int idx
, short color
)
217 const struct got_error
*err
= NULL
;
218 struct tog_color
*tc
;
221 if (idx
< 1 || idx
> COLOR_PAIRS
- 1)
224 init_pair(idx
, color
, -1);
226 tc
= calloc(1, sizeof(*tc
));
228 return got_error_from_errno("calloc");
229 regerr
= regcomp(&tc
->regex
, pattern
,
230 REG_EXTENDED
| REG_NOSUB
| REG_NEWLINE
);
232 static char regerr_msg
[512];
233 static char err_msg
[512];
234 regerror(regerr
, &tc
->regex
, regerr_msg
,
236 snprintf(err_msg
, sizeof(err_msg
), "regcomp: %s",
238 err
= got_error_msg(GOT_ERR_REGEX
, err_msg
);
243 STAILQ_INSERT_HEAD(colors
, tc
, entry
);
248 free_colors(struct tog_colors
*colors
)
250 struct tog_color
*tc
;
252 while (!STAILQ_EMPTY(colors
)) {
253 tc
= STAILQ_FIRST(colors
);
254 STAILQ_REMOVE_HEAD(colors
, entry
);
260 static struct tog_color
*
261 get_color(struct tog_colors
*colors
, int colorpair
)
263 struct tog_color
*tc
= NULL
;
265 STAILQ_FOREACH(tc
, colors
, entry
) {
266 if (tc
->colorpair
== colorpair
)
274 default_color_value(const char *envvar
)
276 if (strcmp(envvar
, "TOG_COLOR_DIFF_MINUS") == 0)
277 return COLOR_MAGENTA
;
278 if (strcmp(envvar
, "TOG_COLOR_DIFF_PLUS") == 0)
280 if (strcmp(envvar
, "TOG_COLOR_DIFF_CHUNK_HEADER") == 0)
282 if (strcmp(envvar
, "TOG_COLOR_DIFF_META") == 0)
284 if (strcmp(envvar
, "TOG_COLOR_TREE_SUBMODULE") == 0)
285 return COLOR_MAGENTA
;
286 if (strcmp(envvar
, "TOG_COLOR_TREE_SYMLINK") == 0)
287 return COLOR_MAGENTA
;
288 if (strcmp(envvar
, "TOG_COLOR_TREE_DIRECTORY") == 0)
290 if (strcmp(envvar
, "TOG_COLOR_TREE_EXECUTABLE") == 0)
292 if (strcmp(envvar
, "TOG_COLOR_COMMIT") == 0)
294 if (strcmp(envvar
, "TOG_COLOR_AUTHOR") == 0)
296 if (strcmp(envvar
, "TOG_COLOR_DATE") == 0)
298 if (strcmp(envvar
, "TOG_COLOR_REFS_HEADS") == 0)
300 if (strcmp(envvar
, "TOG_COLOR_REFS_TAGS") == 0)
301 return COLOR_MAGENTA
;
302 if (strcmp(envvar
, "TOG_COLOR_REFS_REMOTES") == 0)
304 if (strcmp(envvar
, "TOG_COLOR_REFS_BACKUP") == 0)
311 get_color_value(const char *envvar
)
313 const char *val
= getenv(envvar
);
316 return default_color_value(envvar
);
318 if (strcasecmp(val
, "black") == 0)
320 if (strcasecmp(val
, "red") == 0)
322 if (strcasecmp(val
, "green") == 0)
324 if (strcasecmp(val
, "yellow") == 0)
326 if (strcasecmp(val
, "blue") == 0)
328 if (strcasecmp(val
, "magenta") == 0)
329 return COLOR_MAGENTA
;
330 if (strcasecmp(val
, "cyan") == 0)
332 if (strcasecmp(val
, "white") == 0)
334 if (strcasecmp(val
, "default") == 0)
337 return default_color_value(envvar
);
340 struct tog_diff_view_state
{
341 struct got_object_id
*id1
, *id2
;
342 const char *label1
, *label2
;
346 int first_displayed_line
;
347 int last_displayed_line
;
350 int ignore_whitespace
;
352 struct got_repository
*repo
;
353 struct got_diff_line
*lines
;
358 /* passed from log or blame view; may be NULL */
359 struct tog_view
*parent_view
;
362 pthread_mutex_t tog_mutex
= PTHREAD_MUTEX_INITIALIZER
;
363 static volatile sig_atomic_t tog_thread_error
;
365 struct tog_log_thread_args
{
366 pthread_cond_t need_commits
;
367 pthread_cond_t commit_loaded
;
370 struct got_commit_graph
*graph
;
371 struct commit_queue
*real_commits
;
372 const char *in_repo_path
;
373 struct got_object_id
*start_id
;
374 struct got_repository
*repo
;
377 pthread_cond_t log_loaded
;
379 struct commit_queue_entry
**first_displayed_entry
;
380 struct commit_queue_entry
**selected_entry
;
382 int *search_next_done
;
386 regex_t
*limit_regex
;
387 struct commit_queue
*limit_commits
;
388 struct got_worktree
*worktree
;
389 int need_commit_marker
;
392 struct tog_log_view_state
{
393 struct commit_queue
*commits
;
394 struct commit_queue_entry
*first_displayed_entry
;
395 struct commit_queue_entry
*last_displayed_entry
;
396 struct commit_queue_entry
*selected_entry
;
397 struct commit_queue real_commits
;
402 struct got_repository
*repo
;
403 struct got_object_id
*start_id
;
406 struct tog_log_thread_args thread_args
;
407 struct commit_queue_entry
*matched_entry
;
408 struct commit_queue_entry
*search_entry
;
409 struct tog_colors colors
;
413 struct commit_queue limit_commits
;
416 #define TOG_COLOR_DIFF_MINUS 1
417 #define TOG_COLOR_DIFF_PLUS 2
418 #define TOG_COLOR_DIFF_CHUNK_HEADER 3
419 #define TOG_COLOR_DIFF_META 4
420 #define TOG_COLOR_TREE_SUBMODULE 5
421 #define TOG_COLOR_TREE_SYMLINK 6
422 #define TOG_COLOR_TREE_DIRECTORY 7
423 #define TOG_COLOR_TREE_EXECUTABLE 8
424 #define TOG_COLOR_COMMIT 9
425 #define TOG_COLOR_AUTHOR 10
426 #define TOG_COLOR_DATE 11
427 #define TOG_COLOR_REFS_HEADS 12
428 #define TOG_COLOR_REFS_TAGS 13
429 #define TOG_COLOR_REFS_REMOTES 14
430 #define TOG_COLOR_REFS_BACKUP 15
432 struct tog_blame_cb_args
{
433 struct tog_blame_line
*lines
; /* one per line */
436 struct tog_view
*view
;
437 struct got_object_id
*commit_id
;
441 struct tog_blame_thread_args
{
443 struct got_repository
*repo
;
444 struct tog_blame_cb_args
*cb_args
;
446 got_cancel_cb cancel_cb
;
448 pthread_cond_t blame_complete
;
454 struct tog_blame_line
*lines
;
458 struct tog_blame_thread_args thread_args
;
459 struct tog_blame_cb_args cb_args
;
464 struct tog_blame_view_state
{
465 int first_displayed_line
;
466 int last_displayed_line
;
468 int last_diffed_line
;
472 struct got_object_id_queue blamed_commits
;
473 struct got_object_qid
*blamed_commit
;
475 struct got_repository
*repo
;
476 struct got_object_id
*commit_id
;
477 struct got_object_id
*id_to_log
;
478 struct tog_blame blame
;
480 struct tog_colors colors
;
483 struct tog_parent_tree
{
484 TAILQ_ENTRY(tog_parent_tree
) entry
;
485 struct got_tree_object
*tree
;
486 struct got_tree_entry
*first_displayed_entry
;
487 struct got_tree_entry
*selected_entry
;
491 TAILQ_HEAD(tog_parent_trees
, tog_parent_tree
);
493 struct tog_tree_view_state
{
495 struct got_object_id
*commit_id
;/* commit which this tree belongs to */
496 struct got_tree_object
*root
; /* the commit's root tree entry */
497 struct got_tree_object
*tree
; /* currently displayed (sub-)tree */
498 struct got_tree_entry
*first_displayed_entry
;
499 struct got_tree_entry
*last_displayed_entry
;
500 struct got_tree_entry
*selected_entry
;
501 int ndisplayed
, selected
, show_ids
;
502 struct tog_parent_trees parents
; /* parent trees of current sub-tree */
504 struct got_repository
*repo
;
505 struct got_tree_entry
*matched_entry
;
506 struct tog_colors colors
;
509 struct tog_reflist_entry
{
510 TAILQ_ENTRY(tog_reflist_entry
) entry
;
511 struct got_reference
*ref
;
515 TAILQ_HEAD(tog_reflist_head
, tog_reflist_entry
);
517 struct tog_ref_view_state
{
518 struct tog_reflist_head refs
;
519 struct tog_reflist_entry
*first_displayed_entry
;
520 struct tog_reflist_entry
*last_displayed_entry
;
521 struct tog_reflist_entry
*selected_entry
;
522 int nrefs
, ndisplayed
, selected
, show_date
, show_ids
, sort_by_date
;
523 struct got_repository
*repo
;
524 struct tog_reflist_entry
*matched_entry
;
525 struct tog_colors colors
;
528 struct tog_help_view_state
{
533 int first_displayed_line
;
534 int last_displayed_line
;
539 enum tog_keymap_type type
;
542 #define GENERATE_HELP \
543 KEYMAP_("Global", TOG_KEYMAP_GLOBAL), \
544 KEY_("H F1", "Open view-specific help (double tap for all help)"), \
545 KEY_("k C-p Up", "Move cursor or page up one line"), \
546 KEY_("j C-n Down", "Move cursor or page down one line"), \
547 KEY_("C-b b PgUp", "Scroll the view up one page"), \
548 KEY_("C-f f PgDn Space", "Scroll the view down one page"), \
549 KEY_("C-u u", "Scroll the view up one half page"), \
550 KEY_("C-d d", "Scroll the view down one half page"), \
551 KEY_("g", "Go to line N (default: first line)"), \
552 KEY_("Home =", "Go to the first line"), \
553 KEY_("G", "Go to line N (default: last line)"), \
554 KEY_("End *", "Go to the last line"), \
555 KEY_("l Right", "Scroll the view right"), \
556 KEY_("h Left", "Scroll the view left"), \
557 KEY_("$", "Scroll view to the rightmost position"), \
558 KEY_("0", "Scroll view to the leftmost position"), \
559 KEY_("-", "Decrease size of the focussed split"), \
560 KEY_("+", "Increase size of the focussed split"), \
561 KEY_("Tab", "Switch focus between views"), \
562 KEY_("F", "Toggle fullscreen mode"), \
563 KEY_("S", "Switch split-screen layout"), \
564 KEY_("/", "Open prompt to enter search term"), \
565 KEY_("n", "Find next line/token matching the current search term"), \
566 KEY_("N", "Find previous line/token matching the current search term"),\
567 KEY_("q", "Quit the focussed view; Quit help screen"), \
568 KEY_("Q", "Quit tog"), \
570 KEYMAP_("Log view", TOG_KEYMAP_LOG), \
571 KEY_("< ,", "Move cursor up one commit"), \
572 KEY_("> .", "Move cursor down one commit"), \
573 KEY_("Enter", "Open diff view of the selected commit"), \
574 KEY_("B", "Reload the log view and toggle display of merged commits"), \
575 KEY_("R", "Open ref view of all repository references"), \
576 KEY_("T", "Display tree view of the repository from the selected" \
578 KEY_("@", "Toggle between displaying author and committer name"), \
579 KEY_("&", "Open prompt to enter term to limit commits displayed"), \
580 KEY_("C-g Backspace", "Cancel current search or log operation"), \
581 KEY_("C-l", "Reload the log view with new commits in the repository"), \
583 KEYMAP_("Diff view", TOG_KEYMAP_DIFF), \
584 KEY_("K < ,", "Display diff of next line in the file/log entry"), \
585 KEY_("J > .", "Display diff of previous line in the file/log entry"), \
586 KEY_("A", "Toggle between Myers and Patience diff algorithm"), \
587 KEY_("a", "Toggle treatment of file as ASCII irrespective of binary" \
589 KEY_("(", "Go to the previous file in the diff"), \
590 KEY_(")", "Go to the next file in the diff"), \
591 KEY_("{", "Go to the previous hunk in the diff"), \
592 KEY_("}", "Go to the next hunk in the diff"), \
593 KEY_("[", "Decrease the number of context lines"), \
594 KEY_("]", "Increase the number of context lines"), \
595 KEY_("w", "Toggle ignore whitespace-only changes in the diff"), \
597 KEYMAP_("Blame view", TOG_KEYMAP_BLAME), \
598 KEY_("Enter", "Display diff view of the selected line's commit"), \
599 KEY_("A", "Toggle diff algorithm between Myers and Patience"), \
600 KEY_("L", "Open log view for the currently selected annotated line"), \
601 KEY_("C", "Reload view with the previously blamed commit"), \
602 KEY_("c", "Reload view with the version of the file found in the" \
603 " selected line's commit"), \
604 KEY_("p", "Reload view with the version of the file found in the" \
605 " selected line's parent commit"), \
607 KEYMAP_("Tree view", TOG_KEYMAP_TREE), \
608 KEY_("Enter", "Enter selected directory or open blame view of the" \
610 KEY_("L", "Open log view for the selected entry"), \
611 KEY_("R", "Open ref view of all repository references"), \
612 KEY_("i", "Show object IDs for all tree entries"), \
613 KEY_("Backspace", "Return to the parent directory"), \
615 KEYMAP_("Ref view", TOG_KEYMAP_REF), \
616 KEY_("Enter", "Display log view of the selected reference"), \
617 KEY_("T", "Display tree view of the selected reference"), \
618 KEY_("i", "Toggle display of IDs for all non-symbolic references"), \
619 KEY_("m", "Toggle display of last modified date for each reference"), \
620 KEY_("o", "Toggle reference sort order (name -> timestamp)"), \
621 KEY_("C-l", "Reload view with all repository references")
626 enum tog_keymap_type type
;
629 /* curses io for tog regress */
637 static int using_mock_io
;
639 #define TOG_KEY_SCRDUMP SHRT_MIN
642 * We implement two types of views: parent views and child views.
644 * The 'Tab' key switches focus between a parent view and its child view.
645 * Child views are shown side-by-side to their parent view, provided
646 * there is enough screen estate.
648 * When a new view is opened from within a parent view, this new view
649 * becomes a child view of the parent view, replacing any existing child.
651 * When a new view is opened from within a child view, this new view
652 * becomes a parent view which will obscure the views below until the
653 * user quits the new parent view by typing 'q'.
655 * This list of views contains parent views only.
656 * Child views are only pointed to by their parent view.
658 TAILQ_HEAD(tog_view_list_head
, tog_view
);
661 TAILQ_ENTRY(tog_view
) entry
;
664 int nlines
, ncols
, begin_y
, begin_x
; /* based on split height/width */
665 int resized_y
, resized_x
; /* begin_y/x based on user resizing */
666 int maxx
, x
; /* max column and current start column */
667 int lines
, cols
; /* copies of LINES and COLS */
668 int nscrolled
, offset
; /* lines scrolled and hsplit line offset */
669 int gline
, hiline
; /* navigate to and highlight this nG line */
670 int ch
, count
; /* current keymap and count prefix */
671 int resized
; /* set when in a resize event */
672 int focussed
; /* Only set on one parent or child view at a time. */
674 struct tog_view
*parent
;
675 struct tog_view
*child
;
678 * This flag is initially set on parent views when a new child view
679 * is created. It gets toggled when the 'Tab' key switches focus
680 * between parent and child.
681 * The flag indicates whether focus should be passed on to our child
682 * view if this parent view gets picked for focus after another parent
683 * view was closed. This prevents child views from losing focus in such
688 enum tog_view_mode mode
;
689 /* type-specific state */
690 enum tog_view_type type
;
692 struct tog_diff_view_state diff
;
693 struct tog_log_view_state log
;
694 struct tog_blame_view_state blame
;
695 struct tog_tree_view_state tree
;
696 struct tog_ref_view_state ref
;
697 struct tog_help_view_state help
;
700 const struct got_error
*(*show
)(struct tog_view
*);
701 const struct got_error
*(*input
)(struct tog_view
**,
702 struct tog_view
*, int);
703 const struct got_error
*(*reset
)(struct tog_view
*);
704 const struct got_error
*(*resize
)(struct tog_view
*, int);
705 const struct got_error
*(*close
)(struct tog_view
*);
707 const struct got_error
*(*search_start
)(struct tog_view
*);
708 const struct got_error
*(*search_next
)(struct tog_view
*);
709 void (*search_setup
)(struct tog_view
*, FILE **, off_t
**, size_t *,
710 int **, int **, int **, int **);
713 #define TOG_SEARCH_FORWARD 1
714 #define TOG_SEARCH_BACKWARD 2
715 int search_next_done
;
716 #define TOG_SEARCH_HAVE_MORE 1
717 #define TOG_SEARCH_NO_MORE 2
718 #define TOG_SEARCH_HAVE_NONE 3
724 static const struct got_error
*open_diff_view(struct tog_view
*,
725 struct got_object_id
*, struct got_object_id
*,
726 const char *, const char *, int, int, int, struct tog_view
*,
727 struct got_repository
*);
728 static const struct got_error
*show_diff_view(struct tog_view
*);
729 static const struct got_error
*input_diff_view(struct tog_view
**,
730 struct tog_view
*, int);
731 static const struct got_error
*reset_diff_view(struct tog_view
*);
732 static const struct got_error
* close_diff_view(struct tog_view
*);
733 static const struct got_error
*search_start_diff_view(struct tog_view
*);
734 static void search_setup_diff_view(struct tog_view
*, FILE **, off_t
**,
735 size_t *, int **, int **, int **, int **);
736 static const struct got_error
*search_next_view_match(struct tog_view
*);
738 static const struct got_error
*open_log_view(struct tog_view
*,
739 struct got_object_id
*, struct got_repository
*,
740 const char *, const char *, int, struct got_worktree
*);
741 static const struct got_error
* show_log_view(struct tog_view
*);
742 static const struct got_error
*input_log_view(struct tog_view
**,
743 struct tog_view
*, int);
744 static const struct got_error
*resize_log_view(struct tog_view
*, int);
745 static const struct got_error
*close_log_view(struct tog_view
*);
746 static const struct got_error
*search_start_log_view(struct tog_view
*);
747 static const struct got_error
*search_next_log_view(struct tog_view
*);
749 static const struct got_error
*open_blame_view(struct tog_view
*, char *,
750 struct got_object_id
*, struct got_repository
*);
751 static const struct got_error
*show_blame_view(struct tog_view
*);
752 static const struct got_error
*input_blame_view(struct tog_view
**,
753 struct tog_view
*, int);
754 static const struct got_error
*reset_blame_view(struct tog_view
*);
755 static const struct got_error
*close_blame_view(struct tog_view
*);
756 static const struct got_error
*search_start_blame_view(struct tog_view
*);
757 static void search_setup_blame_view(struct tog_view
*, FILE **, off_t
**,
758 size_t *, int **, int **, int **, int **);
760 static const struct got_error
*open_tree_view(struct tog_view
*,
761 struct got_object_id
*, const char *, struct got_repository
*);
762 static const struct got_error
*show_tree_view(struct tog_view
*);
763 static const struct got_error
*input_tree_view(struct tog_view
**,
764 struct tog_view
*, int);
765 static const struct got_error
*close_tree_view(struct tog_view
*);
766 static const struct got_error
*search_start_tree_view(struct tog_view
*);
767 static const struct got_error
*search_next_tree_view(struct tog_view
*);
769 static const struct got_error
*open_ref_view(struct tog_view
*,
770 struct got_repository
*);
771 static const struct got_error
*show_ref_view(struct tog_view
*);
772 static const struct got_error
*input_ref_view(struct tog_view
**,
773 struct tog_view
*, int);
774 static const struct got_error
*close_ref_view(struct tog_view
*);
775 static const struct got_error
*search_start_ref_view(struct tog_view
*);
776 static const struct got_error
*search_next_ref_view(struct tog_view
*);
778 static const struct got_error
*open_help_view(struct tog_view
*,
780 static const struct got_error
*show_help_view(struct tog_view
*);
781 static const struct got_error
*input_help_view(struct tog_view
**,
782 struct tog_view
*, int);
783 static const struct got_error
*reset_help_view(struct tog_view
*);
784 static const struct got_error
* close_help_view(struct tog_view
*);
785 static const struct got_error
*search_start_help_view(struct tog_view
*);
786 static void search_setup_help_view(struct tog_view
*, FILE **, off_t
**,
787 size_t *, int **, int **, int **, int **);
789 static volatile sig_atomic_t tog_sigwinch_received
;
790 static volatile sig_atomic_t tog_sigpipe_received
;
791 static volatile sig_atomic_t tog_sigcont_received
;
792 static volatile sig_atomic_t tog_sigint_received
;
793 static volatile sig_atomic_t tog_sigterm_received
;
796 tog_sigwinch(int signo
)
798 tog_sigwinch_received
= 1;
802 tog_sigpipe(int signo
)
804 tog_sigpipe_received
= 1;
808 tog_sigcont(int signo
)
810 tog_sigcont_received
= 1;
814 tog_sigint(int signo
)
816 tog_sigint_received
= 1;
820 tog_sigterm(int signo
)
822 tog_sigterm_received
= 1;
826 tog_fatal_signal_received(void)
828 return (tog_sigpipe_received
||
829 tog_sigint_received
|| tog_sigterm_received
);
832 static const struct got_error
*
833 view_close(struct tog_view
*view
)
835 const struct got_error
*err
= NULL
, *child_err
= NULL
;
838 child_err
= view_close(view
->child
);
842 err
= view
->close(view
);
844 del_panel(view
->panel
);
846 delwin(view
->window
);
848 return err
? err
: child_err
;
851 static struct tog_view
*
852 view_open(int nlines
, int ncols
, int begin_y
, int begin_x
,
853 enum tog_view_type type
)
855 struct tog_view
*view
= calloc(1, sizeof(*view
));
863 view
->nlines
= nlines
? nlines
: LINES
- begin_y
;
864 view
->ncols
= ncols
? ncols
: COLS
- begin_x
;
865 view
->begin_y
= begin_y
;
866 view
->begin_x
= begin_x
;
867 view
->window
= newwin(nlines
, ncols
, begin_y
, begin_x
);
868 if (view
->window
== NULL
) {
872 view
->panel
= new_panel(view
->window
);
873 if (view
->panel
== NULL
||
874 set_panel_userptr(view
->panel
, view
) != OK
) {
879 keypad(view
->window
, TRUE
);
884 view_split_begin_x(int begin_x
)
886 if (begin_x
> 0 || COLS
< 120)
888 return (COLS
- MAX(COLS
/ 2, 80));
891 /* XXX Stub till we decide what to do. */
893 view_split_begin_y(int lines
)
895 return lines
* HSPLIT_SCALE
;
898 static const struct got_error
*view_resize(struct tog_view
*);
900 static const struct got_error
*
901 view_splitscreen(struct tog_view
*view
)
903 const struct got_error
*err
= NULL
;
905 if (!view
->resized
&& view
->mode
== TOG_VIEW_SPLIT_HRZN
) {
906 if (view
->resized_y
&& view
->resized_y
< view
->lines
)
907 view
->begin_y
= view
->resized_y
;
909 view
->begin_y
= view_split_begin_y(view
->nlines
);
911 } else if (!view
->resized
) {
912 if (view
->resized_x
&& view
->resized_x
< view
->cols
- 1 &&
914 view
->begin_x
= view
->resized_x
;
916 view
->begin_x
= view_split_begin_x(0);
919 view
->nlines
= LINES
- view
->begin_y
;
920 view
->ncols
= COLS
- view
->begin_x
;
923 err
= view_resize(view
);
927 if (view
->parent
&& view
->mode
== TOG_VIEW_SPLIT_HRZN
)
928 view
->parent
->nlines
= view
->begin_y
;
930 if (mvwin(view
->window
, view
->begin_y
, view
->begin_x
) == ERR
)
931 return got_error_from_errno("mvwin");
936 static const struct got_error
*
937 view_fullscreen(struct tog_view
*view
)
939 const struct got_error
*err
= NULL
;
942 view
->begin_y
= view
->resized
? view
->begin_y
: 0;
943 view
->nlines
= view
->resized
? view
->nlines
: LINES
;
947 err
= view_resize(view
);
951 if (mvwin(view
->window
, view
->begin_y
, view
->begin_x
) == ERR
)
952 return got_error_from_errno("mvwin");
958 view_is_parent_view(struct tog_view
*view
)
960 return view
->parent
== NULL
;
964 view_is_splitscreen(struct tog_view
*view
)
966 return view
->begin_x
> 0 || view
->begin_y
> 0;
970 view_is_fullscreen(struct tog_view
*view
)
972 return view
->nlines
== LINES
&& view
->ncols
== COLS
;
976 view_is_hsplit_top(struct tog_view
*view
)
978 return view
->mode
== TOG_VIEW_SPLIT_HRZN
&& view
->child
&&
979 view_is_splitscreen(view
->child
);
983 view_border(struct tog_view
*view
)
986 const struct tog_view
*view_above
;
989 return view_border(view
->parent
);
991 panel
= panel_above(view
->panel
);
995 view_above
= panel_userptr(panel
);
996 if (view
->mode
== TOG_VIEW_SPLIT_HRZN
)
997 mvwhline(view
->window
, view_above
->begin_y
- 1,
998 view
->begin_x
, ACS_HLINE
, view
->ncols
);
1000 mvwvline(view
->window
, view
->begin_y
, view_above
->begin_x
- 1,
1001 ACS_VLINE
, view
->nlines
);
1004 static const struct got_error
*view_init_hsplit(struct tog_view
*, int);
1005 static const struct got_error
*request_log_commits(struct tog_view
*);
1006 static const struct got_error
*offset_selection_down(struct tog_view
*);
1007 static void offset_selection_up(struct tog_view
*);
1008 static void view_get_split(struct tog_view
*, int *, int *);
1010 static const struct got_error
*
1011 view_resize(struct tog_view
*view
)
1013 const struct got_error
*err
= NULL
;
1014 int dif
, nlines
, ncols
;
1016 dif
= LINES
- view
->lines
; /* line difference */
1018 if (view
->lines
> LINES
)
1019 nlines
= view
->nlines
- (view
->lines
- LINES
);
1021 nlines
= view
->nlines
+ (LINES
- view
->lines
);
1022 if (view
->cols
> COLS
)
1023 ncols
= view
->ncols
- (view
->cols
- COLS
);
1025 ncols
= view
->ncols
+ (COLS
- view
->cols
);
1028 int hs
= view
->child
->begin_y
;
1030 if (!view_is_fullscreen(view
))
1031 view
->child
->begin_x
= view_split_begin_x(view
->begin_x
);
1032 if (view
->mode
== TOG_VIEW_SPLIT_HRZN
||
1033 view
->child
->begin_x
== 0) {
1036 view_fullscreen(view
->child
);
1037 if (view
->child
->focussed
)
1038 show_panel(view
->child
->panel
);
1040 show_panel(view
->panel
);
1042 ncols
= view
->child
->begin_x
;
1044 view_splitscreen(view
->child
);
1045 show_panel(view
->child
->panel
);
1048 * XXX This is ugly and needs to be moved into the above
1049 * logic but "works" for now and my attempts at moving it
1050 * break either 'tab' or 'F' key maps in horizontal splits.
1053 err
= view_splitscreen(view
->child
);
1056 if (dif
< 0) { /* top split decreased */
1057 err
= offset_selection_down(view
);
1064 show_panel(view
->child
->panel
);
1065 nlines
= view
->nlines
;
1067 } else if (view
->parent
== NULL
)
1070 if (view
->resize
&& dif
> 0) {
1071 err
= view
->resize(view
, dif
);
1076 if (wresize(view
->window
, nlines
, ncols
) == ERR
)
1077 return got_error_from_errno("wresize");
1078 if (replace_panel(view
->panel
, view
->window
) == ERR
)
1079 return got_error_from_errno("replace_panel");
1080 wclear(view
->window
);
1082 view
->nlines
= nlines
;
1083 view
->ncols
= ncols
;
1084 view
->lines
= LINES
;
1090 static const struct got_error
*
1091 resize_log_view(struct tog_view
*view
, int increase
)
1093 struct tog_log_view_state
*s
= &view
->state
.log
;
1094 const struct got_error
*err
= NULL
;
1097 if (s
->selected_entry
)
1098 n
= s
->selected_entry
->idx
+ view
->lines
- s
->selected
;
1101 * Request commits to account for the increased
1102 * height so we have enough to populate the view.
1104 if (s
->commits
->ncommits
< n
) {
1105 view
->nscrolled
= n
- s
->commits
->ncommits
+ increase
+ 1;
1106 err
= request_log_commits(view
);
1113 view_adjust_offset(struct tog_view
*view
, int n
)
1118 if (view
->parent
&& view
->parent
->offset
) {
1119 if (view
->parent
->offset
+ n
>= 0)
1120 view
->parent
->offset
+= n
;
1122 view
->parent
->offset
= 0;
1123 } else if (view
->offset
) {
1124 if (view
->offset
- n
>= 0)
1131 static const struct got_error
*
1132 view_resize_split(struct tog_view
*view
, int resize
)
1134 const struct got_error
*err
= NULL
;
1135 struct tog_view
*v
= NULL
;
1142 if (!v
->child
|| !view_is_splitscreen(v
->child
))
1145 v
->resized
= v
->child
->resized
= resize
; /* lock for resize event */
1147 if (view
->mode
== TOG_VIEW_SPLIT_HRZN
) {
1148 if (v
->child
->resized_y
)
1149 v
->child
->begin_y
= v
->child
->resized_y
;
1151 v
->child
->begin_y
-= resize
;
1153 v
->child
->begin_y
+= resize
;
1154 if (v
->child
->begin_y
< 3) {
1156 v
->child
->begin_y
= 3;
1157 } else if (v
->child
->begin_y
> LINES
- 1) {
1159 v
->child
->begin_y
= LINES
- 1;
1162 v
->child
->ncols
= COLS
;
1163 view_adjust_offset(view
, resize
);
1164 err
= view_init_hsplit(v
, v
->child
->begin_y
);
1167 v
->child
->resized_y
= v
->child
->begin_y
;
1169 if (v
->child
->resized_x
)
1170 v
->child
->begin_x
= v
->child
->resized_x
;
1172 v
->child
->begin_x
-= resize
;
1174 v
->child
->begin_x
+= resize
;
1175 if (v
->child
->begin_x
< 11) {
1177 v
->child
->begin_x
= 11;
1178 } else if (v
->child
->begin_x
> COLS
- 1) {
1180 v
->child
->begin_x
= COLS
- 1;
1182 v
->child
->resized_x
= v
->child
->begin_x
;
1185 v
->child
->mode
= v
->mode
;
1186 v
->child
->nlines
= v
->lines
- v
->child
->begin_y
;
1187 v
->child
->ncols
= v
->cols
- v
->child
->begin_x
;
1190 err
= view_fullscreen(v
);
1193 err
= view_splitscreen(v
->child
);
1197 if (v
->mode
== TOG_VIEW_SPLIT_HRZN
) {
1198 err
= offset_selection_down(v
->child
);
1204 err
= v
->resize(v
, 0);
1205 else if (v
->child
->resize
)
1206 err
= v
->child
->resize(v
->child
, 0);
1208 v
->resized
= v
->child
->resized
= 0;
1214 view_transfer_size(struct tog_view
*dst
, struct tog_view
*src
)
1216 struct tog_view
*v
= src
->child
? src
->child
: src
;
1218 dst
->resized_x
= v
->resized_x
;
1219 dst
->resized_y
= v
->resized_y
;
1222 static const struct got_error
*
1223 view_close_child(struct tog_view
*view
)
1225 const struct got_error
*err
= NULL
;
1227 if (view
->child
== NULL
)
1230 err
= view_close(view
->child
);
1235 static const struct got_error
*
1236 view_set_child(struct tog_view
*view
, struct tog_view
*child
)
1238 const struct got_error
*err
= NULL
;
1240 view
->child
= child
;
1241 child
->parent
= view
;
1243 err
= view_resize(view
);
1247 if (view
->child
->resized_x
|| view
->child
->resized_y
)
1248 err
= view_resize_split(view
, 0);
1253 static const struct got_error
*view_dispatch_request(struct tog_view
**,
1254 struct tog_view
*, enum tog_view_type
, int, int);
1256 static const struct got_error
*
1257 view_request_new(struct tog_view
**requested
, struct tog_view
*view
,
1258 enum tog_view_type request
)
1260 struct tog_view
*new_view
= NULL
;
1261 const struct got_error
*err
;
1266 if (view_is_parent_view(view
) && request
!= TOG_VIEW_HELP
)
1267 view_get_split(view
, &y
, &x
);
1269 err
= view_dispatch_request(&new_view
, view
, request
, y
, x
);
1273 if (view_is_parent_view(view
) && view
->mode
== TOG_VIEW_SPLIT_HRZN
&&
1274 request
!= TOG_VIEW_HELP
) {
1275 err
= view_init_hsplit(view
, y
);
1281 new_view
->focussed
= 1;
1282 new_view
->mode
= view
->mode
;
1283 new_view
->nlines
= request
== TOG_VIEW_HELP
?
1284 view
->lines
: view
->lines
- y
;
1286 if (view_is_parent_view(view
) && request
!= TOG_VIEW_HELP
) {
1287 view_transfer_size(new_view
, view
);
1288 err
= view_close_child(view
);
1291 err
= view_set_child(view
, new_view
);
1294 view
->focus_child
= 1;
1296 *requested
= new_view
;
1302 tog_resizeterm(void)
1305 struct winsize size
;
1307 if (ioctl(STDOUT_FILENO
, TIOCGWINSZ
, &size
) < 0) {
1308 cols
= 80; /* Default */
1312 lines
= size
.ws_row
;
1314 resize_term(lines
, cols
);
1317 static const struct got_error
*
1318 view_search_start(struct tog_view
*view
, int fast_refresh
)
1320 const struct got_error
*err
= NULL
;
1321 struct tog_view
*v
= view
;
1325 if (view
->search_started
) {
1326 regfree(&view
->regex
);
1327 view
->searching
= 0;
1328 memset(&view
->regmatch
, 0, sizeof(view
->regmatch
));
1330 view
->search_started
= 0;
1332 if (view
->nlines
< 1)
1335 if (view_is_hsplit_top(view
))
1337 else if (view
->mode
== TOG_VIEW_SPLIT_VERT
&& view
->parent
)
1340 mvwaddstr(v
->window
, v
->nlines
- 1, 0, "/");
1341 wclrtoeol(v
->window
);
1343 nodelay(v
->window
, FALSE
); /* block for search term input */
1346 ret
= wgetnstr(v
->window
, pattern
, sizeof(pattern
));
1347 wrefresh(v
->window
);
1350 nodelay(v
->window
, TRUE
);
1351 if (!fast_refresh
&& !using_mock_io
)
1356 if (regcomp(&view
->regex
, pattern
, REG_EXTENDED
| REG_NEWLINE
) == 0) {
1357 err
= view
->search_start(view
);
1359 regfree(&view
->regex
);
1362 view
->search_started
= 1;
1363 view
->searching
= TOG_SEARCH_FORWARD
;
1364 view
->search_next_done
= 0;
1365 view
->search_next(view
);
1371 /* Switch split mode. If view is a parent or child, draw the new splitscreen. */
1372 static const struct got_error
*
1373 switch_split(struct tog_view
*view
)
1375 const struct got_error
*err
= NULL
;
1376 struct tog_view
*v
= NULL
;
1383 if (v
->mode
== TOG_VIEW_SPLIT_HRZN
)
1384 v
->mode
= TOG_VIEW_SPLIT_VERT
;
1386 v
->mode
= TOG_VIEW_SPLIT_HRZN
;
1390 else if (v
->mode
== TOG_VIEW_SPLIT_VERT
&& v
->cols
< 120)
1391 v
->mode
= TOG_VIEW_SPLIT_NONE
;
1393 view_get_split(v
, &v
->child
->begin_y
, &v
->child
->begin_x
);
1394 if (v
->mode
== TOG_VIEW_SPLIT_HRZN
&& v
->child
->resized_y
)
1395 v
->child
->begin_y
= v
->child
->resized_y
;
1396 else if (v
->mode
== TOG_VIEW_SPLIT_VERT
&& v
->child
->resized_x
)
1397 v
->child
->begin_x
= v
->child
->resized_x
;
1400 if (v
->mode
== TOG_VIEW_SPLIT_HRZN
) {
1402 v
->child
->ncols
= COLS
;
1403 v
->child
->nscrolled
= LINES
- v
->child
->nlines
;
1405 err
= view_init_hsplit(v
, v
->child
->begin_y
);
1409 v
->child
->mode
= v
->mode
;
1410 v
->child
->nlines
= v
->lines
- v
->child
->begin_y
;
1413 err
= view_fullscreen(v
);
1416 err
= view_splitscreen(v
->child
);
1420 if (v
->mode
== TOG_VIEW_SPLIT_NONE
)
1421 v
->mode
= TOG_VIEW_SPLIT_VERT
;
1422 if (v
->mode
== TOG_VIEW_SPLIT_HRZN
) {
1423 err
= offset_selection_down(v
);
1426 err
= offset_selection_down(v
->child
);
1430 offset_selection_up(v
);
1431 offset_selection_up(v
->child
);
1434 err
= v
->resize(v
, 0);
1435 else if (v
->child
->resize
)
1436 err
= v
->child
->resize(v
->child
, 0);
1442 * Strip trailing whitespace from str starting at byte *n;
1443 * if *n < 0, use strlen(str). Return new str length in *n.
1446 strip_trailing_ws(char *str
, int *n
)
1450 if (str
== NULL
|| *str
== '\0')
1456 while (x
-- > 0 && isspace((unsigned char)str
[x
]))
1463 * Extract visible substring of line y from the curses screen
1464 * and strip trailing whitespace. If vline is set, overwrite
1465 * line[vline] with '|' because the ACS_VLINE character is
1466 * written out as 'x'. Write the line to file f.
1468 static const struct got_error
*
1469 view_write_line(FILE *f
, int y
, int vline
)
1471 char line
[COLS
* MB_LEN_MAX
]; /* allow for multibyte chars */
1474 r
= mvwinnstr(curscr
, y
, 0, line
, sizeof(line
));
1476 return got_error_fmt(GOT_ERR_RANGE
,
1477 "failed to extract line %d", y
);
1480 * In some views, lines are padded with blanks to COLS width.
1481 * Strip them so we can diff without the -b flag when testing.
1483 strip_trailing_ws(line
, &r
);
1488 w
= fprintf(f
, "%s\n", line
);
1489 if (w
!= r
+ 1) /* \n */
1490 return got_ferror(f
, GOT_ERR_IO
);
1496 * Capture the visible curses screen by writing each line to the
1497 * file at the path set via the TOG_SCR_DUMP environment variable.
1499 static const struct got_error
*
1500 screendump(struct tog_view
*view
)
1502 const struct got_error
*err
;
1505 err
= got_opentemp_truncate(tog_io
.sdump
);
1509 if ((view
->child
&& view
->child
->begin_x
) ||
1510 (view
->parent
&& view
->begin_x
)) {
1511 int ncols
= view
->child
? view
->ncols
: view
->parent
->ncols
;
1513 /* vertical splitscreen */
1514 for (i
= 0; i
< view
->nlines
; ++i
) {
1515 err
= view_write_line(tog_io
.sdump
, i
, ncols
- 1);
1522 /* fullscreen or horizontal splitscreen */
1523 if ((view
->child
&& view
->child
->begin_y
) ||
1524 (view
->parent
&& view
->begin_y
)) /* hsplit */
1525 hline
= view
->child
?
1526 view
->child
->begin_y
: view
->begin_y
;
1528 for (i
= 0; i
< view
->lines
; i
++) {
1529 if (hline
&& i
== hline
- 1) {
1532 /* ACS_HLINE writes out as 'q', overwrite it */
1533 for (c
= 0; c
< view
->cols
; ++c
)
1534 fputc('-', tog_io
.sdump
);
1535 fputc('\n', tog_io
.sdump
);
1539 err
= view_write_line(tog_io
.sdump
, i
, 0);
1550 * Compute view->count from numeric input. Assign total to view->count and
1551 * return first non-numeric key entered.
1554 get_compound_key(struct tog_view
*view
, int c
)
1556 struct tog_view
*v
= view
;
1559 if (view_is_hsplit_top(view
))
1561 else if (view
->mode
== TOG_VIEW_SPLIT_VERT
&& view
->parent
)
1565 cbreak(); /* block for input */
1566 nodelay(view
->window
, FALSE
);
1567 wmove(v
->window
, v
->nlines
- 1, 0);
1568 wclrtoeol(v
->window
);
1569 waddch(v
->window
, ':');
1572 x
= getcurx(v
->window
);
1573 if (x
!= ERR
&& x
< view
->ncols
) {
1574 waddch(v
->window
, c
);
1575 wrefresh(v
->window
);
1579 * Don't overflow. Max valid request should be the greatest
1580 * between the longest and total lines; cap at 10 million.
1585 n
= n
* 10 + (c
- '0');
1586 } while (((c
= wgetch(view
->window
))) >= '0' && c
<= '9' && c
!= ERR
);
1588 if (c
== 'G' || c
== 'g') { /* nG key map */
1589 view
->gline
= view
->hiline
= n
;
1594 /* Massage excessive or inapplicable values at the input handler. */
1601 action_report(struct tog_view
*view
)
1603 struct tog_view
*v
= view
;
1605 if (view_is_hsplit_top(view
))
1607 else if (view
->mode
== TOG_VIEW_SPLIT_VERT
&& view
->parent
)
1610 wmove(v
->window
, v
->nlines
- 1, 0);
1611 wclrtoeol(v
->window
);
1612 wprintw(v
->window
, ":%s", view
->action
);
1613 wrefresh(v
->window
);
1616 * Clear action status report. Only clear in blame view
1617 * once annotating is complete, otherwise it's too fast.
1619 if (view
->type
== TOG_VIEW_BLAME
) {
1620 if (view
->state
.blame
.blame_complete
)
1621 view
->action
= NULL
;
1623 view
->action
= NULL
;
1627 * Read the next line from the test script and assign
1628 * key instruction to *ch. If at EOF, set the *done flag.
1630 static const struct got_error
*
1631 tog_read_script_key(FILE *script
, struct tog_view
*view
, int *ch
, int *done
)
1633 const struct got_error
*err
= NULL
;
1637 if (view
->count
&& --view
->count
) {
1643 if (getline(&line
, &linesz
, script
) == -1) {
1648 err
= got_ferror(script
, GOT_ERR_IO
);
1653 if (strncasecmp(line
, "WAIT_FOR_UI", 11) == 0)
1654 tog_io
.wait_for_ui
= 1;
1655 else if (strncasecmp(line
, "KEY_ENTER", 9) == 0)
1657 else if (strncasecmp(line
, "KEY_RIGHT", 9) == 0)
1659 else if (strncasecmp(line
, "KEY_LEFT", 8) == 0)
1661 else if (strncasecmp(line
, "KEY_DOWN", 8) == 0)
1663 else if (strncasecmp(line
, "KEY_UP", 6) == 0)
1665 else if (strncasecmp(line
, "TAB", 3) == 0)
1667 else if (strncasecmp(line
, "SCREENDUMP", 10) == 0)
1668 *ch
= TOG_KEY_SCRDUMP
;
1669 else if (isdigit((unsigned char)*line
)) {
1672 while (isdigit((unsigned char)*t
))
1674 view
->ch
= *ch
= *t
;
1676 /* ignore error, view->count is 0 if instruction is invalid */
1677 view
->count
= strtonum(line
, 0, INT_MAX
, NULL
);
1686 static const struct got_error
*
1687 view_input(struct tog_view
**new, int *done
, struct tog_view
*view
,
1688 struct tog_view_list_head
*views
, int fast_refresh
)
1690 const struct got_error
*err
= NULL
;
1697 action_report(view
);
1699 /* Clear "no matches" indicator. */
1700 if (view
->search_next_done
== TOG_SEARCH_NO_MORE
||
1701 view
->search_next_done
== TOG_SEARCH_HAVE_NONE
) {
1702 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
1706 if (view
->searching
&& !view
->search_next_done
) {
1707 errcode
= pthread_mutex_unlock(&tog_mutex
);
1709 return got_error_set_errno(errcode
,
1710 "pthread_mutex_unlock");
1712 errcode
= pthread_mutex_lock(&tog_mutex
);
1714 return got_error_set_errno(errcode
,
1715 "pthread_mutex_lock");
1716 view
->search_next(view
);
1720 /* Allow threads to make progress while we are waiting for input. */
1721 errcode
= pthread_mutex_unlock(&tog_mutex
);
1723 return got_error_set_errno(errcode
, "pthread_mutex_unlock");
1725 if (using_mock_io
) {
1726 err
= tog_read_script_key(tog_io
.f
, view
, &ch
, done
);
1728 errcode
= pthread_mutex_lock(&tog_mutex
);
1731 } else if (view
->count
&& --view
->count
) {
1733 nodelay(view
->window
, TRUE
);
1734 ch
= wgetch(view
->window
);
1735 /* let C-g or backspace abort unfinished count */
1736 if (ch
== CTRL('g') || ch
== KEY_BACKSPACE
)
1741 ch
= wgetch(view
->window
);
1742 if (ch
>= '1' && ch
<= '9')
1743 view
->ch
= ch
= get_compound_key(view
, ch
);
1745 if (view
->hiline
&& ch
!= ERR
&& ch
!= 0)
1746 view
->hiline
= 0; /* key pressed, clear line highlight */
1747 nodelay(view
->window
, TRUE
);
1748 errcode
= pthread_mutex_lock(&tog_mutex
);
1750 return got_error_set_errno(errcode
, "pthread_mutex_lock");
1752 if (tog_sigwinch_received
|| tog_sigcont_received
) {
1754 tog_sigwinch_received
= 0;
1755 tog_sigcont_received
= 0;
1756 TAILQ_FOREACH(v
, views
, entry
) {
1757 err
= view_resize(v
);
1760 err
= v
->input(new, v
, KEY_RESIZE
);
1764 err
= view_resize(v
->child
);
1767 err
= v
->child
->input(new, v
->child
,
1771 if (v
->child
->resized_x
|| v
->child
->resized_y
) {
1772 err
= view_resize_split(v
, 0);
1784 if (view
->type
== TOG_VIEW_HELP
)
1785 err
= view
->reset(view
);
1787 err
= view_request_new(new, view
, TOG_VIEW_HELP
);
1793 view
->child
->focussed
= 1;
1794 view
->focus_child
= 1;
1795 } else if (view
->parent
) {
1797 view
->parent
->focussed
= 1;
1798 view
->parent
->focus_child
= 0;
1799 if (!view_is_splitscreen(view
)) {
1800 if (view
->parent
->resize
) {
1801 err
= view
->parent
->resize(view
->parent
,
1806 offset_selection_up(view
->parent
);
1807 err
= view_fullscreen(view
->parent
);
1814 if (view
->parent
&& view
->mode
== TOG_VIEW_SPLIT_HRZN
) {
1815 if (view
->parent
->resize
) {
1816 /* might need more commits to fill fullscreen */
1817 err
= view
->parent
->resize(view
->parent
, 0);
1821 offset_selection_up(view
->parent
);
1823 err
= view
->input(new, view
, ch
);
1831 if (view_is_parent_view(view
)) {
1832 if (view
->child
== NULL
)
1834 if (view_is_splitscreen(view
->child
)) {
1836 view
->child
->focussed
= 1;
1837 err
= view_fullscreen(view
->child
);
1839 err
= view_splitscreen(view
->child
);
1841 err
= view_resize_split(view
, 0);
1845 err
= view
->child
->input(new, view
->child
,
1848 if (view_is_splitscreen(view
)) {
1849 view
->parent
->focussed
= 0;
1851 err
= view_fullscreen(view
);
1853 err
= view_splitscreen(view
);
1854 if (!err
&& view
->mode
!= TOG_VIEW_SPLIT_HRZN
)
1855 err
= view_resize(view
->parent
);
1857 err
= view_resize_split(view
, 0);
1861 err
= view
->input(new, view
, KEY_RESIZE
);
1866 err
= view
->resize(view
, 0);
1871 if (view
->parent
->resize
) {
1872 err
= view
->parent
->resize(view
->parent
, 0);
1876 err
= offset_selection_down(view
->parent
);
1880 err
= offset_selection_down(view
);
1884 err
= switch_split(view
);
1887 err
= view_resize_split(view
, -1);
1890 err
= view_resize_split(view
, 1);
1896 if (view
->search_start
)
1897 view_search_start(view
, fast_refresh
);
1899 err
= view
->input(new, view
, ch
);
1903 if (view
->search_started
&& view
->search_next
) {
1904 view
->searching
= (ch
== 'n' ?
1905 TOG_SEARCH_FORWARD
: TOG_SEARCH_BACKWARD
);
1906 view
->search_next_done
= 0;
1907 view
->search_next(view
);
1909 err
= view
->input(new, view
, ch
);
1912 if (tog_diff_algo
== GOT_DIFF_ALGORITHM_MYERS
) {
1913 tog_diff_algo
= GOT_DIFF_ALGORITHM_PATIENCE
;
1914 view
->action
= "Patience diff algorithm";
1916 tog_diff_algo
= GOT_DIFF_ALGORITHM_MYERS
;
1917 view
->action
= "Myers diff algorithm";
1919 TAILQ_FOREACH(v
, views
, entry
) {
1925 if (v
->child
&& v
->child
->reset
) {
1926 err
= v
->child
->reset(v
->child
);
1932 case TOG_KEY_SCRDUMP
:
1933 err
= screendump(view
);
1936 err
= view
->input(new, view
, ch
);
1944 view_needs_focus_indication(struct tog_view
*view
)
1946 if (view_is_parent_view(view
)) {
1947 if (view
->child
== NULL
|| view
->child
->focussed
)
1949 if (!view_is_splitscreen(view
->child
))
1951 } else if (!view_is_splitscreen(view
))
1954 return view
->focussed
;
1957 static const struct got_error
*
1960 const struct got_error
*err
= NULL
;
1962 if (tog_io
.cin
&& fclose(tog_io
.cin
) == EOF
)
1963 err
= got_ferror(tog_io
.cin
, GOT_ERR_IO
);
1964 if (tog_io
.cout
&& fclose(tog_io
.cout
) == EOF
&& err
== NULL
)
1965 err
= got_ferror(tog_io
.cout
, GOT_ERR_IO
);
1966 if (tog_io
.f
&& fclose(tog_io
.f
) == EOF
&& err
== NULL
)
1967 err
= got_ferror(tog_io
.f
, GOT_ERR_IO
);
1968 if (tog_io
.sdump
&& fclose(tog_io
.sdump
) == EOF
&& err
== NULL
)
1969 err
= got_ferror(tog_io
.sdump
, GOT_ERR_IO
);
1974 static const struct got_error
*
1975 view_loop(struct tog_view
*view
)
1977 const struct got_error
*err
= NULL
;
1978 struct tog_view_list_head views
;
1979 struct tog_view
*new_view
;
1981 int fast_refresh
= 10;
1982 int done
= 0, errcode
;
1984 mode
= getenv("TOG_VIEW_SPLIT_MODE");
1985 if (!mode
|| !(*mode
== 'h' || *mode
== 'H'))
1986 view
->mode
= TOG_VIEW_SPLIT_VERT
;
1988 view
->mode
= TOG_VIEW_SPLIT_HRZN
;
1990 errcode
= pthread_mutex_lock(&tog_mutex
);
1992 return got_error_set_errno(errcode
, "pthread_mutex_lock");
1995 TAILQ_INSERT_HEAD(&views
, view
, entry
);
1998 err
= view
->show(view
);
2003 while (!TAILQ_EMPTY(&views
) && !done
&& !tog_thread_error
&&
2004 !tog_fatal_signal_received()) {
2005 /* Refresh fast during initialization, then become slower. */
2006 if (fast_refresh
&& --fast_refresh
== 0 && !using_mock_io
)
2007 halfdelay(10); /* switch to once per second */
2009 err
= view_input(&new_view
, &done
, view
, &views
, fast_refresh
);
2013 if (view
->dying
&& view
== TAILQ_FIRST(&views
) &&
2014 TAILQ_NEXT(view
, entry
) == NULL
)
2020 * When we quit, scroll the screen up a single line
2021 * so we don't lose any information.
2023 TAILQ_FOREACH(v
, &views
, entry
) {
2024 wmove(v
->window
, 0, 0);
2025 wdeleteln(v
->window
);
2026 wnoutrefresh(v
->window
);
2027 if (v
->child
&& !view_is_fullscreen(v
)) {
2028 wmove(v
->child
->window
, 0, 0);
2029 wdeleteln(v
->child
->window
);
2030 wnoutrefresh(v
->child
->window
);
2037 struct tog_view
*v
, *prev
= NULL
;
2039 if (view_is_parent_view(view
))
2040 prev
= TAILQ_PREV(view
, tog_view_list_head
,
2042 else if (view
->parent
)
2043 prev
= view
->parent
;
2046 view
->parent
->child
= NULL
;
2047 view
->parent
->focus_child
= 0;
2048 /* Restore fullscreen line height. */
2049 view
->parent
->nlines
= view
->parent
->lines
;
2050 err
= view_resize(view
->parent
);
2053 /* Make resized splits persist. */
2054 view_transfer_size(view
->parent
, view
);
2056 TAILQ_REMOVE(&views
, view
, entry
);
2058 err
= view_close(view
);
2063 TAILQ_FOREACH(v
, &views
, entry
) {
2067 if (view
== NULL
&& new_view
== NULL
) {
2068 /* No view has focus. Try to pick one. */
2071 else if (!TAILQ_EMPTY(&views
)) {
2072 view
= TAILQ_LAST(&views
,
2073 tog_view_list_head
);
2076 if (view
->focus_child
) {
2077 view
->child
->focussed
= 1;
2085 struct tog_view
*v
, *t
;
2086 /* Only allow one parent view per type. */
2087 TAILQ_FOREACH_SAFE(v
, &views
, entry
, t
) {
2088 if (v
->type
!= new_view
->type
)
2090 TAILQ_REMOVE(&views
, v
, entry
);
2091 err
= view_close(v
);
2096 TAILQ_INSERT_TAIL(&views
, new_view
, entry
);
2099 if (view
&& !done
) {
2100 if (view_is_parent_view(view
)) {
2101 if (view
->child
&& view
->child
->focussed
)
2104 if (view
->parent
&& view
->parent
->focussed
)
2105 view
= view
->parent
;
2107 show_panel(view
->panel
);
2108 if (view
->child
&& view_is_splitscreen(view
->child
))
2109 show_panel(view
->child
->panel
);
2110 if (view
->parent
&& view_is_splitscreen(view
)) {
2111 err
= view
->parent
->show(view
->parent
);
2115 err
= view
->show(view
);
2119 err
= view
->child
->show(view
->child
);
2128 while (!TAILQ_EMPTY(&views
)) {
2129 const struct got_error
*close_err
;
2130 view
= TAILQ_FIRST(&views
);
2131 TAILQ_REMOVE(&views
, view
, entry
);
2132 close_err
= view_close(view
);
2133 if (close_err
&& err
== NULL
)
2137 errcode
= pthread_mutex_unlock(&tog_mutex
);
2138 if (errcode
&& err
== NULL
)
2139 err
= got_error_set_errno(errcode
, "pthread_mutex_unlock");
2149 "usage: %s log [-b] [-c commit] [-r repository-path] [path]\n",
2154 /* Create newly allocated wide-character string equivalent to a byte string. */
2155 static const struct got_error
*
2156 mbs2ws(wchar_t **ws
, size_t *wlen
, const char *s
)
2159 const struct got_error
*err
= NULL
;
2162 *wlen
= mbstowcs(NULL
, s
, 0);
2163 if (*wlen
== (size_t)-1) {
2165 if (errno
!= EILSEQ
)
2166 return got_error_from_errno("mbstowcs");
2168 /* byte string invalid in current encoding; try to "fix" it */
2169 err
= got_mbsavis(&vis
, &vislen
, s
);
2172 *wlen
= mbstowcs(NULL
, vis
, 0);
2173 if (*wlen
== (size_t)-1) {
2174 err
= got_error_from_errno("mbstowcs"); /* give up */
2179 *ws
= calloc(*wlen
+ 1, sizeof(**ws
));
2181 err
= got_error_from_errno("calloc");
2185 if (mbstowcs(*ws
, vis
? vis
: s
, *wlen
) != *wlen
)
2186 err
= got_error_from_errno("mbstowcs");
2197 static const struct got_error
*
2198 expand_tab(char **ptr
, const char *src
)
2201 size_t len
, n
, idx
= 0, sz
= 0;
2204 n
= len
= strlen(src
);
2205 dst
= malloc(n
+ 1);
2207 return got_error_from_errno("malloc");
2209 while (idx
< len
&& src
[idx
]) {
2210 const char c
= src
[idx
];
2213 size_t nb
= TABSIZE
- sz
% TABSIZE
;
2216 p
= realloc(dst
, n
+ nb
);
2219 return got_error_from_errno("realloc");
2224 memset(dst
+ sz
, ' ', nb
);
2227 dst
[sz
++] = src
[idx
];
2237 * Advance at most n columns from wline starting at offset off.
2238 * Return the index to the first character after the span operation.
2239 * Return the combined column width of all spanned wide characters in
2243 span_wline(int *rcol
, int off
, wchar_t *wline
, int n
, int col_tab_align
)
2245 int width
, i
, cols
= 0;
2252 for (i
= off
; wline
[i
] != L
'\0'; ++i
) {
2253 if (wline
[i
] == L
'\t')
2254 width
= TABSIZE
- ((cols
+ col_tab_align
) % TABSIZE
);
2256 width
= wcwidth(wline
[i
]);
2263 if (cols
+ width
> n
)
2273 * Format a line for display, ensuring that it won't overflow a width limit.
2274 * With scrolling, the width returned refers to the scrolled version of the
2275 * line, which starts at (*wlinep)[*scrollxp]. The caller must free *wlinep.
2277 static const struct got_error
*
2278 format_line(wchar_t **wlinep
, int *widthp
, int *scrollxp
,
2279 const char *line
, int nscroll
, int wlimit
, int col_tab_align
, int expand
)
2281 const struct got_error
*err
= NULL
;
2283 wchar_t *wline
= NULL
;
2292 err
= expand_tab(&exstr
, line
);
2297 err
= mbs2ws(&wline
, &wlen
, expand
? exstr
: line
);
2302 scrollx
= span_wline(&cols
, 0, wline
, nscroll
, col_tab_align
);
2304 if (wlen
> 0 && wline
[wlen
- 1] == L
'\n') {
2305 wline
[wlen
- 1] = L
'\0';
2308 if (wlen
> 0 && wline
[wlen
- 1] == L
'\r') {
2309 wline
[wlen
- 1] = L
'\0';
2313 i
= span_wline(&cols
, scrollx
, wline
, wlimit
, col_tab_align
);
2319 *scrollxp
= scrollx
;
2327 static const struct got_error
*
2328 build_refs_str(char **refs_str
, struct got_reflist_head
*refs
,
2329 struct got_object_id
*id
, struct got_repository
*repo
)
2331 static const struct got_error
*err
= NULL
;
2332 struct got_reflist_entry
*re
;
2341 TAILQ_FOREACH(re
, refs
, entry
) {
2342 struct got_tag_object
*tag
= NULL
;
2343 struct got_object_id
*ref_id
;
2346 name
= got_ref_get_name(re
->ref
);
2347 if (strcmp(name
, GOT_REF_HEAD
) == 0)
2349 if (strncmp(name
, "refs/", 5) == 0)
2351 if (strncmp(name
, "got/", 4) == 0)
2353 if (strncmp(name
, "heads/", 6) == 0)
2355 if (strncmp(name
, "remotes/", 8) == 0) {
2357 s
= strstr(name
, "/" GOT_REF_HEAD
);
2358 if (s
!= NULL
&& strcmp(s
, "/" GOT_REF_HEAD
) == 0)
2361 err
= got_ref_resolve(&ref_id
, repo
, re
->ref
);
2364 if (strncmp(name
, "tags/", 5) == 0) {
2365 err
= got_object_open_as_tag(&tag
, repo
, ref_id
);
2367 if (err
->code
!= GOT_ERR_OBJ_TYPE
) {
2371 /* Ref points at something other than a tag. */
2376 cmp
= got_object_id_cmp(tag
?
2377 got_object_tag_get_object_id(tag
) : ref_id
, id
);
2380 got_object_tag_close(tag
);
2384 if (asprintf(refs_str
, "%s%s%s", s
? s
: "",
2385 s
? ", " : "", name
) == -1) {
2386 err
= got_error_from_errno("asprintf");
2397 static const struct got_error
*
2398 format_author(wchar_t **wauthor
, int *author_width
, char *author
, int limit
,
2403 smallerthan
= strchr(author
, '<');
2404 if (smallerthan
&& smallerthan
[1] != '\0')
2405 author
= smallerthan
+ 1;
2406 author
[strcspn(author
, "@>")] = '\0';
2407 return format_line(wauthor
, author_width
, NULL
, author
, 0, limit
,
2411 static const struct got_error
*
2412 draw_commit(struct tog_view
*view
, struct commit_queue_entry
*entry
,
2413 const size_t date_display_cols
, int author_display_cols
)
2415 struct tog_log_view_state
*s
= &view
->state
.log
;
2416 const struct got_error
*err
= NULL
;
2417 struct got_commit_object
*commit
= entry
->commit
;
2418 struct got_object_id
*id
= entry
->id
;
2419 char datebuf
[12]; /* YYYY-MM-DD + SPACE + NUL */
2420 char *refs_str
= NULL
;
2421 char *logmsg0
= NULL
, *logmsg
= NULL
;
2422 char *author
= NULL
;
2423 wchar_t *wrefstr
= NULL
, *wlogmsg
= NULL
, *wauthor
= NULL
;
2424 int author_width
, refstr_width
, logmsg_width
;
2425 char *newline
, *line
= NULL
;
2426 int col
, limit
, scrollx
, logmsg_x
;
2427 const int avail
= view
->ncols
, marker_column
= author_display_cols
+ 1;
2429 time_t committer_time
;
2430 struct tog_color
*tc
;
2431 struct got_reflist_head
*refs
;
2433 if (tog_base_commit
.id
!= NULL
&& tog_base_commit
.idx
== -1 &&
2434 got_object_id_cmp(id
, tog_base_commit
.id
) == 0)
2435 tog_base_commit
.idx
= entry
->idx
;
2436 if (tog_io
.wait_for_ui
&& s
->thread_args
.need_commit_marker
) {
2439 rc
= pthread_cond_wait(&s
->thread_args
.log_loaded
, &tog_mutex
);
2441 return got_error_set_errno(rc
, "pthread_cond_wait");
2444 committer_time
= got_object_commit_get_committer_time(commit
);
2445 if (gmtime_r(&committer_time
, &tm
) == NULL
)
2446 return got_error_from_errno("gmtime_r");
2447 if (strftime(datebuf
, sizeof(datebuf
), "%G-%m-%d ", &tm
) == 0)
2448 return got_error(GOT_ERR_NO_SPACE
);
2450 if (avail
<= date_display_cols
)
2451 limit
= MIN(sizeof(datebuf
) - 1, avail
);
2453 limit
= MIN(date_display_cols
, sizeof(datebuf
) - 1);
2454 tc
= get_color(&s
->colors
, TOG_COLOR_DATE
);
2456 wattr_on(view
->window
,
2457 COLOR_PAIR(tc
->colorpair
), NULL
);
2458 waddnstr(view
->window
, datebuf
, limit
);
2460 wattr_off(view
->window
,
2461 COLOR_PAIR(tc
->colorpair
), NULL
);
2468 err
= got_object_id_str(&id_str
, id
);
2471 tc
= get_color(&s
->colors
, TOG_COLOR_COMMIT
);
2473 wattr_on(view
->window
,
2474 COLOR_PAIR(tc
->colorpair
), NULL
);
2475 wprintw(view
->window
, "%.8s ", id_str
);
2477 wattr_off(view
->window
,
2478 COLOR_PAIR(tc
->colorpair
), NULL
);
2485 if (s
->use_committer
)
2486 author
= strdup(got_object_commit_get_committer(commit
));
2488 author
= strdup(got_object_commit_get_author(commit
));
2489 if (author
== NULL
) {
2490 err
= got_error_from_errno("strdup");
2493 err
= format_author(&wauthor
, &author_width
, author
, avail
- col
, col
);
2496 tc
= get_color(&s
->colors
, TOG_COLOR_AUTHOR
);
2498 wattr_on(view
->window
,
2499 COLOR_PAIR(tc
->colorpair
), NULL
);
2500 waddwstr(view
->window
, wauthor
);
2501 col
+= author_width
;
2502 while (col
< avail
&& author_width
< author_display_cols
+ 2) {
2503 if (tog_base_commit
.marker
!= GOT_WORKTREE_STATE_UNKNOWN
&&
2504 author_width
== marker_column
&&
2505 entry
->idx
== tog_base_commit
.idx
&& !s
->limit_view
) {
2506 tc
= get_color(&s
->colors
, TOG_COLOR_COMMIT
);
2508 wattr_on(view
->window
,
2509 COLOR_PAIR(tc
->colorpair
), NULL
);
2510 waddch(view
->window
, tog_base_commit
.marker
);
2512 wattr_off(view
->window
,
2513 COLOR_PAIR(tc
->colorpair
), NULL
);
2515 waddch(view
->window
, ' ');
2520 wattr_off(view
->window
,
2521 COLOR_PAIR(tc
->colorpair
), NULL
);
2525 err
= got_object_commit_get_logmsg(&logmsg0
, commit
);
2529 while (*logmsg
== '\n')
2531 newline
= strchr(logmsg
, '\n');
2535 limit
= avail
- col
;
2536 if (view
->child
&& !view_is_hsplit_top(view
) && limit
> 0)
2537 limit
--; /* for the border */
2539 /* Prepend reference labels to log message if possible .*/
2540 refs
= got_reflist_object_id_map_lookup(tog_refs_idmap
, id
);
2541 err
= build_refs_str(&refs_str
, refs
, id
, s
->repo
);
2547 if (asprintf(&rs
, "[%s]", refs_str
) == -1) {
2548 err
= got_error_from_errno("asprintf");
2551 err
= format_line(&wrefstr
, &refstr_width
,
2552 &scrollx
, rs
, view
->x
, limit
, col
, 1);
2556 tc
= get_color(&s
->colors
, TOG_COLOR_COMMIT
);
2558 wattr_on(view
->window
,
2559 COLOR_PAIR(tc
->colorpair
), NULL
);
2560 waddwstr(view
->window
, &wrefstr
[scrollx
]);
2562 wattr_off(view
->window
,
2563 COLOR_PAIR(tc
->colorpair
), NULL
);
2564 col
+= MAX(refstr_width
, 0);
2569 waddch(view
->window
, ' ');
2573 if (refstr_width
> 0)
2576 int unscrolled_refstr_width
;
2577 size_t len
= wcslen(wrefstr
);
2580 * No need to check for -1 return value here since
2581 * unprintables have been replaced by span_wline().
2583 unscrolled_refstr_width
= wcswidth(wrefstr
, len
);
2584 unscrolled_refstr_width
+= 1; /* trailing space */
2585 logmsg_x
= view
->x
- unscrolled_refstr_width
;
2588 limit
= avail
- col
;
2589 if (view
->child
&& !view_is_hsplit_top(view
) && limit
> 0)
2590 limit
--; /* for the border */
2594 err
= format_line(&wlogmsg
, &logmsg_width
, &scrollx
, logmsg
, logmsg_x
,
2598 waddwstr(view
->window
, &wlogmsg
[scrollx
]);
2599 col
+= MAX(logmsg_width
, 0);
2600 while (col
< avail
) {
2601 waddch(view
->window
, ' ');
2615 static struct commit_queue_entry
*
2616 alloc_commit_queue_entry(struct got_commit_object
*commit
,
2617 struct got_object_id
*id
)
2619 struct commit_queue_entry
*entry
;
2620 struct got_object_id
*dup
;
2622 entry
= calloc(1, sizeof(*entry
));
2626 dup
= got_object_id_dup(id
);
2633 entry
->commit
= commit
;
2638 pop_commit(struct commit_queue
*commits
)
2640 struct commit_queue_entry
*entry
;
2642 entry
= TAILQ_FIRST(&commits
->head
);
2643 TAILQ_REMOVE(&commits
->head
, entry
, entry
);
2644 got_object_commit_close(entry
->commit
);
2645 commits
->ncommits
--;
2651 free_commits(struct commit_queue
*commits
)
2653 while (!TAILQ_EMPTY(&commits
->head
))
2654 pop_commit(commits
);
2657 static const struct got_error
*
2658 match_commit(int *have_match
, struct got_object_id
*id
,
2659 struct got_commit_object
*commit
, regex_t
*regex
)
2661 const struct got_error
*err
= NULL
;
2662 regmatch_t regmatch
;
2663 char *id_str
= NULL
, *logmsg
= NULL
;
2667 err
= got_object_id_str(&id_str
, id
);
2671 err
= got_object_commit_get_logmsg(&logmsg
, commit
);
2675 if (regexec(regex
, got_object_commit_get_author(commit
), 1,
2676 ®match
, 0) == 0 ||
2677 regexec(regex
, got_object_commit_get_committer(commit
), 1,
2678 ®match
, 0) == 0 ||
2679 regexec(regex
, id_str
, 1, ®match
, 0) == 0 ||
2680 regexec(regex
, logmsg
, 1, ®match
, 0) == 0)
2688 static const struct got_error
*
2689 queue_commits(struct tog_log_thread_args
*a
)
2691 const struct got_error
*err
= NULL
;
2694 * We keep all commits open throughout the lifetime of the log
2695 * view in order to avoid having to re-fetch commits from disk
2696 * while updating the display.
2699 struct got_object_id id
;
2700 struct got_commit_object
*commit
;
2701 struct commit_queue_entry
*entry
;
2702 int limit_match
= 0;
2705 err
= got_commit_graph_iter_next(&id
, a
->graph
, a
->repo
,
2710 err
= got_object_open_as_commit(&commit
, a
->repo
, &id
);
2713 entry
= alloc_commit_queue_entry(commit
, &id
);
2714 if (entry
== NULL
) {
2715 err
= got_error_from_errno("alloc_commit_queue_entry");
2719 errcode
= pthread_mutex_lock(&tog_mutex
);
2721 err
= got_error_set_errno(errcode
,
2722 "pthread_mutex_lock");
2726 entry
->idx
= a
->real_commits
->ncommits
;
2727 TAILQ_INSERT_TAIL(&a
->real_commits
->head
, entry
, entry
);
2728 a
->real_commits
->ncommits
++;
2731 err
= match_commit(&limit_match
, &id
, commit
,
2737 struct commit_queue_entry
*matched
;
2739 matched
= alloc_commit_queue_entry(
2740 entry
->commit
, entry
->id
);
2741 if (matched
== NULL
) {
2742 err
= got_error_from_errno(
2743 "alloc_commit_queue_entry");
2746 matched
->commit
= entry
->commit
;
2747 got_object_commit_retain(entry
->commit
);
2749 matched
->idx
= a
->limit_commits
->ncommits
;
2750 TAILQ_INSERT_TAIL(&a
->limit_commits
->head
,
2752 a
->limit_commits
->ncommits
++;
2756 * This is how we signal log_thread() that we
2757 * have found a match, and that it should be
2758 * counted as a new entry for the view.
2760 a
->limit_match
= limit_match
;
2763 if (*a
->searching
== TOG_SEARCH_FORWARD
&&
2764 !*a
->search_next_done
) {
2766 err
= match_commit(&have_match
, &id
, commit
, a
->regex
);
2771 if (limit_match
&& have_match
)
2772 *a
->search_next_done
=
2773 TOG_SEARCH_HAVE_MORE
;
2774 } else if (have_match
)
2775 *a
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
2778 errcode
= pthread_mutex_unlock(&tog_mutex
);
2779 if (errcode
&& err
== NULL
)
2780 err
= got_error_set_errno(errcode
,
2781 "pthread_mutex_unlock");
2784 } while (*a
->searching
== TOG_SEARCH_FORWARD
&& !*a
->search_next_done
);
2790 select_commit(struct tog_log_view_state
*s
)
2792 struct commit_queue_entry
*entry
;
2795 entry
= s
->first_displayed_entry
;
2797 if (ncommits
== s
->selected
) {
2798 s
->selected_entry
= entry
;
2801 entry
= TAILQ_NEXT(entry
, entry
);
2806 static const struct got_error
*
2807 draw_commits(struct tog_view
*view
)
2809 const struct got_error
*err
= NULL
;
2810 struct tog_log_view_state
*s
= &view
->state
.log
;
2811 struct commit_queue_entry
*entry
= s
->selected_entry
;
2812 int limit
= view
->nlines
;
2814 int ncommits
, author_cols
= 4, refstr_cols
;
2815 char *id_str
= NULL
, *header
= NULL
, *ncommits_str
= NULL
;
2816 char *refs_str
= NULL
;
2818 struct tog_color
*tc
;
2819 static const size_t date_display_cols
= 12;
2820 struct got_reflist_head
*refs
;
2822 if (view_is_hsplit_top(view
))
2823 --limit
; /* account for border */
2825 if (s
->selected_entry
&&
2826 !(view
->searching
&& view
->search_next_done
== 0)) {
2827 err
= got_object_id_str(&id_str
, s
->selected_entry
->id
);
2830 refs
= got_reflist_object_id_map_lookup(tog_refs_idmap
,
2831 s
->selected_entry
->id
);
2832 err
= build_refs_str(&refs_str
, refs
, s
->selected_entry
->id
,
2838 if (s
->thread_args
.commits_needed
== 0 && !using_mock_io
)
2839 halfdelay(10); /* disable fast refresh */
2841 if (s
->thread_args
.commits_needed
> 0 || s
->thread_args
.load_all
) {
2842 if (asprintf(&ncommits_str
, " [%d/%d] %s",
2843 entry
? entry
->idx
+ 1 : 0, s
->commits
->ncommits
,
2844 (view
->searching
&& !view
->search_next_done
) ?
2845 "searching..." : "loading...") == -1) {
2846 err
= got_error_from_errno("asprintf");
2850 const char *search_str
= NULL
;
2851 const char *limit_str
= NULL
;
2853 if (view
->searching
) {
2854 if (view
->search_next_done
== TOG_SEARCH_NO_MORE
)
2855 search_str
= "no more matches";
2856 else if (view
->search_next_done
== TOG_SEARCH_HAVE_NONE
)
2857 search_str
= "no matches found";
2858 else if (!view
->search_next_done
)
2859 search_str
= "searching...";
2862 if (s
->limit_view
&& s
->commits
->ncommits
== 0)
2863 limit_str
= "no matches found";
2865 if (asprintf(&ncommits_str
, " [%d/%d] %s %s",
2866 entry
? entry
->idx
+ 1 : 0, s
->commits
->ncommits
,
2867 search_str
? search_str
: (refs_str
? refs_str
: ""),
2868 limit_str
? limit_str
: "") == -1) {
2869 err
= got_error_from_errno("asprintf");
2877 if (s
->in_repo_path
&& strcmp(s
->in_repo_path
, "/") != 0) {
2878 if (asprintf(&header
, "commit %s %s%s", id_str
? id_str
:
2879 "........................................",
2880 s
->in_repo_path
, ncommits_str
) == -1) {
2881 err
= got_error_from_errno("asprintf");
2885 } else if (asprintf(&header
, "commit %s%s",
2886 id_str
? id_str
: "........................................",
2887 ncommits_str
) == -1) {
2888 err
= got_error_from_errno("asprintf");
2892 err
= format_line(&wline
, &width
, NULL
, header
, 0, view
->ncols
, 0, 0);
2896 werase(view
->window
);
2898 if (view_needs_focus_indication(view
))
2899 wstandout(view
->window
);
2900 tc
= get_color(&s
->colors
, TOG_COLOR_COMMIT
);
2902 wattr_on(view
->window
, COLOR_PAIR(tc
->colorpair
), NULL
);
2903 waddwstr(view
->window
, wline
);
2904 while (width
< view
->ncols
) {
2905 waddch(view
->window
, ' ');
2909 wattr_off(view
->window
, COLOR_PAIR(tc
->colorpair
), NULL
);
2910 if (view_needs_focus_indication(view
))
2911 wstandend(view
->window
);
2916 /* Grow author column size if necessary, and set view->maxx. */
2917 entry
= s
->first_displayed_entry
;
2921 struct got_commit_object
*c
= entry
->commit
;
2922 char *author
, *eol
, *msg
, *msg0
;
2923 wchar_t *wauthor
, *wmsg
;
2925 if (ncommits
>= limit
- 1)
2927 if (s
->use_committer
)
2928 author
= strdup(got_object_commit_get_committer(c
));
2930 author
= strdup(got_object_commit_get_author(c
));
2931 if (author
== NULL
) {
2932 err
= got_error_from_errno("strdup");
2935 err
= format_author(&wauthor
, &width
, author
, COLS
,
2937 if (author_cols
< width
)
2938 author_cols
= width
;
2943 refs
= got_reflist_object_id_map_lookup(tog_refs_idmap
,
2945 err
= build_refs_str(&refs_str
, refs
, entry
->id
, s
->repo
);
2950 err
= format_line(&ws
, &width
, NULL
, refs_str
,
2951 0, INT_MAX
, date_display_cols
+ author_cols
, 0);
2957 refstr_cols
= width
+ 3; /* account for [ ] + space */
2960 err
= got_object_commit_get_logmsg(&msg0
, c
);
2964 while (*msg
== '\n')
2966 if ((eol
= strchr(msg
, '\n')))
2968 err
= format_line(&wmsg
, &width
, NULL
, msg
, 0, INT_MAX
,
2969 date_display_cols
+ author_cols
+ refstr_cols
, 0);
2972 view
->maxx
= MAX(view
->maxx
, width
+ refstr_cols
);
2976 entry
= TAILQ_NEXT(entry
, entry
);
2979 entry
= s
->first_displayed_entry
;
2980 s
->last_displayed_entry
= s
->first_displayed_entry
;
2983 if (ncommits
>= limit
- 1)
2985 if (ncommits
== s
->selected
)
2986 wstandout(view
->window
);
2987 err
= draw_commit(view
, entry
, date_display_cols
, author_cols
);
2988 if (ncommits
== s
->selected
)
2989 wstandend(view
->window
);
2993 s
->last_displayed_entry
= entry
;
2994 entry
= TAILQ_NEXT(entry
, entry
);
3007 log_scroll_up(struct tog_log_view_state
*s
, int maxscroll
)
3009 struct commit_queue_entry
*entry
;
3012 entry
= TAILQ_FIRST(&s
->commits
->head
);
3013 if (s
->first_displayed_entry
== entry
)
3016 entry
= s
->first_displayed_entry
;
3017 while (entry
&& nscrolled
< maxscroll
) {
3018 entry
= TAILQ_PREV(entry
, commit_queue_head
, entry
);
3020 s
->first_displayed_entry
= entry
;
3026 static const struct got_error
*
3027 trigger_log_thread(struct tog_view
*view
, int wait
)
3029 struct tog_log_thread_args
*ta
= &view
->state
.log
.thread_args
;
3033 halfdelay(1); /* fast refresh while loading commits */
3035 while (!ta
->log_complete
&& !tog_thread_error
&&
3036 (ta
->commits_needed
> 0 || ta
->load_all
)) {
3037 /* Wake the log thread. */
3038 errcode
= pthread_cond_signal(&ta
->need_commits
);
3040 return got_error_set_errno(errcode
,
3041 "pthread_cond_signal");
3044 * The mutex will be released while the view loop waits
3045 * in wgetch(), at which time the log thread will run.
3050 /* Display progress update in log view. */
3051 show_log_view(view
);
3055 /* Wait right here while next commit is being loaded. */
3056 errcode
= pthread_cond_wait(&ta
->commit_loaded
, &tog_mutex
);
3058 return got_error_set_errno(errcode
,
3059 "pthread_cond_wait");
3061 /* Display progress update in log view. */
3062 show_log_view(view
);
3070 static const struct got_error
*
3071 request_log_commits(struct tog_view
*view
)
3073 struct tog_log_view_state
*state
= &view
->state
.log
;
3074 const struct got_error
*err
= NULL
;
3076 if (state
->thread_args
.log_complete
)
3079 state
->thread_args
.commits_needed
+= view
->nscrolled
;
3080 err
= trigger_log_thread(view
, 1);
3081 view
->nscrolled
= 0;
3086 static const struct got_error
*
3087 log_scroll_down(struct tog_view
*view
, int maxscroll
)
3089 struct tog_log_view_state
*s
= &view
->state
.log
;
3090 const struct got_error
*err
= NULL
;
3091 struct commit_queue_entry
*pentry
;
3092 int nscrolled
= 0, ncommits_needed
;
3094 if (s
->last_displayed_entry
== NULL
)
3097 ncommits_needed
= s
->last_displayed_entry
->idx
+ 1 + maxscroll
;
3098 if (s
->commits
->ncommits
< ncommits_needed
&&
3099 !s
->thread_args
.log_complete
) {
3101 * Ask the log thread for required amount of commits.
3103 s
->thread_args
.commits_needed
+=
3104 ncommits_needed
- s
->commits
->ncommits
;
3105 err
= trigger_log_thread(view
, 1);
3111 pentry
= TAILQ_NEXT(s
->last_displayed_entry
, entry
);
3112 if (pentry
== NULL
&& view
->mode
!= TOG_VIEW_SPLIT_HRZN
)
3115 s
->last_displayed_entry
= pentry
?
3116 pentry
: s
->last_displayed_entry
;
3118 pentry
= TAILQ_NEXT(s
->first_displayed_entry
, entry
);
3121 s
->first_displayed_entry
= pentry
;
3122 } while (++nscrolled
< maxscroll
);
3124 if (view
->mode
== TOG_VIEW_SPLIT_HRZN
&& !s
->thread_args
.log_complete
)
3125 view
->nscrolled
+= nscrolled
;
3127 view
->nscrolled
= 0;
3132 static const struct got_error
*
3133 open_diff_view_for_commit(struct tog_view
**new_view
, int begin_y
, int begin_x
,
3134 struct got_commit_object
*commit
, struct got_object_id
*commit_id
,
3135 struct tog_view
*log_view
, struct got_repository
*repo
)
3137 const struct got_error
*err
;
3138 struct got_object_qid
*parent_id
;
3139 struct tog_view
*diff_view
;
3141 diff_view
= view_open(0, 0, begin_y
, begin_x
, TOG_VIEW_DIFF
);
3142 if (diff_view
== NULL
)
3143 return got_error_from_errno("view_open");
3145 parent_id
= STAILQ_FIRST(got_object_commit_get_parent_ids(commit
));
3146 err
= open_diff_view(diff_view
, parent_id
? &parent_id
->id
: NULL
,
3147 commit_id
, NULL
, NULL
, 3, 0, 0, log_view
, repo
);
3149 *new_view
= diff_view
;
3153 static const struct got_error
*
3154 tree_view_visit_subtree(struct tog_tree_view_state
*s
,
3155 struct got_tree_object
*subtree
)
3157 struct tog_parent_tree
*parent
;
3159 parent
= calloc(1, sizeof(*parent
));
3161 return got_error_from_errno("calloc");
3163 parent
->tree
= s
->tree
;
3164 parent
->first_displayed_entry
= s
->first_displayed_entry
;
3165 parent
->selected_entry
= s
->selected_entry
;
3166 parent
->selected
= s
->selected
;
3167 TAILQ_INSERT_HEAD(&s
->parents
, parent
, entry
);
3170 s
->first_displayed_entry
= NULL
;
3174 static const struct got_error
*
3175 tree_view_walk_path(struct tog_tree_view_state
*s
,
3176 struct got_commit_object
*commit
, const char *path
)
3178 const struct got_error
*err
= NULL
;
3179 struct got_tree_object
*tree
= NULL
;
3181 char *slash
, *subpath
= NULL
;
3183 /* Walk the path and open corresponding tree objects. */
3186 struct got_tree_entry
*te
;
3187 struct got_object_id
*tree_id
;
3193 /* Ensure the correct subtree entry is selected. */
3194 slash
= strchr(p
, '/');
3196 te_name
= strdup(p
);
3198 te_name
= strndup(p
, slash
- p
);
3199 if (te_name
== NULL
) {
3200 err
= got_error_from_errno("strndup");
3203 te
= got_object_tree_find_entry(s
->tree
, te_name
);
3205 err
= got_error_path(te_name
, GOT_ERR_NO_TREE_ENTRY
);
3210 s
->first_displayed_entry
= s
->selected_entry
= te
;
3212 if (!S_ISDIR(got_tree_entry_get_mode(s
->selected_entry
)))
3213 break; /* jump to this file's entry */
3215 slash
= strchr(p
, '/');
3217 subpath
= strndup(path
, slash
- path
);
3219 subpath
= strdup(path
);
3220 if (subpath
== NULL
) {
3221 err
= got_error_from_errno("strdup");
3225 err
= got_object_id_by_path(&tree_id
, s
->repo
, commit
,
3230 err
= got_object_open_as_tree(&tree
, s
->repo
, tree_id
);
3235 err
= tree_view_visit_subtree(s
, tree
);
3237 got_object_tree_close(tree
);
3251 static const struct got_error
*
3252 browse_commit_tree(struct tog_view
**new_view
, int begin_y
, int begin_x
,
3253 struct commit_queue_entry
*entry
, const char *path
,
3254 const char *head_ref_name
, struct got_repository
*repo
)
3256 const struct got_error
*err
= NULL
;
3257 struct tog_tree_view_state
*s
;
3258 struct tog_view
*tree_view
;
3260 tree_view
= view_open(0, 0, begin_y
, begin_x
, TOG_VIEW_TREE
);
3261 if (tree_view
== NULL
)
3262 return got_error_from_errno("view_open");
3264 err
= open_tree_view(tree_view
, entry
->id
, head_ref_name
, repo
);
3267 s
= &tree_view
->state
.tree
;
3269 *new_view
= tree_view
;
3271 if (got_path_is_root_dir(path
))
3274 return tree_view_walk_path(s
, entry
->commit
, path
);
3277 static const struct got_error
*
3278 block_signals_used_by_main_thread(void)
3283 if (sigemptyset(&sigset
) == -1)
3284 return got_error_from_errno("sigemptyset");
3286 /* tog handles SIGWINCH, SIGCONT, SIGINT, SIGTERM */
3287 if (sigaddset(&sigset
, SIGWINCH
) == -1)
3288 return got_error_from_errno("sigaddset");
3289 if (sigaddset(&sigset
, SIGCONT
) == -1)
3290 return got_error_from_errno("sigaddset");
3291 if (sigaddset(&sigset
, SIGINT
) == -1)
3292 return got_error_from_errno("sigaddset");
3293 if (sigaddset(&sigset
, SIGTERM
) == -1)
3294 return got_error_from_errno("sigaddset");
3296 /* ncurses handles SIGTSTP */
3297 if (sigaddset(&sigset
, SIGTSTP
) == -1)
3298 return got_error_from_errno("sigaddset");
3300 errcode
= pthread_sigmask(SIG_BLOCK
, &sigset
, NULL
);
3302 return got_error_set_errno(errcode
, "pthread_sigmask");
3308 log_thread(void *arg
)
3310 const struct got_error
*err
= NULL
;
3312 struct tog_log_thread_args
*a
= arg
;
3316 * Sync startup with main thread such that we begin our
3317 * work once view_input() has released the mutex.
3319 errcode
= pthread_mutex_lock(&tog_mutex
);
3321 err
= got_error_set_errno(errcode
, "pthread_mutex_lock");
3325 err
= block_signals_used_by_main_thread();
3327 pthread_mutex_unlock(&tog_mutex
);
3331 while (!done
&& !err
&& !tog_fatal_signal_received()) {
3332 errcode
= pthread_mutex_unlock(&tog_mutex
);
3334 err
= got_error_set_errno(errcode
,
3335 "pthread_mutex_unlock");
3338 err
= queue_commits(a
);
3340 if (err
->code
!= GOT_ERR_ITER_COMPLETED
)
3344 a
->commits_needed
= 0;
3345 } else if (a
->commits_needed
> 0 && !a
->load_all
) {
3348 a
->commits_needed
--;
3350 a
->commits_needed
--;
3353 errcode
= pthread_mutex_lock(&tog_mutex
);
3355 err
= got_error_set_errno(errcode
,
3356 "pthread_mutex_lock");
3358 } else if (*a
->quit
)
3360 else if (*a
->limiting
&& *a
->first_displayed_entry
== NULL
) {
3361 *a
->first_displayed_entry
=
3362 TAILQ_FIRST(&a
->limit_commits
->head
);
3363 *a
->selected_entry
= *a
->first_displayed_entry
;
3364 } else if (*a
->first_displayed_entry
== NULL
) {
3365 *a
->first_displayed_entry
=
3366 TAILQ_FIRST(&a
->real_commits
->head
);
3367 *a
->selected_entry
= *a
->first_displayed_entry
;
3370 errcode
= pthread_cond_signal(&a
->commit_loaded
);
3372 err
= got_error_set_errno(errcode
,
3373 "pthread_cond_signal");
3374 pthread_mutex_unlock(&tog_mutex
);
3378 if (a
->commits_needed
== 0 &&
3379 a
->need_commit_marker
&& a
->worktree
) {
3380 errcode
= pthread_mutex_unlock(&tog_mutex
);
3382 err
= got_error_set_errno(errcode
,
3383 "pthread_mutex_unlock");
3386 err
= got_worktree_get_state(&tog_base_commit
.marker
,
3387 a
->repo
, a
->worktree
, NULL
, NULL
);
3390 errcode
= pthread_mutex_lock(&tog_mutex
);
3392 err
= got_error_set_errno(errcode
,
3393 "pthread_mutex_lock");
3396 a
->need_commit_marker
= 0;
3398 * The main thread did not close this
3399 * work tree yet. Close it now.
3401 got_worktree_close(a
->worktree
);
3409 a
->commits_needed
= 0;
3411 if (a
->commits_needed
== 0 && !a
->load_all
) {
3412 if (tog_io
.wait_for_ui
) {
3413 errcode
= pthread_cond_signal(
3415 if (errcode
&& err
== NULL
)
3416 err
= got_error_set_errno(
3418 "pthread_cond_signal");
3421 errcode
= pthread_cond_wait(&a
->need_commits
,
3424 err
= got_error_set_errno(errcode
,
3425 "pthread_cond_wait");
3426 pthread_mutex_unlock(&tog_mutex
);
3434 a
->log_complete
= 1;
3435 if (tog_io
.wait_for_ui
) {
3436 errcode
= pthread_cond_signal(&a
->log_loaded
);
3437 if (errcode
&& err
== NULL
)
3438 err
= got_error_set_errno(errcode
,
3439 "pthread_cond_signal");
3442 errcode
= pthread_mutex_unlock(&tog_mutex
);
3444 err
= got_error_set_errno(errcode
, "pthread_mutex_unlock");
3447 tog_thread_error
= 1;
3448 pthread_cond_signal(&a
->commit_loaded
);
3450 got_worktree_close(a
->worktree
);
3457 static const struct got_error
*
3458 stop_log_thread(struct tog_log_view_state
*s
)
3460 const struct got_error
*err
= NULL
, *thread_err
= NULL
;
3465 errcode
= pthread_cond_signal(&s
->thread_args
.need_commits
);
3467 return got_error_set_errno(errcode
,
3468 "pthread_cond_signal");
3469 errcode
= pthread_mutex_unlock(&tog_mutex
);
3471 return got_error_set_errno(errcode
,
3472 "pthread_mutex_unlock");
3473 errcode
= pthread_join(s
->thread
, (void **)&thread_err
);
3475 return got_error_set_errno(errcode
, "pthread_join");
3476 errcode
= pthread_mutex_lock(&tog_mutex
);
3478 return got_error_set_errno(errcode
,
3479 "pthread_mutex_lock");
3480 s
->thread
= 0; //NULL;
3483 if (s
->thread_args
.repo
) {
3484 err
= got_repo_close(s
->thread_args
.repo
);
3485 s
->thread_args
.repo
= NULL
;
3488 if (s
->thread_args
.pack_fds
) {
3489 const struct got_error
*pack_err
=
3490 got_repo_pack_fds_close(s
->thread_args
.pack_fds
);
3493 s
->thread_args
.pack_fds
= NULL
;
3496 if (s
->thread_args
.graph
) {
3497 got_commit_graph_close(s
->thread_args
.graph
);
3498 s
->thread_args
.graph
= NULL
;
3501 return err
? err
: thread_err
;
3504 static const struct got_error
*
3505 close_log_view(struct tog_view
*view
)
3507 const struct got_error
*err
= NULL
;
3508 struct tog_log_view_state
*s
= &view
->state
.log
;
3511 err
= stop_log_thread(s
);
3513 errcode
= pthread_cond_destroy(&s
->thread_args
.need_commits
);
3514 if (errcode
&& err
== NULL
)
3515 err
= got_error_set_errno(errcode
, "pthread_cond_destroy");
3517 errcode
= pthread_cond_destroy(&s
->thread_args
.commit_loaded
);
3518 if (errcode
&& err
== NULL
)
3519 err
= got_error_set_errno(errcode
, "pthread_cond_destroy");
3521 free_commits(&s
->limit_commits
);
3522 free_commits(&s
->real_commits
);
3523 free(s
->in_repo_path
);
3524 s
->in_repo_path
= NULL
;
3527 free(s
->head_ref_name
);
3528 s
->head_ref_name
= NULL
;
3533 * We use two queues to implement the limit feature: first consists of
3534 * commits matching the current limit_regex; second is the real queue
3535 * of all known commits (real_commits). When the user starts limiting,
3536 * we swap queues such that all movement and displaying functionality
3537 * works with very slight change.
3539 static const struct got_error
*
3540 limit_log_view(struct tog_view
*view
)
3542 struct tog_log_view_state
*s
= &view
->state
.log
;
3543 struct commit_queue_entry
*entry
;
3544 struct tog_view
*v
= view
;
3545 const struct got_error
*err
= NULL
;
3549 if (view_is_hsplit_top(view
))
3551 else if (view
->mode
== TOG_VIEW_SPLIT_VERT
&& view
->parent
)
3554 /* Get the pattern */
3555 wmove(v
->window
, v
->nlines
- 1, 0);
3556 wclrtoeol(v
->window
);
3557 mvwaddstr(v
->window
, v
->nlines
- 1, 0, "&/");
3558 nodelay(v
->window
, FALSE
);
3561 ret
= wgetnstr(v
->window
, pattern
, sizeof(pattern
));
3564 nodelay(v
->window
, TRUE
);
3568 if (*pattern
== '\0') {
3570 * Safety measure for the situation where the user
3571 * resets limit without previously limiting anything.
3577 * User could have pressed Ctrl+L, which refreshed the
3578 * commit queues, it means we can't save previously
3579 * (before limit took place) displayed entries,
3580 * because they would point to already free'ed memory,
3581 * so we are forced to always select first entry of
3584 s
->commits
= &s
->real_commits
;
3585 s
->first_displayed_entry
= TAILQ_FIRST(&s
->real_commits
.head
);
3586 s
->selected_entry
= s
->first_displayed_entry
;
3593 if (regcomp(&s
->limit_regex
, pattern
, REG_EXTENDED
| REG_NEWLINE
))
3598 /* Clear the screen while loading limit view */
3599 s
->first_displayed_entry
= NULL
;
3600 s
->last_displayed_entry
= NULL
;
3601 s
->selected_entry
= NULL
;
3602 s
->commits
= &s
->limit_commits
;
3604 /* Prepare limit queue for new search */
3605 free_commits(&s
->limit_commits
);
3606 s
->limit_commits
.ncommits
= 0;
3608 /* First process commits, which are in queue already */
3609 TAILQ_FOREACH(entry
, &s
->real_commits
.head
, entry
) {
3612 err
= match_commit(&have_match
, entry
->id
,
3613 entry
->commit
, &s
->limit_regex
);
3618 struct commit_queue_entry
*matched
;
3620 matched
= alloc_commit_queue_entry(entry
->commit
,
3622 if (matched
== NULL
) {
3623 err
= got_error_from_errno(
3624 "alloc_commit_queue_entry");
3627 matched
->commit
= entry
->commit
;
3628 got_object_commit_retain(entry
->commit
);
3630 matched
->idx
= s
->limit_commits
.ncommits
;
3631 TAILQ_INSERT_TAIL(&s
->limit_commits
.head
,
3633 s
->limit_commits
.ncommits
++;
3637 /* Second process all the commits, until we fill the screen */
3638 if (s
->limit_commits
.ncommits
< view
->nlines
- 1 &&
3639 !s
->thread_args
.log_complete
) {
3640 s
->thread_args
.commits_needed
+=
3641 view
->nlines
- s
->limit_commits
.ncommits
- 1;
3642 err
= trigger_log_thread(view
, 1);
3647 s
->first_displayed_entry
= TAILQ_FIRST(&s
->commits
->head
);
3648 s
->selected_entry
= TAILQ_FIRST(&s
->commits
->head
);
3654 static const struct got_error
*
3655 search_start_log_view(struct tog_view
*view
)
3657 struct tog_log_view_state
*s
= &view
->state
.log
;
3659 s
->matched_entry
= NULL
;
3660 s
->search_entry
= NULL
;
3664 static const struct got_error
*
3665 search_next_log_view(struct tog_view
*view
)
3667 const struct got_error
*err
= NULL
;
3668 struct tog_log_view_state
*s
= &view
->state
.log
;
3669 struct commit_queue_entry
*entry
;
3671 /* Display progress update in log view. */
3672 show_log_view(view
);
3676 if (s
->search_entry
) {
3678 errcode
= pthread_mutex_unlock(&tog_mutex
);
3680 return got_error_set_errno(errcode
,
3681 "pthread_mutex_unlock");
3682 ch
= wgetch(view
->window
);
3683 errcode
= pthread_mutex_lock(&tog_mutex
);
3685 return got_error_set_errno(errcode
,
3686 "pthread_mutex_lock");
3687 if (ch
== CTRL('g') || ch
== KEY_BACKSPACE
) {
3688 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
3691 if (view
->searching
== TOG_SEARCH_FORWARD
)
3692 entry
= TAILQ_NEXT(s
->search_entry
, entry
);
3694 entry
= TAILQ_PREV(s
->search_entry
,
3695 commit_queue_head
, entry
);
3696 } else if (s
->matched_entry
) {
3698 * If the user has moved the cursor after we hit a match,
3699 * the position from where we should continue searching
3700 * might have changed.
3702 if (view
->searching
== TOG_SEARCH_FORWARD
)
3703 entry
= TAILQ_NEXT(s
->selected_entry
, entry
);
3705 entry
= TAILQ_PREV(s
->selected_entry
, commit_queue_head
,
3708 entry
= s
->selected_entry
;
3714 if (entry
== NULL
) {
3715 if (s
->thread_args
.log_complete
||
3716 view
->searching
== TOG_SEARCH_BACKWARD
) {
3717 view
->search_next_done
=
3718 (s
->matched_entry
== NULL
?
3719 TOG_SEARCH_HAVE_NONE
: TOG_SEARCH_NO_MORE
);
3720 s
->search_entry
= NULL
;
3724 * Poke the log thread for more commits and return,
3725 * allowing the main loop to make progress. Search
3726 * will resume at s->search_entry once we come back.
3728 s
->search_entry
= s
->selected_entry
;
3729 s
->thread_args
.commits_needed
++;
3730 return trigger_log_thread(view
, 0);
3733 err
= match_commit(&have_match
, entry
->id
, entry
->commit
,
3738 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
3739 s
->matched_entry
= entry
;
3743 s
->search_entry
= entry
;
3744 if (view
->searching
== TOG_SEARCH_FORWARD
)
3745 entry
= TAILQ_NEXT(entry
, entry
);
3747 entry
= TAILQ_PREV(entry
, commit_queue_head
, entry
);
3750 if (s
->matched_entry
) {
3751 int cur
= s
->selected_entry
->idx
;
3752 while (cur
< s
->matched_entry
->idx
) {
3753 err
= input_log_view(NULL
, view
, KEY_DOWN
);
3758 while (cur
> s
->matched_entry
->idx
) {
3759 err
= input_log_view(NULL
, view
, KEY_UP
);
3766 s
->search_entry
= NULL
;
3771 static const struct got_error
*
3772 open_log_view(struct tog_view
*view
, struct got_object_id
*start_id
,
3773 struct got_repository
*repo
, const char *head_ref_name
,
3774 const char *in_repo_path
, int log_branches
,
3775 struct got_worktree
*worktree
)
3777 const struct got_error
*err
= NULL
;
3778 struct tog_log_view_state
*s
= &view
->state
.log
;
3779 struct got_repository
*thread_repo
= NULL
;
3780 struct got_commit_graph
*thread_graph
= NULL
;
3783 if (in_repo_path
!= s
->in_repo_path
) {
3784 free(s
->in_repo_path
);
3785 s
->in_repo_path
= strdup(in_repo_path
);
3786 if (s
->in_repo_path
== NULL
) {
3787 err
= got_error_from_errno("strdup");
3792 /* The commit queue only contains commits being displayed. */
3793 TAILQ_INIT(&s
->real_commits
.head
);
3794 s
->real_commits
.ncommits
= 0;
3795 s
->commits
= &s
->real_commits
;
3797 TAILQ_INIT(&s
->limit_commits
.head
);
3799 s
->limit_commits
.ncommits
= 0;
3802 if (head_ref_name
) {
3803 s
->head_ref_name
= strdup(head_ref_name
);
3804 if (s
->head_ref_name
== NULL
) {
3805 err
= got_error_from_errno("strdup");
3809 s
->start_id
= got_object_id_dup(start_id
);
3810 if (s
->start_id
== NULL
) {
3811 err
= got_error_from_errno("got_object_id_dup");
3814 s
->log_branches
= log_branches
;
3815 s
->use_committer
= 1;
3817 STAILQ_INIT(&s
->colors
);
3818 if (has_colors() && getenv("TOG_COLORS") != NULL
) {
3819 err
= add_color(&s
->colors
, "^$", TOG_COLOR_COMMIT
,
3820 get_color_value("TOG_COLOR_COMMIT"));
3823 err
= add_color(&s
->colors
, "^$", TOG_COLOR_AUTHOR
,
3824 get_color_value("TOG_COLOR_AUTHOR"));
3826 free_colors(&s
->colors
);
3829 err
= add_color(&s
->colors
, "^$", TOG_COLOR_DATE
,
3830 get_color_value("TOG_COLOR_DATE"));
3832 free_colors(&s
->colors
);
3837 view
->show
= show_log_view
;
3838 view
->input
= input_log_view
;
3839 view
->resize
= resize_log_view
;
3840 view
->close
= close_log_view
;
3841 view
->search_start
= search_start_log_view
;
3842 view
->search_next
= search_next_log_view
;
3844 if (s
->thread_args
.pack_fds
== NULL
) {
3845 err
= got_repo_pack_fds_open(&s
->thread_args
.pack_fds
);
3849 err
= got_repo_open(&thread_repo
, got_repo_get_path(repo
), NULL
,
3850 s
->thread_args
.pack_fds
);
3853 err
= got_commit_graph_open(&thread_graph
, s
->in_repo_path
,
3857 err
= got_commit_graph_iter_start(thread_graph
, s
->start_id
,
3858 s
->repo
, NULL
, NULL
);
3862 errcode
= pthread_cond_init(&s
->thread_args
.need_commits
, NULL
);
3864 err
= got_error_set_errno(errcode
, "pthread_cond_init");
3867 errcode
= pthread_cond_init(&s
->thread_args
.commit_loaded
, NULL
);
3869 err
= got_error_set_errno(errcode
, "pthread_cond_init");
3873 if (using_mock_io
) {
3876 rc
= pthread_cond_init(&s
->thread_args
.log_loaded
, NULL
);
3878 return got_error_set_errno(rc
, "pthread_cond_init");
3881 s
->thread_args
.commits_needed
= view
->nlines
;
3882 s
->thread_args
.graph
= thread_graph
;
3883 s
->thread_args
.real_commits
= &s
->real_commits
;
3884 s
->thread_args
.limit_commits
= &s
->limit_commits
;
3885 s
->thread_args
.in_repo_path
= s
->in_repo_path
;
3886 s
->thread_args
.start_id
= s
->start_id
;
3887 s
->thread_args
.repo
= thread_repo
;
3888 s
->thread_args
.log_complete
= 0;
3889 s
->thread_args
.quit
= &s
->quit
;
3890 s
->thread_args
.first_displayed_entry
= &s
->first_displayed_entry
;
3891 s
->thread_args
.selected_entry
= &s
->selected_entry
;
3892 s
->thread_args
.searching
= &view
->searching
;
3893 s
->thread_args
.search_next_done
= &view
->search_next_done
;
3894 s
->thread_args
.regex
= &view
->regex
;
3895 s
->thread_args
.limiting
= &s
->limit_view
;
3896 s
->thread_args
.limit_regex
= &s
->limit_regex
;
3897 s
->thread_args
.limit_commits
= &s
->limit_commits
;
3898 s
->thread_args
.worktree
= worktree
;
3900 s
->thread_args
.need_commit_marker
= 1;
3903 if (view
->close
== NULL
)
3904 close_log_view(view
);
3910 static const struct got_error
*
3911 show_log_view(struct tog_view
*view
)
3913 const struct got_error
*err
;
3914 struct tog_log_view_state
*s
= &view
->state
.log
;
3916 if (s
->thread
== 0) { //NULL) {
3917 int errcode
= pthread_create(&s
->thread
, NULL
, log_thread
,
3920 return got_error_set_errno(errcode
, "pthread_create");
3921 if (s
->thread_args
.commits_needed
> 0) {
3922 err
= trigger_log_thread(view
, 1);
3928 return draw_commits(view
);
3932 log_move_cursor_up(struct tog_view
*view
, int page
, int home
)
3934 struct tog_log_view_state
*s
= &view
->state
.log
;
3936 if (s
->first_displayed_entry
== NULL
)
3938 if (s
->selected_entry
->idx
== 0)
3941 if ((page
&& TAILQ_FIRST(&s
->commits
->head
) == s
->first_displayed_entry
)
3943 s
->selected
= home
? 0 : MAX(0, s
->selected
- page
- 1);
3945 if (!page
&& !home
&& s
->selected
> 0)
3948 log_scroll_up(s
, home
? s
->commits
->ncommits
: MAX(page
, 1));
3954 static const struct got_error
*
3955 log_move_cursor_down(struct tog_view
*view
, int page
)
3957 struct tog_log_view_state
*s
= &view
->state
.log
;
3958 const struct got_error
*err
= NULL
;
3959 int eos
= view
->nlines
- 2;
3961 if (s
->first_displayed_entry
== NULL
)
3964 if (s
->thread_args
.log_complete
&&
3965 s
->selected_entry
->idx
>= s
->commits
->ncommits
- 1)
3968 if (view_is_hsplit_top(view
))
3969 --eos
; /* border consumes the last line */
3972 if (s
->selected
< MIN(eos
, s
->commits
->ncommits
- 1))
3975 err
= log_scroll_down(view
, 1);
3976 } else if (s
->thread_args
.load_all
&& s
->thread_args
.log_complete
) {
3977 struct commit_queue_entry
*entry
;
3981 entry
= TAILQ_LAST(&s
->commits
->head
, commit_queue_head
);
3982 s
->last_displayed_entry
= entry
;
3983 for (n
= 0; n
<= eos
; n
++) {
3986 s
->first_displayed_entry
= entry
;
3987 entry
= TAILQ_PREV(entry
, commit_queue_head
, entry
);
3990 s
->selected
= n
- 1;
3992 if (s
->last_displayed_entry
->idx
== s
->commits
->ncommits
- 1 &&
3993 s
->thread_args
.log_complete
)
3994 s
->selected
+= MIN(page
,
3995 s
->commits
->ncommits
- s
->selected_entry
->idx
- 1);
3997 err
= log_scroll_down(view
, page
);
4003 * We might necessarily overshoot in horizontal
4004 * splits; if so, select the last displayed commit.
4006 if (s
->first_displayed_entry
&& s
->last_displayed_entry
) {
4007 s
->selected
= MIN(s
->selected
,
4008 s
->last_displayed_entry
->idx
-
4009 s
->first_displayed_entry
->idx
);
4014 if (s
->thread_args
.log_complete
&&
4015 s
->selected_entry
->idx
== s
->commits
->ncommits
- 1)
4022 view_get_split(struct tog_view
*view
, int *y
, int *x
)
4027 if (view
->mode
== TOG_VIEW_SPLIT_HRZN
) {
4028 if (view
->child
&& view
->child
->resized_y
)
4029 *y
= view
->child
->resized_y
;
4030 else if (view
->resized_y
)
4031 *y
= view
->resized_y
;
4033 *y
= view_split_begin_y(view
->lines
);
4034 } else if (view
->mode
== TOG_VIEW_SPLIT_VERT
) {
4035 if (view
->child
&& view
->child
->resized_x
)
4036 *x
= view
->child
->resized_x
;
4037 else if (view
->resized_x
)
4038 *x
= view
->resized_x
;
4040 *x
= view_split_begin_x(view
->begin_x
);
4044 /* Split view horizontally at y and offset view->state->selected line. */
4045 static const struct got_error
*
4046 view_init_hsplit(struct tog_view
*view
, int y
)
4048 const struct got_error
*err
= NULL
;
4052 err
= view_resize(view
);
4056 err
= offset_selection_down(view
);
4061 static const struct got_error
*
4062 log_goto_line(struct tog_view
*view
, int nlines
)
4064 const struct got_error
*err
= NULL
;
4065 struct tog_log_view_state
*s
= &view
->state
.log
;
4066 int g
, idx
= s
->selected_entry
->idx
;
4068 if (s
->first_displayed_entry
== NULL
|| s
->last_displayed_entry
== NULL
)
4074 if (g
>= s
->first_displayed_entry
->idx
+ 1 &&
4075 g
<= s
->last_displayed_entry
->idx
+ 1 &&
4076 g
- s
->first_displayed_entry
->idx
- 1 < nlines
) {
4077 s
->selected
= g
- s
->first_displayed_entry
->idx
- 1;
4083 err
= log_move_cursor_down(view
, g
- idx
- 1);
4084 if (!err
&& g
> s
->selected_entry
->idx
+ 1)
4085 err
= log_move_cursor_down(view
,
4086 g
- s
->first_displayed_entry
->idx
- 1);
4089 } else if (idx
+ 1 > g
)
4090 log_move_cursor_up(view
, idx
- g
+ 1, 0);
4092 if (g
< nlines
&& s
->first_displayed_entry
->idx
== 0)
4093 s
->selected
= g
- 1;
4101 horizontal_scroll_input(struct tog_view
*view
, int ch
)
4107 view
->x
-= MIN(view
->x
, 2);
4113 if (view
->x
+ view
->ncols
/ 2 < view
->maxx
)
4122 view
->x
= MAX(view
->maxx
- view
->ncols
/ 2, 0);
4130 static const struct got_error
*
4131 input_log_view(struct tog_view
**new_view
, struct tog_view
*view
, int ch
)
4133 const struct got_error
*err
= NULL
;
4134 struct tog_log_view_state
*s
= &view
->state
.log
;
4137 if (s
->thread_args
.load_all
) {
4138 if (ch
== CTRL('g') || ch
== KEY_BACKSPACE
)
4139 s
->thread_args
.load_all
= 0;
4140 else if (s
->thread_args
.log_complete
) {
4141 err
= log_move_cursor_down(view
, s
->commits
->ncommits
);
4142 s
->thread_args
.load_all
= 0;
4148 eos
= nscroll
= view
->nlines
- 1;
4149 if (view_is_hsplit_top(view
))
4153 return log_goto_line(view
, eos
);
4157 err
= limit_log_view(view
);
4168 horizontal_scroll_input(view
, ch
);
4175 log_move_cursor_up(view
, 0, 0);
4180 log_move_cursor_up(view
, 0, 1);
4190 log_move_cursor_up(view
, nscroll
, 0);
4197 err
= log_move_cursor_down(view
, 0);
4200 s
->use_committer
= !s
->use_committer
;
4201 view
->action
= s
->use_committer
?
4202 "show committer" : "show commit author";
4207 /* We don't know yet how many commits, so we're forced to
4208 * traverse them all. */
4210 s
->thread_args
.load_all
= 1;
4211 if (!s
->thread_args
.log_complete
)
4212 return trigger_log_thread(view
, 0);
4213 err
= log_move_cursor_down(view
, s
->commits
->ncommits
);
4214 s
->thread_args
.load_all
= 0;
4225 err
= log_move_cursor_down(view
, nscroll
);
4228 if (s
->selected
> view
->nlines
- 2)
4229 s
->selected
= view
->nlines
- 2;
4230 if (s
->selected
> s
->commits
->ncommits
- 1)
4231 s
->selected
= s
->commits
->ncommits
- 1;
4233 if (s
->commits
->ncommits
< view
->nlines
- 1 &&
4234 !s
->thread_args
.log_complete
) {
4235 s
->thread_args
.commits_needed
+= (view
->nlines
- 1) -
4236 s
->commits
->ncommits
;
4237 err
= trigger_log_thread(view
, 1);
4243 if (s
->selected_entry
== NULL
)
4245 err
= view_request_new(new_view
, view
, TOG_VIEW_DIFF
);
4249 if (s
->selected_entry
== NULL
)
4251 err
= view_request_new(new_view
, view
, TOG_VIEW_TREE
);
4257 if (ch
== KEY_BACKSPACE
&&
4258 got_path_is_root_dir(s
->in_repo_path
))
4260 err
= stop_log_thread(s
);
4263 if (ch
== KEY_BACKSPACE
) {
4265 err
= got_path_dirname(&parent_path
, s
->in_repo_path
);
4268 free(s
->in_repo_path
);
4269 s
->in_repo_path
= parent_path
;
4270 s
->thread_args
.in_repo_path
= s
->in_repo_path
;
4271 } else if (ch
== CTRL('l')) {
4272 struct got_object_id
*start_id
;
4273 err
= got_repo_match_object_id(&start_id
, NULL
,
4274 s
->head_ref_name
? s
->head_ref_name
: GOT_REF_HEAD
,
4275 GOT_OBJ_TYPE_COMMIT
, &tog_refs
, s
->repo
);
4277 if (s
->head_ref_name
== NULL
||
4278 err
->code
!= GOT_ERR_NOT_REF
)
4280 /* Try to cope with deleted references. */
4281 free(s
->head_ref_name
);
4282 s
->head_ref_name
= NULL
;
4283 err
= got_repo_match_object_id(&start_id
,
4284 NULL
, GOT_REF_HEAD
, GOT_OBJ_TYPE_COMMIT
,
4285 &tog_refs
, s
->repo
);
4290 s
->start_id
= start_id
;
4291 s
->thread_args
.start_id
= s
->start_id
;
4293 s
->log_branches
= !s
->log_branches
;
4295 if (s
->thread_args
.pack_fds
== NULL
) {
4296 err
= got_repo_pack_fds_open(&s
->thread_args
.pack_fds
);
4300 err
= got_repo_open(&s
->thread_args
.repo
,
4301 got_repo_get_path(s
->repo
), NULL
,
4302 s
->thread_args
.pack_fds
);
4306 err
= tog_load_refs(s
->repo
, 0);
4309 err
= got_commit_graph_open(&s
->thread_args
.graph
,
4310 s
->in_repo_path
, !s
->log_branches
);
4313 err
= got_commit_graph_iter_start(s
->thread_args
.graph
,
4314 s
->start_id
, s
->repo
, NULL
, NULL
);
4317 free_commits(&s
->real_commits
);
4318 free_commits(&s
->limit_commits
);
4319 s
->first_displayed_entry
= NULL
;
4320 s
->last_displayed_entry
= NULL
;
4321 s
->selected_entry
= NULL
;
4323 s
->thread_args
.log_complete
= 0;
4325 s
->thread_args
.commits_needed
= view
->lines
;
4326 s
->matched_entry
= NULL
;
4327 s
->search_entry
= NULL
;
4332 err
= view_request_new(new_view
, view
, TOG_VIEW_REF
);
4342 static const struct got_error
*
4343 apply_unveil(const char *repo_path
, const char *worktree_path
)
4345 const struct got_error
*error
;
4348 if (unveil("gmon.out", "rwc") != 0)
4349 return got_error_from_errno2("unveil", "gmon.out");
4351 if (repo_path
&& unveil(repo_path
, "r") != 0)
4352 return got_error_from_errno2("unveil", repo_path
);
4354 if (worktree_path
&& unveil(worktree_path
, "rwc") != 0)
4355 return got_error_from_errno2("unveil", worktree_path
);
4357 if (unveil(GOT_TMPDIR_STR
, "rwc") != 0)
4358 return got_error_from_errno2("unveil", GOT_TMPDIR_STR
);
4360 error
= got_privsep_unveil_exec_helpers();
4364 if (unveil(NULL
, NULL
) != 0)
4365 return got_error_from_errno("unveil");
4370 static const struct got_error
*
4371 init_mock_term(const char *test_script_path
)
4373 const struct got_error
*err
= NULL
;
4374 const char *screen_dump_path
;
4377 if (test_script_path
== NULL
|| *test_script_path
== '\0')
4378 return got_error_msg(GOT_ERR_IO
, "TOG_TEST_SCRIPT not defined");
4380 tog_io
.f
= fopen(test_script_path
, "re");
4381 if (tog_io
.f
== NULL
) {
4382 err
= got_error_from_errno_fmt("fopen: %s",
4387 /* test mode, we don't want any output */
4388 tog_io
.cout
= fopen("/dev/null", "w+");
4389 if (tog_io
.cout
== NULL
) {
4390 err
= got_error_from_errno2("fopen", "/dev/null");
4394 in
= dup(fileno(tog_io
.cout
));
4396 err
= got_error_from_errno("dup");
4399 tog_io
.cin
= fdopen(in
, "r");
4400 if (tog_io
.cin
== NULL
) {
4401 err
= got_error_from_errno("fdopen");
4406 screen_dump_path
= getenv("TOG_SCR_DUMP");
4407 if (screen_dump_path
== NULL
|| *screen_dump_path
== '\0')
4408 return got_error_msg(GOT_ERR_IO
, "TOG_SCR_DUMP not defined");
4409 tog_io
.sdump
= fopen(screen_dump_path
, "we");
4410 if (tog_io
.sdump
== NULL
) {
4411 err
= got_error_from_errno2("fopen", screen_dump_path
);
4415 if (fseeko(tog_io
.f
, 0L, SEEK_SET
) == -1) {
4416 err
= got_error_from_errno("fseeko");
4420 if (newterm(NULL
, tog_io
.cout
, tog_io
.cin
) == NULL
)
4421 err
= got_error_msg(GOT_ERR_IO
,
4422 "newterm: failed to initialise curses");
4435 if (using_mock_io
) /* In test mode we use a fake terminal */
4441 halfdelay(1); /* Fast refresh while initial view is loading. */
4444 intrflush(stdscr
, FALSE
);
4445 keypad(stdscr
, TRUE
);
4447 if (getenv("TOG_COLORS") != NULL
) {
4449 use_default_colors();
4455 static const struct got_error
*
4456 set_tog_base_commit(struct got_repository
*repo
, struct got_worktree
*worktree
)
4458 tog_base_commit
.id
= got_object_id_dup(
4459 got_worktree_get_base_commit_id(worktree
));
4460 if (tog_base_commit
.id
== NULL
)
4461 return got_error_from_errno( "got_object_id_dup");
4466 static const struct got_error
*
4467 get_in_repo_path_from_argv0(char **in_repo_path
, int argc
, char *argv
[],
4468 struct got_repository
*repo
, struct got_worktree
*worktree
)
4470 const struct got_error
*err
= NULL
;
4473 *in_repo_path
= strdup("/");
4474 if (*in_repo_path
== NULL
)
4475 return got_error_from_errno("strdup");
4480 const char *prefix
= got_worktree_get_path_prefix(worktree
);
4483 err
= got_worktree_resolve_path(&p
, worktree
, argv
[0]);
4486 if (asprintf(in_repo_path
, "%s%s%s", prefix
,
4487 (p
[0] != '\0' && !got_path_is_root_dir(prefix
)) ? "/" : "",
4489 err
= got_error_from_errno("asprintf");
4490 *in_repo_path
= NULL
;
4494 err
= got_repo_map_path(in_repo_path
, repo
, argv
[0]);
4499 static const struct got_error
*
4500 cmd_log(int argc
, char *argv
[])
4502 const struct got_error
*error
;
4503 struct got_repository
*repo
= NULL
;
4504 struct got_worktree
*worktree
= NULL
;
4505 struct got_object_id
*start_id
= NULL
;
4506 char *in_repo_path
= NULL
, *repo_path
= NULL
, *cwd
= NULL
;
4507 char *keyword_idstr
= NULL
, *start_commit
= NULL
, *label
= NULL
;
4508 struct got_reference
*ref
= NULL
;
4509 const char *head_ref_name
= NULL
;
4510 int ch
, log_branches
= 0;
4511 struct tog_view
*view
;
4512 int *pack_fds
= NULL
;
4514 while ((ch
= getopt(argc
, argv
, "bc:r:")) != -1) {
4520 start_commit
= optarg
;
4523 repo_path
= realpath(optarg
, NULL
);
4524 if (repo_path
== NULL
)
4525 return got_error_from_errno2("realpath",
4540 error
= got_repo_pack_fds_open(&pack_fds
);
4544 if (repo_path
== NULL
) {
4545 cwd
= getcwd(NULL
, 0);
4547 error
= got_error_from_errno("getcwd");
4550 error
= got_worktree_open(&worktree
, cwd
, NULL
);
4551 if (error
&& error
->code
!= GOT_ERR_NOT_WORKTREE
)
4555 strdup(got_worktree_get_repo_path(worktree
));
4557 repo_path
= strdup(cwd
);
4558 if (repo_path
== NULL
) {
4559 error
= got_error_from_errno("strdup");
4564 error
= got_repo_open(&repo
, repo_path
, NULL
, pack_fds
);
4568 error
= get_in_repo_path_from_argv0(&in_repo_path
, argc
, argv
,
4575 error
= apply_unveil(got_repo_get_path(repo
),
4576 worktree
? got_worktree_get_root_path(worktree
) : NULL
);
4580 /* already loaded by tog_log_with_path()? */
4581 if (TAILQ_EMPTY(&tog_refs
)) {
4582 error
= tog_load_refs(repo
, 0);
4587 if (start_commit
== NULL
) {
4588 error
= got_repo_match_object_id(&start_id
, &label
,
4589 worktree
? got_worktree_get_head_ref_name(worktree
) :
4590 GOT_REF_HEAD
, GOT_OBJ_TYPE_COMMIT
, &tog_refs
, repo
);
4593 head_ref_name
= label
;
4595 error
= got_keyword_to_idstr(&keyword_idstr
, start_commit
,
4599 if (keyword_idstr
!= NULL
)
4600 start_commit
= keyword_idstr
;
4602 error
= got_ref_open(&ref
, repo
, start_commit
, 0);
4604 head_ref_name
= got_ref_get_name(ref
);
4605 else if (error
->code
!= GOT_ERR_NOT_REF
)
4607 error
= got_repo_match_object_id(&start_id
, NULL
,
4608 start_commit
, GOT_OBJ_TYPE_COMMIT
, &tog_refs
, repo
);
4613 view
= view_open(0, 0, 0, 0, TOG_VIEW_LOG
);
4615 error
= got_error_from_errno("view_open");
4620 error
= set_tog_base_commit(repo
, worktree
);
4625 error
= open_log_view(view
, start_id
, repo
, head_ref_name
,
4626 in_repo_path
, log_branches
, worktree
);
4631 /* The work tree will be closed by the log thread. */
4635 error
= view_loop(view
);
4638 free(tog_base_commit
.id
);
4639 free(keyword_idstr
);
4648 const struct got_error
*close_err
= got_repo_close(repo
);
4653 got_worktree_close(worktree
);
4655 const struct got_error
*pack_err
=
4656 got_repo_pack_fds_close(pack_fds
);
4668 fprintf(stderr
, "usage: %s diff [-aw] [-C number] [-r repository-path] "
4669 "object1 object2\n", getprogname());
4674 match_line(const char *line
, regex_t
*regex
, size_t nmatch
,
4675 regmatch_t
*regmatch
)
4677 return regexec(regex
, line
, nmatch
, regmatch
, 0) == 0;
4680 static struct tog_color
*
4681 match_color(struct tog_colors
*colors
, const char *line
)
4683 struct tog_color
*tc
= NULL
;
4685 STAILQ_FOREACH(tc
, colors
, entry
) {
4686 if (match_line(line
, &tc
->regex
, 0, NULL
))
4693 static const struct got_error
*
4694 add_matched_line(int *wtotal
, const char *line
, int wlimit
, int col_tab_align
,
4695 WINDOW
*window
, int skipcol
, regmatch_t
*regmatch
)
4697 const struct got_error
*err
= NULL
;
4699 wchar_t *wline
= NULL
;
4700 int rme
, rms
, n
, width
, scrollx
;
4701 int width0
= 0, width1
= 0, width2
= 0;
4702 char *seg0
= NULL
, *seg1
= NULL
, *seg2
= NULL
;
4706 rms
= regmatch
->rm_so
;
4707 rme
= regmatch
->rm_eo
;
4709 err
= expand_tab(&exstr
, line
);
4713 /* Split the line into 3 segments, according to match offsets. */
4714 seg0
= strndup(exstr
, rms
);
4716 err
= got_error_from_errno("strndup");
4719 seg1
= strndup(exstr
+ rms
, rme
- rms
);
4721 err
= got_error_from_errno("strndup");
4724 seg2
= strdup(exstr
+ rme
);
4726 err
= got_error_from_errno("strndup");
4730 /* draw up to matched token if we haven't scrolled past it */
4731 err
= format_line(&wline
, &width0
, NULL
, seg0
, 0, wlimit
,
4735 n
= MAX(width0
- skipcol
, 0);
4738 err
= format_line(&wline
, &width
, &scrollx
, seg0
, skipcol
,
4739 wlimit
, col_tab_align
, 1);
4742 waddwstr(window
, &wline
[scrollx
]);
4752 err
= format_line(&wline
, &width1
, NULL
, seg1
, 0, wlimit
,
4756 wlen
= wcslen(wline
);
4758 width
= wcwidth(wline
[i
]);
4760 /* should not happen, tabs are expanded */
4761 err
= got_error(GOT_ERR_RANGE
);
4764 if (width0
+ w
+ width
> skipcol
)
4769 /* draw (visible part of) matched token (if scrolled into it) */
4770 if (width1
- w
> 0) {
4771 wattron(window
, A_STANDOUT
);
4772 waddwstr(window
, &wline
[i
]);
4773 wattroff(window
, A_STANDOUT
);
4774 wlimit
-= (width1
- w
);
4775 *wtotal
+= (width1
- w
);
4779 if (wlimit
> 0) { /* draw rest of line */
4781 if (skipcol
> width0
+ width1
) {
4782 err
= format_line(&wline
, &width2
, &scrollx
, seg2
,
4783 skipcol
- (width0
+ width1
), wlimit
,
4787 waddwstr(window
, &wline
[scrollx
]);
4789 err
= format_line(&wline
, &width2
, NULL
, seg2
, 0,
4790 wlimit
, col_tab_align
, 1);
4793 waddwstr(window
, wline
);
4807 gotoline(struct tog_view
*view
, int *lineno
, int *nprinted
)
4810 int *eof
, *first
, *selected
;
4812 if (view
->type
== TOG_VIEW_DIFF
) {
4813 struct tog_diff_view_state
*s
= &view
->state
.diff
;
4815 first
= &s
->first_displayed_line
;
4819 } else if (view
->type
== TOG_VIEW_HELP
) {
4820 struct tog_help_view_state
*s
= &view
->state
.help
;
4822 first
= &s
->first_displayed_line
;
4826 } else if (view
->type
== TOG_VIEW_BLAME
) {
4827 struct tog_blame_view_state
*s
= &view
->state
.blame
;
4829 first
= &s
->first_displayed_line
;
4830 selected
= &s
->selected_line
;
4836 /* Center gline in the middle of the page like vi(1). */
4837 if (*lineno
< view
->gline
- (view
->nlines
- 3) / 2)
4839 if (*first
!= 1 && (*lineno
> view
->gline
- (view
->nlines
- 3) / 2)) {
4848 *selected
= view
->gline
<= (view
->nlines
- 3) / 2 ?
4849 view
->gline
: (view
->nlines
- 3) / 2 + 1;
4855 static const struct got_error
*
4856 draw_file(struct tog_view
*view
, const char *header
)
4858 struct tog_diff_view_state
*s
= &view
->state
.diff
;
4859 regmatch_t
*regmatch
= &view
->regmatch
;
4860 const struct got_error
*err
;
4863 size_t linesize
= 0;
4867 int max_lines
= view
->nlines
;
4868 int nlines
= s
->nlines
;
4871 s
->lineno
= s
->first_displayed_line
- 1;
4872 line_offset
= s
->lines
[s
->first_displayed_line
- 1].offset
;
4873 if (fseeko(s
->f
, line_offset
, SEEK_SET
) == -1)
4874 return got_error_from_errno("fseek");
4876 werase(view
->window
);
4878 if (view
->gline
> s
->nlines
- 1)
4879 view
->gline
= s
->nlines
- 1;
4882 int ln
= view
->gline
? view
->gline
<= (view
->nlines
- 3) / 2 ?
4883 1 : view
->gline
- (view
->nlines
- 3) / 2 :
4884 s
->lineno
+ s
->selected_line
;
4886 if (asprintf(&line
, "[%d/%d] %s", ln
, nlines
, header
) == -1)
4887 return got_error_from_errno("asprintf");
4888 err
= format_line(&wline
, &width
, NULL
, line
, 0, view
->ncols
,
4894 if (view_needs_focus_indication(view
))
4895 wstandout(view
->window
);
4896 waddwstr(view
->window
, wline
);
4899 while (width
++ < view
->ncols
)
4900 waddch(view
->window
, ' ');
4901 if (view_needs_focus_indication(view
))
4902 wstandend(view
->window
);
4912 while (max_lines
> 0 && nprinted
< max_lines
) {
4913 enum got_diff_line_type linetype
;
4916 linelen
= getline(&line
, &linesize
, s
->f
);
4917 if (linelen
== -1) {
4923 return got_ferror(s
->f
, GOT_ERR_IO
);
4926 if (++s
->lineno
< s
->first_displayed_line
)
4928 if (view
->gline
&& !gotoline(view
, &s
->lineno
, &nprinted
))
4930 if (s
->lineno
== view
->hiline
)
4933 /* Set view->maxx based on full line length. */
4934 err
= format_line(&wline
, &width
, NULL
, line
, 0, INT_MAX
, 0,
4940 view
->maxx
= MAX(view
->maxx
, width
);
4944 linetype
= s
->lines
[s
->lineno
].type
;
4945 if (linetype
> GOT_DIFF_LINE_LOGMSG
&&
4946 linetype
< GOT_DIFF_LINE_CONTEXT
)
4947 attr
|= COLOR_PAIR(linetype
);
4949 wattron(view
->window
, attr
);
4950 if (s
->first_displayed_line
+ nprinted
== s
->matched_line
&&
4951 regmatch
->rm_so
>= 0 && regmatch
->rm_so
< regmatch
->rm_eo
) {
4952 err
= add_matched_line(&width
, line
, view
->ncols
, 0,
4953 view
->window
, view
->x
, regmatch
);
4960 err
= format_line(&wline
, &width
, &skip
, line
,
4961 view
->x
, view
->ncols
, 0, view
->x
? 1 : 0);
4966 waddwstr(view
->window
, &wline
[skip
]);
4970 if (s
->lineno
== view
->hiline
) {
4971 /* highlight full gline length */
4972 while (width
++ < view
->ncols
)
4973 waddch(view
->window
, ' ');
4975 if (width
<= view
->ncols
- 1)
4976 waddch(view
->window
, '\n');
4979 wattroff(view
->window
, attr
);
4980 if (++nprinted
== 1)
4981 s
->first_displayed_line
= s
->lineno
;
4985 s
->last_displayed_line
= s
->first_displayed_line
+
4988 s
->last_displayed_line
= s
->first_displayed_line
;
4993 while (nprinted
< view
->nlines
) {
4994 waddch(view
->window
, '\n');
4998 err
= format_line(&wline
, &width
, NULL
, TOG_EOF_STRING
, 0,
5004 wstandout(view
->window
);
5005 waddwstr(view
->window
, wline
);
5008 wstandend(view
->window
);
5015 get_datestr(time_t *time
, char *datebuf
)
5017 struct tm mytm
, *tm
;
5020 tm
= gmtime_r(time
, &mytm
);
5023 s
= asctime_r(tm
, datebuf
);
5026 p
= strchr(s
, '\n');
5032 static const struct got_error
*
5033 add_line_metadata(struct got_diff_line
**lines
, size_t *nlines
,
5034 off_t off
, uint8_t type
)
5036 struct got_diff_line
*p
;
5038 p
= reallocarray(*lines
, *nlines
+ 1, sizeof(**lines
));
5040 return got_error_from_errno("reallocarray");
5042 (*lines
)[*nlines
].offset
= off
;
5043 (*lines
)[*nlines
].type
= type
;
5049 static const struct got_error
*
5050 cat_diff(FILE *dst
, FILE *src
, struct got_diff_line
**d_lines
, size_t *d_nlines
,
5051 struct got_diff_line
*s_lines
, size_t s_nlines
)
5053 struct got_diff_line
*p
;
5057 if (fseeko(src
, 0L, SEEK_SET
) == -1)
5058 return got_error_from_errno("fseeko");
5061 r
= fread(buf
, 1, sizeof(buf
), src
);
5064 return got_error_from_errno("fread");
5068 if (fwrite(buf
, 1, r
, dst
) != r
)
5069 return got_ferror(dst
, GOT_ERR_IO
);
5072 if (s_nlines
== 0 && *d_nlines
== 0)
5076 * If commit info was in dst, increment line offsets
5077 * of the appended diff content, but skip s_lines[0]
5078 * because offset zero is already in *d_lines.
5080 if (*d_nlines
> 0) {
5081 for (i
= 1; i
< s_nlines
; ++i
)
5082 s_lines
[i
].offset
+= (*d_lines
)[*d_nlines
- 1].offset
;
5090 p
= reallocarray(*d_lines
, *d_nlines
+ s_nlines
, sizeof(*p
));
5092 /* d_lines is freed in close_diff_view() */
5093 return got_error_from_errno("reallocarray");
5098 memcpy(*d_lines
+ *d_nlines
, s_lines
, s_nlines
* sizeof(*s_lines
));
5099 *d_nlines
+= s_nlines
;
5104 static const struct got_error
*
5105 write_commit_info(struct got_diff_line
**lines
, size_t *nlines
,
5106 struct got_object_id
*commit_id
, struct got_reflist_head
*refs
,
5107 struct got_repository
*repo
, int ignore_ws
, int force_text_diff
,
5108 struct got_diffstat_cb_arg
*dsa
, FILE *outfile
)
5110 const struct got_error
*err
= NULL
;
5111 char datebuf
[26], *datestr
;
5112 struct got_commit_object
*commit
;
5113 char *id_str
= NULL
, *logmsg
= NULL
, *s
= NULL
, *line
;
5114 time_t committer_time
;
5115 const char *author
, *committer
;
5116 char *refs_str
= NULL
;
5117 struct got_pathlist_entry
*pe
;
5121 err
= build_refs_str(&refs_str
, refs
, commit_id
, repo
);
5125 err
= got_object_open_as_commit(&commit
, repo
, commit_id
);
5129 err
= got_object_id_str(&id_str
, commit_id
);
5131 err
= got_error_from_errno("got_object_id_str");
5135 err
= add_line_metadata(lines
, nlines
, 0, GOT_DIFF_LINE_NONE
);
5139 n
= fprintf(outfile
, "commit %s%s%s%s\n", id_str
, refs_str
? " (" : "",
5140 refs_str
? refs_str
: "", refs_str
? ")" : "");
5142 err
= got_error_from_errno("fprintf");
5146 err
= add_line_metadata(lines
, nlines
, outoff
, GOT_DIFF_LINE_META
);
5150 n
= fprintf(outfile
, "from: %s\n",
5151 got_object_commit_get_author(commit
));
5153 err
= got_error_from_errno("fprintf");
5157 err
= add_line_metadata(lines
, nlines
, outoff
, GOT_DIFF_LINE_AUTHOR
);
5161 author
= got_object_commit_get_author(commit
);
5162 committer
= got_object_commit_get_committer(commit
);
5163 if (strcmp(author
, committer
) != 0) {
5164 n
= fprintf(outfile
, "via: %s\n", committer
);
5166 err
= got_error_from_errno("fprintf");
5170 err
= add_line_metadata(lines
, nlines
, outoff
,
5171 GOT_DIFF_LINE_AUTHOR
);
5175 committer_time
= got_object_commit_get_committer_time(commit
);
5176 datestr
= get_datestr(&committer_time
, datebuf
);
5178 n
= fprintf(outfile
, "date: %s UTC\n", datestr
);
5180 err
= got_error_from_errno("fprintf");
5184 err
= add_line_metadata(lines
, nlines
, outoff
,
5185 GOT_DIFF_LINE_DATE
);
5189 if (got_object_commit_get_nparents(commit
) > 1) {
5190 const struct got_object_id_queue
*parent_ids
;
5191 struct got_object_qid
*qid
;
5193 parent_ids
= got_object_commit_get_parent_ids(commit
);
5194 STAILQ_FOREACH(qid
, parent_ids
, entry
) {
5195 err
= got_object_id_str(&id_str
, &qid
->id
);
5198 n
= fprintf(outfile
, "parent %d: %s\n", pn
++, id_str
);
5200 err
= got_error_from_errno("fprintf");
5204 err
= add_line_metadata(lines
, nlines
, outoff
,
5205 GOT_DIFF_LINE_META
);
5213 err
= got_object_commit_get_logmsg(&logmsg
, commit
);
5217 while ((line
= strsep(&s
, "\n")) != NULL
) {
5218 n
= fprintf(outfile
, "%s\n", line
);
5220 err
= got_error_from_errno("fprintf");
5224 err
= add_line_metadata(lines
, nlines
, outoff
,
5225 GOT_DIFF_LINE_LOGMSG
);
5230 TAILQ_FOREACH(pe
, dsa
->paths
, entry
) {
5231 struct got_diff_changed_path
*cp
= pe
->data
;
5232 int pad
= dsa
->max_path_len
- pe
->path_len
+ 1;
5234 n
= fprintf(outfile
, "%c %s%*c | %*d+ %*d-\n", cp
->status
,
5235 pe
->path
, pad
, ' ', dsa
->add_cols
+ 1, cp
->add
,
5236 dsa
->rm_cols
+ 1, cp
->rm
);
5238 err
= got_error_from_errno("fprintf");
5242 err
= add_line_metadata(lines
, nlines
, outoff
,
5243 GOT_DIFF_LINE_CHANGES
);
5248 fputc('\n', outfile
);
5250 err
= add_line_metadata(lines
, nlines
, outoff
, GOT_DIFF_LINE_NONE
);
5254 n
= fprintf(outfile
,
5255 "%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n",
5256 dsa
->nfiles
, dsa
->nfiles
> 1 ? "s" : "", dsa
->ins
,
5257 dsa
->ins
!= 1 ? "s" : "", dsa
->del
, dsa
->del
!= 1 ? "s" : "");
5259 err
= got_error_from_errno("fprintf");
5263 err
= add_line_metadata(lines
, nlines
, outoff
, GOT_DIFF_LINE_NONE
);
5267 fputc('\n', outfile
);
5269 err
= add_line_metadata(lines
, nlines
, outoff
, GOT_DIFF_LINE_NONE
);
5274 got_object_commit_close(commit
);
5283 static const struct got_error
*
5284 create_diff(struct tog_diff_view_state
*s
)
5286 const struct got_error
*err
= NULL
;
5287 FILE *f
= NULL
, *tmp_diff_file
= NULL
;
5289 struct got_diff_line
*lines
= NULL
;
5290 struct got_pathlist_head changed_paths
;
5292 TAILQ_INIT(&changed_paths
);
5295 s
->lines
= malloc(sizeof(*s
->lines
));
5296 if (s
->lines
== NULL
)
5297 return got_error_from_errno("malloc");
5302 err
= got_error_from_errno("got_opentemp");
5305 tmp_diff_file
= got_opentemp();
5306 if (tmp_diff_file
== NULL
) {
5307 err
= got_error_from_errno("got_opentemp");
5310 if (s
->f
&& fclose(s
->f
) == EOF
) {
5311 err
= got_error_from_errno("fclose");
5317 err
= got_object_get_type(&obj_type
, s
->repo
, s
->id1
);
5319 err
= got_object_get_type(&obj_type
, s
->repo
, s
->id2
);
5324 case GOT_OBJ_TYPE_BLOB
:
5325 err
= got_diff_objects_as_blobs(&s
->lines
, &s
->nlines
,
5326 s
->f1
, s
->f2
, s
->fd1
, s
->fd2
, s
->id1
, s
->id2
,
5327 s
->label1
, s
->label2
, tog_diff_algo
, s
->diff_context
,
5328 s
->ignore_whitespace
, s
->force_text_diff
, NULL
, s
->repo
,
5331 case GOT_OBJ_TYPE_TREE
:
5332 err
= got_diff_objects_as_trees(&s
->lines
, &s
->nlines
,
5333 s
->f1
, s
->f2
, s
->fd1
, s
->fd2
, s
->id1
, s
->id2
, NULL
, "", "",
5334 tog_diff_algo
, s
->diff_context
, s
->ignore_whitespace
,
5335 s
->force_text_diff
, NULL
, s
->repo
, s
->f
);
5337 case GOT_OBJ_TYPE_COMMIT
: {
5338 const struct got_object_id_queue
*parent_ids
;
5339 struct got_object_qid
*pid
;
5340 struct got_commit_object
*commit2
;
5341 struct got_reflist_head
*refs
;
5343 struct got_diffstat_cb_arg dsa
= {
5346 s
->ignore_whitespace
,
5351 lines
= malloc(sizeof(*lines
));
5352 if (lines
== NULL
) {
5353 err
= got_error_from_errno("malloc");
5357 /* build diff first in tmp file then append to commit info */
5358 err
= got_diff_objects_as_commits(&lines
, &nlines
,
5359 s
->f1
, s
->f2
, s
->fd1
, s
->fd2
, s
->id1
, s
->id2
, NULL
,
5360 tog_diff_algo
, s
->diff_context
, s
->ignore_whitespace
,
5361 s
->force_text_diff
, &dsa
, s
->repo
, tmp_diff_file
);
5365 err
= got_object_open_as_commit(&commit2
, s
->repo
, s
->id2
);
5368 refs
= got_reflist_object_id_map_lookup(tog_refs_idmap
, s
->id2
);
5369 /* Show commit info if we're diffing to a parent/root commit. */
5370 if (s
->id1
== NULL
) {
5371 err
= write_commit_info(&s
->lines
, &s
->nlines
, s
->id2
,
5372 refs
, s
->repo
, s
->ignore_whitespace
,
5373 s
->force_text_diff
, &dsa
, s
->f
);
5377 parent_ids
= got_object_commit_get_parent_ids(commit2
);
5378 STAILQ_FOREACH(pid
, parent_ids
, entry
) {
5379 if (got_object_id_cmp(s
->id1
, &pid
->id
) == 0) {
5380 err
= write_commit_info(&s
->lines
,
5381 &s
->nlines
, s
->id2
, refs
, s
->repo
,
5382 s
->ignore_whitespace
,
5383 s
->force_text_diff
, &dsa
, s
->f
);
5390 got_object_commit_close(commit2
);
5392 err
= cat_diff(s
->f
, tmp_diff_file
, &s
->lines
, &s
->nlines
,
5397 err
= got_error(GOT_ERR_OBJ_TYPE
);
5402 got_pathlist_free(&changed_paths
, GOT_PATHLIST_FREE_ALL
);
5403 if (s
->f
&& fflush(s
->f
) != 0 && err
== NULL
)
5404 err
= got_error_from_errno("fflush");
5405 if (tmp_diff_file
&& fclose(tmp_diff_file
) == EOF
&& err
== NULL
)
5406 err
= got_error_from_errno("fclose");
5411 diff_view_indicate_progress(struct tog_view
*view
)
5413 mvwaddstr(view
->window
, 0, 0, "diffing...");
5418 static const struct got_error
*
5419 search_start_diff_view(struct tog_view
*view
)
5421 struct tog_diff_view_state
*s
= &view
->state
.diff
;
5423 s
->matched_line
= 0;
5428 search_setup_diff_view(struct tog_view
*view
, FILE **f
, off_t
**line_offsets
,
5429 size_t *nlines
, int **first
, int **last
, int **match
, int **selected
)
5431 struct tog_diff_view_state
*s
= &view
->state
.diff
;
5434 *nlines
= s
->nlines
;
5435 *line_offsets
= NULL
;
5436 *match
= &s
->matched_line
;
5437 *first
= &s
->first_displayed_line
;
5438 *last
= &s
->last_displayed_line
;
5439 *selected
= &s
->selected_line
;
5442 static const struct got_error
*
5443 search_next_view_match(struct tog_view
*view
)
5445 const struct got_error
*err
= NULL
;
5449 size_t linesize
= 0;
5451 off_t
*line_offsets
;
5453 int *first
, *last
, *match
, *selected
;
5455 if (!view
->search_setup
)
5456 return got_error_msg(GOT_ERR_NOT_IMPL
,
5457 "view search not supported");
5458 view
->search_setup(view
, &f
, &line_offsets
, &nlines
, &first
, &last
,
5461 if (!view
->searching
) {
5462 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
5467 if (view
->searching
== TOG_SEARCH_FORWARD
)
5468 lineno
= *first
+ 1;
5470 lineno
= *first
- 1;
5472 lineno
= *first
- 1 + *selected
;
5477 if (lineno
<= 0 || lineno
> nlines
) {
5479 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
5483 if (view
->searching
== TOG_SEARCH_FORWARD
)
5489 offset
= view
->type
== TOG_VIEW_DIFF
?
5490 view
->state
.diff
.lines
[lineno
- 1].offset
:
5491 line_offsets
[lineno
- 1];
5492 if (fseeko(f
, offset
, SEEK_SET
) != 0) {
5494 return got_error_from_errno("fseeko");
5496 linelen
= getline(&line
, &linesize
, f
);
5497 if (linelen
!= -1) {
5499 err
= expand_tab(&exstr
, line
);
5502 if (match_line(exstr
, &view
->regex
, 1,
5504 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
5511 if (view
->searching
== TOG_SEARCH_FORWARD
)
5526 static const struct got_error
*
5527 close_diff_view(struct tog_view
*view
)
5529 const struct got_error
*err
= NULL
;
5530 struct tog_diff_view_state
*s
= &view
->state
.diff
;
5536 if (s
->f
&& fclose(s
->f
) == EOF
)
5537 err
= got_error_from_errno("fclose");
5539 if (s
->f1
&& fclose(s
->f1
) == EOF
&& err
== NULL
)
5540 err
= got_error_from_errno("fclose");
5542 if (s
->f2
&& fclose(s
->f2
) == EOF
&& err
== NULL
)
5543 err
= got_error_from_errno("fclose");
5545 if (s
->fd1
!= -1 && close(s
->fd1
) == -1 && err
== NULL
)
5546 err
= got_error_from_errno("close");
5548 if (s
->fd2
!= -1 && close(s
->fd2
) == -1 && err
== NULL
)
5549 err
= got_error_from_errno("close");
5557 static const struct got_error
*
5558 open_diff_view(struct tog_view
*view
, struct got_object_id
*id1
,
5559 struct got_object_id
*id2
, const char *label1
, const char *label2
,
5560 int diff_context
, int ignore_whitespace
, int force_text_diff
,
5561 struct tog_view
*parent_view
, struct got_repository
*repo
)
5563 const struct got_error
*err
;
5564 struct tog_diff_view_state
*s
= &view
->state
.diff
;
5566 memset(s
, 0, sizeof(*s
));
5570 if (id1
!= NULL
&& id2
!= NULL
) {
5573 err
= got_object_get_type(&type1
, repo
, id1
);
5576 err
= got_object_get_type(&type2
, repo
, id2
);
5580 if (type1
!= type2
) {
5581 err
= got_error(GOT_ERR_OBJ_TYPE
);
5585 s
->first_displayed_line
= 1;
5586 s
->last_displayed_line
= view
->nlines
;
5587 s
->selected_line
= 1;
5595 s
->id1
= got_object_id_dup(id1
);
5596 if (s
->id1
== NULL
) {
5597 err
= got_error_from_errno("got_object_id_dup");
5603 s
->id2
= got_object_id_dup(id2
);
5604 if (s
->id2
== NULL
) {
5605 err
= got_error_from_errno("got_object_id_dup");
5609 s
->f1
= got_opentemp();
5610 if (s
->f1
== NULL
) {
5611 err
= got_error_from_errno("got_opentemp");
5615 s
->f2
= got_opentemp();
5616 if (s
->f2
== NULL
) {
5617 err
= got_error_from_errno("got_opentemp");
5621 s
->fd1
= got_opentempfd();
5623 err
= got_error_from_errno("got_opentempfd");
5627 s
->fd2
= got_opentempfd();
5629 err
= got_error_from_errno("got_opentempfd");
5633 s
->diff_context
= diff_context
;
5634 s
->ignore_whitespace
= ignore_whitespace
;
5635 s
->force_text_diff
= force_text_diff
;
5636 s
->parent_view
= parent_view
;
5639 if (has_colors() && getenv("TOG_COLORS") != NULL
&& !using_mock_io
) {
5642 rc
= init_pair(GOT_DIFF_LINE_MINUS
,
5643 get_color_value("TOG_COLOR_DIFF_MINUS"), -1);
5645 rc
= init_pair(GOT_DIFF_LINE_PLUS
,
5646 get_color_value("TOG_COLOR_DIFF_PLUS"), -1);
5648 rc
= init_pair(GOT_DIFF_LINE_HUNK
,
5649 get_color_value("TOG_COLOR_DIFF_CHUNK_HEADER"), -1);
5651 rc
= init_pair(GOT_DIFF_LINE_META
,
5652 get_color_value("TOG_COLOR_DIFF_META"), -1);
5654 rc
= init_pair(GOT_DIFF_LINE_CHANGES
,
5655 get_color_value("TOG_COLOR_DIFF_META"), -1);
5657 rc
= init_pair(GOT_DIFF_LINE_BLOB_MIN
,
5658 get_color_value("TOG_COLOR_DIFF_META"), -1);
5660 rc
= init_pair(GOT_DIFF_LINE_BLOB_PLUS
,
5661 get_color_value("TOG_COLOR_DIFF_META"), -1);
5663 rc
= init_pair(GOT_DIFF_LINE_AUTHOR
,
5664 get_color_value("TOG_COLOR_AUTHOR"), -1);
5666 rc
= init_pair(GOT_DIFF_LINE_DATE
,
5667 get_color_value("TOG_COLOR_DATE"), -1);
5669 err
= got_error(GOT_ERR_RANGE
);
5674 if (parent_view
&& parent_view
->type
== TOG_VIEW_LOG
&&
5675 view_is_splitscreen(view
))
5676 show_log_view(parent_view
); /* draw border */
5677 diff_view_indicate_progress(view
);
5679 err
= create_diff(s
);
5681 view
->show
= show_diff_view
;
5682 view
->input
= input_diff_view
;
5683 view
->reset
= reset_diff_view
;
5684 view
->close
= close_diff_view
;
5685 view
->search_start
= search_start_diff_view
;
5686 view
->search_setup
= search_setup_diff_view
;
5687 view
->search_next
= search_next_view_match
;
5690 if (view
->close
== NULL
)
5691 close_diff_view(view
);
5697 static const struct got_error
*
5698 show_diff_view(struct tog_view
*view
)
5700 const struct got_error
*err
;
5701 struct tog_diff_view_state
*s
= &view
->state
.diff
;
5702 char *id_str1
= NULL
, *id_str2
, *header
;
5703 const char *label1
, *label2
;
5706 err
= got_object_id_str(&id_str1
, s
->id1
);
5709 label1
= s
->label1
? s
->label1
: id_str1
;
5711 label1
= "/dev/null";
5713 err
= got_object_id_str(&id_str2
, s
->id2
);
5716 label2
= s
->label2
? s
->label2
: id_str2
;
5718 if (asprintf(&header
, "diff %s %s", label1
, label2
) == -1) {
5719 err
= got_error_from_errno("asprintf");
5727 err
= draw_file(view
, header
);
5732 static const struct got_error
*
5733 set_selected_commit(struct tog_diff_view_state
*s
,
5734 struct commit_queue_entry
*entry
)
5736 const struct got_error
*err
;
5737 const struct got_object_id_queue
*parent_ids
;
5738 struct got_commit_object
*selected_commit
;
5739 struct got_object_qid
*pid
;
5742 s
->id2
= got_object_id_dup(entry
->id
);
5744 return got_error_from_errno("got_object_id_dup");
5746 err
= got_object_open_as_commit(&selected_commit
, s
->repo
, entry
->id
);
5749 parent_ids
= got_object_commit_get_parent_ids(selected_commit
);
5751 pid
= STAILQ_FIRST(parent_ids
);
5752 s
->id1
= pid
? got_object_id_dup(&pid
->id
) : NULL
;
5753 got_object_commit_close(selected_commit
);
5757 static const struct got_error
*
5758 reset_diff_view(struct tog_view
*view
)
5760 struct tog_diff_view_state
*s
= &view
->state
.diff
;
5763 wclear(view
->window
);
5764 s
->first_displayed_line
= 1;
5765 s
->last_displayed_line
= view
->nlines
;
5766 s
->matched_line
= 0;
5767 diff_view_indicate_progress(view
);
5768 return create_diff(s
);
5772 diff_prev_index(struct tog_diff_view_state
*s
, enum got_diff_line_type type
)
5776 i
= start
= s
->first_displayed_line
- 1;
5778 while (s
->lines
[i
].type
!= type
) {
5782 return; /* do nothing, requested type not in file */
5785 s
->selected_line
= 1;
5786 s
->first_displayed_line
= i
;
5790 diff_next_index(struct tog_diff_view_state
*s
, enum got_diff_line_type type
)
5794 i
= start
= s
->first_displayed_line
+ 1;
5796 while (s
->lines
[i
].type
!= type
) {
5797 if (i
== s
->nlines
- 1)
5800 return; /* do nothing, requested type not in file */
5803 s
->selected_line
= 1;
5804 s
->first_displayed_line
= i
;
5807 static struct got_object_id
*get_selected_commit_id(struct tog_blame_line
*,
5809 static struct got_object_id
*get_annotation_for_line(struct tog_blame_line
*,
5812 static const struct got_error
*
5813 input_diff_view(struct tog_view
**new_view
, struct tog_view
*view
, int ch
)
5815 const struct got_error
*err
= NULL
;
5816 struct tog_diff_view_state
*s
= &view
->state
.diff
;
5817 struct tog_log_view_state
*ls
;
5818 struct commit_queue_entry
*old_selected_entry
;
5820 size_t linesize
= 0;
5822 int i
, nscroll
= view
->nlines
- 1, up
= 0;
5824 s
->lineno
= s
->first_displayed_line
- 1 + s
->selected_line
;
5833 horizontal_scroll_input(view
, ch
);
5838 s
->force_text_diff
= !s
->force_text_diff
;
5839 view
->action
= s
->force_text_diff
?
5840 "force ASCII text enabled" :
5841 "force ASCII text disabled";
5843 else if (ch
== 'w') {
5844 s
->ignore_whitespace
= !s
->ignore_whitespace
;
5845 view
->action
= s
->ignore_whitespace
?
5846 "ignore whitespace enabled" :
5847 "ignore whitespace disabled";
5849 err
= reset_diff_view(view
);
5853 s
->first_displayed_line
= 1;
5862 s
->first_displayed_line
= (s
->nlines
- view
->nlines
) + 2;
5868 if (s
->first_displayed_line
> 1)
5869 s
->first_displayed_line
--;
5880 if (s
->first_displayed_line
== 1) {
5885 while (i
++ < nscroll
&& s
->first_displayed_line
> 1)
5886 s
->first_displayed_line
--;
5892 s
->first_displayed_line
++;
5909 while (!s
->eof
&& i
++ < nscroll
) {
5910 linelen
= getline(&line
, &linesize
, s
->f
);
5911 s
->first_displayed_line
++;
5912 if (linelen
== -1) {
5916 err
= got_ferror(s
->f
, GOT_ERR_IO
);
5923 diff_prev_index(s
, GOT_DIFF_LINE_BLOB_MIN
);
5926 diff_next_index(s
, GOT_DIFF_LINE_BLOB_MIN
);
5929 diff_prev_index(s
, GOT_DIFF_LINE_HUNK
);
5932 diff_next_index(s
, GOT_DIFF_LINE_HUNK
);
5935 if (s
->diff_context
> 0) {
5937 s
->matched_line
= 0;
5938 diff_view_indicate_progress(view
);
5939 err
= create_diff(s
);
5940 if (s
->first_displayed_line
+ view
->nlines
- 1 >
5942 s
->first_displayed_line
= 1;
5943 s
->last_displayed_line
= view
->nlines
;
5949 if (s
->diff_context
< GOT_DIFF_MAX_CONTEXT
) {
5951 s
->matched_line
= 0;
5952 diff_view_indicate_progress(view
);
5953 err
= create_diff(s
);
5965 if (s
->parent_view
== NULL
) {
5969 s
->parent_view
->count
= view
->count
;
5971 if (s
->parent_view
->type
== TOG_VIEW_LOG
) {
5972 ls
= &s
->parent_view
->state
.log
;
5973 old_selected_entry
= ls
->selected_entry
;
5975 err
= input_log_view(NULL
, s
->parent_view
,
5976 up
? KEY_UP
: KEY_DOWN
);
5979 view
->count
= s
->parent_view
->count
;
5981 if (old_selected_entry
== ls
->selected_entry
)
5984 err
= set_selected_commit(s
, ls
->selected_entry
);
5987 } else if (s
->parent_view
->type
== TOG_VIEW_BLAME
) {
5988 struct tog_blame_view_state
*bs
;
5989 struct got_object_id
*id
, *prev_id
;
5991 bs
= &s
->parent_view
->state
.blame
;
5992 prev_id
= get_annotation_for_line(bs
->blame
.lines
,
5993 bs
->blame
.nlines
, bs
->last_diffed_line
);
5995 err
= input_blame_view(&view
, s
->parent_view
,
5996 up
? KEY_UP
: KEY_DOWN
);
5999 view
->count
= s
->parent_view
->count
;
6001 if (prev_id
== NULL
)
6003 id
= get_selected_commit_id(bs
->blame
.lines
,
6004 bs
->blame
.nlines
, bs
->first_displayed_line
,
6009 if (!got_object_id_cmp(prev_id
, id
))
6012 err
= input_blame_view(&view
, s
->parent_view
, KEY_ENTER
);
6016 s
->first_displayed_line
= 1;
6017 s
->last_displayed_line
= view
->nlines
;
6018 s
->matched_line
= 0;
6021 diff_view_indicate_progress(view
);
6022 err
= create_diff(s
);
6032 static const struct got_error
*
6033 cmd_diff(int argc
, char *argv
[])
6035 const struct got_error
*error
;
6036 struct got_repository
*repo
= NULL
;
6037 struct got_worktree
*worktree
= NULL
;
6038 struct got_object_id
*id1
= NULL
, *id2
= NULL
;
6039 char *repo_path
= NULL
, *cwd
= NULL
;
6040 char *id_str1
= NULL
, *id_str2
= NULL
;
6041 char *keyword_idstr1
= NULL
, *keyword_idstr2
= NULL
;
6042 char *label1
= NULL
, *label2
= NULL
;
6043 int diff_context
= 3, ignore_whitespace
= 0;
6044 int ch
, force_text_diff
= 0;
6046 struct tog_view
*view
;
6047 int *pack_fds
= NULL
;
6049 while ((ch
= getopt(argc
, argv
, "aC:r:w")) != -1) {
6052 force_text_diff
= 1;
6055 diff_context
= strtonum(optarg
, 0, GOT_DIFF_MAX_CONTEXT
,
6058 errx(1, "number of context lines is %s: %s",
6062 repo_path
= realpath(optarg
, NULL
);
6063 if (repo_path
== NULL
)
6064 return got_error_from_errno2("realpath",
6066 got_path_strip_trailing_slashes(repo_path
);
6069 ignore_whitespace
= 1;
6081 usage_diff(); /* TODO show local worktree changes */
6082 } else if (argc
== 2) {
6088 error
= got_repo_pack_fds_open(&pack_fds
);
6092 if (repo_path
== NULL
) {
6093 cwd
= getcwd(NULL
, 0);
6095 return got_error_from_errno("getcwd");
6096 error
= got_worktree_open(&worktree
, cwd
, NULL
);
6097 if (error
&& error
->code
!= GOT_ERR_NOT_WORKTREE
)
6101 strdup(got_worktree_get_repo_path(worktree
));
6103 repo_path
= strdup(cwd
);
6104 if (repo_path
== NULL
) {
6105 error
= got_error_from_errno("strdup");
6110 error
= got_repo_open(&repo
, repo_path
, NULL
, pack_fds
);
6116 error
= apply_unveil(got_repo_get_path(repo
), NULL
);
6120 error
= tog_load_refs(repo
, 0);
6124 if (id_str1
!= NULL
) {
6125 error
= got_keyword_to_idstr(&keyword_idstr1
, id_str1
,
6129 if (keyword_idstr1
!= NULL
)
6130 id_str1
= keyword_idstr1
;
6132 if (id_str2
!= NULL
) {
6133 error
= got_keyword_to_idstr(&keyword_idstr2
, id_str2
,
6137 if (keyword_idstr2
!= NULL
)
6138 id_str2
= keyword_idstr2
;
6141 error
= got_repo_match_object_id(&id1
, &label1
, id_str1
,
6142 GOT_OBJ_TYPE_ANY
, &tog_refs
, repo
);
6146 error
= got_repo_match_object_id(&id2
, &label2
, id_str2
,
6147 GOT_OBJ_TYPE_ANY
, &tog_refs
, repo
);
6151 view
= view_open(0, 0, 0, 0, TOG_VIEW_DIFF
);
6153 error
= got_error_from_errno("view_open");
6156 error
= open_diff_view(view
, id1
, id2
, label1
, label2
, diff_context
,
6157 ignore_whitespace
, force_text_diff
, NULL
, repo
);
6162 error
= set_tog_base_commit(repo
, worktree
);
6167 error
= view_loop(view
);
6170 free(tog_base_commit
.id
);
6171 free(keyword_idstr1
);
6172 free(keyword_idstr2
);
6178 const struct got_error
*close_err
= got_repo_close(repo
);
6183 got_worktree_close(worktree
);
6185 const struct got_error
*pack_err
=
6186 got_repo_pack_fds_close(pack_fds
);
6199 "usage: %s blame [-c commit] [-r repository-path] path\n",
6204 struct tog_blame_line
{
6206 struct got_object_id
*id
;
6209 static const struct got_error
*
6210 draw_blame(struct tog_view
*view
)
6212 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6213 struct tog_blame
*blame
= &s
->blame
;
6214 regmatch_t
*regmatch
= &view
->regmatch
;
6215 const struct got_error
*err
;
6216 int lineno
= 0, nprinted
= 0;
6218 size_t linesize
= 0;
6222 struct tog_blame_line
*blame_line
;
6223 struct got_object_id
*prev_id
= NULL
;
6225 struct tog_color
*tc
;
6227 err
= got_object_id_str(&id_str
, &s
->blamed_commit
->id
);
6232 werase(view
->window
);
6234 if (asprintf(&line
, "commit %s", id_str
) == -1) {
6235 err
= got_error_from_errno("asprintf");
6240 err
= format_line(&wline
, &width
, NULL
, line
, 0, view
->ncols
, 0, 0);
6245 if (view_needs_focus_indication(view
))
6246 wstandout(view
->window
);
6247 tc
= get_color(&s
->colors
, TOG_COLOR_COMMIT
);
6249 wattr_on(view
->window
, COLOR_PAIR(tc
->colorpair
), NULL
);
6250 waddwstr(view
->window
, wline
);
6251 while (width
++ < view
->ncols
)
6252 waddch(view
->window
, ' ');
6254 wattr_off(view
->window
, COLOR_PAIR(tc
->colorpair
), NULL
);
6255 if (view_needs_focus_indication(view
))
6256 wstandend(view
->window
);
6260 if (view
->gline
> blame
->nlines
)
6261 view
->gline
= blame
->nlines
;
6263 if (tog_io
.wait_for_ui
) {
6264 struct tog_blame_thread_args
*bta
= &s
->blame
.thread_args
;
6267 rc
= pthread_cond_wait(&bta
->blame_complete
, &tog_mutex
);
6269 return got_error_set_errno(rc
, "pthread_cond_wait");
6270 tog_io
.wait_for_ui
= 0;
6273 if (asprintf(&line
, "[%d/%d] %s%s", view
->gline
? view
->gline
:
6274 s
->first_displayed_line
- 1 + s
->selected_line
, blame
->nlines
,
6275 s
->blame_complete
? "" : "annotating... ", s
->path
) == -1) {
6277 return got_error_from_errno("asprintf");
6280 err
= format_line(&wline
, &width
, NULL
, line
, 0, view
->ncols
, 0, 0);
6285 waddwstr(view
->window
, wline
);
6288 if (width
< view
->ncols
- 1)
6289 waddch(view
->window
, '\n');
6293 while (nprinted
< view
->nlines
- 2) {
6294 linelen
= getline(&line
, &linesize
, blame
->f
);
6295 if (linelen
== -1) {
6296 if (feof(blame
->f
)) {
6301 return got_ferror(blame
->f
, GOT_ERR_IO
);
6303 if (++lineno
< s
->first_displayed_line
)
6305 if (view
->gline
&& !gotoline(view
, &lineno
, &nprinted
))
6308 /* Set view->maxx based on full line length. */
6309 err
= format_line(&wline
, &width
, NULL
, line
, 0, INT_MAX
, 9, 1);
6316 view
->maxx
= MAX(view
->maxx
, width
);
6318 if (nprinted
== s
->selected_line
- 1)
6319 wstandout(view
->window
);
6321 if (blame
->nlines
> 0) {
6322 blame_line
= &blame
->lines
[lineno
- 1];
6323 if (blame_line
->annotated
&& prev_id
&&
6324 got_object_id_cmp(prev_id
, blame_line
->id
) == 0 &&
6325 !(nprinted
== s
->selected_line
- 1)) {
6326 waddstr(view
->window
, " ");
6327 } else if (blame_line
->annotated
) {
6329 err
= got_object_id_str(&id_str
,
6335 tc
= get_color(&s
->colors
, TOG_COLOR_COMMIT
);
6337 wattr_on(view
->window
,
6338 COLOR_PAIR(tc
->colorpair
), NULL
);
6339 wprintw(view
->window
, "%.8s", id_str
);
6341 wattr_off(view
->window
,
6342 COLOR_PAIR(tc
->colorpair
), NULL
);
6344 prev_id
= blame_line
->id
;
6346 waddstr(view
->window
, "........");
6350 waddstr(view
->window
, "........");
6354 if (nprinted
== s
->selected_line
- 1)
6355 wstandend(view
->window
);
6356 waddstr(view
->window
, " ");
6358 if (view
->ncols
<= 9) {
6360 } else if (s
->first_displayed_line
+ nprinted
==
6362 regmatch
->rm_so
>= 0 && regmatch
->rm_so
< regmatch
->rm_eo
) {
6363 err
= add_matched_line(&width
, line
, view
->ncols
- 9, 9,
6364 view
->window
, view
->x
, regmatch
);
6372 err
= format_line(&wline
, &width
, &skip
, line
,
6373 view
->x
, view
->ncols
- 9, 9, 1);
6378 waddwstr(view
->window
, &wline
[skip
]);
6384 if (width
<= view
->ncols
- 1)
6385 waddch(view
->window
, '\n');
6386 if (++nprinted
== 1)
6387 s
->first_displayed_line
= lineno
;
6390 s
->last_displayed_line
= lineno
;
6397 static const struct got_error
*
6398 blame_cb(void *arg
, int nlines
, int lineno
,
6399 struct got_commit_object
*commit
, struct got_object_id
*id
)
6401 const struct got_error
*err
= NULL
;
6402 struct tog_blame_cb_args
*a
= arg
;
6403 struct tog_blame_line
*line
;
6406 if (nlines
!= a
->nlines
||
6407 (lineno
!= -1 && lineno
< 1) || lineno
> a
->nlines
)
6408 return got_error(GOT_ERR_RANGE
);
6410 errcode
= pthread_mutex_lock(&tog_mutex
);
6412 return got_error_set_errno(errcode
, "pthread_mutex_lock");
6414 if (*a
->quit
) { /* user has quit the blame view */
6415 err
= got_error(GOT_ERR_ITER_COMPLETED
);
6420 goto done
; /* no change in this commit */
6422 line
= &a
->lines
[lineno
- 1];
6423 if (line
->annotated
)
6426 line
->id
= got_object_id_dup(id
);
6427 if (line
->id
== NULL
) {
6428 err
= got_error_from_errno("got_object_id_dup");
6431 line
->annotated
= 1;
6433 errcode
= pthread_mutex_unlock(&tog_mutex
);
6435 err
= got_error_set_errno(errcode
, "pthread_mutex_unlock");
6440 blame_thread(void *arg
)
6442 const struct got_error
*err
, *close_err
;
6443 struct tog_blame_thread_args
*ta
= arg
;
6444 struct tog_blame_cb_args
*a
= ta
->cb_args
;
6445 int errcode
, fd1
= -1, fd2
= -1;
6446 FILE *f1
= NULL
, *f2
= NULL
;
6448 fd1
= got_opentempfd();
6450 return (void *)got_error_from_errno("got_opentempfd");
6452 fd2
= got_opentempfd();
6454 err
= got_error_from_errno("got_opentempfd");
6458 f1
= got_opentemp();
6460 err
= (void *)got_error_from_errno("got_opentemp");
6463 f2
= got_opentemp();
6465 err
= (void *)got_error_from_errno("got_opentemp");
6469 err
= block_signals_used_by_main_thread();
6473 err
= got_blame(ta
->path
, a
->commit_id
, ta
->repo
,
6474 tog_diff_algo
, blame_cb
, ta
->cb_args
,
6475 ta
->cancel_cb
, ta
->cancel_arg
, fd1
, fd2
, f1
, f2
);
6476 if (err
&& err
->code
== GOT_ERR_CANCELLED
)
6479 errcode
= pthread_mutex_lock(&tog_mutex
);
6481 err
= got_error_set_errno(errcode
, "pthread_mutex_lock");
6485 close_err
= got_repo_close(ta
->repo
);
6491 if (tog_io
.wait_for_ui
) {
6492 errcode
= pthread_cond_signal(&ta
->blame_complete
);
6493 if (errcode
&& err
== NULL
)
6494 err
= got_error_set_errno(errcode
,
6495 "pthread_cond_signal");
6498 errcode
= pthread_mutex_unlock(&tog_mutex
);
6499 if (errcode
&& err
== NULL
)
6500 err
= got_error_set_errno(errcode
, "pthread_mutex_unlock");
6503 if (fd1
!= -1 && close(fd1
) == -1 && err
== NULL
)
6504 err
= got_error_from_errno("close");
6505 if (fd2
!= -1 && close(fd2
) == -1 && err
== NULL
)
6506 err
= got_error_from_errno("close");
6507 if (f1
&& fclose(f1
) == EOF
&& err
== NULL
)
6508 err
= got_error_from_errno("fclose");
6509 if (f2
&& fclose(f2
) == EOF
&& err
== NULL
)
6510 err
= got_error_from_errno("fclose");
6515 static struct got_object_id
*
6516 get_selected_commit_id(struct tog_blame_line
*lines
, int nlines
,
6517 int first_displayed_line
, int selected_line
)
6519 struct tog_blame_line
*line
;
6524 line
= &lines
[first_displayed_line
- 1 + selected_line
- 1];
6525 if (!line
->annotated
)
6531 static struct got_object_id
*
6532 get_annotation_for_line(struct tog_blame_line
*lines
, int nlines
,
6535 struct tog_blame_line
*line
;
6537 if (nlines
<= 0 || lineno
>= nlines
)
6540 line
= &lines
[lineno
- 1];
6541 if (!line
->annotated
)
6547 static const struct got_error
*
6548 stop_blame(struct tog_blame
*blame
)
6550 const struct got_error
*err
= NULL
;
6553 if (blame
->thread
) {
6555 errcode
= pthread_mutex_unlock(&tog_mutex
);
6557 return got_error_set_errno(errcode
,
6558 "pthread_mutex_unlock");
6559 errcode
= pthread_join(blame
->thread
, (void **)&err
);
6561 return got_error_set_errno(errcode
, "pthread_join");
6562 errcode
= pthread_mutex_lock(&tog_mutex
);
6564 return got_error_set_errno(errcode
,
6565 "pthread_mutex_lock");
6566 if (err
&& err
->code
== GOT_ERR_ITER_COMPLETED
)
6568 blame
->thread
= 0; //NULL;
6570 if (blame
->thread_args
.repo
) {
6571 const struct got_error
*close_err
;
6572 close_err
= got_repo_close(blame
->thread_args
.repo
);
6575 blame
->thread_args
.repo
= NULL
;
6578 if (fclose(blame
->f
) == EOF
&& err
== NULL
)
6579 err
= got_error_from_errno("fclose");
6583 for (i
= 0; i
< blame
->nlines
; i
++)
6584 free(blame
->lines
[i
].id
);
6586 blame
->lines
= NULL
;
6588 free(blame
->cb_args
.commit_id
);
6589 blame
->cb_args
.commit_id
= NULL
;
6590 if (blame
->pack_fds
) {
6591 const struct got_error
*pack_err
=
6592 got_repo_pack_fds_close(blame
->pack_fds
);
6595 blame
->pack_fds
= NULL
;
6597 free(blame
->line_offsets
);
6598 blame
->line_offsets
= NULL
;
6602 static const struct got_error
*
6603 cancel_blame_view(void *arg
)
6605 const struct got_error
*err
= NULL
;
6609 errcode
= pthread_mutex_lock(&tog_mutex
);
6611 return got_error_set_errno(errcode
,
6612 "pthread_mutex_unlock");
6615 err
= got_error(GOT_ERR_CANCELLED
);
6617 errcode
= pthread_mutex_unlock(&tog_mutex
);
6619 return got_error_set_errno(errcode
,
6620 "pthread_mutex_lock");
6625 static const struct got_error
*
6626 run_blame(struct tog_view
*view
)
6628 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6629 struct tog_blame
*blame
= &s
->blame
;
6630 const struct got_error
*err
= NULL
;
6631 struct got_commit_object
*commit
= NULL
;
6632 struct got_blob_object
*blob
= NULL
;
6633 struct got_repository
*thread_repo
= NULL
;
6634 struct got_object_id
*obj_id
= NULL
;
6635 int obj_type
, fd
= -1;
6636 int *pack_fds
= NULL
;
6638 err
= got_object_open_as_commit(&commit
, s
->repo
,
6639 &s
->blamed_commit
->id
);
6643 fd
= got_opentempfd();
6645 err
= got_error_from_errno("got_opentempfd");
6649 err
= got_object_id_by_path(&obj_id
, s
->repo
, commit
, s
->path
);
6653 err
= got_object_get_type(&obj_type
, s
->repo
, obj_id
);
6657 if (obj_type
!= GOT_OBJ_TYPE_BLOB
) {
6658 err
= got_error(GOT_ERR_OBJ_TYPE
);
6662 err
= got_object_open_as_blob(&blob
, s
->repo
, obj_id
, 8192, fd
);
6665 blame
->f
= got_opentemp();
6666 if (blame
->f
== NULL
) {
6667 err
= got_error_from_errno("got_opentemp");
6670 err
= got_object_blob_dump_to_file(&blame
->filesize
, &blame
->nlines
,
6671 &blame
->line_offsets
, blame
->f
, blob
);
6674 if (blame
->nlines
== 0) {
6675 s
->blame_complete
= 1;
6679 /* Don't include \n at EOF in the blame line count. */
6680 if (blame
->line_offsets
[blame
->nlines
- 1] == blame
->filesize
)
6683 blame
->lines
= calloc(blame
->nlines
, sizeof(*blame
->lines
));
6684 if (blame
->lines
== NULL
) {
6685 err
= got_error_from_errno("calloc");
6689 err
= got_repo_pack_fds_open(&pack_fds
);
6692 err
= got_repo_open(&thread_repo
, got_repo_get_path(s
->repo
), NULL
,
6697 blame
->pack_fds
= pack_fds
;
6698 blame
->cb_args
.view
= view
;
6699 blame
->cb_args
.lines
= blame
->lines
;
6700 blame
->cb_args
.nlines
= blame
->nlines
;
6701 blame
->cb_args
.commit_id
= got_object_id_dup(&s
->blamed_commit
->id
);
6702 if (blame
->cb_args
.commit_id
== NULL
) {
6703 err
= got_error_from_errno("got_object_id_dup");
6706 blame
->cb_args
.quit
= &s
->done
;
6708 blame
->thread_args
.path
= s
->path
;
6709 blame
->thread_args
.repo
= thread_repo
;
6710 blame
->thread_args
.cb_args
= &blame
->cb_args
;
6711 blame
->thread_args
.complete
= &s
->blame_complete
;
6712 blame
->thread_args
.cancel_cb
= cancel_blame_view
;
6713 blame
->thread_args
.cancel_arg
= &s
->done
;
6714 s
->blame_complete
= 0;
6716 if (s
->first_displayed_line
+ view
->nlines
- 1 > blame
->nlines
) {
6717 s
->first_displayed_line
= 1;
6718 s
->last_displayed_line
= view
->nlines
;
6719 s
->selected_line
= 1;
6721 s
->matched_line
= 0;
6725 got_object_commit_close(commit
);
6726 if (fd
!= -1 && close(fd
) == -1 && err
== NULL
)
6727 err
= got_error_from_errno("close");
6729 got_object_blob_close(blob
);
6736 static const struct got_error
*
6737 open_blame_view(struct tog_view
*view
, char *path
,
6738 struct got_object_id
*commit_id
, struct got_repository
*repo
)
6740 const struct got_error
*err
= NULL
;
6741 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6743 STAILQ_INIT(&s
->blamed_commits
);
6745 s
->path
= strdup(path
);
6746 if (s
->path
== NULL
)
6747 return got_error_from_errno("strdup");
6749 err
= got_object_qid_alloc(&s
->blamed_commit
, commit_id
);
6755 STAILQ_INSERT_HEAD(&s
->blamed_commits
, s
->blamed_commit
, entry
);
6756 s
->first_displayed_line
= 1;
6757 s
->last_displayed_line
= view
->nlines
;
6758 s
->selected_line
= 1;
6759 s
->blame_complete
= 0;
6761 s
->commit_id
= commit_id
;
6762 memset(&s
->blame
, 0, sizeof(s
->blame
));
6764 STAILQ_INIT(&s
->colors
);
6765 if (has_colors() && getenv("TOG_COLORS") != NULL
) {
6766 err
= add_color(&s
->colors
, "^", TOG_COLOR_COMMIT
,
6767 get_color_value("TOG_COLOR_COMMIT"));
6772 view
->show
= show_blame_view
;
6773 view
->input
= input_blame_view
;
6774 view
->reset
= reset_blame_view
;
6775 view
->close
= close_blame_view
;
6776 view
->search_start
= search_start_blame_view
;
6777 view
->search_setup
= search_setup_blame_view
;
6778 view
->search_next
= search_next_view_match
;
6780 if (using_mock_io
) {
6781 struct tog_blame_thread_args
*bta
= &s
->blame
.thread_args
;
6784 rc
= pthread_cond_init(&bta
->blame_complete
, NULL
);
6786 return got_error_set_errno(rc
, "pthread_cond_init");
6789 return run_blame(view
);
6792 static const struct got_error
*
6793 close_blame_view(struct tog_view
*view
)
6795 const struct got_error
*err
= NULL
;
6796 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6798 if (s
->blame
.thread
)
6799 err
= stop_blame(&s
->blame
);
6801 while (!STAILQ_EMPTY(&s
->blamed_commits
)) {
6802 struct got_object_qid
*blamed_commit
;
6803 blamed_commit
= STAILQ_FIRST(&s
->blamed_commits
);
6804 STAILQ_REMOVE_HEAD(&s
->blamed_commits
, entry
);
6805 got_object_qid_free(blamed_commit
);
6808 if (using_mock_io
) {
6809 struct tog_blame_thread_args
*bta
= &s
->blame
.thread_args
;
6812 rc
= pthread_cond_destroy(&bta
->blame_complete
);
6813 if (rc
&& err
== NULL
)
6814 err
= got_error_set_errno(rc
, "pthread_cond_destroy");
6818 free_colors(&s
->colors
);
6822 static const struct got_error
*
6823 search_start_blame_view(struct tog_view
*view
)
6825 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6827 s
->matched_line
= 0;
6832 search_setup_blame_view(struct tog_view
*view
, FILE **f
, off_t
**line_offsets
,
6833 size_t *nlines
, int **first
, int **last
, int **match
, int **selected
)
6835 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6838 *nlines
= s
->blame
.nlines
;
6839 *line_offsets
= s
->blame
.line_offsets
;
6840 *match
= &s
->matched_line
;
6841 *first
= &s
->first_displayed_line
;
6842 *last
= &s
->last_displayed_line
;
6843 *selected
= &s
->selected_line
;
6846 static const struct got_error
*
6847 show_blame_view(struct tog_view
*view
)
6849 const struct got_error
*err
= NULL
;
6850 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6853 if (s
->blame
.thread
== 0 && !s
->blame_complete
) {
6854 errcode
= pthread_create(&s
->blame
.thread
, NULL
, blame_thread
,
6855 &s
->blame
.thread_args
);
6857 return got_error_set_errno(errcode
, "pthread_create");
6860 halfdelay(1); /* fast refresh while annotating */
6863 if (s
->blame_complete
&& !using_mock_io
)
6864 halfdelay(10); /* disable fast refresh */
6866 err
= draw_blame(view
);
6872 static const struct got_error
*
6873 log_annotated_line(struct tog_view
**new_view
, int begin_y
, int begin_x
,
6874 struct got_repository
*repo
, struct got_object_id
*id
)
6876 struct tog_view
*log_view
;
6877 const struct got_error
*err
= NULL
;
6881 log_view
= view_open(0, 0, begin_y
, begin_x
, TOG_VIEW_LOG
);
6882 if (log_view
== NULL
)
6883 return got_error_from_errno("view_open");
6885 err
= open_log_view(log_view
, id
, repo
, GOT_REF_HEAD
, "", 0, NULL
);
6887 view_close(log_view
);
6889 *new_view
= log_view
;
6894 static const struct got_error
*
6895 input_blame_view(struct tog_view
**new_view
, struct tog_view
*view
, int ch
)
6897 const struct got_error
*err
= NULL
, *thread_err
= NULL
;
6898 struct tog_view
*diff_view
;
6899 struct tog_blame_view_state
*s
= &view
->state
.blame
;
6900 int eos
, nscroll
, begin_y
= 0, begin_x
= 0;
6902 eos
= nscroll
= view
->nlines
- 2;
6903 if (view_is_hsplit_top(view
))
6913 horizontal_scroll_input(view
, ch
);
6920 s
->selected_line
= 1;
6921 s
->first_displayed_line
= 1;
6926 if (s
->blame
.nlines
< eos
) {
6927 s
->selected_line
= s
->blame
.nlines
;
6928 s
->first_displayed_line
= 1;
6930 s
->selected_line
= eos
;
6931 s
->first_displayed_line
= s
->blame
.nlines
- (eos
- 1);
6938 if (s
->selected_line
> 1)
6940 else if (s
->selected_line
== 1 &&
6941 s
->first_displayed_line
> 1)
6942 s
->first_displayed_line
--;
6953 if (s
->first_displayed_line
== 1) {
6954 if (view
->count
> 1)
6956 s
->selected_line
= MAX(1, s
->selected_line
- nscroll
);
6960 if (s
->first_displayed_line
> nscroll
)
6961 s
->first_displayed_line
-= nscroll
;
6963 s
->first_displayed_line
= 1;
6968 if (s
->selected_line
< eos
&& s
->first_displayed_line
+
6969 s
->selected_line
<= s
->blame
.nlines
)
6971 else if (s
->first_displayed_line
< s
->blame
.nlines
- (eos
- 1))
6972 s
->first_displayed_line
++;
6978 struct got_object_id
*id
= NULL
;
6981 id
= get_selected_commit_id(s
->blame
.lines
, s
->blame
.nlines
,
6982 s
->first_displayed_line
, s
->selected_line
);
6986 struct got_commit_object
*commit
, *pcommit
;
6987 struct got_object_qid
*pid
;
6988 struct got_object_id
*blob_id
= NULL
;
6990 err
= got_object_open_as_commit(&commit
,
6995 got_object_commit_get_parent_ids(commit
));
6997 got_object_commit_close(commit
);
7000 /* Check if path history ends here. */
7001 err
= got_object_open_as_commit(&pcommit
,
7005 err
= got_object_id_by_path(&blob_id
, s
->repo
,
7007 got_object_commit_close(pcommit
);
7009 if (err
->code
== GOT_ERR_NO_TREE_ENTRY
)
7011 got_object_commit_close(commit
);
7014 err
= got_object_get_type(&obj_type
, s
->repo
,
7017 /* Can't blame non-blob type objects. */
7018 if (obj_type
!= GOT_OBJ_TYPE_BLOB
) {
7019 got_object_commit_close(commit
);
7022 err
= got_object_qid_alloc(&s
->blamed_commit
,
7024 got_object_commit_close(commit
);
7026 if (got_object_id_cmp(id
,
7027 &s
->blamed_commit
->id
) == 0)
7029 err
= got_object_qid_alloc(&s
->blamed_commit
,
7035 thread_err
= stop_blame(&s
->blame
);
7039 STAILQ_INSERT_HEAD(&s
->blamed_commits
,
7040 s
->blamed_commit
, entry
);
7041 err
= run_blame(view
);
7047 struct got_object_qid
*first
;
7050 first
= STAILQ_FIRST(&s
->blamed_commits
);
7051 if (!got_object_id_cmp(&first
->id
, s
->commit_id
))
7054 thread_err
= stop_blame(&s
->blame
);
7058 STAILQ_REMOVE_HEAD(&s
->blamed_commits
, entry
);
7059 got_object_qid_free(s
->blamed_commit
);
7061 STAILQ_FIRST(&s
->blamed_commits
);
7062 err
= run_blame(view
);
7069 s
->id_to_log
= get_selected_commit_id(s
->blame
.lines
,
7070 s
->blame
.nlines
, s
->first_displayed_line
, s
->selected_line
);
7072 err
= view_request_new(new_view
, view
, TOG_VIEW_LOG
);
7076 struct got_object_id
*id
= NULL
;
7077 struct got_object_qid
*pid
;
7078 struct got_commit_object
*commit
= NULL
;
7081 id
= get_selected_commit_id(s
->blame
.lines
, s
->blame
.nlines
,
7082 s
->first_displayed_line
, s
->selected_line
);
7085 err
= got_object_open_as_commit(&commit
, s
->repo
, id
);
7088 pid
= STAILQ_FIRST(got_object_commit_get_parent_ids(commit
));
7090 /* traversed from diff view, release diff resources */
7091 err
= close_diff_view(*new_view
);
7094 diff_view
= *new_view
;
7096 if (view_is_parent_view(view
))
7097 view_get_split(view
, &begin_y
, &begin_x
);
7099 diff_view
= view_open(0, 0, begin_y
, begin_x
,
7101 if (diff_view
== NULL
) {
7102 got_object_commit_close(commit
);
7103 err
= got_error_from_errno("view_open");
7107 err
= open_diff_view(diff_view
, pid
? &pid
->id
: NULL
,
7108 id
, NULL
, NULL
, 3, 0, 0, view
, s
->repo
);
7109 got_object_commit_close(commit
);
7112 s
->last_diffed_line
= s
->first_displayed_line
- 1 +
7115 break; /* still open from active diff view */
7116 if (view_is_parent_view(view
) &&
7117 view
->mode
== TOG_VIEW_SPLIT_HRZN
) {
7118 err
= view_init_hsplit(view
, begin_y
);
7124 diff_view
->focussed
= 1;
7125 diff_view
->mode
= view
->mode
;
7126 diff_view
->nlines
= view
->lines
- begin_y
;
7127 if (view_is_parent_view(view
)) {
7128 view_transfer_size(diff_view
, view
);
7129 err
= view_close_child(view
);
7132 err
= view_set_child(view
, diff_view
);
7135 view
->focus_child
= 1;
7137 *new_view
= diff_view
;
7150 if (s
->last_displayed_line
>= s
->blame
.nlines
&&
7151 s
->selected_line
>= MIN(s
->blame
.nlines
,
7152 view
->nlines
- 2)) {
7156 if (s
->last_displayed_line
>= s
->blame
.nlines
&&
7157 s
->selected_line
< view
->nlines
- 2) {
7159 MIN(nscroll
, s
->last_displayed_line
-
7160 s
->first_displayed_line
- s
->selected_line
+ 1);
7162 if (s
->last_displayed_line
+ nscroll
<= s
->blame
.nlines
)
7163 s
->first_displayed_line
+= nscroll
;
7165 s
->first_displayed_line
=
7166 s
->blame
.nlines
- (view
->nlines
- 3);
7169 if (s
->selected_line
> view
->nlines
- 2) {
7170 s
->selected_line
= MIN(s
->blame
.nlines
,
7178 return thread_err
? thread_err
: err
;
7181 static const struct got_error
*
7182 reset_blame_view(struct tog_view
*view
)
7184 const struct got_error
*err
;
7185 struct tog_blame_view_state
*s
= &view
->state
.blame
;
7189 err
= stop_blame(&s
->blame
);
7193 return run_blame(view
);
7196 static const struct got_error
*
7197 cmd_blame(int argc
, char *argv
[])
7199 const struct got_error
*error
;
7200 struct got_repository
*repo
= NULL
;
7201 struct got_worktree
*worktree
= NULL
;
7202 char *cwd
= NULL
, *repo_path
= NULL
, *in_repo_path
= NULL
;
7203 char *link_target
= NULL
;
7204 struct got_object_id
*commit_id
= NULL
;
7205 struct got_commit_object
*commit
= NULL
;
7206 char *keyword_idstr
= NULL
, *commit_id_str
= NULL
;
7208 struct tog_view
*view
= NULL
;
7209 int *pack_fds
= NULL
;
7211 while ((ch
= getopt(argc
, argv
, "c:r:")) != -1) {
7214 commit_id_str
= optarg
;
7217 repo_path
= realpath(optarg
, NULL
);
7218 if (repo_path
== NULL
)
7219 return got_error_from_errno2("realpath",
7234 error
= got_repo_pack_fds_open(&pack_fds
);
7238 if (repo_path
== NULL
) {
7239 cwd
= getcwd(NULL
, 0);
7241 return got_error_from_errno("getcwd");
7242 error
= got_worktree_open(&worktree
, cwd
, NULL
);
7243 if (error
&& error
->code
!= GOT_ERR_NOT_WORKTREE
)
7247 strdup(got_worktree_get_repo_path(worktree
));
7249 repo_path
= strdup(cwd
);
7250 if (repo_path
== NULL
) {
7251 error
= got_error_from_errno("strdup");
7256 error
= got_repo_open(&repo
, repo_path
, NULL
, pack_fds
);
7260 error
= get_in_repo_path_from_argv0(&in_repo_path
, argc
, argv
, repo
,
7267 error
= apply_unveil(got_repo_get_path(repo
), NULL
);
7271 error
= tog_load_refs(repo
, 0);
7275 if (commit_id_str
== NULL
) {
7276 struct got_reference
*head_ref
;
7277 error
= got_ref_open(&head_ref
, repo
, worktree
?
7278 got_worktree_get_head_ref_name(worktree
) : GOT_REF_HEAD
, 0);
7281 error
= got_ref_resolve(&commit_id
, repo
, head_ref
);
7282 got_ref_close(head_ref
);
7284 error
= got_keyword_to_idstr(&keyword_idstr
, commit_id_str
,
7288 if (keyword_idstr
!= NULL
)
7289 commit_id_str
= keyword_idstr
;
7291 error
= got_repo_match_object_id(&commit_id
, NULL
,
7292 commit_id_str
, GOT_OBJ_TYPE_COMMIT
, &tog_refs
, repo
);
7297 error
= got_object_open_as_commit(&commit
, repo
, commit_id
);
7301 error
= got_object_resolve_symlinks(&link_target
, in_repo_path
,
7306 view
= view_open(0, 0, 0, 0, TOG_VIEW_BLAME
);
7308 error
= got_error_from_errno("view_open");
7311 error
= open_blame_view(view
, link_target
? link_target
: in_repo_path
,
7313 if (error
!= NULL
) {
7314 if (view
->close
== NULL
)
7315 close_blame_view(view
);
7321 error
= set_tog_base_commit(repo
, worktree
);
7325 /* Release work tree lock. */
7326 got_worktree_close(worktree
);
7330 error
= view_loop(view
);
7333 free(tog_base_commit
.id
);
7339 free(keyword_idstr
);
7341 got_object_commit_close(commit
);
7343 got_worktree_close(worktree
);
7345 const struct got_error
*close_err
= got_repo_close(repo
);
7350 const struct got_error
*pack_err
=
7351 got_repo_pack_fds_close(pack_fds
);
7359 static const struct got_error
*
7360 draw_tree_entries(struct tog_view
*view
, const char *parent_path
)
7362 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7363 const struct got_error
*err
= NULL
;
7364 struct got_tree_entry
*te
;
7367 struct tog_color
*tc
;
7368 int width
, n
, nentries
, scrollx
, i
= 1;
7369 int limit
= view
->nlines
;
7372 if (view_is_hsplit_top(view
))
7373 --limit
; /* border */
7375 werase(view
->window
);
7380 err
= format_line(&wline
, &width
, NULL
, s
->tree_label
, 0, view
->ncols
,
7384 if (view_needs_focus_indication(view
))
7385 wstandout(view
->window
);
7386 tc
= get_color(&s
->colors
, TOG_COLOR_COMMIT
);
7388 wattr_on(view
->window
, COLOR_PAIR(tc
->colorpair
), NULL
);
7389 waddwstr(view
->window
, wline
);
7392 while (width
++ < view
->ncols
)
7393 waddch(view
->window
, ' ');
7395 wattr_off(view
->window
, COLOR_PAIR(tc
->colorpair
), NULL
);
7396 if (view_needs_focus_indication(view
))
7397 wstandend(view
->window
);
7402 if (s
->first_displayed_entry
) {
7403 i
+= got_tree_entry_get_index(s
->first_displayed_entry
);
7404 if (s
->tree
!= s
->root
)
7405 ++i
; /* account for ".." entry */
7407 nentries
= got_object_tree_get_nentries(s
->tree
);
7408 if (asprintf(&index
, "[%d/%d] %s",
7409 i
, nentries
+ (s
->tree
== s
->root
? 0 : 1), parent_path
) == -1)
7410 return got_error_from_errno("asprintf");
7411 err
= format_line(&wline
, &width
, NULL
, index
, 0, view
->ncols
, 0, 0);
7415 waddwstr(view
->window
, wline
);
7418 if (width
< view
->ncols
- 1)
7419 waddch(view
->window
, '\n');
7422 waddch(view
->window
, '\n');
7426 if (s
->first_displayed_entry
== NULL
) {
7427 te
= got_object_tree_get_first_entry(s
->tree
);
7428 if (s
->selected
== 0) {
7430 wstandout(view
->window
);
7431 s
->selected_entry
= NULL
;
7433 waddstr(view
->window
, " ..\n"); /* parent directory */
7434 if (s
->selected
== 0 && view
->focussed
)
7435 wstandend(view
->window
);
7442 te
= s
->first_displayed_entry
;
7446 for (i
= got_tree_entry_get_index(te
); i
< nentries
; i
++) {
7447 char *line
= NULL
, *id_str
= NULL
, *link_target
= NULL
;
7448 const char *modestr
= "";
7451 te
= got_object_tree_get_entry(s
->tree
, i
);
7452 mode
= got_tree_entry_get_mode(te
);
7455 err
= got_object_id_str(&id_str
,
7456 got_tree_entry_get_id(te
));
7458 return got_error_from_errno(
7459 "got_object_id_str");
7461 if (got_object_tree_entry_is_submodule(te
))
7463 else if (S_ISLNK(mode
)) {
7466 err
= got_tree_entry_get_symlink_target(&link_target
,
7472 for (i
= 0; link_target
[i
] != '\0'; i
++) {
7473 if (!isprint((unsigned char)link_target
[i
]))
7474 link_target
[i
] = '?';
7478 else if (S_ISDIR(mode
))
7480 else if (mode
& S_IXUSR
)
7482 if (asprintf(&line
, "%s %s%s%s%s", id_str
? id_str
: "",
7483 got_tree_entry_get_name(te
), modestr
,
7484 link_target
? " -> ": "",
7485 link_target
? link_target
: "") == -1) {
7488 return got_error_from_errno("asprintf");
7493 /* use full line width to determine view->maxx */
7494 err
= format_line(&wline
, &width
, NULL
, line
, 0, INT_MAX
, 0, 0);
7499 view
->maxx
= MAX(view
->maxx
, width
);
7503 err
= format_line(&wline
, &width
, &scrollx
, line
, view
->x
,
7509 if (n
== s
->selected
) {
7511 wstandout(view
->window
);
7512 s
->selected_entry
= te
;
7514 tc
= match_color(&s
->colors
, line
);
7516 wattr_on(view
->window
,
7517 COLOR_PAIR(tc
->colorpair
), NULL
);
7518 waddwstr(view
->window
, &wline
[scrollx
]);
7520 wattr_off(view
->window
,
7521 COLOR_PAIR(tc
->colorpair
), NULL
);
7522 if (width
< view
->ncols
)
7523 waddch(view
->window
, '\n');
7524 if (n
== s
->selected
&& view
->focussed
)
7525 wstandend(view
->window
);
7531 s
->last_displayed_entry
= te
;
7540 tree_scroll_up(struct tog_tree_view_state
*s
, int maxscroll
)
7542 struct got_tree_entry
*te
;
7543 int isroot
= s
->tree
== s
->root
;
7546 if (s
->first_displayed_entry
== NULL
)
7549 te
= got_tree_entry_get_prev(s
->tree
, s
->first_displayed_entry
);
7550 while (i
++ < maxscroll
) {
7553 s
->first_displayed_entry
= NULL
;
7556 s
->first_displayed_entry
= te
;
7557 te
= got_tree_entry_get_prev(s
->tree
, te
);
7561 static const struct got_error
*
7562 tree_scroll_down(struct tog_view
*view
, int maxscroll
)
7564 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7565 struct got_tree_entry
*next
, *last
;
7568 if (s
->first_displayed_entry
)
7569 next
= got_tree_entry_get_next(s
->tree
,
7570 s
->first_displayed_entry
);
7572 next
= got_object_tree_get_first_entry(s
->tree
);
7574 last
= s
->last_displayed_entry
;
7575 while (next
&& n
++ < maxscroll
) {
7577 s
->last_displayed_entry
= last
;
7578 last
= got_tree_entry_get_next(s
->tree
, last
);
7580 if (last
|| (view
->mode
== TOG_VIEW_SPLIT_HRZN
&& next
)) {
7581 s
->first_displayed_entry
= next
;
7582 next
= got_tree_entry_get_next(s
->tree
, next
);
7589 static const struct got_error
*
7590 tree_entry_path(char **path
, struct tog_parent_trees
*parents
,
7591 struct got_tree_entry
*te
)
7593 const struct got_error
*err
= NULL
;
7594 struct tog_parent_tree
*pt
;
7595 size_t len
= 2; /* for leading slash and NUL */
7597 TAILQ_FOREACH(pt
, parents
, entry
)
7598 len
+= strlen(got_tree_entry_get_name(pt
->selected_entry
))
7601 len
+= strlen(got_tree_entry_get_name(te
));
7603 *path
= calloc(1, len
);
7605 return got_error_from_errno("calloc");
7608 pt
= TAILQ_LAST(parents
, tog_parent_trees
);
7610 const char *name
= got_tree_entry_get_name(pt
->selected_entry
);
7611 if (strlcat(*path
, name
, len
) >= len
) {
7612 err
= got_error(GOT_ERR_NO_SPACE
);
7615 if (strlcat(*path
, "/", len
) >= len
) {
7616 err
= got_error(GOT_ERR_NO_SPACE
);
7619 pt
= TAILQ_PREV(pt
, tog_parent_trees
, entry
);
7622 if (strlcat(*path
, got_tree_entry_get_name(te
), len
) >= len
) {
7623 err
= got_error(GOT_ERR_NO_SPACE
);
7635 static const struct got_error
*
7636 blame_tree_entry(struct tog_view
**new_view
, int begin_y
, int begin_x
,
7637 struct got_tree_entry
*te
, struct tog_parent_trees
*parents
,
7638 struct got_object_id
*commit_id
, struct got_repository
*repo
)
7640 const struct got_error
*err
= NULL
;
7642 struct tog_view
*blame_view
;
7646 err
= tree_entry_path(&path
, parents
, te
);
7650 blame_view
= view_open(0, 0, begin_y
, begin_x
, TOG_VIEW_BLAME
);
7651 if (blame_view
== NULL
) {
7652 err
= got_error_from_errno("view_open");
7656 err
= open_blame_view(blame_view
, path
, commit_id
, repo
);
7658 if (err
->code
== GOT_ERR_CANCELLED
)
7660 view_close(blame_view
);
7662 *new_view
= blame_view
;
7668 static const struct got_error
*
7669 log_selected_tree_entry(struct tog_view
**new_view
, int begin_y
, int begin_x
,
7670 struct tog_tree_view_state
*s
)
7672 struct tog_view
*log_view
;
7673 const struct got_error
*err
= NULL
;
7678 log_view
= view_open(0, 0, begin_y
, begin_x
, TOG_VIEW_LOG
);
7679 if (log_view
== NULL
)
7680 return got_error_from_errno("view_open");
7682 err
= tree_entry_path(&path
, &s
->parents
, s
->selected_entry
);
7686 err
= open_log_view(log_view
, s
->commit_id
, s
->repo
, s
->head_ref_name
,
7689 view_close(log_view
);
7691 *new_view
= log_view
;
7696 static const struct got_error
*
7697 open_tree_view(struct tog_view
*view
, struct got_object_id
*commit_id
,
7698 const char *head_ref_name
, struct got_repository
*repo
)
7700 const struct got_error
*err
= NULL
;
7701 char *commit_id_str
= NULL
;
7702 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7703 struct got_commit_object
*commit
= NULL
;
7705 TAILQ_INIT(&s
->parents
);
7706 STAILQ_INIT(&s
->colors
);
7708 s
->commit_id
= got_object_id_dup(commit_id
);
7709 if (s
->commit_id
== NULL
) {
7710 err
= got_error_from_errno("got_object_id_dup");
7714 err
= got_object_open_as_commit(&commit
, repo
, commit_id
);
7719 * The root is opened here and will be closed when the view is closed.
7720 * Any visited subtrees and their path-wise parents are opened and
7723 err
= got_object_open_as_tree(&s
->root
, repo
,
7724 got_object_commit_get_tree_id(commit
));
7729 err
= got_object_id_str(&commit_id_str
, commit_id
);
7733 if (asprintf(&s
->tree_label
, "commit %s", commit_id_str
) == -1) {
7734 err
= got_error_from_errno("asprintf");
7738 s
->first_displayed_entry
= got_object_tree_get_entry(s
->tree
, 0);
7739 s
->selected_entry
= got_object_tree_get_entry(s
->tree
, 0);
7740 if (head_ref_name
) {
7741 s
->head_ref_name
= strdup(head_ref_name
);
7742 if (s
->head_ref_name
== NULL
) {
7743 err
= got_error_from_errno("strdup");
7749 if (has_colors() && getenv("TOG_COLORS") != NULL
) {
7750 err
= add_color(&s
->colors
, "\\$$",
7751 TOG_COLOR_TREE_SUBMODULE
,
7752 get_color_value("TOG_COLOR_TREE_SUBMODULE"));
7755 err
= add_color(&s
->colors
, "@$", TOG_COLOR_TREE_SYMLINK
,
7756 get_color_value("TOG_COLOR_TREE_SYMLINK"));
7759 err
= add_color(&s
->colors
, "/$",
7760 TOG_COLOR_TREE_DIRECTORY
,
7761 get_color_value("TOG_COLOR_TREE_DIRECTORY"));
7765 err
= add_color(&s
->colors
, "\\*$",
7766 TOG_COLOR_TREE_EXECUTABLE
,
7767 get_color_value("TOG_COLOR_TREE_EXECUTABLE"));
7771 err
= add_color(&s
->colors
, "^$", TOG_COLOR_COMMIT
,
7772 get_color_value("TOG_COLOR_COMMIT"));
7777 view
->show
= show_tree_view
;
7778 view
->input
= input_tree_view
;
7779 view
->close
= close_tree_view
;
7780 view
->search_start
= search_start_tree_view
;
7781 view
->search_next
= search_next_tree_view
;
7783 free(commit_id_str
);
7785 got_object_commit_close(commit
);
7787 if (view
->close
== NULL
)
7788 close_tree_view(view
);
7794 static const struct got_error
*
7795 close_tree_view(struct tog_view
*view
)
7797 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7799 free_colors(&s
->colors
);
7800 free(s
->tree_label
);
7801 s
->tree_label
= NULL
;
7803 s
->commit_id
= NULL
;
7804 free(s
->head_ref_name
);
7805 s
->head_ref_name
= NULL
;
7806 while (!TAILQ_EMPTY(&s
->parents
)) {
7807 struct tog_parent_tree
*parent
;
7808 parent
= TAILQ_FIRST(&s
->parents
);
7809 TAILQ_REMOVE(&s
->parents
, parent
, entry
);
7810 if (parent
->tree
!= s
->root
)
7811 got_object_tree_close(parent
->tree
);
7815 if (s
->tree
!= NULL
&& s
->tree
!= s
->root
)
7816 got_object_tree_close(s
->tree
);
7818 got_object_tree_close(s
->root
);
7822 static const struct got_error
*
7823 search_start_tree_view(struct tog_view
*view
)
7825 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7827 s
->matched_entry
= NULL
;
7832 match_tree_entry(struct got_tree_entry
*te
, regex_t
*regex
)
7834 regmatch_t regmatch
;
7836 return regexec(regex
, got_tree_entry_get_name(te
), 1, ®match
,
7840 static const struct got_error
*
7841 search_next_tree_view(struct tog_view
*view
)
7843 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7844 struct got_tree_entry
*te
= NULL
;
7846 if (!view
->searching
) {
7847 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
7851 if (s
->matched_entry
) {
7852 if (view
->searching
== TOG_SEARCH_FORWARD
) {
7853 if (s
->selected_entry
)
7854 te
= got_tree_entry_get_next(s
->tree
,
7857 te
= got_object_tree_get_first_entry(s
->tree
);
7859 if (s
->selected_entry
== NULL
)
7860 te
= got_object_tree_get_last_entry(s
->tree
);
7862 te
= got_tree_entry_get_prev(s
->tree
,
7866 if (s
->selected_entry
)
7867 te
= s
->selected_entry
;
7868 else if (view
->searching
== TOG_SEARCH_FORWARD
)
7869 te
= got_object_tree_get_first_entry(s
->tree
);
7871 te
= got_object_tree_get_last_entry(s
->tree
);
7876 if (s
->matched_entry
== NULL
) {
7877 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
7880 if (view
->searching
== TOG_SEARCH_FORWARD
)
7881 te
= got_object_tree_get_first_entry(s
->tree
);
7883 te
= got_object_tree_get_last_entry(s
->tree
);
7886 if (match_tree_entry(te
, &view
->regex
)) {
7887 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
7888 s
->matched_entry
= te
;
7892 if (view
->searching
== TOG_SEARCH_FORWARD
)
7893 te
= got_tree_entry_get_next(s
->tree
, te
);
7895 te
= got_tree_entry_get_prev(s
->tree
, te
);
7898 if (s
->matched_entry
) {
7899 s
->first_displayed_entry
= s
->matched_entry
;
7906 static const struct got_error
*
7907 show_tree_view(struct tog_view
*view
)
7909 const struct got_error
*err
= NULL
;
7910 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7913 err
= tree_entry_path(&parent_path
, &s
->parents
, NULL
);
7917 err
= draw_tree_entries(view
, parent_path
);
7924 static const struct got_error
*
7925 tree_goto_line(struct tog_view
*view
, int nlines
)
7927 const struct got_error
*err
= NULL
;
7928 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7929 struct got_tree_entry
**fte
, **lte
, **ste
;
7930 int g
, last
, first
= 1, i
= 1;
7931 int root
= s
->tree
== s
->root
;
7932 int off
= root
? 1 : 2;
7939 else if (g
> got_object_tree_get_nentries(s
->tree
))
7940 g
= got_object_tree_get_nentries(s
->tree
) + (root
? 0 : 1);
7942 fte
= &s
->first_displayed_entry
;
7943 lte
= &s
->last_displayed_entry
;
7944 ste
= &s
->selected_entry
;
7947 first
= got_tree_entry_get_index(*fte
);
7948 first
+= off
; /* account for ".." */
7950 last
= got_tree_entry_get_index(*lte
);
7953 if (g
>= first
&& g
<= last
&& g
- first
< nlines
) {
7954 s
->selected
= g
- first
;
7955 return NULL
; /* gline is on the current page */
7959 i
= got_tree_entry_get_index(*ste
);
7964 err
= tree_scroll_down(view
, g
- i
);
7967 if (got_tree_entry_get_index(*lte
) >=
7968 got_object_tree_get_nentries(s
->tree
) - 1 &&
7969 first
+ s
->selected
< g
&&
7970 s
->selected
< s
->ndisplayed
- 1) {
7971 first
= got_tree_entry_get_index(*fte
);
7973 s
->selected
= g
- first
;
7976 tree_scroll_up(s
, i
- g
);
7979 (*fte
== NULL
|| (root
&& !got_tree_entry_get_index(*fte
))))
7980 s
->selected
= g
- 1;
7985 static const struct got_error
*
7986 input_tree_view(struct tog_view
**new_view
, struct tog_view
*view
, int ch
)
7988 const struct got_error
*err
= NULL
;
7989 struct tog_tree_view_state
*s
= &view
->state
.tree
;
7990 struct got_tree_entry
*te
;
7991 int n
, nscroll
= view
->nlines
- 3;
7994 return tree_goto_line(view
, nscroll
);
8003 horizontal_scroll_input(view
, ch
);
8006 s
->show_ids
= !s
->show_ids
;
8011 if (!s
->selected_entry
)
8013 err
= view_request_new(new_view
, view
, TOG_VIEW_LOG
);
8017 err
= view_request_new(new_view
, view
, TOG_VIEW_REF
);
8024 if (s
->tree
== s
->root
)
8025 s
->first_displayed_entry
=
8026 got_object_tree_get_first_entry(s
->tree
);
8028 s
->first_displayed_entry
= NULL
;
8033 int eos
= view
->nlines
- 3;
8035 if (view
->mode
== TOG_VIEW_SPLIT_HRZN
)
8039 te
= got_object_tree_get_last_entry(s
->tree
);
8040 for (n
= 0; n
< eos
; n
++) {
8042 if (s
->tree
!= s
->root
) {
8043 s
->first_displayed_entry
= NULL
;
8048 s
->first_displayed_entry
= te
;
8049 te
= got_tree_entry_get_prev(s
->tree
, te
);
8052 s
->selected
= n
- 1;
8058 if (s
->selected
> 0) {
8062 tree_scroll_up(s
, 1);
8063 if (s
->selected_entry
== NULL
||
8064 (s
->tree
== s
->root
&& s
->selected_entry
==
8065 got_object_tree_get_first_entry(s
->tree
)))
8075 if (s
->tree
== s
->root
) {
8076 if (got_object_tree_get_first_entry(s
->tree
) ==
8077 s
->first_displayed_entry
)
8078 s
->selected
-= MIN(s
->selected
, nscroll
);
8080 if (s
->first_displayed_entry
== NULL
)
8081 s
->selected
-= MIN(s
->selected
, nscroll
);
8083 tree_scroll_up(s
, MAX(0, nscroll
));
8084 if (s
->selected_entry
== NULL
||
8085 (s
->tree
== s
->root
&& s
->selected_entry
==
8086 got_object_tree_get_first_entry(s
->tree
)))
8092 if (s
->selected
< s
->ndisplayed
- 1) {
8096 if (got_tree_entry_get_next(s
->tree
, s
->last_displayed_entry
)
8098 /* can't scroll any further */
8102 tree_scroll_down(view
, 1);
8112 if (got_tree_entry_get_next(s
->tree
, s
->last_displayed_entry
)
8114 /* can't scroll any further; move cursor down */
8115 if (s
->selected
< s
->ndisplayed
- 1)
8116 s
->selected
+= MIN(nscroll
,
8117 s
->ndisplayed
- s
->selected
- 1);
8122 tree_scroll_down(view
, nscroll
);
8127 if (s
->selected_entry
== NULL
|| ch
== KEY_BACKSPACE
) {
8128 struct tog_parent_tree
*parent
;
8129 /* user selected '..' */
8130 if (s
->tree
== s
->root
) {
8134 parent
= TAILQ_FIRST(&s
->parents
);
8135 TAILQ_REMOVE(&s
->parents
, parent
,
8137 got_object_tree_close(s
->tree
);
8138 s
->tree
= parent
->tree
;
8139 s
->first_displayed_entry
=
8140 parent
->first_displayed_entry
;
8142 parent
->selected_entry
;
8143 s
->selected
= parent
->selected
;
8144 if (s
->selected
> view
->nlines
- 3) {
8145 err
= offset_selection_down(view
);
8150 } else if (S_ISDIR(got_tree_entry_get_mode(
8151 s
->selected_entry
))) {
8152 struct got_tree_object
*subtree
;
8154 err
= got_object_open_as_tree(&subtree
, s
->repo
,
8155 got_tree_entry_get_id(s
->selected_entry
));
8158 err
= tree_view_visit_subtree(s
, subtree
);
8160 got_object_tree_close(subtree
);
8163 } else if (S_ISREG(got_tree_entry_get_mode(s
->selected_entry
)))
8164 err
= view_request_new(new_view
, view
, TOG_VIEW_BLAME
);
8167 if (view
->nlines
>= 4 && s
->selected
>= view
->nlines
- 3)
8168 s
->selected
= view
->nlines
- 4;
8184 "usage: %s tree [-c commit] [-r repository-path] [path]\n",
8189 static const struct got_error
*
8190 cmd_tree(int argc
, char *argv
[])
8192 const struct got_error
*error
;
8193 struct got_repository
*repo
= NULL
;
8194 struct got_worktree
*worktree
= NULL
;
8195 char *cwd
= NULL
, *repo_path
= NULL
, *in_repo_path
= NULL
;
8196 struct got_object_id
*commit_id
= NULL
;
8197 struct got_commit_object
*commit
= NULL
;
8198 const char *commit_id_arg
= NULL
;
8199 char *keyword_idstr
= NULL
, *label
= NULL
;
8200 struct got_reference
*ref
= NULL
;
8201 const char *head_ref_name
= NULL
;
8203 struct tog_view
*view
;
8204 int *pack_fds
= NULL
;
8206 while ((ch
= getopt(argc
, argv
, "c:r:")) != -1) {
8209 commit_id_arg
= optarg
;
8212 repo_path
= realpath(optarg
, NULL
);
8213 if (repo_path
== NULL
)
8214 return got_error_from_errno2("realpath",
8229 error
= got_repo_pack_fds_open(&pack_fds
);
8233 if (repo_path
== NULL
) {
8234 cwd
= getcwd(NULL
, 0);
8236 return got_error_from_errno("getcwd");
8237 error
= got_worktree_open(&worktree
, cwd
, NULL
);
8238 if (error
&& error
->code
!= GOT_ERR_NOT_WORKTREE
)
8242 strdup(got_worktree_get_repo_path(worktree
));
8244 repo_path
= strdup(cwd
);
8245 if (repo_path
== NULL
) {
8246 error
= got_error_from_errno("strdup");
8251 error
= got_repo_open(&repo
, repo_path
, NULL
, pack_fds
);
8255 error
= get_in_repo_path_from_argv0(&in_repo_path
, argc
, argv
,
8262 error
= apply_unveil(got_repo_get_path(repo
), NULL
);
8266 error
= tog_load_refs(repo
, 0);
8270 if (commit_id_arg
== NULL
) {
8271 error
= got_repo_match_object_id(&commit_id
, &label
,
8272 worktree
? got_worktree_get_head_ref_name(worktree
) :
8273 GOT_REF_HEAD
, GOT_OBJ_TYPE_COMMIT
, &tog_refs
, repo
);
8276 head_ref_name
= label
;
8278 error
= got_keyword_to_idstr(&keyword_idstr
, commit_id_arg
,
8282 if (keyword_idstr
!= NULL
)
8283 commit_id_arg
= keyword_idstr
;
8285 error
= got_ref_open(&ref
, repo
, commit_id_arg
, 0);
8287 head_ref_name
= got_ref_get_name(ref
);
8288 else if (error
->code
!= GOT_ERR_NOT_REF
)
8290 error
= got_repo_match_object_id(&commit_id
, NULL
,
8291 commit_id_arg
, GOT_OBJ_TYPE_COMMIT
, &tog_refs
, repo
);
8296 error
= got_object_open_as_commit(&commit
, repo
, commit_id
);
8300 view
= view_open(0, 0, 0, 0, TOG_VIEW_TREE
);
8302 error
= got_error_from_errno("view_open");
8305 error
= open_tree_view(view
, commit_id
, head_ref_name
, repo
);
8308 if (!got_path_is_root_dir(in_repo_path
)) {
8309 error
= tree_view_walk_path(&view
->state
.tree
, commit
,
8316 error
= set_tog_base_commit(repo
, worktree
);
8320 /* Release work tree lock. */
8321 got_worktree_close(worktree
);
8325 error
= view_loop(view
);
8328 free(tog_base_commit
.id
);
8329 free(keyword_idstr
);
8336 if (worktree
!= NULL
)
8337 got_worktree_close(worktree
);
8339 const struct got_error
*close_err
= got_repo_close(repo
);
8344 const struct got_error
*pack_err
=
8345 got_repo_pack_fds_close(pack_fds
);
8353 static const struct got_error
*
8354 ref_view_load_refs(struct tog_ref_view_state
*s
)
8356 struct got_reflist_entry
*sre
;
8357 struct tog_reflist_entry
*re
;
8360 TAILQ_FOREACH(sre
, &tog_refs
, entry
) {
8361 if (strncmp(got_ref_get_name(sre
->ref
),
8362 "refs/got/", 9) == 0 &&
8363 strncmp(got_ref_get_name(sre
->ref
),
8364 "refs/got/backup/", 16) != 0)
8367 re
= malloc(sizeof(*re
));
8369 return got_error_from_errno("malloc");
8371 re
->ref
= got_ref_dup(sre
->ref
);
8372 if (re
->ref
== NULL
)
8373 return got_error_from_errno("got_ref_dup");
8374 re
->idx
= s
->nrefs
++;
8375 TAILQ_INSERT_TAIL(&s
->refs
, re
, entry
);
8378 s
->first_displayed_entry
= TAILQ_FIRST(&s
->refs
);
8383 ref_view_free_refs(struct tog_ref_view_state
*s
)
8385 struct tog_reflist_entry
*re
;
8387 while (!TAILQ_EMPTY(&s
->refs
)) {
8388 re
= TAILQ_FIRST(&s
->refs
);
8389 TAILQ_REMOVE(&s
->refs
, re
, entry
);
8390 got_ref_close(re
->ref
);
8395 static const struct got_error
*
8396 open_ref_view(struct tog_view
*view
, struct got_repository
*repo
)
8398 const struct got_error
*err
= NULL
;
8399 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8401 s
->selected_entry
= 0;
8404 TAILQ_INIT(&s
->refs
);
8405 STAILQ_INIT(&s
->colors
);
8407 err
= ref_view_load_refs(s
);
8411 if (has_colors() && getenv("TOG_COLORS") != NULL
) {
8412 err
= add_color(&s
->colors
, "^refs/heads/",
8413 TOG_COLOR_REFS_HEADS
,
8414 get_color_value("TOG_COLOR_REFS_HEADS"));
8418 err
= add_color(&s
->colors
, "^refs/tags/",
8419 TOG_COLOR_REFS_TAGS
,
8420 get_color_value("TOG_COLOR_REFS_TAGS"));
8424 err
= add_color(&s
->colors
, "^refs/remotes/",
8425 TOG_COLOR_REFS_REMOTES
,
8426 get_color_value("TOG_COLOR_REFS_REMOTES"));
8430 err
= add_color(&s
->colors
, "^refs/got/backup/",
8431 TOG_COLOR_REFS_BACKUP
,
8432 get_color_value("TOG_COLOR_REFS_BACKUP"));
8437 view
->show
= show_ref_view
;
8438 view
->input
= input_ref_view
;
8439 view
->close
= close_ref_view
;
8440 view
->search_start
= search_start_ref_view
;
8441 view
->search_next
= search_next_ref_view
;
8444 if (view
->close
== NULL
)
8445 close_ref_view(view
);
8451 static const struct got_error
*
8452 close_ref_view(struct tog_view
*view
)
8454 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8456 ref_view_free_refs(s
);
8457 free_colors(&s
->colors
);
8462 static const struct got_error
*
8463 resolve_reflist_entry(struct got_object_id
**commit_id
,
8464 struct tog_reflist_entry
*re
, struct got_repository
*repo
)
8466 const struct got_error
*err
= NULL
;
8467 struct got_object_id
*obj_id
;
8468 struct got_tag_object
*tag
= NULL
;
8473 err
= got_ref_resolve(&obj_id
, repo
, re
->ref
);
8477 err
= got_object_get_type(&obj_type
, repo
, obj_id
);
8482 case GOT_OBJ_TYPE_COMMIT
:
8483 *commit_id
= obj_id
;
8485 case GOT_OBJ_TYPE_TAG
:
8486 err
= got_object_open_as_tag(&tag
, repo
, obj_id
);
8490 err
= got_object_get_type(&obj_type
, repo
,
8491 got_object_tag_get_object_id(tag
));
8494 if (obj_type
!= GOT_OBJ_TYPE_COMMIT
) {
8495 err
= got_error(GOT_ERR_OBJ_TYPE
);
8498 *commit_id
= got_object_id_dup(
8499 got_object_tag_get_object_id(tag
));
8500 if (*commit_id
== NULL
) {
8501 err
= got_error_from_errno("got_object_id_dup");
8506 err
= got_error(GOT_ERR_OBJ_TYPE
);
8512 got_object_tag_close(tag
);
8520 static const struct got_error
*
8521 log_ref_entry(struct tog_view
**new_view
, int begin_y
, int begin_x
,
8522 struct tog_reflist_entry
*re
, struct got_repository
*repo
)
8524 struct tog_view
*log_view
;
8525 const struct got_error
*err
= NULL
;
8526 struct got_object_id
*commit_id
= NULL
;
8530 err
= resolve_reflist_entry(&commit_id
, re
, repo
);
8532 if (err
->code
!= GOT_ERR_OBJ_TYPE
)
8538 log_view
= view_open(0, 0, begin_y
, begin_x
, TOG_VIEW_LOG
);
8539 if (log_view
== NULL
) {
8540 err
= got_error_from_errno("view_open");
8544 err
= open_log_view(log_view
, commit_id
, repo
,
8545 got_ref_get_name(re
->ref
), "", 0, NULL
);
8548 view_close(log_view
);
8550 *new_view
= log_view
;
8556 ref_scroll_up(struct tog_ref_view_state
*s
, int maxscroll
)
8558 struct tog_reflist_entry
*re
;
8561 if (s
->first_displayed_entry
== TAILQ_FIRST(&s
->refs
))
8564 re
= TAILQ_PREV(s
->first_displayed_entry
, tog_reflist_head
, entry
);
8565 while (i
++ < maxscroll
) {
8568 s
->first_displayed_entry
= re
;
8569 re
= TAILQ_PREV(re
, tog_reflist_head
, entry
);
8573 static const struct got_error
*
8574 ref_scroll_down(struct tog_view
*view
, int maxscroll
)
8576 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8577 struct tog_reflist_entry
*next
, *last
;
8580 if (s
->first_displayed_entry
)
8581 next
= TAILQ_NEXT(s
->first_displayed_entry
, entry
);
8583 next
= TAILQ_FIRST(&s
->refs
);
8585 last
= s
->last_displayed_entry
;
8586 while (next
&& n
++ < maxscroll
) {
8588 s
->last_displayed_entry
= last
;
8589 last
= TAILQ_NEXT(last
, entry
);
8591 if (last
|| (view
->mode
== TOG_VIEW_SPLIT_HRZN
)) {
8592 s
->first_displayed_entry
= next
;
8593 next
= TAILQ_NEXT(next
, entry
);
8600 static const struct got_error
*
8601 search_start_ref_view(struct tog_view
*view
)
8603 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8605 s
->matched_entry
= NULL
;
8610 match_reflist_entry(struct tog_reflist_entry
*re
, regex_t
*regex
)
8612 regmatch_t regmatch
;
8614 return regexec(regex
, got_ref_get_name(re
->ref
), 1, ®match
,
8618 static const struct got_error
*
8619 search_next_ref_view(struct tog_view
*view
)
8621 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8622 struct tog_reflist_entry
*re
= NULL
;
8624 if (!view
->searching
) {
8625 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
8629 if (s
->matched_entry
) {
8630 if (view
->searching
== TOG_SEARCH_FORWARD
) {
8631 if (s
->selected_entry
)
8632 re
= TAILQ_NEXT(s
->selected_entry
, entry
);
8634 re
= TAILQ_PREV(s
->selected_entry
,
8635 tog_reflist_head
, entry
);
8637 if (s
->selected_entry
== NULL
)
8638 re
= TAILQ_LAST(&s
->refs
, tog_reflist_head
);
8640 re
= TAILQ_PREV(s
->selected_entry
,
8641 tog_reflist_head
, entry
);
8644 if (s
->selected_entry
)
8645 re
= s
->selected_entry
;
8646 else if (view
->searching
== TOG_SEARCH_FORWARD
)
8647 re
= TAILQ_FIRST(&s
->refs
);
8649 re
= TAILQ_LAST(&s
->refs
, tog_reflist_head
);
8654 if (s
->matched_entry
== NULL
) {
8655 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
8658 if (view
->searching
== TOG_SEARCH_FORWARD
)
8659 re
= TAILQ_FIRST(&s
->refs
);
8661 re
= TAILQ_LAST(&s
->refs
, tog_reflist_head
);
8664 if (match_reflist_entry(re
, &view
->regex
)) {
8665 view
->search_next_done
= TOG_SEARCH_HAVE_MORE
;
8666 s
->matched_entry
= re
;
8670 if (view
->searching
== TOG_SEARCH_FORWARD
)
8671 re
= TAILQ_NEXT(re
, entry
);
8673 re
= TAILQ_PREV(re
, tog_reflist_head
, entry
);
8676 if (s
->matched_entry
) {
8677 s
->first_displayed_entry
= s
->matched_entry
;
8684 static const struct got_error
*
8685 show_ref_view(struct tog_view
*view
)
8687 const struct got_error
*err
= NULL
;
8688 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8689 struct tog_reflist_entry
*re
;
8692 struct tog_color
*tc
;
8693 int width
, n
, scrollx
;
8694 int limit
= view
->nlines
;
8696 werase(view
->window
);
8699 if (view_is_hsplit_top(view
))
8700 --limit
; /* border */
8705 re
= s
->first_displayed_entry
;
8707 if (asprintf(&line
, "references [%d/%d]", re
->idx
+ s
->selected
+ 1,
8709 return got_error_from_errno("asprintf");
8711 err
= format_line(&wline
, &width
, NULL
, line
, 0, view
->ncols
, 0, 0);
8716 if (view_needs_focus_indication(view
))
8717 wstandout(view
->window
);
8718 waddwstr(view
->window
, wline
);
8719 while (width
++ < view
->ncols
)
8720 waddch(view
->window
, ' ');
8721 if (view_needs_focus_indication(view
))
8722 wstandend(view
->window
);
8732 while (re
&& limit
> 0) {
8734 char ymd
[13]; /* YYYY-MM-DD + " " + NUL */
8737 struct got_commit_object
*ci
;
8738 struct got_tag_object
*tag
;
8739 struct got_object_id
*id
;
8743 err
= got_ref_resolve(&id
, s
->repo
, re
->ref
);
8746 err
= got_object_open_as_tag(&tag
, s
->repo
, id
);
8748 if (err
->code
!= GOT_ERR_OBJ_TYPE
) {
8752 err
= got_object_open_as_commit(&ci
, s
->repo
,
8758 t
= got_object_commit_get_committer_time(ci
);
8759 got_object_commit_close(ci
);
8761 t
= got_object_tag_get_tagger_time(tag
);
8762 got_object_tag_close(tag
);
8765 if (gmtime_r(&t
, &tm
) == NULL
)
8766 return got_error_from_errno("gmtime_r");
8767 if (strftime(ymd
, sizeof(ymd
), "%G-%m-%d ", &tm
) == 0)
8768 return got_error(GOT_ERR_NO_SPACE
);
8770 if (got_ref_is_symbolic(re
->ref
)) {
8771 if (asprintf(&line
, "%s%s -> %s", s
->show_date
?
8772 ymd
: "", got_ref_get_name(re
->ref
),
8773 got_ref_get_symref_target(re
->ref
)) == -1)
8774 return got_error_from_errno("asprintf");
8775 } else if (s
->show_ids
) {
8776 struct got_object_id
*id
;
8778 err
= got_ref_resolve(&id
, s
->repo
, re
->ref
);
8781 err
= got_object_id_str(&id_str
, id
);
8786 if (asprintf(&line
, "%s%s: %s", s
->show_date
? ymd
: "",
8787 got_ref_get_name(re
->ref
), id_str
) == -1) {
8788 err
= got_error_from_errno("asprintf");
8795 } else if (asprintf(&line
, "%s%s", s
->show_date
? ymd
: "",
8796 got_ref_get_name(re
->ref
)) == -1)
8797 return got_error_from_errno("asprintf");
8799 /* use full line width to determine view->maxx */
8800 err
= format_line(&wline
, &width
, NULL
, line
, 0, INT_MAX
, 0, 0);
8805 view
->maxx
= MAX(view
->maxx
, width
);
8809 err
= format_line(&wline
, &width
, &scrollx
, line
, view
->x
,
8815 if (n
== s
->selected
) {
8817 wstandout(view
->window
);
8818 s
->selected_entry
= re
;
8820 tc
= match_color(&s
->colors
, got_ref_get_name(re
->ref
));
8822 wattr_on(view
->window
,
8823 COLOR_PAIR(tc
->colorpair
), NULL
);
8824 waddwstr(view
->window
, &wline
[scrollx
]);
8826 wattr_off(view
->window
,
8827 COLOR_PAIR(tc
->colorpair
), NULL
);
8828 if (width
< view
->ncols
)
8829 waddch(view
->window
, '\n');
8830 if (n
== s
->selected
&& view
->focussed
)
8831 wstandend(view
->window
);
8837 s
->last_displayed_entry
= re
;
8840 re
= TAILQ_NEXT(re
, entry
);
8847 static const struct got_error
*
8848 browse_ref_tree(struct tog_view
**new_view
, int begin_y
, int begin_x
,
8849 struct tog_reflist_entry
*re
, struct got_repository
*repo
)
8851 const struct got_error
*err
= NULL
;
8852 struct got_object_id
*commit_id
= NULL
;
8853 struct tog_view
*tree_view
;
8857 err
= resolve_reflist_entry(&commit_id
, re
, repo
);
8859 if (err
->code
!= GOT_ERR_OBJ_TYPE
)
8866 tree_view
= view_open(0, 0, begin_y
, begin_x
, TOG_VIEW_TREE
);
8867 if (tree_view
== NULL
) {
8868 err
= got_error_from_errno("view_open");
8872 err
= open_tree_view(tree_view
, commit_id
,
8873 got_ref_get_name(re
->ref
), repo
);
8877 *new_view
= tree_view
;
8883 static const struct got_error
*
8884 ref_goto_line(struct tog_view
*view
, int nlines
)
8886 const struct got_error
*err
= NULL
;
8887 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8888 int g
, idx
= s
->selected_entry
->idx
;
8895 else if (g
> s
->nrefs
)
8898 if (g
>= s
->first_displayed_entry
->idx
+ 1 &&
8899 g
<= s
->last_displayed_entry
->idx
+ 1 &&
8900 g
- s
->first_displayed_entry
->idx
- 1 < nlines
) {
8901 s
->selected
= g
- s
->first_displayed_entry
->idx
- 1;
8906 err
= ref_scroll_down(view
, g
- idx
- 1);
8909 if (TAILQ_NEXT(s
->last_displayed_entry
, entry
) == NULL
&&
8910 s
->first_displayed_entry
->idx
+ s
->selected
< g
&&
8911 s
->selected
< s
->ndisplayed
- 1)
8912 s
->selected
= g
- s
->first_displayed_entry
->idx
- 1;
8913 } else if (idx
+ 1 > g
)
8914 ref_scroll_up(s
, idx
- g
+ 1);
8916 if (g
< nlines
&& s
->first_displayed_entry
->idx
== 0)
8917 s
->selected
= g
- 1;
8923 static const struct got_error
*
8924 input_ref_view(struct tog_view
**new_view
, struct tog_view
*view
, int ch
)
8926 const struct got_error
*err
= NULL
;
8927 struct tog_ref_view_state
*s
= &view
->state
.ref
;
8928 struct tog_reflist_entry
*re
;
8929 int n
, nscroll
= view
->nlines
- 1;
8932 return ref_goto_line(view
, nscroll
);
8941 horizontal_scroll_input(view
, ch
);
8944 s
->show_ids
= !s
->show_ids
;
8948 s
->show_date
= !s
->show_date
;
8952 s
->sort_by_date
= !s
->sort_by_date
;
8953 view
->action
= s
->sort_by_date
? "sort by date" : "sort by name";
8955 err
= got_reflist_sort(&tog_refs
, s
->sort_by_date
?
8956 got_ref_cmp_by_commit_timestamp_descending
:
8957 tog_ref_cmp_by_name
, s
->repo
);
8960 got_reflist_object_id_map_free(tog_refs_idmap
);
8961 err
= got_reflist_object_id_map_create(&tog_refs_idmap
,
8962 &tog_refs
, s
->repo
);
8965 ref_view_free_refs(s
);
8966 err
= ref_view_load_refs(s
);
8971 if (!s
->selected_entry
)
8973 err
= view_request_new(new_view
, view
, TOG_VIEW_LOG
);
8977 if (!s
->selected_entry
)
8979 err
= view_request_new(new_view
, view
, TOG_VIEW_TREE
);
8986 s
->first_displayed_entry
= TAILQ_FIRST(&s
->refs
);
8991 int eos
= view
->nlines
- 1;
8993 if (view
->mode
== TOG_VIEW_SPLIT_HRZN
)
8997 re
= TAILQ_LAST(&s
->refs
, tog_reflist_head
);
8998 for (n
= 0; n
< eos
; n
++) {
9001 s
->first_displayed_entry
= re
;
9002 re
= TAILQ_PREV(re
, tog_reflist_head
, entry
);
9005 s
->selected
= n
- 1;
9011 if (s
->selected
> 0) {
9015 ref_scroll_up(s
, 1);
9016 if (s
->selected_entry
== TAILQ_FIRST(&s
->refs
))
9026 if (s
->first_displayed_entry
== TAILQ_FIRST(&s
->refs
))
9027 s
->selected
-= MIN(nscroll
, s
->selected
);
9028 ref_scroll_up(s
, MAX(0, nscroll
));
9029 if (s
->selected_entry
== TAILQ_FIRST(&s
->refs
))
9035 if (s
->selected
< s
->ndisplayed
- 1) {
9039 if (TAILQ_NEXT(s
->last_displayed_entry
, entry
) == NULL
) {
9040 /* can't scroll any further */
9044 ref_scroll_down(view
, 1);
9054 if (TAILQ_NEXT(s
->last_displayed_entry
, entry
) == NULL
) {
9055 /* can't scroll any further; move cursor down */
9056 if (s
->selected
< s
->ndisplayed
- 1)
9057 s
->selected
+= MIN(nscroll
,
9058 s
->ndisplayed
- s
->selected
- 1);
9059 if (view
->count
> 1 && s
->selected
< s
->ndisplayed
- 1)
9060 s
->selected
+= s
->ndisplayed
- s
->selected
- 1;
9064 ref_scroll_down(view
, nscroll
);
9069 err
= tog_load_refs(s
->repo
, s
->sort_by_date
);
9072 ref_view_free_refs(s
);
9073 err
= ref_view_load_refs(s
);
9076 if (view
->nlines
>= 2 && s
->selected
>= view
->nlines
- 1)
9077 s
->selected
= view
->nlines
- 2;
9091 fprintf(stderr
, "usage: %s ref [-r repository-path]\n",
9096 static const struct got_error
*
9097 cmd_ref(int argc
, char *argv
[])
9099 const struct got_error
*error
;
9100 struct got_repository
*repo
= NULL
;
9101 struct got_worktree
*worktree
= NULL
;
9102 char *cwd
= NULL
, *repo_path
= NULL
;
9104 struct tog_view
*view
;
9105 int *pack_fds
= NULL
;
9107 while ((ch
= getopt(argc
, argv
, "r:")) != -1) {
9110 repo_path
= realpath(optarg
, NULL
);
9111 if (repo_path
== NULL
)
9112 return got_error_from_errno2("realpath",
9127 error
= got_repo_pack_fds_open(&pack_fds
);
9131 if (repo_path
== NULL
) {
9132 cwd
= getcwd(NULL
, 0);
9134 return got_error_from_errno("getcwd");
9135 error
= got_worktree_open(&worktree
, cwd
, NULL
);
9136 if (error
&& error
->code
!= GOT_ERR_NOT_WORKTREE
)
9140 strdup(got_worktree_get_repo_path(worktree
));
9142 repo_path
= strdup(cwd
);
9143 if (repo_path
== NULL
) {
9144 error
= got_error_from_errno("strdup");
9149 error
= got_repo_open(&repo
, repo_path
, NULL
, pack_fds
);
9155 error
= apply_unveil(got_repo_get_path(repo
), NULL
);
9159 error
= tog_load_refs(repo
, 0);
9163 view
= view_open(0, 0, 0, 0, TOG_VIEW_REF
);
9165 error
= got_error_from_errno("view_open");
9169 error
= open_ref_view(view
, repo
);
9174 error
= set_tog_base_commit(repo
, worktree
);
9178 /* Release work tree lock. */
9179 got_worktree_close(worktree
);
9183 error
= view_loop(view
);
9186 free(tog_base_commit
.id
);
9189 if (worktree
!= NULL
)
9190 got_worktree_close(worktree
);
9192 const struct got_error
*close_err
= got_repo_close(repo
);
9197 const struct got_error
*pack_err
=
9198 got_repo_pack_fds_close(pack_fds
);
9206 static const struct got_error
*
9207 win_draw_center(WINDOW
*win
, size_t y
, size_t x
, size_t maxx
, int focus
,
9216 x
= x
? x
: maxx
> len
? (maxx
- len
) / 2 : 0;
9220 if (mvwprintw(win
, y
, x
, "%s", str
) == ERR
)
9221 return got_error_msg(GOT_ERR_RANGE
, "mvwprintw");
9228 static const struct got_error
*
9229 add_line_offset(off_t
**line_offsets
, size_t *nlines
, off_t off
)
9233 p
= reallocarray(*line_offsets
, *nlines
+ 1, sizeof(off_t
));
9235 free(*line_offsets
);
9236 *line_offsets
= NULL
;
9237 return got_error_from_errno("reallocarray");
9241 (*line_offsets
)[*nlines
] = off
;
9246 static const struct got_error
*
9247 max_key_str(int *ret
, const struct tog_key_map
*km
, size_t n
)
9251 for (;n
> 0; --n
, ++km
) {
9255 if (km
->keys
== NULL
)
9258 t
= t0
= strdup(km
->keys
);
9260 return got_error_from_errno("strdup");
9263 while ((k
= strsep(&t
, " ")) != NULL
)
9264 len
+= strlen(k
) > 1 ? 2 : 0;
9266 *ret
= MAX(*ret
, len
);
9273 * Write keymap section headers, keys, and key info in km to f.
9274 * Save line offset to *off. If terminal has UTF8 encoding enabled,
9275 * wrap control and symbolic keys in guillemets, else use <>.
9277 static const struct got_error
*
9278 format_help_line(off_t
*off
, FILE *f
, const struct tog_key_map
*km
, int width
)
9283 static const char *u8_glyph
[] = {
9284 "\xe2\x80\xb9", /* U+2039 (utf8 <) */
9285 "\xe2\x80\xba" /* U+203A (utf8 >) */
9288 int cs
, s
, first
= 1;
9290 cs
= got_locale_is_utf8();
9292 t
= t0
= strdup(km
->keys
);
9294 return got_error_from_errno("strdup");
9296 len
= strlen(km
->keys
);
9297 while ((k
= strsep(&t
, " ")) != NULL
) {
9298 s
= strlen(k
) > 1; /* control or symbolic key */
9299 n
= fprintf(f
, "%s%s%s%s%s", first
? " " : "",
9300 cs
&& s
? u8_glyph
[0] : s
? "<" : "", k
,
9301 cs
&& s
? u8_glyph
[1] : s
? ">" : "", t
? " " : "");
9304 return got_error_from_errno("fprintf");
9312 n
= fprintf(f
, "%*s%s\n", width
- len
, width
- len
? " " : "", km
->info
);
9314 return got_error_from_errno("fprintf");
9320 static const struct got_error
*
9321 format_help(struct tog_help_view_state
*s
)
9323 const struct got_error
*err
= NULL
;
9325 int i
, max
, n
, show
= s
->all
;
9326 static const struct tog_key_map km
[] = {
9327 #define KEYMAP_(info, type) { NULL, (info), type }
9328 #define KEY_(keys, info) { (keys), (info), TOG_KEYMAP_KEYS }
9334 err
= add_line_offset(&s
->line_offsets
, &s
->nlines
, 0);
9339 err
= max_key_str(&max
, km
, n
);
9343 for (i
= 0; i
< n
; ++i
) {
9344 if (km
[i
].keys
== NULL
) {
9346 if (km
[i
].type
== TOG_KEYMAP_GLOBAL
||
9347 km
[i
].type
== s
->type
|| s
->all
)
9351 err
= format_help_line(&off
, s
->f
, &km
[i
], max
);
9354 err
= add_line_offset(&s
->line_offsets
, &s
->nlines
, off
);
9361 err
= add_line_offset(&s
->line_offsets
, &s
->nlines
, off
);
9365 static const struct got_error
*
9366 create_help(struct tog_help_view_state
*s
)
9369 const struct got_error
*err
;
9371 free(s
->line_offsets
);
9372 s
->line_offsets
= NULL
;
9377 return got_error_from_errno("got_opentemp");
9380 err
= format_help(s
);
9384 if (s
->f
&& fflush(s
->f
) != 0)
9385 return got_error_from_errno("fflush");
9390 static const struct got_error
*
9391 search_start_help_view(struct tog_view
*view
)
9393 view
->state
.help
.matched_line
= 0;
9398 search_setup_help_view(struct tog_view
*view
, FILE **f
, off_t
**line_offsets
,
9399 size_t *nlines
, int **first
, int **last
, int **match
, int **selected
)
9401 struct tog_help_view_state
*s
= &view
->state
.help
;
9404 *nlines
= s
->nlines
;
9405 *line_offsets
= s
->line_offsets
;
9406 *match
= &s
->matched_line
;
9407 *first
= &s
->first_displayed_line
;
9408 *last
= &s
->last_displayed_line
;
9409 *selected
= &s
->selected_line
;
9412 static const struct got_error
*
9413 show_help_view(struct tog_view
*view
)
9415 struct tog_help_view_state
*s
= &view
->state
.help
;
9416 const struct got_error
*err
;
9417 regmatch_t
*regmatch
= &view
->regmatch
;
9422 int width
, nprinted
= 0, rc
= 0;
9423 int eos
= view
->nlines
;
9425 if (view_is_hsplit_top(view
))
9426 --eos
; /* account for border */
9430 werase(view
->window
);
9432 if (view
->gline
> s
->nlines
- 1)
9433 view
->gline
= s
->nlines
- 1;
9435 err
= win_draw_center(view
->window
, 0, 0, view
->ncols
,
9436 view_needs_focus_indication(view
),
9437 "tog help (press q to return to tog)");
9442 waddstr(view
->window
, "\n\n");
9448 while (eos
> 0 && nprinted
< eos
) {
9451 linelen
= getline(&line
, &linesz
, s
->f
);
9452 if (linelen
== -1) {
9455 return got_ferror(s
->f
, GOT_ERR_IO
);
9460 if (++s
->lineno
< s
->first_displayed_line
)
9462 if (view
->gline
&& !gotoline(view
, &s
->lineno
, &nprinted
))
9464 if (s
->lineno
== view
->hiline
)
9467 err
= format_line(&wline
, &width
, NULL
, line
, 0, INT_MAX
, 0,
9473 view
->maxx
= MAX(view
->maxx
, width
);
9478 wattron(view
->window
, attr
);
9479 if (s
->first_displayed_line
+ nprinted
== s
->matched_line
&&
9480 regmatch
->rm_so
>= 0 && regmatch
->rm_so
< regmatch
->rm_eo
) {
9481 err
= add_matched_line(&width
, line
, view
->ncols
- 1, 0,
9482 view
->window
, view
->x
, regmatch
);
9490 err
= format_line(&wline
, &width
, &skip
, line
,
9491 view
->x
, view
->ncols
, 0, view
->x
? 1 : 0);
9496 waddwstr(view
->window
, &wline
[skip
]);
9500 if (s
->lineno
== view
->hiline
) {
9501 while (width
++ < view
->ncols
)
9502 waddch(view
->window
, ' ');
9504 if (width
< view
->ncols
)
9505 waddch(view
->window
, '\n');
9508 wattroff(view
->window
, attr
);
9509 if (++nprinted
== 1)
9510 s
->first_displayed_line
= s
->lineno
;
9514 s
->last_displayed_line
= s
->first_displayed_line
+ nprinted
- 1;
9516 s
->last_displayed_line
= s
->first_displayed_line
;
9521 rc
= waddnstr(view
->window
,
9522 "See the tog(1) manual page for full documentation",
9525 return got_error_msg(GOT_ERR_RANGE
, "waddnstr");
9527 wmove(view
->window
, view
->nlines
- 1, 0);
9528 wclrtoeol(view
->window
);
9529 wstandout(view
->window
);
9530 rc
= waddnstr(view
->window
, "scroll down for more...",
9533 return got_error_msg(GOT_ERR_RANGE
, "waddnstr");
9534 if (getcurx(view
->window
) < view
->ncols
- 6) {
9535 rc
= wprintw(view
->window
, "[%.0f%%]",
9536 100.00 * s
->last_displayed_line
/ s
->nlines
);
9538 return got_error_msg(GOT_ERR_IO
, "wprintw");
9540 wstandend(view
->window
);
9546 static const struct got_error
*
9547 input_help_view(struct tog_view
**new_view
, struct tog_view
*view
, int ch
)
9549 struct tog_help_view_state
*s
= &view
->state
.help
;
9550 const struct got_error
*err
= NULL
;
9556 eos
= nscroll
= view
->nlines
;
9557 if (view_is_hsplit_top(view
))
9560 s
->lineno
= s
->first_displayed_line
- 1 + s
->selected_line
;
9569 horizontal_scroll_input(view
, ch
);
9573 s
->first_displayed_line
= 1;
9581 s
->first_displayed_line
= (s
->nlines
- eos
) + 3;
9586 if (s
->first_displayed_line
> 1)
9587 --s
->first_displayed_line
;
9598 if (s
->first_displayed_line
== 1) {
9602 while (--nscroll
> 0 && s
->first_displayed_line
> 1)
9603 s
->first_displayed_line
--;
9609 ++s
->first_displayed_line
;
9625 while (!s
->eof
&& --nscroll
> 0) {
9626 linelen
= getline(&line
, &linesz
, s
->f
);
9627 s
->first_displayed_line
++;
9628 if (linelen
== -1) {
9632 err
= got_ferror(s
->f
, GOT_ERR_IO
);
9646 static const struct got_error
*
9647 close_help_view(struct tog_view
*view
)
9649 struct tog_help_view_state
*s
= &view
->state
.help
;
9651 free(s
->line_offsets
);
9652 s
->line_offsets
= NULL
;
9653 if (fclose(s
->f
) == EOF
)
9654 return got_error_from_errno("fclose");
9659 static const struct got_error
*
9660 reset_help_view(struct tog_view
*view
)
9662 struct tog_help_view_state
*s
= &view
->state
.help
;
9665 if (s
->f
&& fclose(s
->f
) == EOF
)
9666 return got_error_from_errno("fclose");
9668 wclear(view
->window
);
9672 s
->first_displayed_line
= 1;
9673 s
->last_displayed_line
= view
->nlines
;
9674 s
->matched_line
= 0;
9676 return create_help(s
);
9679 static const struct got_error
*
9680 open_help_view(struct tog_view
*view
, struct tog_view
*parent
)
9682 const struct got_error
*err
= NULL
;
9683 struct tog_help_view_state
*s
= &view
->state
.help
;
9685 s
->type
= (enum tog_keymap_type
)parent
->type
;
9686 s
->first_displayed_line
= 1;
9687 s
->last_displayed_line
= view
->nlines
;
9688 s
->selected_line
= 1;
9690 view
->show
= show_help_view
;
9691 view
->input
= input_help_view
;
9692 view
->reset
= reset_help_view
;
9693 view
->close
= close_help_view
;
9694 view
->search_start
= search_start_help_view
;
9695 view
->search_setup
= search_setup_help_view
;
9696 view
->search_next
= search_next_view_match
;
9698 err
= create_help(s
);
9702 static const struct got_error
*
9703 view_dispatch_request(struct tog_view
**new_view
, struct tog_view
*view
,
9704 enum tog_view_type request
, int y
, int x
)
9706 const struct got_error
*err
= NULL
;
9712 if (view
->type
== TOG_VIEW_LOG
) {
9713 struct tog_log_view_state
*s
= &view
->state
.log
;
9715 err
= open_diff_view_for_commit(new_view
, y
, x
,
9716 s
->selected_entry
->commit
, s
->selected_entry
->id
,
9719 return got_error_msg(GOT_ERR_NOT_IMPL
,
9720 "parent/child view pair not supported");
9722 case TOG_VIEW_BLAME
:
9723 if (view
->type
== TOG_VIEW_TREE
) {
9724 struct tog_tree_view_state
*s
= &view
->state
.tree
;
9726 err
= blame_tree_entry(new_view
, y
, x
,
9727 s
->selected_entry
, &s
->parents
, s
->commit_id
,
9730 return got_error_msg(GOT_ERR_NOT_IMPL
,
9731 "parent/child view pair not supported");
9734 if (view
->type
== TOG_VIEW_BLAME
)
9735 err
= log_annotated_line(new_view
, y
, x
,
9736 view
->state
.blame
.repo
, view
->state
.blame
.id_to_log
);
9737 else if (view
->type
== TOG_VIEW_TREE
)
9738 err
= log_selected_tree_entry(new_view
, y
, x
,
9740 else if (view
->type
== TOG_VIEW_REF
)
9741 err
= log_ref_entry(new_view
, y
, x
,
9742 view
->state
.ref
.selected_entry
,
9743 view
->state
.ref
.repo
);
9745 return got_error_msg(GOT_ERR_NOT_IMPL
,
9746 "parent/child view pair not supported");
9749 if (view
->type
== TOG_VIEW_LOG
)
9750 err
= browse_commit_tree(new_view
, y
, x
,
9751 view
->state
.log
.selected_entry
,
9752 view
->state
.log
.in_repo_path
,
9753 view
->state
.log
.head_ref_name
,
9754 view
->state
.log
.repo
);
9755 else if (view
->type
== TOG_VIEW_REF
)
9756 err
= browse_ref_tree(new_view
, y
, x
,
9757 view
->state
.ref
.selected_entry
,
9758 view
->state
.ref
.repo
);
9760 return got_error_msg(GOT_ERR_NOT_IMPL
,
9761 "parent/child view pair not supported");
9764 *new_view
= view_open(0, 0, y
, x
, TOG_VIEW_REF
);
9765 if (*new_view
== NULL
)
9766 return got_error_from_errno("view_open");
9767 if (view
->type
== TOG_VIEW_LOG
)
9768 err
= open_ref_view(*new_view
, view
->state
.log
.repo
);
9769 else if (view
->type
== TOG_VIEW_TREE
)
9770 err
= open_ref_view(*new_view
, view
->state
.tree
.repo
);
9772 err
= got_error_msg(GOT_ERR_NOT_IMPL
,
9773 "parent/child view pair not supported");
9775 view_close(*new_view
);
9778 *new_view
= view_open(0, 0, 0, 0, TOG_VIEW_HELP
);
9779 if (*new_view
== NULL
)
9780 return got_error_from_errno("view_open");
9781 err
= open_help_view(*new_view
, view
);
9783 view_close(*new_view
);
9786 return got_error_msg(GOT_ERR_NOT_IMPL
, "invalid view");
9793 * If view was scrolled down to move the selected line into view when opening a
9794 * horizontal split, scroll back up when closing the split/toggling fullscreen.
9797 offset_selection_up(struct tog_view
*view
)
9799 switch (view
->type
) {
9800 case TOG_VIEW_BLAME
: {
9801 struct tog_blame_view_state
*s
= &view
->state
.blame
;
9802 if (s
->first_displayed_line
== 1) {
9803 s
->selected_line
= MAX(s
->selected_line
- view
->offset
,
9807 if (s
->first_displayed_line
> view
->offset
)
9808 s
->first_displayed_line
-= view
->offset
;
9810 s
->first_displayed_line
= 1;
9811 s
->selected_line
+= view
->offset
;
9815 log_scroll_up(&view
->state
.log
, view
->offset
);
9816 view
->state
.log
.selected
+= view
->offset
;
9819 ref_scroll_up(&view
->state
.ref
, view
->offset
);
9820 view
->state
.ref
.selected
+= view
->offset
;
9823 tree_scroll_up(&view
->state
.tree
, view
->offset
);
9824 view
->state
.tree
.selected
+= view
->offset
;
9834 * If the selected line is in the section of screen covered by the bottom split,
9835 * scroll down offset lines to move it into view and index its new position.
9837 static const struct got_error
*
9838 offset_selection_down(struct tog_view
*view
)
9840 const struct got_error
*err
= NULL
;
9841 const struct got_error
*(*scrolld
)(struct tog_view
*, int);
9842 int *selected
= NULL
;
9845 switch (view
->type
) {
9846 case TOG_VIEW_BLAME
: {
9847 struct tog_blame_view_state
*s
= &view
->state
.blame
;
9850 if (s
->selected_line
> view
->nlines
- header
) {
9851 offset
= abs(view
->nlines
- s
->selected_line
- header
);
9852 s
->first_displayed_line
+= offset
;
9853 s
->selected_line
-= offset
;
9854 view
->offset
= offset
;
9858 case TOG_VIEW_LOG
: {
9859 struct tog_log_view_state
*s
= &view
->state
.log
;
9860 scrolld
= &log_scroll_down
;
9861 header
= view_is_parent_view(view
) ? 3 : 2;
9862 selected
= &s
->selected
;
9865 case TOG_VIEW_REF
: {
9866 struct tog_ref_view_state
*s
= &view
->state
.ref
;
9867 scrolld
= &ref_scroll_down
;
9869 selected
= &s
->selected
;
9872 case TOG_VIEW_TREE
: {
9873 struct tog_tree_view_state
*s
= &view
->state
.tree
;
9874 scrolld
= &tree_scroll_down
;
9876 selected
= &s
->selected
;
9886 if (selected
&& *selected
> view
->nlines
- header
) {
9887 offset
= abs(view
->nlines
- *selected
- header
);
9888 view
->offset
= offset
;
9889 if (scrolld
&& offset
) {
9890 err
= scrolld(view
, offset
);
9891 *selected
-= offset
;
9899 list_commands(FILE *fp
)
9903 fprintf(fp
, "commands:");
9904 for (i
= 0; i
< nitems(tog_commands
); i
++) {
9905 const struct tog_cmd
*cmd
= &tog_commands
[i
];
9906 fprintf(fp
, " %s", cmd
->name
);
9912 usage(int hflag
, int status
)
9914 FILE *fp
= (status
== 0) ? stdout
: stderr
;
9916 fprintf(fp
, "usage: %s [-hV] command [arg ...]\n",
9919 fprintf(fp
, "lazy usage: %s path\n", getprogname());
9926 make_argv(int argc
, ...)
9934 argv
= calloc(argc
, sizeof(char *));
9937 for (i
= 0; i
< argc
; i
++) {
9938 argv
[i
] = strdup(va_arg(ap
, char *));
9939 if (argv
[i
] == NULL
)
9948 * Try to convert 'tog path' into a 'tog log path' command.
9949 * The user could simply have mistyped the command rather than knowingly
9950 * provided a path. So check whether argv[0] can in fact be resolved
9951 * to a path in the HEAD commit and print a special error if not.
9952 * This hack is for mpi@ <3
9954 static const struct got_error
*
9955 tog_log_with_path(int argc
, char *argv
[])
9957 const struct got_error
*error
= NULL
, *close_err
;
9958 const struct tog_cmd
*cmd
= NULL
;
9959 struct got_repository
*repo
= NULL
;
9960 struct got_worktree
*worktree
= NULL
;
9961 struct got_object_id
*commit_id
= NULL
, *id
= NULL
;
9962 struct got_commit_object
*commit
= NULL
;
9963 char *cwd
= NULL
, *repo_path
= NULL
, *in_repo_path
= NULL
;
9964 char *commit_id_str
= NULL
, **cmd_argv
= NULL
;
9965 int *pack_fds
= NULL
;
9967 cwd
= getcwd(NULL
, 0);
9969 return got_error_from_errno("getcwd");
9971 error
= got_repo_pack_fds_open(&pack_fds
);
9975 error
= got_worktree_open(&worktree
, cwd
, NULL
);
9976 if (error
&& error
->code
!= GOT_ERR_NOT_WORKTREE
)
9980 repo_path
= strdup(got_worktree_get_repo_path(worktree
));
9982 repo_path
= strdup(cwd
);
9983 if (repo_path
== NULL
) {
9984 error
= got_error_from_errno("strdup");
9988 error
= got_repo_open(&repo
, repo_path
, NULL
, pack_fds
);
9992 error
= get_in_repo_path_from_argv0(&in_repo_path
, argc
, argv
,
9997 error
= tog_load_refs(repo
, 0);
10000 error
= got_repo_match_object_id(&commit_id
, NULL
, worktree
?
10001 got_worktree_get_head_ref_name(worktree
) : GOT_REF_HEAD
,
10002 GOT_OBJ_TYPE_COMMIT
, &tog_refs
, repo
);
10007 got_worktree_close(worktree
);
10011 error
= got_object_open_as_commit(&commit
, repo
, commit_id
);
10015 error
= got_object_id_by_path(&id
, repo
, commit
, in_repo_path
);
10017 if (error
->code
!= GOT_ERR_NO_TREE_ENTRY
)
10019 fprintf(stderr
, "%s: '%s' is no known command or path\n",
10020 getprogname(), argv
[0]);
10025 error
= got_object_id_str(&commit_id_str
, commit_id
);
10029 cmd
= &tog_commands
[0]; /* log */
10031 cmd_argv
= make_argv(argc
, cmd
->name
, "-c", commit_id_str
, argv
[0]);
10032 error
= cmd
->cmd_main(argc
, cmd_argv
);
10035 close_err
= got_repo_close(repo
);
10040 got_object_commit_close(commit
);
10042 got_worktree_close(worktree
);
10044 const struct got_error
*pack_err
=
10045 got_repo_pack_fds_close(pack_fds
);
10050 free(commit_id_str
);
10054 free(in_repo_path
);
10057 for (i
= 0; i
< argc
; i
++)
10066 main(int argc
, char *argv
[])
10068 const struct got_error
*io_err
, *error
= NULL
;
10069 const struct tog_cmd
*cmd
= NULL
;
10070 int ch
, hflag
= 0, Vflag
= 0;
10071 char **cmd_argv
= NULL
;
10072 static const struct option longopts
[] = {
10073 { "version", no_argument
, NULL
, 'V' },
10074 { NULL
, 0, NULL
, 0}
10076 char *diff_algo_str
= NULL
;
10077 const char *test_script_path
;
10079 setlocale(LC_CTYPE
, "");
10082 * Override default signal handlers before starting ncurses.
10083 * This should prevent ncurses from installing its own
10084 * broken cleanup() signal handler.
10086 signal(SIGWINCH
, tog_sigwinch
);
10087 signal(SIGPIPE
, tog_sigpipe
);
10088 signal(SIGCONT
, tog_sigcont
);
10089 signal(SIGINT
, tog_sigint
);
10090 signal(SIGTERM
, tog_sigterm
);
10093 * Test mode init must happen before pledge() because "tty" will
10094 * not allow TTY-related ioctls to occur via regular files.
10096 test_script_path
= getenv("TOG_TEST_SCRIPT");
10097 if (test_script_path
!= NULL
) {
10098 error
= init_mock_term(test_script_path
);
10100 fprintf(stderr
, "%s: %s\n", getprogname(), error
->msg
);
10103 } else if (!isatty(STDIN_FILENO
))
10104 errx(1, "standard input is not a tty");
10106 #if !defined(PROFILE)
10107 if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
10112 while ((ch
= getopt_long(argc
, argv
, "+hV", longopts
, NULL
)) != -1) {
10132 got_version_print_str();
10139 /* Build an argument vector which runs a default command. */
10140 cmd
= &tog_commands
[0];
10142 cmd_argv
= make_argv(argc
, cmd
->name
);
10146 /* Did the user specify a command? */
10147 for (i
= 0; i
< nitems(tog_commands
); i
++) {
10148 if (strncmp(tog_commands
[i
].name
, argv
[0],
10149 strlen(argv
[0])) == 0) {
10150 cmd
= &tog_commands
[i
];
10156 diff_algo_str
= getenv("TOG_DIFF_ALGORITHM");
10157 if (diff_algo_str
) {
10158 if (strcasecmp(diff_algo_str
, "patience") == 0)
10159 tog_diff_algo
= GOT_DIFF_ALGORITHM_PATIENCE
;
10160 if (strcasecmp(diff_algo_str
, "myers") == 0)
10161 tog_diff_algo
= GOT_DIFF_ALGORITHM_MYERS
;
10164 tog_base_commit
.idx
= -1;
10165 tog_base_commit
.marker
= GOT_WORKTREE_STATE_UNKNOWN
;
10170 /* No command specified; try log with a path */
10171 error
= tog_log_with_path(argc
, argv
);
10176 error
= cmd
->cmd_main(argc
, cmd_argv
? cmd_argv
: argv
);
10179 if (using_mock_io
) {
10180 io_err
= tog_io_close();
10187 for (i
= 0; i
< argc
; i
++)
10192 if (error
&& error
->code
!= GOT_ERR_CANCELLED
&&
10193 error
->code
!= GOT_ERR_EOF
&&
10194 error
->code
!= GOT_ERR_PRIVSEP_EXIT
&&
10195 error
->code
!= GOT_ERR_PRIVSEP_PIPE
&&
10196 !(error
->code
== GOT_ERR_ERRNO
&& errno
== EINTR
)) {
10197 fprintf(stderr
, "%s: %s\n", getprogname(), error
->msg
);