UPSTREAM PR #2377: feat: add sha256 feature to gix-commitgraph

gix-commitgraph/Cargo.toml

@@ -33,6 +33,7 @@ document-features = { version = "0.2.0", optional = true }
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
 gix-date = { path = "../gix-date" }
+gix-hash = { path = "../gix-hash", features = ["sha256"] }
 
 [package.metadata.docs.rs]
 all-features = true

gix-commitgraph/src/access.rs

@@ -11,6 +11,20 @@ impl Graph {
         r.file.commit_at(r.pos)
     }
 
+    /// The kind of hash used in this `Graph`.
+    ///
+    /// Note that it is always conforming to the hash used in the owning repository.
+    ///
+    /// # Panics
+    ///
+    /// If the graph does not contain any `File`.
+    pub fn object_hash(&self) -> gix_hash::Kind {
+        self.files
+            .first()
+            .map(super::File::object_hash)
+            .expect("graph to have at least one file")
+    }
+
     /// Returns the commit matching the given `id`.
     pub fn commit_by_id(&self, id: impl AsRef<gix_hash::oid>) -> Option<Commit<'_>> {
         let r = self.lookup_by_id(id.as_ref())?;

gix-diff/src/tree/visit.rs

@@ -151,9 +151,12 @@ mod tests {
     #[test]
     fn size_of_change() {
         let actual = std::mem::size_of::<Change>();
+        let sha1 = 48;
+        let sha256_extra = 24;
+        let ceiling = sha1 + sha256_extra;
         assert!(
-            actual <= 48,
-            "{actual} <= 48: this type shouldn't grow without us knowing"
+            actual <= ceiling,
+            "{actual} <= {ceiling}: this type shouldn't grow without us knowing"
         );
     }
 }

gix-index/src/extension/tree/mod.rs

@@ -18,7 +18,9 @@ mod tests {
     #[test]
     fn size_of_tree() {
         let actual = std::mem::size_of::<crate::extension::Tree>();
-        let expected = 88;
+        let sha1 = 88;
+        let sha256_extra = 16;
+        let expected = sha1 + sha256_extra;
         assert!(
             size_ok(actual, expected),
             "the size of this structure should not change unexpectedly: {actual} <~ {expected}"

gix-index/tests/Cargo.toml

@@ -24,6 +24,6 @@ gix-features = { path = "../../gix-features", features = ["progress"] }
 gix-testtools = { path = "../../tests/tools" }
 gix-odb = { path = "../../gix-odb" }
 gix-object = { path = "../../gix-object" }
-gix-hash = { path = "../../gix-hash" }
+gix-hash = { path = "../../gix-hash", features = ["sha256"] }
 filetime = "0.2.27"
 bstr = { version = "1.12.0", default-features = false }

gix-index/tests/index/mod.rs

@@ -27,7 +27,9 @@ pub fn loose_file_path(name: &str) -> PathBuf {
 #[test]
 fn size_of_entry() {
     let actual = std::mem::size_of::<gix_index::Entry>();
-    let expected = 80;
+    let sha1 = 80;
+    let sha256_extra = 16;
+    let expected = sha1 + sha256_extra;
     assert!(
         size_ok(actual, expected),
         "the size of this structure should not change unexpectedly: {actual} <~ {expected}"

gix-negotiate/tests/negotiate.rs

@@ -39,7 +39,9 @@ mod baseline;
 #[test]
 fn size_of_entry() {
     let actual = std::mem::size_of::<gix_revwalk::graph::Commit<gix_negotiate::Metadata>>();
-    let expected = 56;
+    let sha1 = 56;
+    let sha256_extra = 16;
+    let expected = sha1 + sha256_extra;
     assert!(
         size_ok(actual, expected),
         "we may keep a lot of these, so let's not let them grow unnoticed: {actual} <~ {expected}"

gix-object/tests/object/main.rs

@@ -80,9 +80,12 @@ fn fixture_name(kind: &str, path: &str) -> Vec<u8> {
 #[test]
 fn size_in_memory() {
     let actual = std::mem::size_of::<gix_object::Object>();
+    let sha1 = 272;
+    let sha256_extra = 16;
+    let expected = sha1 + sha256_extra;
     assert!(
-        actual <= 272,
-        "{actual} <= 272: Prevent unexpected growth of what should be lightweight objects"
+        actual <= expected,
+        "{actual} <= {expected}: Prevent unexpected growth of what should be lightweight objects"
     );
 }
 

gix-pack/Cargo.toml

@@ -65,6 +65,7 @@ gix-tempfile = { version = "^21.0.0", default-features = false, path = "../gix-t
 
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
+gix-hash = { version = "^0.22.0", path = "../gix-hash", features = ["sha256"] }
 
 [package.metadata.docs.rs]
 all-features = true

gix-pack/src/cache/delta/tree.rs

@@ -255,7 +255,9 @@ mod tests {
             }
 
             let actual = std::mem::size_of::<[Item<EntryWithDefault>; 7_500_000]>();
-            let expected = 840_000_000;
+            let sha1 = 840_000_000;
+            let sha256_extra = 120_000_000;
+            let expected = sha1 + sha256_extra;
             assert!(
                 size_ok(actual, expected),
                 "we don't want these to grow unnoticed: {actual} <~ {expected}"

gix-pack/tests/Cargo.toml

@@ -6,7 +6,7 @@ version = "0.0.0"
 repository = "https://github.com/GitoxideLabs/gitoxide"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 license = "MIT OR Apache-2.0"
-description = "Please use `gix-<thiscrate>` instead ('git' -> 'gix')"
+description = "Tests for the gix-pack crate"
 edition = "2021"
 rust-version = "1.82"
 
@@ -27,5 +27,5 @@ bstr = { version = "1.12.0", default-features = false, features = ["std"] }
 maplit = "1.0.2"
 gix-object = { path = "../../gix-object" }
 gix-traverse = { path = "../../gix-traverse" }
-gix-hash = { path = "../../gix-hash" }
+gix-hash = { path = "../../gix-hash", features = ["sha256"] }
 memmap2 = "0.9.7"

gix-pack/tests/pack/data/output/mod.rs

@@ -6,7 +6,9 @@ use gix_testtools::size_ok;
 #[test]
 fn size_of_entry() {
     let actual = std::mem::size_of::<output::Entry>();
-    let expected = 80;
+    let sha1 = 80;
+    let sha256_extra = 32;
+    let expected = sha1 + sha256_extra;
     assert!(
         size_ok(actual, expected),
         "The size of the structure shouldn't change unexpectedly: {actual} <~ {expected}"
@@ -16,7 +18,9 @@ fn size_of_entry() {
 #[test]
 fn size_of_count() {
     let actual = std::mem::size_of::<output::Count>();
-    let expected = 56;
+    let sha1 = 56;
+    let sha256_extra = 16;
+    let expected = sha1 + sha256_extra;
     assert!(
         size_ok(actual, expected),
         "The size of the structure shouldn't change unexpectedly: {actual} <~ {expected}"

gix-pack/tests/pack/iter.rs

@@ -4,7 +4,9 @@ use gix_testtools::size_ok;
 #[test]
 fn size_of_entry() {
     let actual = std::mem::size_of::<pack::data::input::Entry>();
-    let expected = 104;
+    let sha1 = 104;
+    let sha256_extra = 32;
+    let expected = sha1 + sha256_extra;
     assert!(
         size_ok(actual, expected),
         "let's keep the size in check as we have many of them: {actual} <~ {expected}"

gix-ref/src/raw.rs

@@ -100,7 +100,9 @@ mod tests {
     #[test]
     fn size_of_reference() {
         let actual = std::mem::size_of::<Reference>();
-        let expected = 80;
+        let sha1 = 80;
+        let sha256_extra = 24;
+        let expected = sha1 + sha256_extra;
         assert!(
             size_ok(actual, expected),
             "let's not let it change size undetected: {actual} <~ {expected}"

gix-revwalk/tests/revwalk.rs

@@ -5,7 +5,9 @@ mod graph {
         #[test]
         fn size_of_commit() {
             let actual = std::mem::size_of::<gix_revwalk::graph::Commit<()>>();
-            let expected = 48;
+            let sha1 = 48;
+            let sha256_extra = 16;
+            let expected = sha1 + sha256_extra;
             assert!(
                 size_ok(actual, expected),
                 "We might see quite a lot of these, so they shouldn't grow unexpectedly: {actual} <~ {expected}"

gix-worktree-state/tests/Cargo.toml

@@ -24,7 +24,7 @@ gix-object = { path = "../../gix-object" }
 gix-discover = { path = "../../gix-discover" }
 gix-filter = { path = "../../gix-filter" }
 gix-index = { path = "../../gix-index" }
-gix-hash = { path = "../../gix-hash" }
+gix-hash = { path = "../../gix-hash", features = ["sha256"] }
 gix-fs = { path = "../../gix-fs" }
 gix-features = { path = "../../gix-features" }
 gix-testtools = { path = "../../tests/tools" }

gix-worktree/tests/Cargo.toml

@@ -22,7 +22,7 @@ gix-features-parallel = ["gix-features/parallel"]
 gix-worktree = { path = "..", features = ["attributes"] }
 gix-index = { path = "../../gix-index" }
 gix-fs = { path = "../../gix-fs" }
-gix-hash = { path = "../../gix-hash" }
+gix-hash = { path = "../../gix-hash", features = ["sha256"] }
 gix-object = { path = "../../gix-object" }
 gix-glob = { path = "../../gix-glob" }
 gix-path = { path = "../../gix-path" }

gix/Cargo.toml

@@ -411,6 +411,7 @@ document-features = { version = "0.2.0", optional = true }
 gix = { path = ".", default-features = false, features = [
     "need-more-recent-msrv", "tree-error"
 ] }
+gix-hash = { version = "^0.22.0", path = "../gix-hash", features = ["sha256"] }
 pretty_assertions = "1.4.0"
 gix-testtools = { path = "../tests/tools" }
 is_ci = "1.1.1"

gix/src/id.rs

@@ -198,7 +198,9 @@ mod tests {
     #[test]
     fn size_of_oid() {
         let actual = std::mem::size_of::<Id<'_>>();
-        let ceiling = 32;
+        let sha1 = 32;
+        let sha256_extra = 16;
+        let ceiling = sha1 + sha256_extra;
         assert!(
             actual <= ceiling,
             "size of oid shouldn't change without notice: {actual} <= {ceiling}"

gix/tests/gix/object/mod.rs

@@ -7,7 +7,9 @@ use gix_testtools::size_ok;
 #[test]
 fn object_ref_size_in_memory() {
     let actual = std::mem::size_of::<gix::Object<'_>>();
-    let expected = 56;
+    let sha1 = 56;
+    let sha256_extra = 16;
+    let expected = sha1 + sha256_extra;
     assert!(
         size_ok(actual, expected),
         "the size of this structure should not change unexpectedly: {actual} <~ {expected}"
@@ -17,7 +19,9 @@ fn object_ref_size_in_memory() {
 #[test]
 fn oid_size_in_memory() {
     let actual = std::mem::size_of::<gix::Id<'_>>();
-    let expected = 32;
+    let sha1 = 32;
+    let sha256_extra = 16;
+    let expected = sha1 + sha256_extra;
     assert!(
         size_ok(actual, expected),
         "the size of this structure should not change unexpectedly: {actual} <~ {expected}"

gix/tests/gix/revision/spec/from_bytes/mod.rs

@@ -147,7 +147,7 @@ fn bad_objects_are_valid_until_they_are_actually_read_from_the_odb() {
         |
         └─ An error occurred while obtaining an object from the loose object store
         |
-        └─ decompression of loose object at 'tests/fixtures/generated-do-not-edit/make_rev_spec_parse_repos/2990428670-unix/blob.corrupt/objects/ca/fea31147e840161a1860c50af999917ae1536b' failed
+        └─ decompression of loose object at 'tests/fixtures/generated-do-not-edit/make_rev_spec_parse_repos/sha1/2990428670-unix/blob.corrupt/objects/ca/fea31147e840161a1860c50af999917ae1536b' failed
         |
         └─ Could not decode zip stream, status was 'Invalid input data'
         |

gix/tests/gix/status.rs

@@ -29,7 +29,9 @@ mod into_iter {
     #[test]
     fn item_size() {
         let actual = std::mem::size_of::<Item>();
-        let expected = 264;
+        let sha1 = 264;
+        let sha256_extra = 56;
+        let expected = sha1 + sha256_extra;
         assert!(
             size_ok(actual, expected),
             "The size is the same as the one for the index-worktree-item: {actual} <~ {expected}"
@@ -303,7 +305,9 @@ mod index_worktree {
         #[test]
         fn item_size() {
             let actual = std::mem::size_of::<Item>();
-            let expected = 264;
+            let sha1 = 264;
+            let sha256_extra = 56;
+            let expected = sha1 + sha256_extra;
             assert!(
                 size_ok(actual, expected),
                 "The size is pretty huge and goes down ideally: {actual} <~ {expected}"

justfile

@@ -155,24 +155,27 @@ unit-tests:
     cargo nextest run -p gix-archive --no-default-features --features tar_gz --no-fail-fast
     cargo nextest run -p gix-archive --no-default-features --features zip --no-fail-fast
     cargo nextest run -p gix-status-tests --features gix-features-parallel --no-fail-fast
-    cargo nextest run -p gix-worktree-state-tests --features gix-features-parallel --no-fail-fast
-    cargo nextest run -p gix-worktree-tests --features gix-features-parallel --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha1 cargo nextest run -p gix-worktree-state-tests --features gix-features-parallel --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha1 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
     cargo nextest run -p gix-hash --no-fail-fast
     cargo nextest run -p gix-hash --features sha256 --no-fail-fast
     cargo nextest run -p gix-hash --no-default-features --features sha256 --no-fail-fast # TODO: make this actually work by removing 'sha1' from default features.
+    env GIX_TEST_FIXTURE_HASH=sha1 cargo nextest run -p gix-commitgraph --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha256 cargo nextest run -p gix-commitgraph --no-fail-fast
     cargo nextest run -p gix-object --no-fail-fast
     cargo nextest run -p gix-object --features verbose-object-parsing-errors --no-fail-fast
     cargo nextest run -p gix-tempfile --features signals --no-fail-fast
     cargo nextest run -p gix-features --all-features --no-fail-fast
     cargo nextest run -p gix-ref-tests --all-features --no-fail-fast
     cargo nextest run -p gix-odb --all-features --no-fail-fast
     cargo nextest run -p gix-odb-tests --features gix-features-parallel --no-fail-fast
-    cargo nextest run -p gix-pack --all-features --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha1 cargo nextest run -p gix-pack --all-features --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha256 cargo nextest run -p gix-pack --all-features --no-fail-fast
     cargo nextest run -p gix-pack-tests --features all-features --no-fail-fast
     cargo nextest run -p gix-pack-tests --features gix-features-parallel --no-fail-fast
-    cargo nextest run -p gix-index-tests --features gix-features-parallel --no-fail-fast
+    env GIX_TEST_FIXTURE_HASH=sha1 cargo nextest run -p gix-index-tests --features gix-features-parallel --no-fail-fast
     cargo nextest run -p gix-packetline --features blocking-io,maybe-async/is_sync --test blocking-packetline --no-fail-fast
     cargo nextest run -p gix-packetline --features async-io --test async-packetline --no-fail-fast
     cargo nextest run -p gix-transport --features http-client-curl,maybe-async/is_sync --no-fail-fast

tests/tools/Cargo.toml

@@ -25,6 +25,7 @@ default = []
 xz = ["dep:xz2"]
 
 [dependencies]
+gix-hash = { version = "^0.22.0", path = "../../gix-hash" }
 gix-lock = { version = "^21.0.0", path = "../../gix-lock" }
 gix-discover = { version = "^0.46.0", path = "../../gix-discover" }
 gix-worktree = { version = "^0.47.0", path = "../../gix-worktree" }