Struct PlanMerge 

pub struct PlanMerge<'vf> {
    pub a_rev: Vec<u8>,
    pub b_rev: Vec<u8>,
    pub key_prefix: Vec<Vec<u8>>,
    /* private fields */
}

Annotate-based merge planner. Mirrors bzrformats.merge._PlanMerge.

Builds an in-memory weave from the per-file graph between the two tips (back to their recursive LCAs) and runs Weave.plan_merge over it. When one tip dominates the other in the per-file graph, short-circuits to tagging every line of the dominating text new-a/new-b.

Fields

a_rev: Vec<u8>

b_rev: Vec<u8>

key_prefix: Vec<Vec<u8>>

Implementations

impl<'vf> PlanMerge<'vf>

pub fn new( vf: &'vf dyn VersionedFiles, a_rev: Vec<u8>, b_rev: Vec<u8>, key_prefix: Vec<Vec<u8>>, ) -> Result<Self, KnitError>

Construct the planner, eagerly determining the dominating head (or building the in-memory weave). Mirrors _PlanMerge.__init__.

pub fn plan_merge(&mut self) -> Result<Vec<(MergeTag, Vec<u8>)>, KnitError>

Generate the merge plan. Mirrors _PlanMerge.plan_merge.