Method run_three_way

atomic-core/src/merge/engine.rs:253–302

Run a three-way merge given a known base.

(
        &self,
        base: &[u8],
        left: &[u8],
        right: &[u8],
        v_left: &GraphNode<NodeId>,
        v_right: &GraphNode<NodeId>,
    )

    /// Run a three-way merge given a known base.
    fn run_three_way(
        &self,
        base: &[u8],
        left: &[u8],
        right: &[u8],
        v_left: &GraphNode<NodeId>,
        v_right: &GraphNode<NodeId>,
    ) -> Result<MergeOutcome, PristineError> {
        let base_tokens = tokenize(base);
        let left_tokens = tokenize(left);
        let right_tokens = tokenize(right);

        match three_way_merge(&base_tokens, &left_tokens, &right_tokens) {
            ThreeWayResult::Merged(content) => {
                log::debug!(
                    "try_merge: auto-merged {} + {} → {} bytes",
                    left.len(),
                    right.len(),
                    content.len(),
                );
                let left_token_count = left_tokens
                    .iter()
                    .zip(base_tokens.iter())
                    .filter(|(l, b)| l != b)
                    .count();
                let right_token_count = right_tokens
                    .iter()
                    .zip(base_tokens.iter())
                    .filter(|(r, b)| r != b)
                    .count();
                Ok(MergeOutcome::AutoMerged {
                    content,
                    sources: vec![
                        MergeSource::new(v_left.change, left_token_count),
                        MergeSource::new(v_right.change, right_token_count),
                    ],
                })
            }
            ThreeWayResult::Conflict => {
                log::debug!("try_merge: conflict between {} and {}", v_left, v_right);
                Ok(MergeOutcome::Conflict {
                    base: base.to_vec(),
                    left: left.to_vec(),
                    right: right.to_vec(),
                    left_change: v_left.change,
                    right_change: v_right.change,
                })
            }
        }
    }

    /// Read the content bytes for a graph vertex from the change store.
    ///