Merge branch 'various-fixes'

Author: Byron

Cargo.lock

@@ -42,22 +42,22 @@ max = ["max-control", "fast", "gitoxide-core-blocking-client", "http-client-curl
 ## transports as it uses Rust's HTTP implementation.
 ##
 ## As fast as possible, with TUI progress, progress line rendering with auto-configuration, all transports available but less mature pure Rust HTTP implementation, all `ein` tools, CLI colors and local-time support, JSON output, regex support for rev-specs.
-max-pure = ["max-control", "gix-features/rustsha1", "gix-features/zlib-rust-backend", "http-client-reqwest", "gitoxide-core-blocking-client" ]
+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/revparse-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.
 ##
 ## As fast as possible, progress line rendering, all transports based on their most mature implementation (HTTP), all `ein` tools, CLI colors and local-time support, JSON output.
-lean = ["fast", "tracing", "pretty-cli", "http-client-curl", "gitoxide-core-tools-query", "gitoxide-core-tools-corpus", "gitoxide-core-tools", "gitoxide-core-blocking-client", "prodash-render-line" ]
+lean = ["fast", "tracing", "pretty-cli", "http-client-curl", "gitoxide-core-tools-query", "gitoxide-core-tools-corpus", "gitoxide-core-tools", "gitoxide-core-blocking-client", "prodash-render-line"]
 
 ## The smallest possible build, best suitable for small single-core machines.
 ##
 ## This build is essentially limited to local operations without any fanciness.
 ##
 ## Optimized for size, no parallelism thus much slower, progress line rendering.
-small = ["pretty-cli", "gix-features/rustsha1", "gix-features/zlib-rust-backend", "prodash-render-line", "is-terminal"  ]
+small = ["pretty-cli", "gix-features/rustsha1", "gix-features/zlib-rust-backend", "prodash-render-line", "is-terminal"]
 
 ## Like lean, but uses Rusts async implementations for networking.
 ##
@@ -107,12 +107,12 @@ fast = ["gix/max-performance", "gix/comfort"]
 fast-safe = ["gix/max-performance-safe", "gix/comfort"]
 
 ## Enable tracing in `gitoxide-core`.
-tracing = ["dep:tracing-forest", "dep:tracing-subscriber", "dep:tracing", "gix-features/tracing", "gix-features/tracing-detail" ]
+tracing = ["dep:tracing-forest", "dep:tracing-subscriber", "dep:tracing", "gix-features/tracing", "gix-features/tracing-detail"]
 
 ## Use `clap` 3.0 to build the prettiest, best documented and most user-friendly CLI at the expense of binary size.
 ## Provides a terminal user interface for detailed and exhaustive progress.
 ## Provides a line renderer for leaner progress display, without the need for a full-blown TUI.
-pretty-cli = [ "gitoxide-core/serde", "prodash/progress-tree", "prodash/progress-tree-log", "prodash/local-time", "env_logger/humantime", "env_logger/color", "env_logger/auto-color" ]
+pretty-cli = ["gitoxide-core/serde", "prodash/progress-tree", "prodash/progress-tree-log", "prodash/local-time", "env_logger/humantime", "env_logger/color", "env_logger/auto-color"]
 
 ## The `--verbose` flag will be powered by an interactive progress mechanism that doubles as log as well as interactive progress
 ## that appears after a short duration.
@@ -285,9 +285,7 @@ members = [
     "gix-worktree-stream",
     "gix-revwalk",
     "gix-fsck",
-
     "tests/tools",
-
     "gix-diff/tests",
     "gix-pack/tests",
     "gix-odb/tests",

Cargo.toml

@@ -8,20 +8,6 @@
 # More documentation for the advisories section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
 [advisories]
-# The path where the advisory database is cloned/fetched into
-db-path = "~/.cargo/advisory-db"
-# The url(s) of the advisory databases to use
-db-urls = ["https://github.com/rustsec/advisory-db"]
-# The lint level for security vulnerabilities
-vulnerability = "deny"
-# The lint level for unmaintained crates
-unmaintained = "warn"
-# The lint level for crates that have been yanked from their source registry
-yanked = "warn"
-# The lint level for crates with security notices. Note that as of
-# 2019-12-17 there are no security notice advisories in
-# https://github.com/rustsec/advisory-db
-notice = "warn"
 ignore = [
     # this is `rustls@0.20.9` coming in with `curl`, which doesn't have an update yet. It's only active optionally, not by default.
     "RUSTSEC-2024-0336",
@@ -33,28 +19,20 @@ ignore = [
 # More documentation for the licenses section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
 [licenses]
-# The lint level for crates which do not have a detectable license
-unlicensed = "deny"
 # List of explicitly allowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].
 allow = [
     "Apache-2.0",
     "BSD-3-Clause",
+    "BSL-1.0",
     "MIT",
     "MIT-0",
     "ISC",
     "Unicode-DFS-2016",
     "LicenseRef-ring",
     "Zlib"
 ]
-# Lint level for licenses considered copyleft
-copyleft = "allow"
-# Lint level used when no other predicates are matched
-# 1. License isn't in the allow or deny lists
-# 2. License isn't copyleft
-# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
-default = "deny"
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the
 # canonical license text of a valid SPDX license file.

deny.toml

@@ -23,7 +23,7 @@ estimate-hours = ["dep:fs-err", "dep:crossbeam-channel", "dep:smallvec"]
 query = ["dep:rusqlite"]
 ## Run algorithms on a corpus of repositories and store their results for later comparison and intelligence gathering.
 ## *Note that* `organize` we need for finding git repositories fast.
-corpus = [ "dep:rusqlite", "dep:sysinfo", "organize", "dep:crossbeam-channel", "dep:serde_json", "dep:tracing-forest", "dep:tracing-subscriber", "tracing", "dep:parking_lot" ]
+corpus = ["dep:rusqlite", "dep:sysinfo", "organize", "dep:crossbeam-channel", "dep:serde_json", "dep:tracing-forest", "dep:tracing-subscriber", "tracing", "dep:parking_lot"]
 
 ## The ability to create archives from virtual worktrees, similar to `git archive`.
 archive = ["dep:gix-archive-for-configuration-only", "gix/worktree-archive"]
@@ -77,7 +77,7 @@ crossbeam-channel = { version = "0.5.6", optional = true }
 smallvec = { version = "1.10.0", optional = true }
 
 # for 'query' and 'corpus'
-rusqlite = { version = "0.30.0", optional = true, features = ["bundled"] }
+rusqlite = { version = "0.31.0", optional = true, features = ["bundled"] }
 
 # for 'corpus'
 parking_lot = { version = "0.12.1", optional = true }

gitoxide-core/Cargo.toml

@@ -84,3 +84,11 @@ pub use discover::discover;
 
 #[cfg(all(feature = "async-client", feature = "blocking-client"))]
 compile_error!("Cannot set both 'blocking-client' and 'async-client' features as they are mutually exclusive");
+
+fn is_dir_to_mode(is_dir: bool) -> gix::index::entry::Mode {
+    if is_dir {
+        gix::index::entry::Mode::DIR
+    } else {
+        gix::index::entry::Mode::FILE
+    }
+}

gitoxide-core/src/lib.rs

@@ -14,6 +14,7 @@ pub(crate) mod function {
     use gix::bstr::BStr;
 
     use crate::{
+        is_dir_to_mode,
         repository::{
             attributes::query::{attributes_cache, Options},
             PathsOrPatterns,
@@ -38,12 +39,12 @@ pub(crate) mod function {
         match input {
             PathsOrPatterns::Paths(paths) => {
                 for path in paths {
-                    let is_dir = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
+                    let mode = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
                         .metadata()
                         .ok()
-                        .map(|m| m.is_dir());
+                        .map(|m| is_dir_to_mode(m.is_dir()));
 
-                    let entry = cache.at_entry(path.as_slice(), is_dir)?;
+                    let entry = cache.at_entry(path.as_slice(), mode)?;
                     if !entry.matching_attributes(&mut matches) {
                         continue;
                     }
@@ -61,9 +62,9 @@ pub(crate) mod function {
                 )?;
                 let mut pathspec_matched_entry = false;
                 if let Some(it) = pathspec.index_entries_with_paths(&index) {
-                    for (path, _entry) in it {
+                    for (path, entry) in it {
                         pathspec_matched_entry = true;
-                        let entry = cache.at_entry(path, Some(false))?;
+                        let entry = cache.at_entry(path, entry.mode.into())?;
                         if !entry.matching_attributes(&mut matches) {
                             continue;
                         }
@@ -87,10 +88,10 @@ pub(crate) mod function {
                         let path = pattern.path();
                         let entry = cache.at_entry(
                             path,
-                            Some(
+                            Some(is_dir_to_mode(
                                 workdir.map_or(false, |wd| wd.join(gix::path::from_bstr(path)).is_dir())
                                     || pattern.signature.contains(gix::pathspec::MagicSignature::MUST_BE_DIR),
-                            ),
+                            )),
                         )?;
                         if !entry.matching_attributes(&mut matches) {
                             continue;

gitoxide-core/src/repository/attributes/query.rs

@@ -192,7 +192,7 @@ pub(crate) mod function {
         );
 
         for (rela_path, baseline) in rx_base {
-            let entry = cache.at_entry(rela_path.as_str(), Some(false))?;
+            let entry = cache.at_entry(rela_path.as_str(), None)?;
             match baseline {
                 Baseline::Attribute { assignments: expected } => {
                     entry.matching_attributes(&mut matches);

gitoxide-core/src/repository/attributes/validate_baseline.rs

@@ -3,7 +3,7 @@ use std::{borrow::Cow, io};
 use anyhow::bail;
 use gix::bstr::BStr;
 
-use crate::{repository::PathsOrPatterns, OutputFormat};
+use crate::{is_dir_to_mode, repository::PathsOrPatterns, OutputFormat};
 
 pub mod query {
     use std::ffi::OsString;
@@ -44,11 +44,11 @@ pub fn query(
     match input {
         PathsOrPatterns::Paths(paths) => {
             for path in paths {
-                let is_dir = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
+                let mode = gix::path::from_bstr(Cow::Borrowed(path.as_ref()))
                     .metadata()
                     .ok()
-                    .map(|m| m.is_dir());
-                let entry = cache.at_entry(path.as_slice(), is_dir)?;
+                    .map(|m| is_dir_to_mode(m.is_dir()));
+                let entry = cache.at_entry(path.as_slice(), mode)?;
                 let match_ = entry
                     .matching_exclude_pattern()
                     .and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));
@@ -66,9 +66,9 @@ pub fn query(
             )?;
 
             if let Some(it) = pathspec.index_entries_with_paths(&index) {
-                for (path, _entry) in it {
+                for (path, entry) in it {
                     pathspec_matched_something = true;
-                    let entry = cache.at_entry(path, Some(false))?;
+                    let entry = cache.at_entry(path, entry.mode.into())?;
                     let match_ = entry
                         .matching_exclude_pattern()
                         .and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));
@@ -92,10 +92,10 @@ pub fn query(
                     let path = pattern.path();
                     let entry = cache.at_entry(
                         path,
-                        Some(
+                        Some(is_dir_to_mode(
                             workdir.map_or(false, |wd| wd.join(gix::path::from_bstr(path)).is_dir())
                                 || pattern.signature.contains(gix::pathspec::MagicSignature::MUST_BE_DIR),
-                        ),
+                        )),
                     )?;
                     let match_ = entry
                         .matching_exclude_pattern()

gitoxide-core/src/repository/exclude.rs

@@ -31,6 +31,7 @@ pub(crate) mod function {
     };
 
     use crate::{
+        is_dir_to_mode,
         repository::index::entries::{Attributes, Options},
         OutputFormat,
     };
@@ -174,7 +175,7 @@ pub(crate) mod function {
                                         }
                                         // The user doesn't want attributes, so we set the cache position on demand only
                                         None => cache
-                                            .at_entry(rela_path, Some(is_dir))
+                                            .at_entry(rela_path, Some(is_dir_to_mode(is_dir)))
                                             .ok()
                                             .map(|platform| platform.matching_attributes(out))
                                             .unwrap_or_default(),

gitoxide-core/src/repository/index/entries.rs

@@ -127,11 +127,10 @@ pub(crate) mod function {
             }
             gix::object::Kind::Blob if cache.is_some() && spec.path_and_mode().is_some() => {
                 let (path, mode) = spec.path_and_mode().expect("is present");
-                let is_dir = Some(mode.is_tree());
                 match cache.expect("is some") {
                     (BlobFormat::Git, _) => unreachable!("no need for a cache when querying object db"),
                     (BlobFormat::Worktree, cache) => {
-                        let platform = cache.attr_stack.at_entry(path, is_dir, &repo.objects)?;
+                        let platform = cache.attr_stack.at_entry(path, Some(mode.into()), &repo.objects)?;
                         let object = id.object()?;
                         let mut converted = cache.filter.worktree_filter.convert_to_worktree(
                             &object.data,

gitoxide-core/src/repository/revision/resolve.rs

@@ -31,7 +31,7 @@ gix-path = { version = "^0.10.7", path = "../gix-path", optional = true }
 gix-date = { version = "^0.8.6", path = "../gix-date" }
 
 flate2 = { version = "1.0.26", optional = true }
-zip = { version = "0.6.6", optional = true, default-features = false, features = ["deflate", "time"] }
+zip = { version = "1.3.1", optional = true, default-features = false, features = ["deflate", "time"] }
 time = { version = "0.3.23", optional = true, default-features = false, features = ["std"] }
 
 thiserror = "1.0.26"
@@ -42,13 +42,13 @@ tar = { version = "0.4.38", optional = true }
 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", default-features = false, features = ["attributes"]}
-gix-hash = { path = "../gix-hash"}
-gix-attributes = { path = "../gix-attributes"}
-gix-object = { path = "../gix-object"}
-gix-filter = { path = "../gix-filter"}
+gix-testtools = { path = "../tests/tools" }
+gix-odb = { path = "../gix-odb" }
+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-filter = { path = "../gix-filter" }
 
 [package.metadata.docs.rs]
 all-features = true

gix-archive/Cargo.toml

@@ -126,7 +126,7 @@ where
     NextFn: FnMut(&mut Stream) -> Result<Option<Entry<'_>>, gix_worktree_stream::entry::Error>,
 {
     let compression_level = match opts.format {
-        Format::Zip { compression_level } => compression_level.map(|lvl| lvl as i32),
+        Format::Zip { compression_level } => compression_level.map(|lvl| lvl as i64),
         _other => return write_stream(stream, next_entry, out, opts),
     };
 
@@ -161,10 +161,10 @@ fn append_zip_entry<W: std::io::Write + std::io::Seek>(
     mut entry: gix_worktree_stream::Entry<'_>,
     buf: &mut Vec<u8>,
     mtime: zip::DateTime,
-    compression_level: Option<i32>,
+    compression_level: Option<i64>,
     tree_prefix: Option<&bstr::BString>,
 ) -> Result<(), Error> {
-    let file_opts = zip::write::FileOptions::default()
+    let file_opts = zip::write::FileOptions::<'_, ()>::default()
         .compression_method(zip::CompressionMethod::Deflated)
         .compression_level(compression_level)
         .large_file(entry.bytes_remaining().map_or(true, |len| len > u32::MAX as usize))

gix-archive/src/write.rs

@@ -208,7 +208,11 @@ mod from_tree {
                 );
                 let mut link = ar.by_name("prefix/symlink-to-a")?;
                 assert!(!link.is_dir());
-                assert!(link.is_file(), "no symlink differentiation");
+                assert_eq!(
+                    link.is_symlink(),
+                    cfg!(not(windows)),
+                    "symlinks are supported as well, but only on Unix"
+                );
                 assert_eq!(
                     link.unix_mode(),
                     Some(if cfg!(windows) { 0o100644 } else { 0o120644 }),
@@ -233,7 +237,7 @@ mod from_tree {
             noop_pipeline(),
             move |rela_path, mode, attrs| {
                 cache
-                    .at_entry(rela_path, mode.is_tree().into(), &odb)
+                    .at_entry(rela_path, Some(mode.into()), &odb)
                     .map(|entry| entry.matching_attributes(attrs))
                     .map(|_| ())
             },

gix-archive/tests/archive.rs

@@ -19,13 +19,13 @@ name = "mem"
 path = "mem.rs"
 
 [dev-dependencies]
-gix-config = { path = ".."}
-gix-testtools = { path = "../../tests/tools"}
+gix-config = { path = ".." }
+gix-testtools = { path = "../../tests/tools" }
 gix = { path = "../../gix", default-features = false }
 gix-ref = { path = "../../gix-ref" }
 gix-path = { path = "../../gix-path" }
 gix-sec = { path = "../../gix-sec" }
-serial_test = { version = "2.0.0", default-features = false }
+serial_test = { version = "3.1.0", default-features = false }
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 
 bytesize = "1.3.0"

gix-config/tests/Cargo.toml

@@ -583,14 +583,14 @@ impl Platform {
         if self.diff_cache.contains_key(storage) {
             return Ok(());
         }
-        let entry = self
-            .attr_stack
-            .at_entry(rela_path, Some(false), objects)
-            .map_err(|err| set_resource::Error::Attributes {
-                source: err,
-                kind,
-                rela_path: rela_path.to_owned(),
-            })?;
+        let entry =
+            self.attr_stack
+                .at_entry(rela_path, None, objects)
+                .map_err(|err| set_resource::Error::Attributes {
+                    source: err,
+                    kind,
+                    rela_path: rela_path.to_owned(),
+                })?;
         let mut buf = Vec::new();
         let out = self.filter.convert_to_diffable(
             &id,