Run a three-way merge given a known base.
(
&self,
base: &[u8],
left: &[u8],
right: &[u8],
v_left: &GraphNode<NodeId>,
v_right: &GraphNode<NodeId>,
)
| 272 | |
| 273 | /// Run a three-way merge given a known base. |
| 274 | fn run_three_way( |
| 275 | &self, |
| 276 | base: &[u8], |
| 277 | left: &[u8], |
| 278 | right: &[u8], |
| 279 | v_left: &GraphNode<NodeId>, |
| 280 | v_right: &GraphNode<NodeId>, |
| 281 | ) -> Result<MergeOutcome, SemanticMergeError> { |
| 282 | let base_tokens = tokenize(base); |
| 283 | let left_tokens = tokenize(left); |
| 284 | let right_tokens = tokenize(right); |
| 285 | |
| 286 | match three_way_merge(&base_tokens, &left_tokens, &right_tokens) { |
| 287 | ThreeWayResult::Merged(content) => { |
| 288 | log::debug!( |
| 289 | "try_merge: auto-merged {} + {} → {} bytes", |
| 290 | left.len(), |
| 291 | right.len(), |
| 292 | content.len(), |
| 293 | ); |
| 294 | let left_token_count = left_tokens |
| 295 | .iter() |
| 296 | .zip(base_tokens.iter()) |
| 297 | .filter(|(l, b)| l != b) |
| 298 | .count(); |
| 299 | let right_token_count = right_tokens |
| 300 | .iter() |
| 301 | .zip(base_tokens.iter()) |
| 302 | .filter(|(r, b)| r != b) |
| 303 | .count(); |
| 304 | Ok(MergeOutcome::AutoMerged { |
| 305 | content, |
| 306 | sources: vec![ |
| 307 | MergeSource::new(v_left.change, left_token_count), |
| 308 | MergeSource::new(v_right.change, right_token_count), |
| 309 | ], |
| 310 | }) |
| 311 | } |
| 312 | ThreeWayResult::Conflict => { |
| 313 | log::debug!("try_merge: conflict between {} and {}", v_left, v_right); |
| 314 | Ok(MergeOutcome::Conflict { |
| 315 | base: base.to_vec(), |
| 316 | left: left.to_vec(), |
| 317 | right: right.to_vec(), |
| 318 | left_change: v_left.change, |
| 319 | right_change: v_right.change, |
| 320 | }) |
| 321 | } |
| 322 | } |
| 323 | } |
| 324 | |
| 325 | /// Read the content bytes for a graph vertex from the change store. |
| 326 | /// |
no test coverage detected