Add RepositoryPathBuf PoC

Author: cruessler

gix-object/src/object/convert.rs

@@ -72,7 +72,7 @@ impl From<tree::EntryRef<'_>> for tree::Entry {
         let tree::EntryRef { mode, filename, oid } = other;
         tree::Entry {
             mode,
-            filename: filename.to_owned(),
+            filename: filename.to_owned().into(),
             oid: oid.into(),
         }
     }

gix-object/src/tree/mod.rs

@@ -323,14 +323,57 @@ impl Ord for EntryRef<'_> {
     }
 }
 
+/// TODO
+/// Keep in mind that the path separator always is `/`, independent of the platform.
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct RepositoryPathPuf {
+    /// TODO
+    inner: BString,
+}
+
+impl std::fmt::Display for RepositoryPathPuf {
+    #[inline]
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.inner.fmt(f)
+    }
+}
+
+impl From<&str> for RepositoryPathPuf {
+    fn from(value: &str) -> Self {
+        Self { inner: value.into() }
+    }
+}
+
+impl From<&BStr> for RepositoryPathPuf {
+    fn from(value: &BStr) -> Self {
+        Self { inner: value.into() }
+    }
+}
+
+impl From<BString> for RepositoryPathPuf {
+    fn from(value: BString) -> Self {
+        Self { inner: value }
+    }
+}
+
+impl std::ops::Deref for RepositoryPathPuf {
+    type Target = BString;
+
+    #[inline]
+    fn deref(&self) -> &BString {
+        &self.inner
+    }
+}
+
 /// An entry in a [`Tree`], similar to an entry in a directory.
 #[derive(PartialEq, Eq, Debug, Hash, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Entry {
     /// The kind of object to which `oid` is pointing to.
     pub mode: EntryMode,
     /// The name of the file in the parent tree.
-    pub filename: BString,
+    pub filename: RepositoryPathPuf,
     /// The id of the object representing the entry.
     pub oid: gix_hash::ObjectId,
 }

gix-object/src/tree/write.rs

@@ -40,9 +40,11 @@ impl crate::WriteTo for Tree {
             out.write_all(mode.as_bytes(&mut buf))?;
             out.write_all(SPACE)?;
 
+            let name: &BString = filename;
+
             if filename.find_byte(0).is_some() {
                 return Err(Error::NullbyteInFilename {
-                    name: (*filename).to_owned(),
+                    name: (*name).to_owned(),
                 }
                 .into());
             }

gix/src/object/tree/editor.rs

@@ -287,15 +287,21 @@ fn write_cursor<'repo>(cursor: &mut Cursor<'_, 'repo>) -> Result<Id<'repo>, writ
                         .then_some(gix_validate::path::component::Mode::Symlink),
                     cursor.validate,
                 )
-                .map_err(|err| write::Error::InvalidFilename {
-                    filename: entry.filename.clone(),
-                    kind: entry.mode.into(),
-                    id: entry.oid,
-                    source: err,
+                .map_err(|err| {
+                    let filename: &BString = &entry.filename;
+
+                    write::Error::InvalidFilename {
+                        filename: filename.clone(),
+                        kind: entry.mode.into(),
+                        id: entry.oid,
+                        source: err,
+                    }
                 })?;
                 if !entry.mode.is_commit() && !cursor.repo.has_object(entry.oid) {
+                    let filename: &BString = &entry.filename;
+
                     return Err(write::Error::MissingObject {
-                        filename: entry.filename.clone(),
+                        filename: filename.clone(),
                         kind: entry.mode.into(),
                         id: entry.oid,
                     });