fix: use tempfile permissions support to set the correct mode on unix.

Previousoly it would make an additional syscall to change permissions, which
is slower than necessary.

Author: Byron

gix-odb/Cargo.toml

@@ -15,33 +15,25 @@ doctest = false
 
 [features]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
-serde= ["dep:serde", "gix-hash/serde", "gix-object/serde", "gix-pack/serde"]
+serde = ["dep:serde", "gix-hash/serde", "gix-object/serde", "gix-pack/serde"]
 
 [dependencies]
-gix-features = { version = "^0.38.1", path = "../gix-features", features = ["rustsha1", "walkdir", "zlib", "crc32" ] }
+gix-features = { version = "^0.38.1", path = "../gix-features", features = ["rustsha1", "walkdir", "zlib", "crc32"] }
 gix-hash = { version = "^0.14.2", path = "../gix-hash" }
 gix-date = { version = "^0.8.5", path = "../gix-date" }
 gix-path = { version = "^0.10.7", path = "../gix-path" }
 gix-quote = { version = "^0.4.12", path = "../gix-quote" }
 gix-object = { version = "^0.42.0", path = "../gix-object" }
 gix-pack = { version = "^0.50.0", path = "../gix-pack", default-features = false }
 gix-fs = { version = "^0.10.2", path = "../gix-fs" }
-serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
+serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 
-tempfile = "3.1.0"
+tempfile = "3.10.0"
 thiserror = "1.0.26"
 parking_lot = { version = "0.12.0" }
 arc-swap = "1.5.0"
 
 document-features = { version = "0.2.0", optional = true }
 
-#[dev-dependencies]
-#gix-testtools = { path = "../tests/tools"}
-#gix-actor = { path = "../gix-actor" }
-#pretty_assertions = "1.0.0"
-#filetime = "0.2.15"
-#maplit = "1.0.2"
-#crossbeam-channel = "0.5.6"
-
 [package.metadata.docs.rs]
 features = ["document-features", "serde"]

gix-odb/src/store_impls/loose/write.rs

@@ -107,8 +107,16 @@ impl Store {
 
 impl Store {
     fn dest(&self) -> Result<hash::Write<CompressedTempfile>, Error> {
+        #[cfg_attr(not(unix), allow(unused_mut))]
+        let mut builder = tempfile::Builder::new();
+        #[cfg(unix)]
+        {
+            use std::os::unix::fs::PermissionsExt;
+            let perms = std::fs::Permissions::from_mode(0o444);
+            builder.permissions(perms);
+        }
         Ok(hash::Write::new(
-            deflate::Write::new(NamedTempFile::new_in(&self.path).map_err(|err| Error::Io {
+            deflate::Write::new(builder.tempfile_in(&self.path).map_err(|err| Error::Io {
                 source: err,
                 message: "create named temp file in",
                 path: self.path.to_owned(),
@@ -144,24 +152,6 @@ impl Store {
                 return Ok(id);
             }
         }
-        #[cfg(unix)]
-        if let Ok(mut perm) = object_path.metadata().map(|m| m.permissions()) {
-            use std::os::unix::fs::PermissionsExt;
-            /// For now we assume the default with standard umask. This can be more sophisticated,
-            /// but we have the bare minimum.
-            fn comp_mode(_mode: u32) -> u32 {
-                0o444
-            }
-            let new_mode = comp_mode(perm.mode());
-            if (perm.mode() ^ new_mode) & !0o170000 != 0 {
-                perm.set_mode(new_mode);
-                std::fs::set_permissions(&object_path, perm).map_err(|err| Error::Io {
-                    source: err,
-                    message: "Failed to set permission bits",
-                    path: object_path.clone(),
-                })?;
-            }
-        }
         res.map_err(|err| Error::Persist {
             source: err,
             target: object_path,