commit - ee75651731664329c921eb8bd51127f13384ed50
commit + 2b7798554376be53923852de4f57b34f3ebc9cec
blob - 71243c7850ea1be2a41ea376e63e2b384bf06df0
blob + 38cc44f44c8d28152deb170944026300861ddbe5
--- tog/tog.c
+++ tog/tog.c
return err;
}
+static void
+select_commit(struct tog_log_view_state *s)
+{
+ struct commit_queue_entry *entry;
+ int ncommits = 0;
+
+ entry = s->first_displayed_entry;
+ while (entry) {
+ if (ncommits == s->selected) {
+ s->selected_entry = entry;
+ break;
+ }
+ entry = TAILQ_NEXT(entry, entry);
+ ncommits++;
+ }
+}
+
static const struct got_error *
draw_commits(struct tog_view *view)
{
const struct got_error *err = NULL;
struct tog_log_view_state *s = &view->state.log;
- struct commit_queue_entry *entry;
+ struct commit_queue_entry *entry = s->selected_entry;
const int limit = view->nlines;
int width;
int ncommits, author_cols = 4;
struct tog_color *tc;
static const size_t date_display_cols = 12;
- entry = s->first_displayed_entry;
- ncommits = 0;
- while (entry) {
- if (ncommits == s->selected) {
- s->selected_entry = entry;
- break;
- }
- entry = TAILQ_NEXT(entry, entry);
- ncommits++;
- }
-
if (s->selected_entry &&
!(view->searching && view->search_next_done == 0)) {
err = got_object_id_str(&id_str, s->selected_entry->id);
s->selected--;
else
log_scroll_up(s, 1);
+ select_commit(s);
break;
case KEY_PPAGE:
case CTRL('b'):
if (s->first_displayed_entry == NULL)
break;
- if (TAILQ_FIRST(&s->commits.head) ==
- s->first_displayed_entry) {
+ if (TAILQ_FIRST(&s->commits.head) == s->first_displayed_entry)
s->selected = 0;
- break;
- }
- log_scroll_up(s, view->nlines - 1);
+ else
+ log_scroll_up(s, view->nlines - 1);
+ select_commit(s);
break;
case 'j':
case KEY_DOWN:
if (s->first_displayed_entry == NULL)
break;
if (s->selected < MIN(view->nlines - 2,
- s->commits.ncommits - 1)) {
+ s->commits.ncommits - 1))
s->selected++;
- break;
+ else {
+ err = log_scroll_down(view, 1);
+ if (err)
+ break;
}
- err = log_scroll_down(view, 1);
+ select_commit(s);
break;
case KEY_NPAGE:
case CTRL('f'): {
s->selected = MIN(view->nlines - 2,
s->commits.ncommits - 1);
}
- err = NULL;
+ select_commit(s);
break;
}
case KEY_RESIZE:
s->selected = view->nlines - 2;
if (s->selected > s->commits.ncommits - 1)
s->selected = s->commits.ncommits - 1;
+ select_commit(s);
if (s->commits.ncommits < view->nlines - 1 &&
!s->thread_args.log_complete) {
s->thread_args.commits_needed += (view->nlines - 1) -
const struct got_error *err = NULL;
struct tog_diff_view_state *s = &view->state.diff;
struct tog_log_view_state *ls;
- struct commit_queue_entry *entry;
int i;
switch (ch) {
if (s->log_view == NULL)
break;
ls = &s->log_view->state.log;
- entry = TAILQ_PREV(ls->selected_entry,
- commit_queue_head, entry);
- if (entry == NULL)
- break;
err = input_log_view(NULL, s->log_view, KEY_UP);
if (err)
break;
- err = set_selected_commit(s, entry);
+ err = set_selected_commit(s, ls->selected_entry);
if (err)
break;
break;
ls = &s->log_view->state.log;
- if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
- ls->thread_args.commits_needed++;
- err = trigger_log_thread(s->log_view, 1);
- if (err)
- break;
- }
err = input_log_view(NULL, s->log_view, KEY_DOWN);
if (err)
break;
- entry = TAILQ_NEXT(ls->selected_entry, entry);
- if (entry == NULL)
- break;
-
- err = set_selected_commit(s, entry);
+ err = set_selected_commit(s, ls->selected_entry);
if (err)
break;