Commit Diff

Commit:
631e7531fb307436e7797fdf83128e94367ee807
From:
Mark Jamsek <mark@jamsek.dev>
Date:
Message:
tog: move all 'G' logic into log_move_cursor_down() Previously, we only handled 'G' in log_move_cursor_down() when all commits had not yet been loaded; move the case where all commits are already loaded into this routine too, and simplify by handling both cases the same. This change was prompted by Mikhail's observation of a redundant assignment in the previous 'G' handling in log_move_cursor_down(). ok stsp@
Actions:
Patch | Tree
commit - cbb0c8d7953cebb583b29d56dc27f83a38924411
commit + 631e7531fb307436e7797fdf83128e94367ee807
blob - 6ec38b4f4fb702fe582846031bfbd562ee40349a
blob + d36f81499f5b4ae7861ea0f9202c777e7c4787e8
--- tog/tog.c
+++ tog/tog.c
@@ -3165,28 +3165,35 @@ log_move_cursor_down(struct tog_view *view, int page)
 {
 	struct tog_log_view_state	*s = &view->state.log;
 	const struct got_error		*err = NULL;
+	int				 eos = view->nlines - 2;
 
 	if (s->thread_args.log_complete &&
 	    s->selected_entry->idx >= s->commits.ncommits - 1)
 		return NULL;
 
-	if (!page) {
-		int eos = view->nlines - 2;
+	if (view_is_hsplit_top(view))
+		--eos;  /* border consumes the last line */
 
-		if (view_is_hsplit_top(view))
-			--eos;  /* border consumes the last line */
+	if (!page) {
 		if (s->selected < MIN(eos, s->commits.ncommits - 1))
 			++s->selected;
 		else
 			err = log_scroll_down(view, 1);
 	} else if (s->thread_args.load_all) {
-		if (s->last_displayed_entry->idx == s->commits.ncommits - 1)
-			s->selected += MIN(s->last_displayed_entry->idx -
-			    s->selected_entry->idx, page + 1);
-		else
-			err = log_scroll_down(view, MIN(page,
-			    s->commits.ncommits - s->selected_entry->idx - 1));
-		s->selected = MIN(view->nlines - 2, s->commits.ncommits - 1);
+		struct commit_queue_entry *entry;
+		int n;
+
+		s->selected = 0;
+		entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
+		s->last_displayed_entry = entry;
+		for (n = 0; n <= eos; n++) {
+			if (entry == NULL)
+				break;
+			s->first_displayed_entry = entry;
+			entry = TAILQ_PREV(entry, commit_queue_head, entry);
+		}
+		if (n > 0)
+			s->selected = n - 1;
 	} else {
 		if (s->last_displayed_entry->idx == s->commits.ncommits - 1 &&
 		    s->thread_args.log_complete)
@@ -3295,8 +3302,7 @@ input_log_view(struct tog_view **new_view, struct tog_
 {
 	const struct got_error *err = NULL;
 	struct tog_log_view_state *s = &view->state.log;
-	struct commit_queue_entry *entry;
-	int eos, n, nscroll;
+	int eos, nscroll;
 
 	if (s->thread_args.load_all) {
 		if (ch == CTRL('g') || ch == KEY_BACKSPACE)
@@ -3375,22 +3381,11 @@ input_log_view(struct tog_view **new_view, struct tog_
 		/* We don't know yet how many commits, so we're forced to
 		 * traverse them all. */
 		view->count = 0;
-		if (!s->thread_args.log_complete) {
-			s->thread_args.load_all = 1;
+		s->thread_args.load_all = 1;
+		if (!s->thread_args.log_complete)
 			return trigger_log_thread(view, 0);
-		}
-
-		s->selected = 0;
-		entry = TAILQ_LAST(&s->commits.head, commit_queue_head);
-		for (n = 0; n < eos; n++) {
-			if (entry == NULL)
-				break;
-			s->first_displayed_entry = entry;
-			entry = TAILQ_PREV(entry, commit_queue_head, entry);
-		}
-		if (n > 0)
-			s->selected = n - 1;
-		select_commit(s);
+		err = log_move_cursor_down(view, s->commits.ncommits);
+		s->thread_args.load_all = 0;
 		break;
 	}
 	case CTRL('d'):