gix_merge::commit

Struct Outcome

Source
pub struct Outcome<'a> {
    pub tree_merge: Outcome<'a>,
    pub merge_base_tree_id: ObjectId,
    pub merge_bases: Option<Vec<ObjectId>>,
    pub virtual_merge_bases: Vec<ObjectId>,
}
Expand description

The result of commit().

Fields§

§tree_merge: Outcome<'a>

The outcome of the actual tree-merge.

§merge_base_tree_id: ObjectId

The tree id of the base commit we used. This is either…

  • the single merge-base we found
  • the first of multiple merge-bases if use_first_merge_base was true.
  • the merged tree of all merge-bases, which then isn’t linked to an actual commit.
  • an empty tree, if allow_missing_merge_base is enabled.
§merge_bases: Option<Vec<ObjectId>>

The object ids of all the commits which were found to be merge-bases, or None if there was no merge-base.

§virtual_merge_bases: Vec<ObjectId>

A list of virtual commits that were created to merge multiple merge-bases into one, the last one being the one we used as merge-base for the merge. As they are not reachable by anything they will be garbage collected, but knowing them provides options. Would be empty if no virtual commit was needed at all as there was only a single merge-base. Otherwise, the last commit id is the one with the merge_base_tree_id.

Trait Implementations§

Source§

impl<'a> Clone for Outcome<'a>

Source§

fn clone(&self) -> Outcome<'a>

Returns a copy of the value. Read more
1.0.0 · Source§

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

Performs copy-assignment from source. Read more

Auto Trait Implementations§

§

impl<'a> !Freeze for Outcome<'a>

§

impl<'a> !RefUnwindSafe for Outcome<'a>

§

impl<'a> !Send for Outcome<'a>

§

impl<'a> !Sync for Outcome<'a>

§

impl<'a> Unpin for Outcome<'a>

§

impl<'a> !UnwindSafe for Outcome<'a>

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, dst: *mut u8)

🔬This is a nightly-only experimental API. (clone_to_uninit)
Performs copy-assignment from self to dst. 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.