Skip to main content

MergedPath

Struct MergedPath 

Source
pub struct MergedPath {
    pub path: Vec<u8>,
    pub stages: MergeStages,
    pub result: Option<(u32, ObjectId)>,
    pub worktree: Option<(u32, Vec<u8>)>,
    pub conflict: Option<MergeConflictKind>,
    pub auto_merged: bool,
}
Expand description

One resolved/conflicted path in the merged tree.

Fields§

§path: Vec<u8>

Destination path in the merged tree.

§stages: MergeStages

The per-stage (1=base, 2=ours, 3=theirs) entries when conflicted; all None for a clean resolution.

§result: Option<(u32, ObjectId)>

Some((mode, oid)) is the final leaf written to the merged tree; None means the path is absent in the result (a clean delete).

§worktree: Option<(u32, Vec<u8>)>

When conflicted, the worktree bytes + mode to materialize (content with conflict markers, or the surviving side’s bytes). None for a clean path.

§conflict: Option<MergeConflictKind>

Some(..) exactly when this path conflicted.

§auto_merged: bool

True when this path went through a textual 3-way content merge (both sides diverged and both were mergeable files). Drives the “Auto-merging ” informational message, which git merge-tree emits for every such path — clean or conflicted.

Implementations§

Source§

impl MergedPath

Source

pub fn is_clean(&self) -> bool

True when this path resolved cleanly (no conflict recorded).

Trait Implementations§

Source§

impl Clone for MergedPath

Source§

fn clone(&self) -> MergedPath

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 MergedPath

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.