Skip to main content

MergeTreesResult

Struct MergeTreesResult 

Source
pub struct MergeTreesResult {
    pub tree: ObjectId,
    pub paths: Vec<MergedPath>,
    pub clean: bool,
    pub cleanup_paths: Vec<Vec<u8>>,
    pub info_messages: Vec<MergeInfoMessage>,
}
Expand description

The outcome of a 3-way tree merge: the merged top-level tree plus per-path detail and a clean/conflicted flag.

Fields§

§tree: ObjectId

Object id of the merged top-level tree (always written, even on conflict — conflicted blobs go in with their marker content).

§paths: Vec<MergedPath>

Per-path results, sorted by path.

§clean: bool

False if any path conflicted.

§cleanup_paths: Vec<Vec<u8>>

Original paths removed by rename or directory-rename rewrites. These are cleanup-only paths for porcelains materializing a conflicted merge; they are absent from the merged tree.

§info_messages: Vec<MergeInfoMessage>

Non-conflict informational messages produced while detecting renames.

Implementations§

Source§

impl MergeTreesResult

Source

pub fn conflicts(&self) -> impl Iterator<Item = &MergedPath>

Iterate over the paths that conflicted, in path order.

Trait Implementations§

Source§

impl Clone for MergeTreesResult

Source§

fn clone(&self) -> MergeTreesResult

Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · Source§

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source. Read more
Source§

impl Debug for MergeTreesResult

Source§

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter. Read more

Auto Trait Implementations§

Blanket Implementations§

Source§

impl<T> Any for T
where T: 'static + ?Sized,

Source§

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more
Source§

impl<T> Borrow<T> for T
where T: ?Sized,

Source§

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more
Source§

impl<T> BorrowMut<T> for T
where T: ?Sized,

Source§

fn borrow_mut(&mut self) -> &mut T

Mutably borrows from an owned value. Read more
Source§

impl<T> CloneToUninit for T
where T: Clone,

Source§

unsafe fn clone_to_uninit(&self, dest: *mut u8)

🔬This is a nightly-only experimental API. (clone_to_uninit)
Performs copy-assignment from self to dest. Read more
Source§

impl<T> From<T> for T

Source§

fn from(t: T) -> T

Returns the argument unchanged.

Source§

impl<T, U> Into<U> for T
where U: From<T>,

Source§

fn into(self) -> U

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

Source§

impl<T> ToOwned for T
where T: Clone,

Source§

type Owned = T

The resulting type after obtaining ownership.
Source§

fn to_owned(&self) -> T

Creates owned data from borrowed data, usually by cloning. Read more
Source§

fn clone_into(&self, target: &mut T)

Uses borrowed data to replace owned data, usually by cloning. Read more
Source§

impl<T, U> TryFrom<U> for T
where U: Into<T>,

Source§

type Error = Infallible

The type returned in the event of a conversion error.
Source§

fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

Performs the conversion.
Source§

impl<T, U> TryInto<U> for T
where U: TryFrom<T>,

Source§

type Error = <U as TryFrom<T>>::Error

The type returned in the event of a conversion error.
Source§

fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

Performs the conversion.