mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 23:23:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

merged_tree: extract file-conflict resolution from merge_tree_values()

Browse source 
I'll add a public function that resolves file conflicts. This function will
take owned MergedTreeValue, and that's why the extracted function returns
None instead of cloning the passed value.
This commit is contained in:
Yuya Nishihara 2024-08-12 12:42:02 +09:00
parent 38f6ee8918
commit a6566832c2
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/src/merged_tree.rs
View file

@ -493,18 +493,28 @@ fn merge_tree_values(
Ok(merged_tree
.map(|tree| (tree.id() != empty_tree_id).then(|| TreeValue::Tree(tree.id().clone()))))
} else {
// Try to resolve file conflicts by merging the file contents. Treats missing
// files as empty. The values may contain trees canceling each other (notably
// padded absent trees), so we need to simplify them first.
let simplified = values.clone().simplify();
// No fast path for simplified.is_resolved(). If it could be resolved, it would
// have been caught by values.resolve_trivial() above.
if let Some(resolved) = try_resolve_file_conflict(store, path, &simplified)? {
Ok(Merge::normal(resolved))
} else {
// Failed to merge the files, or the paths are not files
Ok(values.cloned())
}
let maybe_resolved = try_resolve_file_values(store, path, values)?;
Ok(maybe_resolved.unwrap_or_else(|| values.cloned()))
}
}
/// Tries to resolve file conflicts by merging the file contents. Treats missing
/// files as empty.
fn try_resolve_file_values(
store: &Arc<Store>,
path: &RepoPath,
values: &MergedTreeVal,
) -> BackendResult<Option<MergedTreeValue>> {
// The values may contain trees canceling each other (notably padded absent
// trees), so we need to simplify them first.
let simplified = values.clone().simplify();
// No fast path for simplified.is_resolved(). If it could be resolved, it would
// have been caught by values.resolve_trivial() above.
if let Some(resolved) = try_resolve_file_conflict(store, path, &simplified)? {
Ok(Some(Merge::normal(resolved)))
} else {
// Failed to merge the files, or the paths are not files
Ok(None)
}
}