Commit Diff

Commit:
f9686aa566bfec8d68b52910b3448bdaeb5d2358
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
show 'searching...' during 'tog log' search even if no new commits are loaded
Actions:
Patch | Tree
commit - f9967bca13c359aa4ba51c67a63fad42f9569626
commit + f9686aa566bfec8d68b52910b3448bdaeb5d2358
blob - 627443ff42c81342f3b1dd935e34b99a36b0a211
blob + 505f372cf8bf12618b4ec8c8109436d4f1cb233b
--- tog/tog.c
+++ tog/tog.c
@@ -1517,12 +1517,21 @@ draw_commits(struct tog_view *view, struct commit_queu
 			goto done;
 		}
 	} else {
+		const char *search_str = NULL;
+
+		if (view->searching) {
+			if (view->search_next_done == TOG_SEARCH_NO_MORE)
+				search_str = "no more matches";
+			else if (view->search_next_done == TOG_SEARCH_HAVE_NONE)
+				search_str = "no matches found";
+			else if (!view->search_next_done)
+				search_str = "searching...";
+		}
+
 		if (asprintf(&ncommits_str, " [%d/%d] %s",
 		    entry ? entry->idx + 1 : 0, commits->ncommits,
-		    view->search_next_done == TOG_SEARCH_NO_MORE ?
-		    "no more matches" :
-		    (view->search_next_done == TOG_SEARCH_HAVE_NONE ?
-		    "no matches found" : (refs_str ? refs_str : ""))) == -1) {
+		    search_str ? search_str :
+		    (refs_str ? refs_str : "")) == -1) {
 			err = got_error_from_errno("asprintf");
 			goto done;
 		}
@@ -2060,6 +2069,11 @@ search_next_log_view(struct tog_view *view)
 	struct tog_log_view_state *s = &view->state.log;
 	struct commit_queue_entry *entry;
 
+	/* Display progress update in log view. */
+	show_log_view(view);
+	update_panels();
+	doupdate();
+
 	if (s->search_entry) {
 		int errcode, ch;
 		errcode = pthread_mutex_unlock(&tog_mutex);