Merge branch 'optimizations'

Author: Byron

Cargo.lock

@@ -44,7 +44,7 @@ max = ["max-control", "fast", "gitoxide-core-blocking-client", "http-client-curl
 max-pure = ["max-control", "gix-features/rustsha1", "gix-features/zlib-rust-backend", "http-client-reqwest", "gitoxide-core-blocking-client" ]
 
 ## Like `max`, but with more control for configuration. See the *Package Maintainers* headline for more information.
-max-control = ["tracing", "fast-safe", "pretty-cli", "gitoxide-core-tools-query", "gitoxide-core-tools-corpus", "gitoxide-core-tools", "prodash-render-line", "prodash-render-tui", "prodash/render-line-autoconfigure", "gix/regex" ]
+max-control = ["tracing", "fast-safe", "pretty-cli", "gitoxide-core-tools-query", "gitoxide-core-tools-corpus", "gitoxide-core-tools", "prodash-render-line", "prodash-render-tui", "prodash/render-line-autoconfigure", "gix/revparse-regex" ]
 
 ## All of the good stuff, with less fanciness for smaller binaries.
 ##

Cargo.toml

@@ -44,8 +44,8 @@ serde = ["gix/serde", "dep:serde_json", "dep:serde", "bytesize/serde"]
 
 [dependencies]
 # deselect everything else (like "performance") as this should be controllable by the parent application.
-gix = { version = "^0.53.0", path = "../gix", default-features = false }
-gix-pack-for-configuration-only = { package = "gix-pack", version = "^0.41.0", path = "../gix-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static"] }
+gix = { version = "^0.53.0", path = "../gix", default-features = false, features = ["blob-diff", "revision", "mailmap", "excludes", "attributes", "worktree-mutation", "credentials", "interrupt"] }
+gix-pack-for-configuration-only = { package = "gix-pack", version = "^0.41.0", path = "../gix-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static", "generate", "streaming-input"] }
 gix-transport-configuration-only = { package = "gix-transport", version = "^0.35.0", path = "../gix-transport", default-features = false }
 gix-archive-for-configuration-only = { package = "gix-archive", version = "^0.3.0", path = "../gix-archive", optional = true, features = ["tar", "tar_gz"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }

gitoxide-core/Cargo.toml

@@ -2,7 +2,7 @@ use std::borrow::Cow;
 use std::io;
 
 use anyhow::{anyhow, bail};
-use gix::{bstr::BStr, prelude::FindExt};
+use gix::bstr::BStr;
 
 use crate::{repository::PathsOrPatterns, OutputFormat};
 
@@ -49,7 +49,7 @@ pub fn query(
                     .metadata()
                     .ok()
                     .map(|m| m.is_dir());
-                let entry = cache.at_entry(path.as_slice(), is_dir, |oid, buf| repo.objects.find_blob(oid, buf))?;
+                let entry = cache.at_entry(path.as_slice(), is_dir)?;
                 let match_ = entry
                     .matching_exclude_pattern()
                     .and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));
@@ -68,7 +68,7 @@ pub fn query(
                 .index_entries_with_paths(&index)
                 .ok_or_else(|| anyhow!("Pathspec didn't yield any entry"))?
             {
-                let entry = cache.at_entry(path, Some(false), |oid, buf| repo.objects.find_blob(oid, buf))?;
+                let entry = cache.at_entry(path, Some(false))?;
                 let match_ = entry
                     .matching_exclude_pattern()
                     .and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));

gitoxide-core/src/repository/exclude.rs

@@ -43,7 +43,7 @@ document-features = { version = "0.2.0", optional = true }
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools"}
 gix-odb = { path = "../gix-odb"}
-gix-worktree = { path = "../gix-worktree"}
+gix-worktree = { path = "../gix-worktree", default-features = false, features = ["attributes"]}
 gix-hash = { path = "../gix-hash"}
 gix-attributes = { path = "../gix-attributes"}
 gix-object = { path = "../gix-object"}

gix-archive/Cargo.toml

@@ -20,14 +20,14 @@ serde = ["dep:serde", "bstr/serde", "gix-glob/serde", "kstring/serde"]
 gix-path = { version = "^0.9.0", path = "../gix-path" }
 gix-quote = { version = "^0.4.7", path = "../gix-quote" }
 gix-glob = { version = "^0.11.0", path = "../gix-glob" }
+gix-trace = { version = "^0.1.3", path = "../gix-trace" }
 
 bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"]}
 smallvec = "1.10.0"
 kstring = "2.0.0"
 unicode-bom = "2.0.2"
 thiserror = "1.0.26"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
-log = "0.4.17"
 
 document-features = { version = "0.2.1", optional = true }
 

gix-attributes/Cargo.toml

@@ -124,7 +124,7 @@ impl Search {
 impl Pattern for Attributes {
     type Value = Value;
 
-    fn bytes_to_patterns(bytes: &[u8], source: &std::path::Path) -> Vec<pattern::Mapping<Self::Value>> {
+    fn bytes_to_patterns(bytes: &[u8], _source: &std::path::Path) -> Vec<pattern::Mapping<Self::Value>> {
         fn into_owned_assignments<'a>(
             attrs: impl Iterator<Item = Result<crate::AssignmentRef<'a>, crate::name::Error>>,
         ) -> Option<Assignments> {
@@ -138,8 +138,8 @@ impl Pattern for Attributes {
                 .collect::<Result<Assignments, _>>();
             match res {
                 Ok(res) => Some(res),
-                Err(err) => {
-                    log::warn!("{}", err);
+                Err(_err) => {
+                    gix_trace::warn!("{}", _err);
                     None
                 }
             }
@@ -148,8 +148,8 @@ impl Pattern for Attributes {
         crate::parse(bytes)
             .filter_map(|res| match res {
                 Ok(pattern) => Some(pattern),
-                Err(err) => {
-                    log::warn!("{}: {}", source.display(), err);
+                Err(_err) => {
+                    gix_trace::warn!("{}: {}", _source.display(), _err);
                     None
                 }
             })

gix-attributes/src/search/attributes.rs

@@ -24,7 +24,6 @@ gix-sec = { version = "^0.9.0", path = "../gix-sec" }
 gix-ref = { version = "^0.35.0", path = "../gix-ref" }
 gix-glob = { version = "^0.11.0", path = "../gix-glob" }
 
-log = "0.4.17"
 winnow = { version = "0.5.14", features = ["simd"] }
 memchr = "2"
 thiserror = "1.0.26"

gix-config/Cargo.toml

@@ -92,7 +92,7 @@ impl File<'static> {
                     Err(err) => {
                         let err = Error::Io { source: err, path };
                         if options.ignore_io_errors {
-                            log::warn!("ignoring: {err:#?}");
+                            gix_features::trace::warn!("ignoring: {err:#?}");
                             continue;
                         } else {
                             return Err(err);
@@ -104,7 +104,7 @@ impl File<'static> {
                 Ok(_) => {}
                 Err(err) => {
                     if options.ignore_io_errors {
-                        log::warn!(
+                        gix_features::trace::warn!(
                             "ignoring: {:#?}",
                             Error::Io {
                                 source: err,

gix-config/src/file/init/from_paths.rs

@@ -17,7 +17,7 @@ path = "config.rs"
 [dev-dependencies]
 gix-config = { path = ".."}
 gix-testtools = { path = "../../tests/tools"}
-gix = { path = "../../gix" }
+gix = { path = "../../gix", default-features = false }
 gix-ref = { path = "../../gix-ref" }
 gix-path = { path = "../../gix-path" }
 gix-sec = { path = "../../gix-sec" }

gix-config/tests/Cargo.toml

@@ -30,4 +30,4 @@ smallvec = "1.10.0"
 [dev-dependencies]
 once_cell = "1.18.0"
 gix-testtools = { path = "../tests/tools" }
-gix-worktree = { path = "../gix-worktree" }
+gix-worktree = { path = "../gix-worktree", default-features = false, features = ["attributes"] }

gix-filter/Cargo.toml

@@ -20,7 +20,7 @@ gix-features-parallel = ["gix-features/parallel"]
 gix-index = { path = ".." }
 gix-features = { path = "../../gix-features", features = ["rustsha1", "progress"] }
 gix-testtools = { path = "../../tests/tools"}
-gix = { path = "../../gix"}
+gix = { path = "../../gix", default-features = false, features = ["index"] }
 gix-hash = { path = "../../gix-hash"}
 filetime = "0.2.15"
 bstr = { version = "1.3.0", default-features = false }

gix-index/tests/Cargo.toml

@@ -24,7 +24,7 @@ gix-date = { version = "^0.7.4", path = "../gix-date" }
 gix-path = { version = "^0.9.0", path = "../gix-path" }
 gix-quote = { version = "^0.4.7", path = "../gix-quote" }
 gix-object = { version = "^0.35.0", path = "../gix-object" }
-gix-pack = { version = "^0.41.0", path = "../gix-pack" }
+gix-pack = { version = "^0.41.0", path = "../gix-pack", default-features = false }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
 tempfile = "3.1.0"

gix-odb/Cargo.toml

@@ -14,7 +14,11 @@ autotests = false
 doctest = false
 
 [features]
-
+default = ["generate", "streaming-input"]
+## generate new packs from a set of objects.
+generate = ["dep:gix-traverse", "dep:gix-diff"]
+## Receive a pack as datastream and resolve it
+streaming-input = []
 ## Provide a fixed-size allocation-free LRU cache for packs. It's useful if caching is desired while keeping the memory footprint
 ## for the LRU-cache itself low.
 pack-cache-lru-static = ["dep:uluru"]
@@ -25,22 +29,26 @@ object-cache-dynamic = ["dep:clru"]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
 serde = ["dep:serde", "gix-object/serde"]
 ## Make it possible to compile to the `wasm32-unknown-unknown` target.
-wasm = ["gix-diff/wasm"]
+wasm = ["gix-diff?/wasm"]
 
 [dependencies]
 gix-features = { version = "^0.33.0", path = "../gix-features", features = ["crc32", "rustsha1", "progress", "zlib"] }
 gix-path = { version = "^0.9.0", path = "../gix-path" }
 gix-hash = { version = "^0.12.0", path = "../gix-hash" }
 gix-chunk = { version = "^0.4.4", path = "../gix-chunk" }
 gix-object = { version = "^0.35.0", path = "../gix-object" }
-gix-traverse = { version = "^0.31.0", path = "../gix-traverse" }
-gix-diff = { version = "^0.34.0", path = "../gix-diff" }
 gix-hashtable = { version = "^0.3.0", path = "../gix-hashtable" }
 
+# for streaming of packs (input, output)
+gix-traverse = { version = "^0.31.0", path = "../gix-traverse", optional = true }
+gix-diff = { version = "^0.34.0", path = "../gix-diff", default-features = false, optional = true }
+
 memmap2 = "0.7.0"
 smallvec = "1.3.0"
 parking_lot = { version = "0.12.0", default-features = false }
 thiserror = "1.0.26"
+
+# for caching
 uluru = { version = "3.0.0", optional = true }
 clru = { version = "0.6.1", optional = true }
 

gix-pack/Cargo.toml

@@ -3,7 +3,7 @@ pub mod init;
 
 mod find;
 ///
-#[cfg(not(feature = "wasm"))]
+#[cfg(all(not(feature = "wasm"), feature = "streaming-input"))]
 pub mod write;
 
 ///

gix-pack/src/bundle/mod.rs

@@ -73,12 +73,11 @@ where
         }
         self.num_entries += 1;
         entry.header.write_to(entry.decompressed_size, &mut self.output)?;
-        std::io::copy(
-            &mut entry
+        self.output.write_all(
+            entry
                 .compressed
                 .as_deref()
                 .expect("caller must configure generator to keep compressed bytes"),
-            &mut self.output,
         )?;
         Ok(entry)
     }

gix-pack/src/data/input/entries_to_bytes.rs

@@ -37,9 +37,11 @@ pub mod init {
 pub mod entry;
 
 ///
+#[cfg(feature = "streaming-input")]
 pub mod input;
 
 /// Utilities to encode pack data entries and write them to a `Write` implementation to resemble a pack data file.
+#[cfg(feature = "generate")]
 pub mod output;
 
 /// A slice into a pack file denoting a pack entry.