Merge remote-tracking branch 'upstream/master'

Author: andrea-berling

Cargo.lock

@@ -32,14 +32,14 @@ filetreelist = { path = "./filetreelist", version = "0.5" }
 fuzzy-matcher = "0.3"
 gh-emoji = { version = "1.0", optional = true }
 indexmap = "2"
-itertools = "0.12"
+itertools = "0.13"
 log = "0.4"
 notify = "6.1"
 notify-debouncer-mini = "0.4"
 once_cell = "1"
 # pin until upgrading this does not introduce a duplicte dependency
 parking_lot_core = "=0.9.9"
-ratatui = { version = "0.26", default-features = false, features = [
+ratatui = { version = "0.27", default-features = false, features = [
     'crossterm',
     'serde',
 ] }
@@ -57,7 +57,7 @@ syntect = { version = "5.2", default-features = false, features = [
     "default-themes",
     "html",
 ] }
-tui-textarea = "0.4.0"
+tui-textarea = "0.5"
 two-face = { version = "0.4.0", default-features = false }
 unicode-segmentation = "1.11"
 unicode-truncate = "1.0"

Cargo.toml

@@ -19,6 +19,7 @@ easy-cast = "0.5"
 fuzzy-matcher = "0.3"
 git2 = "0.19"
 git2-hooks = { path = "../git2-hooks", version = "0.3" }
+gix = { version = "0.63", default-features = false, features = ["max-performance", "revision"] }
 log = "0.4"
 # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
 # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}

asyncgit/Cargo.toml

@@ -93,6 +93,24 @@ pub enum Error {
 	#[error("sign error: {0}")]
 	Sign(#[from] crate::sync::sign::SignError),
 
+	///
+	#[error("gix::open error: {0}")]
+	GixOpen(#[from] Box<gix::open::Error>),
+
+	///
+	#[error("gix::reference::find::existing error: {0}")]
+	GixReferenceFindExisting(
+		#[from] gix::reference::find::existing::Error,
+	),
+
+	///
+	#[error("gix::head::peel::to_commit error: {0}")]
+	GixHeadPeelToCommit(#[from] gix::head::peel::to_commit::Error),
+
+	///
+	#[error("gix::revision::walk error: {0}")]
+	GixRevisionWalk(#[from] gix::revision::walk::Error),
+
 	///
 	#[error("amend error: config commit.gpgsign=true detected.\ngpg signing is not supported for amending non-last commits")]
 	SignAmendNonLastCommit,
@@ -120,3 +138,9 @@ impl<T> From<crossbeam_channel::SendError<T>> for Error {
 		Self::Generic(format!("send error: {error}"))
 	}
 }
+
+impl From<gix::open::Error> for Error {
+	fn from(error: gix::open::Error) -> Self {
+		Self::GixOpen(Box::new(error))
+	}
+}

asyncgit/src/error.rs

@@ -1,7 +1,8 @@
 use crate::{
 	error::Result,
 	sync::{
-		repo, CommitId, LogWalker, RepoPath, SharedCommitFilterFn,
+		repo, CommitId, LogWalker, LogWalkerWithoutFilter, RepoPath,
+		SharedCommitFilterFn,
 	},
 	AsyncGitNotification, Error,
 };
@@ -198,6 +199,34 @@ impl AsyncLog {
 		arc_background: &Arc<AtomicBool>,
 		sender: &Sender<AsyncGitNotification>,
 		filter: Option<SharedCommitFilterFn>,
+	) -> Result<()> {
+		filter.map_or_else(
+			|| {
+				Self::fetch_helper_without_filter(
+					repo_path,
+					arc_current,
+					arc_background,
+					sender,
+				)
+			},
+			|filter| {
+				Self::fetch_helper_with_filter(
+					repo_path,
+					arc_current,
+					arc_background,
+					sender,
+					filter,
+				)
+			},
+		)
+	}
+
+	fn fetch_helper_with_filter(
+		repo_path: &RepoPath,
+		arc_current: &Arc<Mutex<AsyncLogResult>>,
+		arc_background: &Arc<AtomicBool>,
+		sender: &Sender<AsyncGitNotification>,
+		filter: SharedCommitFilterFn,
 	) -> Result<()> {
 		let start_time = Instant::now();
 
@@ -206,7 +235,50 @@ impl AsyncLog {
 
 		let r = repo(repo_path)?;
 		let mut walker =
-			LogWalker::new(&r, LIMIT_COUNT)?.filter(filter);
+			LogWalker::new(&r, LIMIT_COUNT)?.filter(Some(filter));
+
+		loop {
+			entries.clear();
+			let read = walker.read(&mut entries)?;
+
+			let mut current = arc_current.lock()?;
+			current.commits.extend(entries.iter());
+			current.duration = start_time.elapsed();
+
+			if read == 0 {
+				break;
+			}
+			Self::notify(sender);
+
+			let sleep_duration =
+				if arc_background.load(Ordering::Relaxed) {
+					SLEEP_BACKGROUND
+				} else {
+					SLEEP_FOREGROUND
+				};
+
+			thread::sleep(sleep_duration);
+		}
+
+		log::trace!("revlog visited: {}", walker.visited());
+
+		Ok(())
+	}
+
+	fn fetch_helper_without_filter(
+		repo_path: &RepoPath,
+		arc_current: &Arc<Mutex<AsyncLogResult>>,
+		arc_background: &Arc<AtomicBool>,
+		sender: &Sender<AsyncGitNotification>,
+	) -> Result<()> {
+		let start_time = Instant::now();
+
+		let mut entries = vec![CommitId::default(); LIMIT_COUNT];
+		entries.resize(0, CommitId::default());
+
+		let mut repo = gix::open(repo_path.gitpath())?;
+		let mut walker =
+			LogWalkerWithoutFilter::new(&mut repo, LIMIT_COUNT)?;
 
 		loop {
 			entries.clear();

asyncgit/src/revlog.rs

@@ -2,6 +2,7 @@
 use super::{CommitId, SharedCommitFilterFn};
 use crate::error::Result;
 use git2::{Commit, Oid, Repository};
+use gix::{revision::Walk, traverse::commit::simple::Sorting};
 use std::{
 	cmp::Ordering,
 	collections::{BinaryHeap, HashSet},
@@ -108,6 +109,78 @@ impl<'a> LogWalker<'a> {
 	}
 }
 
+/// This is separate from `LogWalker` because filtering currently (June 2024) works through
+/// `SharedCommitFilterFn`.
+///
+/// `SharedCommitFilterFn` requires access to a `git2::repo::Repository` because, under the hood,
+/// it calls into functions that work with a `git2::repo::Repository`. It seems unwise to open a
+/// repo both through `gix::open` and `Repository::open_ext` at the same time, so there is a
+/// separate struct that works with `gix::Repository` only.
+///
+/// A more long-term option is to refactor filtering to work with a `gix::Repository` and to remove
+/// `LogWalker` once this is done, but this is a larger effort.
+pub struct LogWalkerWithoutFilter<'a> {
+	walk: Walk<'a>,
+	limit: usize,
+	visited: usize,
+}
+
+impl<'a> LogWalkerWithoutFilter<'a> {
+	///
+	pub fn new(
+		repo: &'a mut gix::Repository,
+		limit: usize,
+	) -> Result<Self> {
+		// This seems to be an object cache size that yields optimal performance. There’s no specific
+		// reason this is 2^14, so benchmarking might reveal that there’s better values.
+		repo.object_cache_size_if_unset(2_usize.pow(14));
+
+		let commit = repo.head()?.peel_to_commit_in_place()?;
+
+		let tips = [commit.id];
+
+		let platform = repo
+			.rev_walk(tips)
+			.sorting(Sorting::ByCommitTimeNewestFirst)
+			.use_commit_graph(false);
+
+		let walk = platform.all()?;
+
+		Ok(Self {
+			walk,
+			limit,
+			visited: 0,
+		})
+	}
+
+	///
+	pub const fn visited(&self) -> usize {
+		self.visited
+	}
+
+	///
+	pub fn read(&mut self, out: &mut Vec<CommitId>) -> Result<usize> {
+		let mut count = 0_usize;
+
+		while let Some(Ok(info)) = self.walk.next() {
+			let bytes = info.id.as_bytes();
+			let commit_id: CommitId = Oid::from_bytes(bytes)?.into();
+
+			out.push(commit_id);
+
+			count += 1;
+
+			if count == self.limit {
+				break;
+			}
+		}
+
+		self.visited += count;
+
+		Ok(count)
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -183,6 +256,40 @@ mod tests {
 		Ok(())
 	}
 
+	#[test]
+	fn test_logwalker_without_filter() -> Result<()> {
+		let file_path = Path::new("foo");
+		let (_td, repo) = repo_init_empty().unwrap();
+		let root = repo.path().parent().unwrap();
+		let repo_path: &RepoPath =
+			&root.as_os_str().to_str().unwrap().into();
+
+		File::create(root.join(file_path))?.write_all(b"a")?;
+		stage_add_file(repo_path, file_path).unwrap();
+		commit(repo_path, "commit1").unwrap();
+		File::create(root.join(file_path))?.write_all(b"a")?;
+		stage_add_file(repo_path, file_path).unwrap();
+		let oid2 = commit(repo_path, "commit2").unwrap();
+
+		let mut repo = gix::open(repo_path.gitpath()).unwrap();
+		let mut walk = LogWalkerWithoutFilter::new(&mut repo, 100)?;
+		let mut items = Vec::new();
+		assert!(matches!(walk.read(&mut items), Ok(2)));
+
+		let info = get_commits_info(repo_path, &items, 50).unwrap();
+		dbg!(&info);
+
+		assert_eq!(items.len(), 2);
+		assert_eq!(items[0], oid2);
+
+		let mut items = Vec::new();
+		assert!(matches!(walk.read(&mut items), Ok(0)));
+
+		assert_eq!(items.len(), 0);
+
+		Ok(())
+	}
+
 	#[test]
 	fn test_logwalker_with_filter() -> Result<()> {
 		let file_path = Path::new("foo");

asyncgit/src/sync/logwalker.rs

@@ -71,7 +71,7 @@ pub use hooks::{
 };
 pub use hunks::{reset_hunk, stage_hunk, unstage_hunk};
 pub use ignore::add_to_ignore;
-pub use logwalker::LogWalker;
+pub use logwalker::{LogWalker, LogWalkerWithoutFilter};
 pub use merge::{
 	abort_pending_rebase, abort_pending_state,
 	continue_pending_rebase, merge_branch, merge_commit, merge_msg,

asyncgit/src/sync/mod.rs

@@ -1104,7 +1104,7 @@ impl App {
 		const SIDE_PADS: usize = 2;
 		const MARGIN_LEFT_AND_RIGHT: usize = 2;
 
-		let r = r.inner(&Margin {
+		let r = r.inner(Margin {
 			vertical: 0,
 			horizontal: 1,
 		});

src/app.rs

@@ -80,7 +80,7 @@ impl DrawableComponent for BranchListPopup {
 				area,
 			);
 
-			let area = area.inner(&Margin {
+			let area = area.inner(Margin {
 				vertical: 1,
 				horizontal: 1,
 			});

src/popups/branchlist.rs

@@ -293,7 +293,7 @@ impl DrawableComponent for FuzzyFindPopup {
 					]
 					.as_ref(),
 				)
-				.split(area.inner(&Margin {
+				.split(area.inner(Margin {
 					horizontal: 1,
 					vertical: 1,
 				}));