fix: symlink support for zip archives

This started working with the upgradde of the `zip` crate.

Author: Byron

Cargo.lock

@@ -25,6 +25,7 @@ ignore = [
 allow = [
     "Apache-2.0",
     "BSD-3-Clause",
+    "BSL-1.0",
     "MIT",
     "MIT-0",
     "ISC",

deny.toml

@@ -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,7 @@ 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!(link.is_symlink(), "symlinks are supported as well");
                 assert_eq!(
                     link.unix_mode(),
                     Some(if cfg!(windows) { 0o100644 } else { 0o120644 }),