pub enum TreeEntry {
File {
blob: ContentHash,
},
Conflict {
base: Option<ContentHash>,
left: ContentHash,
right: ContentHash,
},
}Expand description
One entry in a commit’s tree: a path maps to file content or to an unresolved conflict (first-class: committing this is valid, D9).
Variants§
File
Regular file; blob is a choir_store manifest address.
Fields
§
blob: ContentHashManifest address of the file content.
Conflict
Unresolved merge conflict for this path, all three sides kept.
Fields
§
base: Option<ContentHash>Base-side manifest address (None when the file is new on
both sides).
§
left: ContentHashLeft-side manifest address.
§
right: ContentHashRight-side manifest address.
Trait Implementations§
Source§impl<'de> Deserialize<'de> for TreeEntry
impl<'de> Deserialize<'de> for TreeEntry
Source§fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
impl Eq for TreeEntry
impl StructuralPartialEq for TreeEntry
Auto Trait Implementations§
impl Freeze for TreeEntry
impl RefUnwindSafe for TreeEntry
impl Send for TreeEntry
impl Sync for TreeEntry
impl Unpin for TreeEntry
impl UnsafeUnpin for TreeEntry
impl UnwindSafe for TreeEntry
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more