Struct jj_lib::merge::Merge

pub struct Merge<T> { /* private fields */ }

A generic representation of merged values.

There is exactly one more adds() than removes(). When interpreted as a series of diffs, the merge’s (i+1)-st add is matched with the i-th remove. The zeroth add is considered a diff from the non-existent state.

Implementations

impl<T> Merge<T>

pub fn new(removes: Vec<T>, adds: Vec<T>) -> Self

Creates a new merge object from the given removes and adds.

pub fn resolved(value: T) -> Self

Creates a Merge with a single resolved value.

pub fn from_legacy_form( removes: impl IntoIterator<Item = T>, adds: impl IntoIterator<Item = T> ) -> Merge<Option<T>>

Create a Merge from a removes and adds, padding with None to make sure that there is exactly one more adds than removes.

pub fn take(self) -> (Vec<T>, Vec<T>)

Returns the removes and adds as a pair.

pub fn removes(&self) -> &[T]

The removed values, also called negative terms.

pub fn adds(&self) -> &[T]

The removed values, also called positive terms.

pub fn num_sides(&self) -> usize

The number of positive terms in the conflict.

pub fn is_resolved(&self) -> bool

Whether this merge is resolved. Does not resolve trivial merges.

pub fn as_resolved(&self) -> Option<&T>

Returns the resolved value, if this merge is resolved. Does not resolve trivial merges.

pub fn into_resolved(self) -> Result<T, Merge<T>>

Returns the resolved value, if this merge is resolved. Otherwise returns the merge itself as an Err. Does not resolve trivial merges.

pub fn simplify(self) -> Selfwhere T: PartialEq,

Simplify the merge by joining diffs like A->B and B->C into A->C. Also drops trivial diffs like A->A.

pub fn resolve_trivial(&self) -> Option<&T>where T: Eq + Hash,

If this merge can be trivially resolved, returns the value it resolves to.

pub fn pad_to(&mut self, num_sides: usize, value: &T)where T: Clone,

Pads this merge with to the specified number of sides with the specified value. No-op if the requested size is not larger than the current size.

pub fn iter(&self) -> impl Iterator<Item = &T>

Returns an iterator over references to the terms. The items will alternate between positive and negative terms, starting with positive (since there’s one more of those).

pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T>

A version of Merge::iter() that iterates over mutable references.

pub fn map<'a, U>(&'a self, f: impl FnMut(&'a T) -> U) -> Merge<U>

Creates a new merge by applying f to each remove and add.

pub fn maybe_map<'a, U>( &'a self, f: impl FnMut(&'a T) -> Option<U> ) -> Option<Merge<U>>

Creates a new merge by applying f to each remove and add, returning None if freturnsNone` for any of them.

pub fn try_map<'a, U, E>( &'a self, f: impl FnMut(&'a T) -> Result<U, E> ) -> Result<Merge<U>, E>

Creates a new merge by applying f to each remove and add, returning Err if freturnsErr` for any of them.

impl<T> Merge<Option<T>>

pub fn absent() -> Self

Creates a resolved merge with a value of None.

pub fn normal(value: T) -> Self

Creates a resolved merge with a value of Some(value).

pub fn is_absent(&self) -> bool

Whether this represents a resolved value of None.

pub fn is_present(&self) -> bool

The opposite of is_absent().

pub fn into_legacy_form(self) -> (Vec<T>, Vec<T>)

Creates lists of removes and adds from a Merge by dropping None values. Note that the conversion is lossy: the order of None values is not preserved when converting back to a Merge.

impl<T> Merge<Merge<T>>

pub fn flatten(self) -> Merge<T>

Flattens a nested merge into a regular merge.

Let’s say we have a 3-way merge of 3-way merges like this:

4 5 7 8 3 6 1 2 0

Flattening that results in this 9-way merge:

4 5 0 7 8 3 2 1 6

impl Merge<Option<TreeValue>>

pub fn from_backend_conflict(conflict: Conflict) -> Self

Create a Merge from a backend::Conflict, padding with None to make sure that there is exactly one more adds() than removes().

pub fn into_backend_conflict(self) -> Conflict

Creates a backend::Conflict from a Merge by dropping None values. Note that the conversion is lossy: the order of None values is not preserved when converting back to a Merge.

pub fn is_tree(&self) -> bool

Whether this merge should be recursed into when doing directory walks.

pub fn to_file_merge(&self) -> Option<Merge<Option<FileId>>>

If this merge contains only non-executable files or absent entries, returns a merge of the FileIds`.

pub fn with_new_file_ids(&self, file_ids: &Merge<Option<FileId>>) -> Self

Creates a new merge with the file ids from the given merge. In other words, only the executable bits from self will be preserved.

pub fn describe(&self, file: &mut dyn Write) -> Result<()>

Give a summary description of the conflict’s “removes” and “adds”

impl<T> Merge<Option<T>>where T: Borrow<TreeValue>,

pub fn to_tree_merge( &self, store: &Arc<Store>, dir: &RepoPath ) -> Result<Option<Merge<Tree>>, BackendError>

If every non-None term of a Merge<Option<TreeValue>> is a TreeValue::Tree, this converts it to a Merge<Tree>, with empty trees instead of any None terms. Otherwise, returns None.

Trait Implementations

impl<T: Clone> Clone for Merge<T>

fn clone(&self) -> Merge<T>

Returns a copy of the value.

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

Performs copy-assignment from source.

impl<T: ContentHash> ContentHash for Merge<T>

fn hash(&self, state: &mut impl Update)

Update the hasher state with this object’s content

impl<T: Debug> Debug for Merge<T>

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

Formats the value using the given formatter.

impl<T: Hash> Hash for Merge<T>

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl<T> IntoIterator for Merge<T>

type Item = T

The type of the elements being iterated over.

type IntoIter = Interleave<IntoIter<T>, IntoIter<T>>

Which kind of iterator are we turning this into?

fn into_iter(self) -> Self::IntoIter

Creates an iterator from a value.

impl<T: PartialEq> PartialEq for Merge<T>

fn eq(&self, other: &Merge<T>) -> 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<T: Eq> Eq for Merge<T>

impl<T> StructuralEq for Merge<T>

impl<T> StructuralPartialEq for Merge<T>