Enum gix_status::index_as_worktree::Conflict

pub enum Conflict {
    BothDeleted,
    AddedByUs,
    DeletedByThem,
    AddedByThem,
    DeletedByUs,
    BothAdded,
    BothModified,
}

Describes a conflicting entry as comparison between ‘our’ version and ‘their’ version of it.

If one side isn’t specified, it is assumed to have modified the entry. In general, there would be no conflict if both parties ended up in the same state.

Variants

BothDeleted

Both deleted a different version of the entry.

AddedByUs

We added, they modified, ending up in different states.

DeletedByThem

They deleted the entry, we modified it.

AddedByThem

They added the entry, we modified it, ending up in different states.

DeletedByUs

We deleted the entry, they modified it, ending up in different states.

BothAdded

Both added the entry in different states.

BothModified

Both modified the entry, ending up in different states.

Implementations

impl Conflict

pub fn try_from_entry( entries: &[Entry], path_backing: &PathStorageRef, start_index: usize, entry_path: &BStr ) -> Option<(Self, usize)>

Given entries and path_backing, both values obtained from an index, use start_index and enumerate all conflict stages that still match entry_path to produce a conflict description. Also return the amount of extra-entries that were part of the conflict declaration (not counting the entry at start_index)

If for some reason entry at start_index isn’t in conflicting state, None is returned.

Trait Implementations

impl Clone for Conflict

fn clone(&self) -> Conflict

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for Conflict

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

Formats the value using the given formatter.

impl Ord for Conflict

fn cmp(&self, other: &Conflict) -> Ordering

This method returns an Ordering between self and other.

fn max(self, other: Self) -> Self

where Self: Sized,

Compares and returns the maximum of two values.

fn min(self, other: Self) -> Self

where Self: Sized,

Compares and returns the minimum of two values.

fn clamp(self, min: Self, max: Self) -> Self

where Self: Sized + PartialOrd,

Restrict a value to a certain interval.

impl PartialEq for Conflict

fn eq(&self, other: &Conflict) -> bool

This method tests for self and other values to be equal, and is used by ==.

fn ne(&self, other: &Rhs) -> bool

This method tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl PartialOrd for Conflict

fn partial_cmp(&self, other: &Conflict) -> Option<Ordering>

This method returns an ordering between self and other values if one exists.

fn lt(&self, other: &Rhs) -> bool

This method tests less than (for self and other) and is used by the < operator.

fn le(&self, other: &Rhs) -> bool

This method tests less than or equal to (for self and other) and is used by the <= operator.

fn gt(&self, other: &Rhs) -> bool

This method tests greater than (for self and other) and is used by the > operator.

fn ge(&self, other: &Rhs) -> bool

This method tests greater than or equal to (for self and other) and is used by the >= operator.

impl Copy for Conflict

impl Eq for Conflict

impl StructuralEq for Conflict

impl StructuralPartialEq for Conflict