Struct Merger 

pub struct Merger(/* private fields */);

Represents a merge operation between two branches.

This struct provides methods to configure and perform merges between branches, including finding the base revision, setting merge parameters, and executing the merge.

Implementations

impl Merger

pub fn new<T: PyTree>( branch: &dyn PyBranch, this_tree: &T, revision_graph: &Graph, ) -> Self

Create a new merger for merging into a tree.

Arguments

• branch - The branch to merge from
• this_tree - The tree to merge into
• revision_graph - The graph of revisions to use for finding common ancestors

Returns

A new Merger object

pub fn find_base(&self) -> Result<Option<RevisionId>, Error>

Find the base revision for the merge.

Returns

The base revision ID if found, or None if the branches are unrelated

pub fn set_other_revision( &mut self, other_revision: &RevisionId, other_branch: &dyn PyBranch, ) -> Result<(), Error>

Set the other revision to merge.

Arguments

• other_revision - The revision ID to merge
• other_branch - The branch containing the revision

Returns

Ok(()) on success, or an error if the operation fails

pub fn set_base_revision( &mut self, base_revision: &RevisionId, base_branch: &dyn PyBranch, ) -> Result<(), Error>

Set the base revision for the merge.

Arguments

• base_revision - The base revision ID to use
• base_branch - The branch containing the base revision

Returns

Ok(()) on success, or an error if the operation fails

pub fn set_merge_type(&mut self, merge_type: MergeType)

Set the merge algorithm to use.

Arguments

• merge_type - The merge algorithm to use

pub fn make_merger(&self) -> Result<Submerger, Error>

Create a submerger to execute the merge.

Returns

A Submerger object that can perform the actual merge

pub fn from_revision_ids<T: PyTree>( other_tree: &T, other_branch: &dyn PyBranch, other: &RevisionId, tree_branch: &dyn PyBranch, ) -> Result<Self, Error>

Create a merger from specific revision IDs.

Arguments

• other_tree - The tree to merge from
• other_branch - The branch containing the revision to merge
• other - The revision ID to merge
• tree_branch - The branch containing the tree to merge into

Returns

A new Merger object, or an error if the operation fails

Trait Implementations

impl From<Py<PyAny>> for Merger

fn from(obj: Py<PyAny>) -> Self

Converts to this type from the input type.