On Thu, Oct 10, 2019 at 10:01:35AM +0200, Martin Pieuchot wrote:
> I'm using "tog log -c master /sys" then search for 'mpi' to check what I
> did during the 6.6 release cycle.
> 
> Due to the fact that 'tog log' do not prefetch more commits than it can
> display, launching it is very fast.  However every time it continues to
> search "past" the already unpacked commits, it waits for got-read-pack.
> 
> This makes searching in big repositories, like openbsd-src, frustrating.
> One has to wait more than a couple of seconds every time 'n' is pressed.
> 
> Without going the tig(1) way of loading everything upon startup, which
> makes it slow on big repository, would it be possible to improve the
> search experiences?

We can keep loading more commits while a search is active.
Please try the diff below.
 
> Another related suggestion, would it be possible to invert the contrast
> of the searched terms, like it is done in less(1)?

I would like this, too. I am not sure how much work is involved.
It would require touching the show() function of each view that
supports search (log, blame, tree). Locating the matched substring
seems to be possible with the REG_STARTEND feature of regexec(3).


Diff to pre-load more commits during search in the log view.
OK?

diff d59c0cb27bc304bc11f9b1094c6eb85f248c7c5f /home/stsp/src/got
blob - aad8017a1963e96977883c2dadfcef0fce8eac58
file + tog/tog.c
--- tog/tog.c
+++ tog/tog.c
@@ -1827,12 +1827,23 @@ search_next_log_view(struct tog_view *view)
 			 * Poke the log thread for more commits and return,
 			 * allowing the main loop to make progress. Search
 			 * will resume at s->search_entry once we come back.
+			 * Prefetch a large number of commits to avoid stalling
+			 * every time the user hits the 'n' key.
 			 */
-			s->thread_args.commits_needed++;
-			return trigger_log_thread(1,
+			s->thread_args.commits_needed += 4096;
+			return trigger_log_thread(0,
 			    &s->thread_args.commits_needed,
 			    &s->thread_args.log_complete,
 			    &s->thread_args.need_commits);
+		} else if (s->matched_entry == NULL) {
+			/* Found a first match, kick off commit prefetching. */
+			s->thread_args.commits_needed += 4096;
+			err = trigger_log_thread(0,
+			    &s->thread_args.commits_needed,
+			    &s->thread_args.log_complete,
+			    &s->thread_args.need_commits);
+			if (err)
+				return err;
 		}
 
 		err = got_object_id_str(&id_str, entry->id);