From c34ec2bf251d8064f51c0231c5687ba0c1c299ed Mon Sep 17 00:00:00 2001
From: Greg Soltis <Greg Soltis>
Date: Wed, 12 Jul 2023 10:50:42 -0700
Subject: [PATCH 1/2] Implement hashing fallback

---
 .../src/absolute_system_path_buf.rs           |  4 ++
 crates/turborepo-scm/src/package_deps.rs      | 47 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/crates/turborepo-paths/src/absolute_system_path_buf.rs b/crates/turborepo-paths/src/absolute_system_path_buf.rs
index 0e7e48ee01e43..acb3777597a7b 100644
--- a/crates/turborepo-paths/src/absolute_system_path_buf.rs
+++ b/crates/turborepo-paths/src/absolute_system_path_buf.rs
@@ -202,6 +202,10 @@ impl AbsoluteSystemPathBuf {
         fs::remove_file(self.0.as_path())
     }
 
+    pub fn remove_dir_all(&self) -> Result<(), io::Error> {
+        fs::remove_dir_all(self.0.as_path())
+    }
+
     pub fn set_readonly(&self) -> Result<(), PathError> {
         let metadata = fs::symlink_metadata(self)?;
         let mut perms = metadata.permissions();
diff --git a/crates/turborepo-scm/src/package_deps.rs b/crates/turborepo-scm/src/package_deps.rs
index dbb9d496a8aa9..ab60efb63dd7f 100644
--- a/crates/turborepo-scm/src/package_deps.rs
+++ b/crates/turborepo-scm/src/package_deps.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use itertools::{Either, Itertools};
+use tracing::debug;
 use turbopath::{AbsoluteSystemPath, AnchoredSystemPathBuf, PathError, RelativeUnixPathBuf};
 
 use crate::{hash_object::hash_objects, Error, Git, SCM};
@@ -20,7 +21,19 @@ impl SCM {
                 package_path,
                 inputs,
             ),
-            SCM::Git(git) => git.get_package_file_hashes(turbo_root, package_path, inputs),
+            SCM::Git(git) => git
+                .get_package_file_hashes(turbo_root, package_path, inputs)
+                .or_else(|e| {
+                    debug!(
+                        "failed to use git to hash files: {}. Falling back to manual",
+                        e
+                    );
+                    crate::manual::get_package_file_hashes_from_processing_gitignore(
+                        turbo_root,
+                        package_path,
+                        inputs,
+                    )
+                }),
         }
     }
 
@@ -155,7 +168,7 @@ impl Git {
 
 #[cfg(test)]
 mod tests {
-    use std::{collections::HashMap, process::Command};
+    use std::{assert_matches::assert_matches, collections::HashMap, process::Command};
 
     use turbopath::{AbsoluteSystemPathBuf, RelativeUnixPathBuf};
 
@@ -218,6 +231,36 @@ mod tests {
         assert!(manual_hashes.is_empty());
     }
 
+    #[test]
+    fn test_get_package_deps_fallback() {
+        let (_repo_root_tmp, repo_root) = tmp_dir();
+        let my_pkg_dir = repo_root.join_component("my-pkg");
+        my_pkg_dir.create_dir_all().unwrap();
+
+        // create file 1
+        let committed_file_path = my_pkg_dir.join_component("committed-file");
+        committed_file_path
+            .create_with_contents("committed bytes")
+            .unwrap();
+
+        setup_repository(&repo_root);
+        commit_all(&repo_root);
+        let git = SCM::new(&repo_root);
+        assert_matches!(git, SCM::Git(_));
+        // Remove the .git directory to trigger an error in git hashing
+        repo_root.join_component(".git").remove_dir_all().unwrap();
+        let pkg_path = repo_root.anchor(&my_pkg_dir).unwrap();
+        let hashes = git
+            .get_package_file_hashes::<&str>(&repo_root, &pkg_path, &[])
+            .unwrap();
+        let mut expected = GitHashes::new();
+        expected.insert(
+            RelativeUnixPathBuf::new("committed-file").unwrap(),
+            "3a29e62ea9ba15c4a4009d1f605d391cdd262033".to_string(),
+        );
+        assert_eq!(hashes, expected);
+    }
+
     #[test]
     fn test_get_package_deps() -> Result<(), Error> {
         // Directory structure:

From 7a6f8819d492bdf1cb92ca8e5f4100052a309972 Mon Sep 17 00:00:00 2001
From: Greg Soltis <Greg Soltis>
Date: Thu, 13 Jul 2023 11:02:19 -0700
Subject: [PATCH 2/2] Move remove_dir_all to reference type

---
 crates/turborepo-paths/src/absolute_system_path.rs     | 4 ++++
 crates/turborepo-paths/src/absolute_system_path_buf.rs | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/turborepo-paths/src/absolute_system_path.rs b/crates/turborepo-paths/src/absolute_system_path.rs
index a10d6e5b1e307..8df63f2dcd033 100644
--- a/crates/turborepo-paths/src/absolute_system_path.rs
+++ b/crates/turborepo-paths/src/absolute_system_path.rs
@@ -119,6 +119,10 @@ impl AbsoluteSystemPath {
         fs::create_dir_all(&self.0)
     }
 
+    pub fn remove_dir_all(&self) -> Result<(), io::Error> {
+        fs::remove_dir_all(&self.0)
+    }
+
     pub fn extension(&self) -> Option<&str> {
         self.0.extension()
     }
diff --git a/crates/turborepo-paths/src/absolute_system_path_buf.rs b/crates/turborepo-paths/src/absolute_system_path_buf.rs
index acb3777597a7b..0e7e48ee01e43 100644
--- a/crates/turborepo-paths/src/absolute_system_path_buf.rs
+++ b/crates/turborepo-paths/src/absolute_system_path_buf.rs
@@ -202,10 +202,6 @@ impl AbsoluteSystemPathBuf {
         fs::remove_file(self.0.as_path())
     }
 
-    pub fn remove_dir_all(&self) -> Result<(), io::Error> {
-        fs::remove_dir_all(self.0.as_path())
-    }
-
     pub fn set_readonly(&self) -> Result<(), PathError> {
         let metadata = fs::symlink_metadata(self)?;
         let mut perms = metadata.permissions();