Merge pull request #2495 from cruessler/add-sha-256-to-gix-filter

Use `GIX_TEST_FIXTURE_HASH` for `gix-filter`

Author: Byron

gix-filter/Cargo.toml

@@ -36,6 +36,7 @@ smallvec = "1.15.1"
 
 
 [dev-dependencies]
+gix-hash = { path = "../gix-hash", features = ["sha1", "sha256"] }
 gix-quote = { path = "../gix-quote" }
 gix-testtools = { path = "../tests/tools" }
 gix-worktree = { path = "../gix-worktree", default-features = false, features = ["attributes"] }

gix-filter/tests/filter/ident.rs

@@ -78,7 +78,11 @@ mod apply {
             "$ID$ case sensitive matching",
             "$Id: expanded is ignored$",
         ] {
-            let changed = ident::apply(input_no_match.as_bytes(), gix_hash::Kind::Sha1, &mut buf)?;
+            let changed = ident::apply(
+                input_no_match.as_bytes(),
+                gix_testtools::hash_kind_from_env().unwrap_or_default(),
+                &mut buf,
+            )?;
             assert!(!changed, "no substitution happens, nothing to do");
             assert_eq!(buf.len(), 0);
         }
@@ -89,15 +93,33 @@ mod apply {
     fn simple() -> crate::Result {
         let mut buf = Vec::new();
         assert!(
-            ident::apply(B("$Id$"), gix_hash::Kind::Sha1, &mut buf)?,
+            ident::apply(
+                B("$Id$"),
+                gix_testtools::hash_kind_from_env().unwrap_or_default(),
+                &mut buf
+            )?,
             "a change happens"
         );
-        assert_eq!(buf.as_bstr(), "$Id: b3f5ebfb5843bc43ceecff6d4f26bb37c615beb1$");
+        let expected_hash = match gix_testtools::hash_kind_from_env().unwrap_or_default() {
+            gix_hash::Kind::Sha1 => "b3f5ebfb5843bc43ceecff6d4f26bb37c615beb1",
+            gix_hash::Kind::Sha256 => "63cdf77e7872965e2af1bee42e925f9b4bd6a3ab9f5ef6c06c4312f7d90d8021",
+            _ => unimplemented!(),
+        };
+        assert_eq!(buf.as_bstr(), format!("$Id: {expected_hash}$"));
 
-        assert!(ident::apply(B("$Id$ $Id$ foo"), gix_hash::Kind::Sha1, &mut buf)?);
+        assert!(ident::apply(
+            B("$Id$ $Id$ foo"),
+            gix_testtools::hash_kind_from_env().unwrap_or_default(),
+            &mut buf
+        )?);
+        let expected_hash = match gix_testtools::hash_kind_from_env().unwrap_or_default() {
+            gix_hash::Kind::Sha1 => "e230cff7a9624f59eaa28bfb97602c3a03651a49",
+            gix_hash::Kind::Sha256 => "64a29d2cfd88cf6cfd786cdd88e99112bef2f7d8596a8701f6955784624604ca",
+            _ => unimplemented!(),
+        };
         assert_eq!(
             buf.as_bstr(),
-            "$Id: e230cff7a9624f59eaa28bfb97602c3a03651a49$ $Id: e230cff7a9624f59eaa28bfb97602c3a03651a49$ foo"
+            format!("$Id: {expected_hash}$ $Id: {expected_hash}$ foo")
         );
         Ok(())
     }
@@ -110,7 +132,11 @@ mod apply {
             "$Id$",
             "$Id$ and one more $Id$ and done",
         ] {
-            let changed = ident::apply(B(input), gix_hash::Kind::Sha1, &mut buf)?;
+            let changed = ident::apply(
+                B(input),
+                gix_testtools::hash_kind_from_env().unwrap_or_default(),
+                &mut buf,
+            )?;
             assert!(changed, "the input was rewritten");
             assert!(ident::undo(&buf.clone(), &mut buf)?, "undo does something as well");
             assert_eq!(buf.as_bstr(), input, "the filter can be undone perfectly");

gix-filter/tests/filter/pipeline/convert_to_git.rs

@@ -48,8 +48,14 @@ fn all_stages_mean_streaming_is_impossible() -> gix_testtools::Result {
         )
     })?;
 
+    let source_hash = match gix_testtools::hash_kind_from_env().unwrap_or_default() {
+        gix_hash::Kind::Sha1 => "2188d1cdee2b93a80084b61af431a49d21bc7cc0",
+        gix_hash::Kind::Sha256 => "66b8b3bf4f18bcb5f74e09b24ac62e10934e9453a1de9793edb9390dc2ab1d6b",
+        _ => unimplemented!(),
+    };
+    let src = format!("➡a\r\n➡b\r\n➡$Id: {source_hash}$");
     let mut out = pipe.convert_to_git(
-        "➡a\r\n➡b\r\n➡$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$".as_bytes(),
+        src.as_bytes(),
         Path::new("any.txt"),
         &mut |path, attrs| {
             cache
@@ -77,8 +83,14 @@ fn only_driver_means_streaming_is_possible() -> gix_testtools::Result {
         )
     })?;
 
+    let source_hash = match gix_testtools::hash_kind_from_env().unwrap_or_default() {
+        gix_hash::Kind::Sha1 => "2188d1cdee2b93a80084b61af431a49d21bc7cc0",
+        gix_hash::Kind::Sha256 => "66b8b3bf4f18bcb5f74e09b24ac62e10934e9453a1de9793edb9390dc2ab1d6b",
+        _ => unimplemented!(),
+    };
+    let src = format!("➡a\r\n➡b\r\n➡$Id: {source_hash}$");
     let mut out = pipe.convert_to_git(
-        "➡a\r\n➡b\r\n➡$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$".as_bytes(),
+        src.as_bytes(),
         Path::new("subdir/doesnot/matter/any.txt"),
         &mut |path, attrs| {
             cache
@@ -94,7 +106,7 @@ fn only_driver_means_streaming_is_possible() -> gix_testtools::Result {
     out.read_to_end(&mut buf)?;
     assert_eq!(
         buf.as_bstr(),
-        "a\r\nb\r\n$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$",
+        format!("a\r\nb\r\n$Id: {source_hash}$"),
         "one filter was reversed"
     );
     Ok(())
@@ -106,7 +118,12 @@ fn no_filter_means_reader_is_returned_unchanged() -> gix_testtools::Result {
         (vec![], Vec::new(), CrlfRoundTripCheck::Fail, Default::default())
     })?;
 
-    let input = "➡a\r\n➡b\r\n➡$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$";
+    let source_hash = match gix_testtools::hash_kind_from_env().unwrap_or_default() {
+        gix_hash::Kind::Sha1 => "2188d1cdee2b93a80084b61af431a49d21bc7cc0",
+        gix_hash::Kind::Sha256 => "66b8b3bf4f18bcb5f74e09b24ac62e10934e9453a1de9793edb9390dc2ab1d6b",
+        _ => unimplemented!(),
+    };
+    let input = format!("➡a\r\n➡b\r\n➡$Id: {source_hash}$");
     let mut out = pipe.convert_to_git(
         input.as_bytes(),
         Path::new("other.txt"),

gix-filter/tests/filter/pipeline/convert_to_worktree.rs

@@ -35,9 +35,14 @@ fn all_stages() -> gix_testtools::Result {
     assert!(out.as_read().is_some(), "process filter is last");
     let mut buf = Vec::new();
     out.read_to_end(&mut buf)?;
+    let expected_hash = match gix_testtools::hash_kind_from_env().unwrap_or_default() {
+        gix_hash::Kind::Sha1 => "2188d1cdee2b93a80084b61af431a49d21bc7cc0",
+        gix_hash::Kind::Sha256 => "66b8b3bf4f18bcb5f74e09b24ac62e10934e9453a1de9793edb9390dc2ab1d6b",
+        _ => unimplemented!(),
+    };
     assert_eq!(
         buf.as_bstr(),
-        "➡a\r\n➡b\r\n➡$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$",
+        format!("➡a\r\n➡b\r\n➡$Id: {expected_hash}$"),
         "the buffer shows that a lot of transformations were applied"
     );
     Ok(())
@@ -66,9 +71,14 @@ fn all_stages_no_filter() -> gix_testtools::Result {
         "there is no filter process, so no chance for getting a stream"
     );
     let buf = out.as_bytes().expect("no filter process");
+    let expected_hash = match gix_testtools::hash_kind_from_env().unwrap_or_default() {
+        gix_hash::Kind::Sha1 => "a77d7acbc809ac8df987a769221c83137ba1b9f9",
+        gix_hash::Kind::Sha256 => "5ac811252c70ca9761feaa6fe00a74fbf558378ff4fc2853e43b097b153bd7eb",
+        _ => unimplemented!(),
+    };
     assert_eq!(
         buf.as_bstr(),
-        "$Id: a77d7acbc809ac8df987a769221c83137ba1b9f9$a\r\nb\r\n",
+        format!("$Id: {expected_hash}$a\r\nb\r\n"),
         "the buffer shows that a lot of transformations were applied"
     );
     Ok(())

gix-filter/tests/filter/pipeline/mod.rs

@@ -65,7 +65,7 @@ fn pipeline(
             eol_config,
             encodings_with_roundtrip_check,
             crlf_roundtrip_check,
-            object_hash: gix_hash::Kind::Sha1,
+            object_hash: gix_testtools::hash_kind_from_env().unwrap_or_default(),
         },
     );
     Ok((cache, pipe))

gix-filter/tests/fixtures/generated-archives/.gitignore

@@ -1 +1,2 @@
 /baseline.tar
+/baseline_sha256.tar

gix-filter/tests/fixtures/generated-archives/pipeline_repos_sha256.tar

@@ -207,6 +207,8 @@ unit-tests:
     cargo nextest run -p gix-worktree-tests --features gix-features-parallel --no-fail-fast
     cargo nextest run -p gix-error --no-fail-fast --test auto-chain-error --features auto-chain-error
     cargo nextest run -p gix-error --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha1 cargo nextest run -p gix-filter --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha256 cargo nextest run -p gix-filter --no-fail-fast
     cargo nextest run -p gix-hash --features sha1 --no-fail-fast
     cargo nextest run -p gix-hash --features sha1,sha256 --no-fail-fast
     cargo nextest run -p gix-hash --features sha256 --no-fail-fast