Add popup for file history

asyncgit/src/lib.rs

@@ -78,6 +78,8 @@ pub enum AsyncGitNotification {
 	///
 	Log,
 	///
+	FileLog,
+	///
 	CommitFiles,
 	///
 	Tags,

asyncgit/src/revlog.rs

@@ -4,7 +4,6 @@ use crate::{
 	AsyncGitNotification,
 };
 use crossbeam_channel::Sender;
-use git2::Oid;
 use scopetime::scope_time;
 use std::{
 	sync::{
@@ -29,6 +28,7 @@ pub enum FetchStatus {
 ///
 pub struct AsyncLog {
 	current: Arc<Mutex<Vec<CommitId>>>,
+	current_head: Arc<Mutex<Option<CommitId>>>,
 	sender: Sender<AsyncGitNotification>,
 	pending: Arc<AtomicBool>,
 	background: Arc<AtomicBool>,
@@ -50,6 +50,7 @@ impl AsyncLog {
 		Self {
 			repo,
 			current: Arc::new(Mutex::new(Vec::new())),
+			current_head: Arc::new(Mutex::new(None)),
 			sender: sender.clone(),
 			pending: Arc::new(AtomicBool::new(false)),
 			background: Arc::new(AtomicBool::new(false)),
@@ -95,20 +96,16 @@ impl AsyncLog {
 	}
 
 	///
-	fn current_head(&self) -> Result<CommitId> {
-		Ok(self
-			.current
-			.lock()?
-			.first()
-			.map_or(Oid::zero().into(), |f| *f))
+	fn current_head(&self) -> Result<Option<CommitId>> {
+		Ok(*self.current_head.lock()?)
 	}
 
 	///
 	fn head_changed(&self) -> Result<bool> {
 		if let Ok(head) = repo(&self.repo)?.head() {
-			if let Some(head) = head.target() {
-				return Ok(head != self.current_head()?.into());
-			}
+			return Ok(
+				head.target() != self.current_head()?.map(Into::into)
+			);
 		}
 		Ok(false)
 	}
@@ -132,15 +129,20 @@ impl AsyncLog {
 		let arc_pending = Arc::clone(&self.pending);
 		let arc_background = Arc::clone(&self.background);
 		let filter = self.filter.clone();
-		let repo = self.repo.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);
+		}
+
 		rayon_core::spawn(move || {
 			scope_time!("async::revlog");
 
 			Self::fetch_helper(
-				&repo,
+				&repo_path,
 				&arc_current,
 				&arc_background,
 				&sender,
@@ -195,6 +197,7 @@ impl AsyncLog {
 
 	fn clear(&mut self) -> Result<()> {
 		self.current.lock()?.clear();
+		*self.current_head.lock()? = None;
 		Ok(())
 	}
 

asyncgit/src/sync/commit_files.rs

@@ -1,11 +1,12 @@
-use std::cmp::Ordering;
+//! Functions for getting infos about files in commits
 
 use super::{stash::is_stash_commit, CommitId, RepoPath};
 use crate::{
 	error::Result, sync::repository::repo, StatusItem, StatusItemType,
 };
 use git2::{Diff, DiffOptions, Repository};
 use scopetime::scope_time;
+use std::cmp::Ordering;
 
 /// get all files that are part of a commit
 pub fn get_commit_files(
@@ -42,6 +43,7 @@ pub fn get_commit_files(
 	Ok(res)
 }
 
+/// get diff of two arbitrary commits
 #[allow(clippy::needless_pass_by_value)]
 pub fn get_compare_commits_diff(
 	repo: &Repository,
@@ -80,8 +82,8 @@ pub fn get_compare_commits_diff(
 	Ok(diff)
 }
 
-#[allow(clippy::redundant_pub_crate)]
-pub(crate) fn get_commit_diff<'a>(
+/// get diff of a commit to its first parent
+pub fn get_commit_diff<'a>(
 	repo_path: &RepoPath,
 	repo: &'a Repository,
 	id: CommitId,

asyncgit/src/sync/logwalker.rs

@@ -1,5 +1,6 @@
 use super::CommitId;
-use crate::error::Result;
+use crate::sync::RepoPath;
+use crate::{error::Result, sync::commit_files::get_commit_diff};
 use git2::{Commit, Oid, Repository};
 use std::{
 	cmp::Ordering,
@@ -34,6 +35,29 @@ pub type LogWalkerFilter = Arc<
 	Box<dyn Fn(&Repository, &CommitId) -> Result<bool> + Send + Sync>,
 >;
 
+///
+pub fn diff_contains_file(
+	repo_path: RepoPath,
+	file_path: String,
+) -> LogWalkerFilter {
+	Arc::new(Box::new(
+		move |repo: &Repository,
+		      commit_id: &CommitId|
+		      -> Result<bool> {
+			let diff = get_commit_diff(
+				&repo_path,
+				repo,
+				*commit_id,
+				Some(file_path.clone()),
+			)?;
+
+			let contains_file = diff.deltas().len() > 0;
+
+			Ok(contains_file)
+		},
+	))
+}
+
 ///
 pub struct LogWalker<'a> {
 	commits: BinaryHeap<TimeOrderedCommit<'a>>,
@@ -111,8 +135,8 @@ mod tests {
 	use crate::error::Result;
 	use crate::sync::RepoPath;
 	use crate::sync::{
-		commit, commit_files::get_commit_diff, get_commits_info,
-		stage_add_file, tests::repo_init_empty,
+		commit, get_commits_info, stage_add_file,
+		tests::repo_init_empty,
 	};
 	use pretty_assertions::assert_eq;
 	use std::{fs::File, io::Write, path::Path};
@@ -201,24 +225,12 @@ mod tests {
 		let _third_commit_id = commit(&repo_path, "commit3").unwrap();
 
 		let repo_path_clone = repo_path.clone();
-		let diff_contains_baz = move |repo: &Repository,
-		                              commit_id: &CommitId|
-		      -> Result<bool> {
-			let diff = get_commit_diff(
-				&repo_path_clone,
-				&repo,
-				*commit_id,
-				Some("baz".into()),
-			)?;
-
-			let contains_file = diff.deltas().len() > 0;
-
-			Ok(contains_file)
-		};
+		let diff_contains_baz =
+			diff_contains_file(repo_path_clone, "baz".into());
 
 		let mut items = Vec::new();
 		let mut walker = LogWalker::new(&repo, 100)?
-			.filter(Some(Arc::new(Box::new(diff_contains_baz))));
+			.filter(Some(diff_contains_baz));
 		walker.read(&mut items).unwrap();
 
 		assert_eq!(items.len(), 1);
@@ -229,25 +241,12 @@ mod tests {
 
 		assert_eq!(items.len(), 0);
 
-		let repo_path_clone = repo_path.clone();
-		let diff_contains_bar = move |repo: &Repository,
-		                              commit_id: &CommitId|
-		      -> Result<bool> {
-			let diff = get_commit_diff(
-				&repo_path_clone,
-				&repo,
-				*commit_id,
-				Some("bar".into()),
-			)?;
-
-			let contains_file = diff.deltas().len() > 0;
-
-			Ok(contains_file)
-		};
+		let diff_contains_bar =
+			diff_contains_file(repo_path, "bar".into());
 
 		let mut items = Vec::new();
 		let mut walker = LogWalker::new(&repo, 100)?
-			.filter(Some(Arc::new(Box::new(diff_contains_bar))));
+			.filter(Some(diff_contains_bar));
 		walker.read(&mut items).unwrap();
 
 		assert_eq!(items.len(), 0);

asyncgit/src/sync/mod.rs

@@ -7,7 +7,7 @@ pub mod blame;
 pub mod branch;
 mod commit;
 mod commit_details;
-mod commit_files;
+pub mod commit_files;
 mod commit_revert;
 mod commits_info;
 mod config;
@@ -60,7 +60,7 @@ pub use hooks::{
 };
 pub use hunks::{reset_hunk, stage_hunk, unstage_hunk};
 pub use ignore::add_to_ignore;
-pub use logwalker::{LogWalker, LogWalkerFilter};
+pub use logwalker::{diff_contains_file, LogWalker, LogWalkerFilter};
 pub use merge::{
 	abort_pending_rebase, abort_pending_state,
 	continue_pending_rebase, merge_branch, merge_commit, merge_msg,

src/app.rs

@@ -7,11 +7,11 @@ use crate::{
 		CommitComponent, CompareCommitsComponent, Component,
 		ConfirmComponent, CreateBranchComponent, DrawableComponent,
 		ExternalEditorComponent, FetchComponent, FileFindPopup,
-		HelpComponent, InspectCommitComponent, MsgComponent,
-		OptionsPopupComponent, PullComponent, PushComponent,
-		PushTagsComponent, RenameBranchComponent, RevisionFilesPopup,
-		SharedOptions, StashMsgComponent, TagCommitComponent,
-		TagListComponent,
+		FileRevlogComponent, HelpComponent, InspectCommitComponent,
+		MsgComponent, OptionsPopupComponent, PullComponent,
+		PushComponent, PushTagsComponent, RenameBranchComponent,
+		RevisionFilesPopup, SharedOptions, StashMsgComponent,
+		TagCommitComponent, TagListComponent,
 	},
 	input::{Input, InputEvent, InputState},
 	keys::{KeyConfig, SharedKeyConfig},
@@ -51,6 +51,7 @@ pub struct App {
 	reset: ConfirmComponent,
 	commit: CommitComponent,
 	blame_file_popup: BlameFileComponent,
+	file_revlog_popup: FileRevlogComponent,
 	stashmsg_popup: StashMsgComponent,
 	inspect_commit_popup: InspectCommitComponent,
 	compare_commits_popup: CompareCommitsComponent,
@@ -122,6 +123,13 @@ impl App {
 				theme.clone(),
 				key_config.clone(),
 			),
+			file_revlog_popup: FileRevlogComponent::new(
+				&repo,
+				&queue,
+				sender,
+				theme.clone(),
+				key_config.clone(),
+			),
 			revision_files_popup: RevisionFilesPopup::new(
 				repo.clone(),
 				&queue,
@@ -419,6 +427,7 @@ impl App {
 			self.stashing_tab.update_git(ev)?;
 			self.revlog.update_git(ev)?;
 			self.blame_file_popup.update_git(ev)?;
+			self.file_revlog_popup.update_git(ev)?;
 			self.inspect_commit_popup.update_git(ev)?;
 			self.compare_commits_popup.update_git(ev)?;
 			self.push_popup.update_git(ev)?;
@@ -451,6 +460,7 @@ impl App {
 			|| self.stashing_tab.anything_pending()
 			|| self.files_tab.anything_pending()
 			|| self.blame_file_popup.any_work_pending()
+			|| self.file_revlog_popup.any_work_pending()
 			|| self.inspect_commit_popup.any_work_pending()
 			|| self.compare_commits_popup.any_work_pending()
 			|| self.input.is_state_changing()
@@ -483,6 +493,7 @@ impl App {
 			reset,
 			commit,
 			blame_file_popup,
+			file_revlog_popup,
 			stashmsg_popup,
 			inspect_commit_popup,
 			compare_commits_popup,
@@ -516,6 +527,7 @@ impl App {
 			inspect_commit_popup,
 			compare_commits_popup,
 			blame_file_popup,
+			file_revlog_popup,
 			external_editor_popup,
 			tag_commit_popup,
 			select_branch_popup,
@@ -630,6 +642,7 @@ impl App {
 			self.status_tab.update_diff()?;
 			self.inspect_commit_popup.update_diff()?;
 			self.compare_commits_popup.update_diff()?;
+			self.file_revlog_popup.update_diff()?;
 		}
 		if flags.contains(NeedsUpdate::COMMANDS) {
 			self.update_commands();
@@ -695,6 +708,11 @@ impl App {
 				flags
 					.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
 			}
+			InternalEvent::OpenFileRevlog(path) => {
+				self.file_revlog_popup.open(&path)?;
+				flags
+					.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS);
+			}
 			InternalEvent::CreateBranch => {
 				self.create_branch_popup.open()?;
 			}