renaming

felt things weren't fully qualified

Author: philocalyst

asyncgit/src/sync/branch/mod.rs

@@ -342,7 +342,7 @@ pub fn checkout_branch(
 	repo.set_head(branch_ref_name?)?;
 
 	// Smudge LFS pointer files with real content from the local LFS store.
-	if let Err(e) = super::lfs::large_file_storage_smudge_tree(
+	if let Err(e) = super::lfs::smudge_tree(
 		&repo,
 		&target_tree,
 		previous_tree.as_ref(),
@@ -390,11 +390,9 @@ pub fn checkout_commit(
 	repo.set_head_detached(commit.id())?;
 
 	// Smudge Large File Storage pointer files with real content from the local Large File Storage store.
-	if let Err(error) = super::lfs::large_file_storage_smudge_tree(
-		&repo,
-		&tree,
-		previous_tree.as_ref(),
-	) {
+	if let Err(error) =
+		super::lfs::smudge_tree(&repo, &tree, previous_tree.as_ref())
+	{
 		log::warn!("checkout_commit: Large File Storage smudge failed: {error}");
 	}
 
@@ -449,11 +447,9 @@ pub fn checkout_remote_branch(
 	}
 
 	// Smudge LFS pointer files with real content from the local LFS store.
-	if let Err(e) = super::lfs::large_file_storage_smudge_tree(
-		&repo,
-		&tree,
-		previous_tree.as_ref(),
-	) {
+	if let Err(e) =
+		super::lfs::smudge_tree(&repo, &tree, previous_tree.as_ref())
+	{
 		log::warn!("checkout_remote_branch: LFS smudge failed: {e}");
 	}
 

asyncgit/src/sync/commit_files.rs

@@ -76,7 +76,7 @@ pub fn get_commit_files(
 				.path()
 				.map(|p| p.to_str().unwrap_or("").to_string())
 				.unwrap_or_default();
-			let is_lfs = super::lfs::lfs_filter_for(
+			let is_lfs = super::lfs::filter_for(
 				&repo,
 				std::path::Path::new(&path),
 			)

asyncgit/src/sync/commit_revert.rs

@@ -20,6 +20,8 @@ pub fn revert_commit(
 
 	repo.revert(&commit, None)?;
 
+	crate::sync::lfs::record_smudge(&repo, "revert_commit");
+
 	Ok(())
 }
 

asyncgit/src/sync/lfs.rs

@@ -51,7 +51,7 @@ fn lfs_skip_smudge() -> bool {
 /// This delegates to libgit2's attribute lookup and returns an [`LfsFilter`]
 /// variant so downstream code can pattern-match instead of inspecting strings
 /// or booleans.
-pub fn lfs_filter_for(repo: &Repository, path: &Path) -> LfsFilter {
+pub fn filter_for(repo: &Repository, path: &Path) -> LfsFilter {
 	match repo.get_attr(path, "filter", git2::AttrCheckFlags::empty())
 	{
 		Ok(Some("lfs")) => LfsFilter::Lfs,
@@ -63,7 +63,7 @@ pub fn lfs_filter_for(repo: &Repository, path: &Path) -> LfsFilter {
 ///
 /// The real bytes are written to `.git/lfs/objects/`; keeping the  index entry holding
 /// just the small pointer text.
-pub fn large_file_storage_clean_and_stage(
+pub fn clean_and_stage(
 	repository: &Repository,
 	index: &mut git2::Index,
 	file_path: &Path,
@@ -147,7 +147,7 @@ fn file_mode_for(path: &Path) -> git2::FileMode {
 /// Walk `tree` and smudge every LFS pointer file in the working tree.
 ///
 /// Returns `Ok(())` even when individual files cannot be smudged, so a partial LFS store only warns.
-pub fn large_file_storage_smudge_tree(
+pub fn smudge_tree(
 	repository: &Repository,
 	target_tree: &git2::Tree,
 	previous_tree: Option<&git2::Tree>,
@@ -198,7 +198,7 @@ pub fn large_file_storage_smudge_tree(
 	for file_path in changed_file_paths {
 		// Staging will clean content into the local LFS store
 		// Checkout will smudge pointer files into their OG content
-		if lfs_filter_for(repository, file_path).is_lfs() {
+		if filter_for(repository, file_path).is_lfs() {
 			let full_path = working_directory.join(file_path);
 			let outcome =
 				smudge_file(&store, full_path.as_path(), file_path);
@@ -210,6 +210,25 @@ pub fn large_file_storage_smudge_tree(
 	Ok(())
 }
 
+/// Smudge LFS pointer files in the working tree against `HEAD`, logging a
+/// warning tagged with `operation` on failure instead of propagating it.
+pub fn record_smudge(repository: &Repository, operation: &str) {
+	// Operations that rewrite the working tree from git history (reset, stash
+	// apply/pop, rebase, revert) leave LFS files as pointer text, so cover that here.
+	let head_tree =
+		match repository.head().and_then(|h| h.peel_to_tree()) {
+			Ok(tree) => tree,
+			Err(e) => {
+				log::warn!("{operation}: LFS smudge failed to resolve HEAD: {e}");
+				return;
+			}
+		};
+
+	if let Err(e) = smudge_tree(repository, &head_tree, None) {
+		log::warn!("{operation}: LFS smudge failed: {e}");
+	}
+}
+
 fn log_smudge_outcome(
 	entry_path: &Path,
 	outcome: Result<SmudgeOutcome>,
@@ -259,11 +278,8 @@ fn smudge_tree_entries(
 			}
 			// Use a match guard to gracefully filter out non-LFS blobs immediately
 			Some(git2::ObjectType::Blob)
-				if lfs_filter_for(
-					repository,
-					entry_path.as_path(),
-				)
-				.is_lfs() =>
+				if filter_for(repository, entry_path.as_path())
+					.is_lfs() =>
 			{
 				let full_path = working_directory.join(&entry_path);
 				let outcome = smudge_file(

asyncgit/src/sync/mod.rs

@@ -107,7 +107,7 @@ pub use tags::{
 pub use tree::{tree_file_content, tree_files, TreeFile};
 pub use utils::{
 	get_head, get_head_tuple, repo_dir, repo_open_error,
-	stage_add_all, stage_add_file, stage_addremoved, Head,
+	stage_add_all_files, stage_add_file, stage_addremoved, Head,
 };
 
 pub use git2::ResetType;

asyncgit/src/sync/rebase.rs

@@ -63,6 +63,8 @@ pub fn conflict_free_rebase(
 
 	rebase.finish(Some(&signature))?;
 
+	crate::sync::lfs::record_smudge(repo, "rebase");
+
 	last_commit.ok_or_else(|| {
 		Error::Generic(String::from("no commit rebased"))
 	})
@@ -103,6 +105,8 @@ pub fn rebase(
 
 	rebase.finish(Some(&signature))?;
 
+	crate::sync::lfs::record_smudge(repo, "rebase");
+
 	Ok(RebaseState::Finished)
 }
 
@@ -140,6 +144,8 @@ pub fn continue_rebase(
 
 	rebase.finish(Some(&signature))?;
 
+	crate::sync::lfs::record_smudge(repo, "continue_rebase");
+
 	Ok(RebaseState::Finished)
 }
 

asyncgit/src/sync/reset.rs

@@ -35,6 +35,9 @@ pub fn reset_workdir(repo_path: &RepoPath, path: &str) -> Result<()> {
 		.path(path);
 
 	repo.checkout_index(None, Some(&mut checkout_opts))?;
+
+	super::lfs::record_smudge(&repo, "reset_workdir");
+
 	Ok(())
 }
 
@@ -55,10 +58,7 @@ pub fn reset_repo(
 	// Only a hard reset rewrites the working tree from the target commit and
 	// leaves LFS files as pointer text; soft/mixed resets leave it untouched.
 	if matches!(kind, ResetType::Hard) {
-		super::lfs::large_file_storage_smudge_head_logged(
-			&repo,
-			"reset_repo",
-		);
+		super::lfs::record_smudge(&repo, "reset_repo");
 	}
 
 	Ok(())
@@ -74,7 +74,7 @@ mod tests {
 		tests::{
 			debug_cmd_print, get_statuses, repo_init, repo_init_empty,
 		},
-		utils::{stage_add_all, stage_add_file},
+		utils::{stage_add_all_files, stage_add_file},
 		RepoPath,
 	};
 	use std::{
@@ -197,7 +197,7 @@ mod tests {
 				.write_all(b"file3")?;
 		}
 
-		stage_add_all(repo_path, "*", None).unwrap();
+		stage_add_all_files(repo_path, "*", None).unwrap();
 		commit(repo_path, "msg").unwrap();
 
 		{

asyncgit/src/sync/stash.rs

@@ -52,6 +52,8 @@ pub fn stash_pop(
 
 	repo.stash_pop(index, None)?;
 
+	super::lfs::record_smudge(&repo, "stash_pop");
+
 	Ok(())
 }
 
@@ -74,6 +76,8 @@ pub fn stash_apply(
 	opt.checkout_options(checkout);
 	repo.stash_apply(index, Some(&mut opt))?;
 
+	super::lfs::record_smudge(&repo, "stash_apply");
+
 	Ok(())
 }
 

asyncgit/src/sync/status.rs

@@ -215,7 +215,7 @@ pub fn get_status(
 
 				if let Some(status) = status {
 					let path = item.rela_path().to_string();
-					let is_lfs = super::lfs::lfs_filter_for(
+					let is_lfs = super::lfs::filter_for(
 						&git2_repo,
 						Path::new(&path),
 					)
@@ -252,7 +252,7 @@ pub fn get_status(
 				 -> Result<gix::diff::index::Action> {
 					let path = change_ref.fields().0.to_string();
 					let status = change_ref.into();
-					let is_lfs = super::lfs::lfs_filter_for(
+					let is_lfs = super::lfs::filter_for(
 						&git2_repo,
 						Path::new(&path),
 					)
@@ -293,7 +293,7 @@ pub fn get_status(
 				};
 
 				if let Some(status) = status {
-					let is_lfs = super::lfs::lfs_filter_for(
+					let is_lfs = super::lfs::filter_for(
 						&git2_repo,
 						Path::new(&path),
 					)

src/components/changes.rs

@@ -98,7 +98,7 @@ impl ChangesComponent {
 						self.options.borrow().status_show_untracked();
 
 					//TODO: check if we can handle the one file case with it as well
-					sync::stage_add_all(
+					sync::stage_add_all_files(
 						&self.repo.borrow(),
 						tree_item.info.full_path.as_str(),
 						config,
@@ -131,7 +131,7 @@ impl ChangesComponent {
 	fn index_add_all(&self) -> Result<()> {
 		let config = self.options.borrow().status_show_untracked();
 
-		sync::stage_add_all(&self.repo.borrow(), "*", config)?;
+		sync::stage_add_all_files(&self.repo.borrow(), "*", config)?;
 
 		self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));