Fix: search in log (#1838)

Author: extrawurst

Makefile

@@ -2,7 +2,7 @@
 .PHONY: debug build-release release-linux-musl test clippy clippy-pedantic install install-debug
 
 ARGS=-l
-# ARGS=-l -d ~/code/extern/pbrt-v4
+# ARGS=-l -d ~/code/extern/linux
 # ARGS=-l -d ~/code/git-bare-test.git -w ~/code/git-bare-test
 
 profile:

asyncgit/src/revlog.rs

@@ -1,7 +1,7 @@
 use crate::{
 	error::Result,
 	sync::{repo, CommitId, LogWalker, LogWalkerFilter, RepoPath},
-	AsyncGitNotification,
+	AsyncGitNotification, Error,
 };
 use crossbeam_channel::Sender;
 use scopetime::scope_time;
@@ -15,7 +15,7 @@ use std::{
 };
 
 ///
-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Eq, Debug)]
 pub enum FetchStatus {
 	/// previous fetch still running
 	Pending,
@@ -40,6 +40,7 @@ pub struct AsyncLog {
 	pending: Arc<AtomicBool>,
 	background: Arc<AtomicBool>,
 	filter: Option<LogWalkerFilter>,
+	partial_extract: AtomicBool,
 	repo: RepoPath,
 }
 
@@ -65,6 +66,7 @@ impl AsyncLog {
 			pending: Arc::new(AtomicBool::new(false)),
 			background: Arc::new(AtomicBool::new(false)),
 			filter,
+			partial_extract: AtomicBool::new(false),
 		}
 	}
 
@@ -89,21 +91,26 @@ impl AsyncLog {
 
 	///
 	pub fn get_items(&self) -> Result<Vec<CommitId>> {
+		if self.partial_extract.load(Ordering::Relaxed) {
+			return Err(Error::Generic(String::from("Faulty usage of AsyncLog: Cannot partially extract items and rely on get_items slice to still work!")));
+		}
+
 		let list = &self.current.lock()?.commits;
 		Ok(list.clone())
 	}
 
 	///
-	pub fn get_last_duration(&self) -> Result<Duration> {
-		Ok(self.current.lock()?.duration)
+	pub fn extract_items(&self) -> Result<Vec<CommitId>> {
+		self.partial_extract.store(true, Ordering::Relaxed);
+		let list = &mut self.current.lock()?.commits;
+		let result = list.clone();
+		list.clear();
+		Ok(result)
 	}
 
 	///
-	pub fn position(&self, id: CommitId) -> Result<Option<usize>> {
-		let list = &self.current.lock()?.commits;
-		let position = list.iter().position(|&x| x == id);
-
-		Ok(position)
+	pub fn get_last_duration(&self) -> Result<Duration> {
+		Ok(self.current.lock()?.duration)
 	}
 
 	///
@@ -143,6 +150,8 @@ impl AsyncLog {
 			return Ok(FetchStatus::NoChange);
 		}
 
+		self.pending.store(true, Ordering::Relaxed);
+
 		self.clear()?;
 
 		let arc_current = Arc::clone(&self.current);
@@ -152,8 +161,6 @@ impl AsyncLog {
 		let filter = self.filter.clone();
 		let repo_path = self.repo.clone();
 
-		self.pending.store(true, Ordering::Relaxed);
-
 		if let Ok(head) = repo(&self.repo)?.head() {
 			*self.current_head.lock()? =
 				head.target().map(CommitId::new);
@@ -192,17 +199,16 @@ impl AsyncLog {
 		let r = repo(repo_path)?;
 		let mut walker =
 			LogWalker::new(&r, LIMIT_COUNT)?.filter(filter);
+
 		loop {
 			entries.clear();
-			let res_is_err = walker.read(&mut entries).is_err();
+			let read = walker.read(&mut entries)?;
 
-			if !res_is_err {
-				let mut current = arc_current.lock()?;
-				current.commits.extend(entries.iter());
-				current.duration = start_time.elapsed();
-			}
+			let mut current = arc_current.lock()?;
+			current.commits.extend(entries.iter());
+			current.duration = start_time.elapsed();
 
-			if res_is_err || entries.len() <= 1 {
+			if read == 0 {
 				break;
 			}
 			Self::notify(sender);
@@ -213,15 +219,19 @@ impl AsyncLog {
 				} else {
 					SLEEP_FOREGROUND
 				};
+
 			thread::sleep(sleep_duration);
 		}
 
+		log::trace!("revlog visited: {}", walker.visited());
+
 		Ok(())
 	}
 
 	fn clear(&mut self) -> Result<()> {
 		self.current.lock()?.commits.clear();
 		*self.current_head.lock()? = None;
+		self.partial_extract.store(false, Ordering::Relaxed);
 		Ok(())
 	}
 

asyncgit/src/sync/logwalker.rs

@@ -261,6 +261,11 @@ impl<'a> LogWalker<'a> {
 		})
 	}
 
+	///
+	pub fn visited(&self) -> usize {
+		self.visited.len()
+	}
+
 	///
 	#[must_use]
 	pub fn filter(self, filter: Option<LogWalkerFilter>) -> Self {