search in commit log

Revert "visualize empty line in diff better (closes #1359)"

This reverts commit 6576c7e.

Author: extrawurst

Cargo.lock

@@ -12,8 +12,10 @@ categories = ["concurrency", "asynchronous"]
 keywords = ["git"]
 
 [dependencies]
+bitflags = "1"
 crossbeam-channel = "0.5"
 easy-cast = "0.5"
+fuzzy-matcher = "0.3"
 git2 = "0.17"
 log = "0.4"
 # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}

asyncgit/Cargo.toml

@@ -77,6 +77,12 @@ impl AsyncLog {
 		Ok(list[min..max].to_vec())
 	}
 
+	///
+	pub fn get_items(&self) -> Result<Vec<CommitId>> {
+		let list = self.current.lock()?;
+		Ok(list.clone())
+	}
+
 	///
 	pub fn position(&self, id: CommitId) -> Result<Option<usize>> {
 		let list = self.current.lock()?;

asyncgit/src/revlog.rs

@@ -1,6 +1,9 @@
+#![allow(dead_code)]
 use super::CommitId;
 use crate::{error::Result, sync::commit_files::get_commit_diff};
-use git2::{Commit, Oid, Repository};
+use bitflags::bitflags;
+use fuzzy_matcher::FuzzyMatcher;
+use git2::{Commit, Diff, Oid, Repository};
 use std::{
 	cmp::Ordering,
 	collections::{BinaryHeap, HashSet},
@@ -55,6 +58,123 @@ pub fn diff_contains_file(file_path: String) -> LogWalkerFilter {
 	))
 }
 
+// TODO:
+// fuzzy-match:
+// 	message, authors, file-names in diff, diff-content
+//
+// substr matching:
+// 	commit-sha, date
+bitflags! {
+	///
+	pub struct FilterSearchOptions: u32 {
+		///
+		const MESSAGE = 0b0000_0001;
+		///
+		const FILENAMES = 0b0000_0010;
+	}
+}
+
+///
+pub struct LogFilterSearch {
+	///
+	pub matcher: fuzzy_matcher::skim::SkimMatcherV2,
+	///
+	pub search_pattern: String,
+	///
+	pub options: FilterSearchOptions,
+}
+
+impl LogFilterSearch {
+	///
+	pub fn new(
+		search_pattern: String,
+		options: FilterSearchOptions,
+	) -> Self {
+		Self {
+			matcher: fuzzy_matcher::skim::SkimMatcherV2::default(),
+			search_pattern,
+			options,
+		}
+	}
+
+	fn match_diff(&self, diff: &Diff<'_>) -> bool {
+		diff.deltas().any(|delta| {
+			if delta
+				.new_file()
+				.path()
+				.and_then(|file| file.as_os_str().to_str())
+				.map(|file| {
+					self.matcher
+						.fuzzy_match(
+							file,
+							self.search_pattern.as_str(),
+						)
+						.is_some()
+				})
+				.unwrap_or_default()
+			{
+				return true;
+			}
+
+			delta
+				.old_file()
+				.path()
+				.and_then(|file| file.as_os_str().to_str())
+				.map(|file| {
+					self.matcher
+						.fuzzy_match(
+							file,
+							self.search_pattern.as_str(),
+						)
+						.is_some()
+				})
+				.unwrap_or_default()
+		})
+	}
+}
+
+///
+pub fn filter_commit_by_search(
+	filter: LogFilterSearch,
+) -> LogWalkerFilter {
+	Arc::new(Box::new(
+		move |repo: &Repository,
+		      commit_id: &CommitId|
+		      -> Result<bool> {
+			let commit = repo.find_commit((*commit_id).into())?;
+
+			let msg_match = filter
+				.options
+				.contains(FilterSearchOptions::MESSAGE)
+				.then(|| {
+					commit.message().and_then(|msg| {
+						filter.matcher.fuzzy_match(
+							msg,
+							filter.search_pattern.as_str(),
+						)
+					})
+				})
+				.flatten()
+				.is_some();
+
+			let file_match = filter
+				.options
+				.contains(FilterSearchOptions::FILENAMES)
+				.then(|| {
+					get_commit_diff(
+						repo, *commit_id, None, None, None,
+					)
+					.ok()
+				})
+				.flatten()
+				.map(|diff| filter.match_diff(&diff))
+				.unwrap_or_default();
+
+			Ok(msg_match || file_match)
+		},
+	))
+}
+
 ///
 pub struct LogWalker<'a> {
 	commits: BinaryHeap<TimeOrderedCommit<'a>>,
@@ -130,11 +250,13 @@ impl<'a> LogWalker<'a> {
 mod tests {
 	use super::*;
 	use crate::error::Result;
+	use crate::sync::tests::write_commit_file;
 	use crate::sync::RepoPath;
 	use crate::sync::{
 		commit, get_commits_info, stage_add_file,
 		tests::repo_init_empty,
 	};
+	use fuzzy_matcher::skim::SkimMatcherV2;
 	use pretty_assertions::assert_eq;
 	use std::{fs::File, io::Write, path::Path};
 
@@ -246,4 +368,47 @@ mod tests {
 
 		Ok(())
 	}
+
+	#[test]
+	fn test_logwalker_with_filter_search() {
+		let (_td, repo) = repo_init_empty().unwrap();
+
+		write_commit_file(&repo, "foo", "a", "commit1");
+		let second_commit_id = write_commit_file(
+			&repo,
+			"baz",
+			"a",
+			"my commit msg (#2)",
+		);
+		write_commit_file(&repo, "foo", "b", "commit3");
+
+		let log_filter = filter_commit_by_search(LogFilterSearch {
+			options: FilterSearchOptions::MESSAGE,
+			matcher: SkimMatcherV2::default(),
+			search_pattern: String::from("my msg"),
+		});
+
+		let mut items = Vec::new();
+		let mut walker = LogWalker::new(&repo, 100)
+			.unwrap()
+			.filter(Some(log_filter));
+		walker.read(&mut items).unwrap();
+
+		assert_eq!(items.len(), 1);
+		assert_eq!(items[0], second_commit_id);
+
+		let log_filter = filter_commit_by_search(LogFilterSearch {
+			options: FilterSearchOptions::FILENAMES,
+			matcher: SkimMatcherV2::default(),
+			search_pattern: String::from("fo"),
+		});
+
+		let mut items = Vec::new();
+		let mut walker = LogWalker::new(&repo, 100)
+			.unwrap()
+			.filter(Some(log_filter));
+		walker.read(&mut items).unwrap();
+
+		assert_eq!(items.len(), 2);
+	}
 }

asyncgit/src/sync/logwalker.rs

@@ -63,7 +63,10 @@ pub use hooks::{
 };
 pub use hunks::{reset_hunk, stage_hunk, unstage_hunk};
 pub use ignore::add_to_ignore;
-pub use logwalker::{diff_contains_file, LogWalker, LogWalkerFilter};
+pub use logwalker::{
+	diff_contains_file, filter_commit_by_search, FilterSearchOptions,
+	LogFilterSearch, LogWalker, LogWalkerFilter,
+};
 pub use merge::{
 	abort_pending_rebase, abort_pending_state,
 	continue_pending_rebase, merge_branch, merge_commit, merge_msg,