commit b1bf14358f5e1cf55766c71c63045c96bf083aaf
from: Stefan Sperling <stsp@stsp.name>
date: Fri Jun 21 09:59:28 2019 UTC

implement backwards search in tog log view

commit - ead14cbec322af4fa0e01bf99fad6e17bfe79f9f
commit + b1bf14358f5e1cf55766c71c63045c96bf083aaf
blob - 63af65768c9342effeeb4eefff98f3b4a2d67b84
blob + 379342debff79aab7b8d92c70ca3c64fffdbf8ef
--- tog/tog.1
+++ tog/tog.1
@@ -110,6 +110,8 @@ The search pattern is an extended regular expression w
 against a commit's author name, committer name, and log message.
 .It Cm n
 Find the next commit which matches the current search pattern.
+.It Cm N
+Find the previous commit which matches the current search pattern.
 .El
 .Pp
 The options for
blob - 9a4a0ef9d7f6fd63caeda2568aa3a9c1c229c48d
blob + 6e379c984958aa272e08540abb0f80bcf4c9617e
--- tog/tog.c
+++ tog/tog.c
@@ -279,6 +279,8 @@ struct tog_view {
 	const struct got_error *(*search_start)(struct tog_view *);
 	const struct got_error *(*search_next)(struct tog_view *);
 	int searching;
+#define TOG_SEARCH_FORWARD	1
+#define TOG_SEARCH_BACKWARD	2
 	int search_next_done;
 };
 
@@ -627,8 +629,11 @@ view_input(struct tog_view **new, struct tog_view **de
 		else
 			err = view->input(new, dead, focus, view, ch);
 		break;
+	case 'N':
 	case 'n':
 		if (view->search_next && view->searching) {
+			view->searching = (ch == 'n' ?
+			    TOG_SEARCH_FORWARD : TOG_SEARCH_BACKWARD);
 			view->search_next_done = 0;
 			view->search_next(view);
 		} else
@@ -1694,7 +1699,7 @@ search_start_log_view(struct tog_view *view)
 
 	s->matched_entry = NULL;
 	if (regcomp(&s->regex, pattern, REG_EXTENDED | REG_ICASE) == 0) {
-		view->searching = 1;
+		view->searching = TOG_SEARCH_FORWARD;
 		view->search_next_done = 0;
 		view->search_next(view);
 	}
@@ -1730,9 +1735,13 @@ search_next_log_view(struct tog_view *view)
 		return NULL;
 	}
 
-	if (s->matched_entry)
-		entry = TAILQ_NEXT(s->matched_entry, entry);
-	else
+	if (s->matched_entry) {
+		if (view->searching == TOG_SEARCH_FORWARD)
+			entry = TAILQ_NEXT(s->matched_entry, entry);
+		else
+			entry = TAILQ_PREV(s->matched_entry,
+			    commit_queue_head, entry);
+	} else
 		entry = TAILQ_FIRST(&s->commits.head);
 
 	while (1) {
@@ -1741,8 +1750,12 @@ search_next_log_view(struct tog_view *view)
 				if (s->matched_entry == NULL) {
 					view->search_next_done = 1;
 					return NULL;
-				} else
+				}
+				if (view->searching == TOG_SEARCH_FORWARD)
 					entry = TAILQ_FIRST(&s->commits.head);
+				else
+					entry = TAILQ_LAST(&s->commits.head,
+					    commit_queue_head);
 			} else {
 				s->thread_args.commits_needed = 1;
 				return trigger_log_thread(0,
@@ -1756,7 +1769,10 @@ search_next_log_view(struct tog_view *view)
 			view->search_next_done = 1;
 			break;
 		}
-		entry = TAILQ_NEXT(entry, entry);
+		if (view->searching == TOG_SEARCH_FORWARD)
+			entry = TAILQ_NEXT(entry, entry);
+		else
+			entry = TAILQ_PREV(entry, commit_queue_head, entry);
 	}
 
 	if (entry) {