Take show_untracked into account

Author: cruessler

asyncgit/src/sync/config.rs

@@ -56,6 +56,13 @@ pub fn untracked_files_config_repo(
 		}
 	}
 
+	// This does not reflect how git works according to its docs that say: "If this variable is not
+	// specified, it defaults to `normal`."
+	//
+	// https://git-scm.com/docs/git-config#Documentation/git-config.txt-statusshowUntrackedFiles
+	//
+	// Note that this might become less relevant over time as more code gets migrated to `gitoxide`
+	// because `gitoxide` respects `status.showUntrackedFiles` by default.
 	Ok(ShowUntrackedFilesConfig::All)
 }
 

asyncgit/src/sync/status.rs

@@ -159,24 +159,33 @@ pub fn is_workdir_clean(
 	Ok(statuses.is_empty())
 }
 
+impl From<ShowUntrackedFilesConfig> for gix::status::UntrackedFiles {
+	fn from(value: ShowUntrackedFilesConfig) -> Self {
+		match value {
+			ShowUntrackedFilesConfig::All => Self::Files,
+			ShowUntrackedFilesConfig::Normal => Self::Collapsed,
+			ShowUntrackedFilesConfig::No => Self::None,
+		}
+	}
+}
+
 /// guarantees sorting
 pub fn get_status(
 	repo_path: &RepoPath,
 	status_type: StatusType,
-	_show_untracked: Option<ShowUntrackedFilesConfig>,
+	show_untracked: Option<ShowUntrackedFilesConfig>,
 ) -> Result<Vec<StatusItem>> {
 	scope_time!("get_status");
 
-	// TODO: take parameter `show_untracked` into account, trying to replicate the existing
-	// behaviour.
-
 	let repo: gix::Repository =
 				gix::ThreadSafeRepository::discover_with_environment_overrides(repo_path.gitpath())
 						.map(Into::into)?;
 
-	let status = repo
-		.status(gix::progress::Discard)?
-		.untracked_files(gix::status::UntrackedFiles::Files);
+	let mut status = repo.status(gix::progress::Discard)?;
+
+	if let Some(config) = show_untracked {
+		status = status.untracked_files(config.into());
+	}
 
 	let mut res = Vec::new();
 

asyncgit/src/sync/utils.rs

@@ -289,6 +289,8 @@ mod tests {
 		File::create(root.join(Path::new("a/f3.txt")))?
 			.write_all(b"foo")?;
 
+		repo.config()?.set_str("status.showUntrackedFiles", "all")?;
+
 		assert_eq!(status_count(StatusType::WorkingDir), 3);
 
 		stage_add_all(repo_path, "a/d", None).unwrap();
@@ -351,6 +353,8 @@ mod tests {
 		File::create(root.join(Path::new("f3.txt")))?
 			.write_all(b"foo")?;
 
+		repo.config()?.set_str("status.showUntrackedFiles", "all")?;
+
 		assert_eq!(get_statuses(repo_path), (3, 0));
 
 		repo.config()?.set_str("status.showUntrackedFiles", "no")?;