first PoC for writing long paths, even though it doens't produce the entire file yet

Author: Byron

git-index/src/entry/write.rs

@@ -1,4 +1,4 @@
-use crate::{Entry, State};
+use crate::{entry, Entry, State};
 use std::convert::TryInto;
 
 impl Entry {
@@ -17,14 +17,13 @@ impl Entry {
         out.write_all(&stat.size.to_be_bytes())?;
         out.write_all(self.id.as_bytes())?;
         let path = self.path(state);
-        let path_len: u16 = path
-            .len()
-            .try_into()
-            .expect("Cannot handle paths longer than 16bits ever");
-        assert!(
-            path_len <= 0xFFF,
-            "Paths can't be longer than 12 bits as they share space with bit flags in a u16"
-        );
+        let path_len: u16 = if path.len() >= entry::Flags::PATH_LEN.bits() as usize {
+            entry::Flags::PATH_LEN.bits() as u16
+        } else {
+            path.len()
+                .try_into()
+                .expect("we just checked that the length is smaller than 0xfff")
+        };
         out.write_all(&(self.flags.to_storage().bits() | path_len).to_be_bytes())?;
         out.write_all(path)?;
         out.write_all(b"\0")

git-index/tests/index-multi-threaded.rs

@@ -1,2 +1,4 @@
+pub use git_testtools::Result;
+
 mod index;
 pub use index::*;

git-index/tests/index-single-threaded.rs

@@ -1,3 +1,5 @@
+pub use git_testtools::Result;
+
 #[cfg(not(feature = "internal-testing-git-features-parallel"))]
 mod index;
 #[cfg(not(feature = "internal-testing-git-features-parallel"))]

git-index/tests/index/file/write.rs

@@ -5,17 +5,16 @@ use git_index::{decode, extension, write, State, Version};
 use std::cmp::{max, min};
 
 #[test]
-#[ignore]
-fn roundtrips() {
+fn roundtrips() -> crate::Result {
     enum Kind {
         Generated(&'static str),
         Loose(&'static str),
     }
     use Kind::*;
     let input = [
-        (Loose("very-long-path"), write::Options::default()),
-        (Generated("v2"), write::Options::default()),
-        (Generated("V2_empty"), write::Options::default()),
+        (Loose("very-long-path"), write::Options::default(), false), // unclear why the file is smaller when written back
+        (Generated("v2"), write::Options::default(), true),
+        (Generated("V2_empty"), write::Options::default(), true),
         (
             Generated("v2_more_files"),
             write::Options {
@@ -25,24 +24,28 @@ fn roundtrips() {
                 },
                 ..write::Options::default()
             },
+            true,
         ),
     ];
 
-    for (fixture, options) in input {
+    for (fixture, options, compare_byte_by_byte) in input {
         let (path, fixture) = match fixture {
             Generated(name) => (crate::fixture_index_path(name), name),
             Loose(name) => (loose_file_path(name), name),
         };
-        let expected_index = git_index::File::at(&path, decode::Options::default()).unwrap();
-        let expected_bytes = std::fs::read(&path).unwrap();
+        let expected = git_index::File::at(&path, decode::Options::default())?;
+        let expected_bytes = std::fs::read(&path)?;
         let mut out_bytes = Vec::new();
 
-        expected_index.write_to(&mut out_bytes, options).unwrap();
-        let (out_index, _) = State::from_bytes(&out_bytes, FileTime::now(), decode::Options::default()).unwrap();
+        expected.write_to(&mut out_bytes, options)?;
+        let (actual, _) = State::from_bytes(&out_bytes, FileTime::now(), decode::Options::default())?;
 
-        compare_states(&out_index, &expected_index, options, fixture);
-        compare_raw_bytes(&out_bytes, &expected_bytes, fixture);
+        compare_states(&actual, &expected, options, fixture);
+        if compare_byte_by_byte {
+            compare_raw_bytes(&out_bytes, &expected_bytes, fixture);
+        }
     }
+    Ok(())
 }
 
 #[test]
@@ -135,12 +138,13 @@ fn v2_index_eoie_extensions() {
     }
 }
 
-fn compare_states(generated: &State, expected: &State, options: write::Options, fixture: &str) {
-    generated.verify_entries().expect("valid");
-    generated.verify_extensions(false, no_find).expect("valid");
-    assert_eq!(generated.version(), options.version, "version mismatch in {}", fixture);
+fn compare_states(actual: &State, expected: &State, options: write::Options, fixture: &str) {
+    actual.verify_entries().expect("valid");
+    actual.verify_extensions(false, no_find).expect("valid");
+
+    assert_eq!(actual.version(), options.version, "version mismatch in {}", fixture);
     assert_eq!(
-        generated.tree(),
+        actual.tree(),
         options
             .extensions
             .should_write(extension::tree::SIGNATURE)
@@ -149,19 +153,14 @@ fn compare_states(generated: &State, expected: &State, options: write::Options,
         fixture
     );
     assert_eq!(
-        generated.entries().len(),
+        actual.entries().len(),
         expected.entries().len(),
         "entry count mismatch in {}",
         fixture
     );
+    assert_eq!(actual.entries(), expected.entries(), "entries mismatch in {}", fixture);
     assert_eq!(
-        generated.entries(),
-        expected.entries(),
-        "entries mismatch in {}",
-        fixture
-    );
-    assert_eq!(
-        generated.path_backing(),
+        actual.path_backing(),
         expected.path_backing(),
         "path_backing mismatch in {}",
         fixture

git-repository/src/repository/identity.rs

@@ -1,8 +1,5 @@
 use std::borrow::Cow;
 
-use git_actor::SignatureRef;
-use git_config::File;
-
 use crate::{bstr::BString, permission};
 
 /// Identity handling.
@@ -15,8 +12,8 @@ impl crate::Repository {
     /// # Note
     ///
     /// The values are cached when the repository is instantiated.
-    pub fn user_default(&self) -> SignatureRef<'_> {
-        SignatureRef {
+    pub fn user_default(&self) -> git_actor::SignatureRef<'_> {
+        git_actor::SignatureRef {
             name: "gitoxide".into(),
             email: "gitoxide@localhost".into(),
             time: git_date::Time::now_local_or_utc(),
@@ -105,7 +102,7 @@ impl Personas {
         fn env_var(name: &str) -> Option<BString> {
             std::env::var_os(name).map(|value| git_path::into_bstr(Cow::Owned(value.into())).into_owned())
         }
-        fn entity_in_section(name: &str, config: &File<'_>) -> (Option<BString>, Option<BString>) {
+        fn entity_in_section(name: &str, config: &git_config::File<'_>) -> (Option<BString>, Option<BString>) {
             config
                 .section(name, None)
                 .map(|section| {