Merge pull request #2170 from GitoxideLabs/copilot/fix-7a3e1d32-c145-43e2-8e87-319b255dbc2f

Implement WriteTo trait for gix::Blob

Sebastian Thiel committed 1 year ago

Commit d302fa22 parents e60e253 34990502 files · +34 −2Browse files

Unified · Split

2 files

@@ -150,6 +150,23 @@ impl std::fmt::Debug for Object<'_> { · 149 unmodified lines
150	}	150	}
151	}	151	}
152		152
		153	/// Note that the `data` written here might not correspond to the `id` of the `Blob` anymore if it was modified.
		154	/// Also, this is merely for convenience when writing empty blobs to the ODB. For writing any blob, use
		155	/// [`Repository::write_blob()`](crate::Repository::write_blob()).
		156	impl gix_object::WriteTo for Blob<'_> {
		157	fn write_to(&self, out: &mut dyn std::io::Write) -> std::io::Result<()> {
		158	out.write_all(&self.data)
		159	}
		160
		161	fn kind(&self) -> gix_object::Kind {
		162	gix_object::Kind::Blob
		163	}
		164
		165	fn size(&self) -> u64 {
		166	self.data.len() as u64
		167	}
		168	}
		169
153	/// In conjunction with the handles free list, leaving an empty Vec in place of the original causes it to not be	170	/// In conjunction with the handles free list, leaving an empty Vec in place of the original causes it to not be
154	/// returned to the free list.	171	/// returned to the free list.
155	fn steal_from_freelist(data: &mut Vec<u8>) -> Vec<u8> {	172	fn steal_from_freelist(data: &mut Vec<u8>) -> Vec<u8> {

         let oid = repo.write_object(gix::objs::TreeRef::empty())?;
         assert_eq!(
             oid,
-            gix::hash::ObjectId::empty_tree(repo.object_hash()),
+            repo.object_hash().empty_tree(),
             "it produces a well-known empty tree id"
         );
         Ok(())
             time: Default::default(),
         };
         let commit = gix::objs::Commit {
-            tree: gix::hash::ObjectId::empty_tree(repo.object_hash()),
+            tree: repo.object_hash().empty_tree(),
             author: actor.clone(),
             committer: actor,
             parents: Default::default(),
         );
         Ok(())
     }
+    #[test]
+    fn blob_write_to_implementation() -> crate::Result {
+        let repo = empty_bare_in_memory_repo()?;
+        let blob = repo.empty_blob();
+        // Create a blob directly to test our WriteTo implementation
+        let actual_id = repo.write_object(&blob)?;
+        let actual_blob = repo.find_object(actual_id)?.into_blob();
+        assert_eq!(actual_id, repo.object_hash().empty_blob());
+        assert_eq!(actual_blob.data, blob.data);
+        Ok(())
+    }
 }
 mod write_blob {