ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

merged_tree: make resolve() return a MergedTree

Browse source 
It seems like a method on `MergedTree` should return another
`MergedTree` when reasonable. I'm not sure why I made it return a
`Merge<Tree>` instead.
This commit is contained in:
Martin von Zweigbergk 2024-06-07 14:01:36 -07:00 committed by Martin von Zweigbergk
parent 6ab9d7bdc7
commit 776b2d981f
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/merged_tree.rs
View file

@ -185,10 +185,13 @@ impl MergedTree {
/// automatically resolved and leaving the rest unresolved. The returned
/// conflict will either be resolved or have the same number of sides as
/// the input.
pub fn resolve(&self) -> BackendResult<Merge<Tree>> {
pub fn resolve(&self) -> BackendResult<MergedTree> {
match self {
MergedTree::Legacy(_) => panic!("Cannot resolve conflicts in legacy tree"),
MergedTree::Merge(trees) => merge_trees(trees),
MergedTree::Merge(trees) => {
let merged = merge_trees(trees)?;
Ok(MergedTree::Merge(merged))
}
}
}

18
lib/tests/test_merged_tree.rs
View file

@ -433,7 +433,9 @@ fn test_resolve_success() {
);
let tree = MergedTree::new(Merge::from_removes_adds(vec![base1], vec![side1, side2]));
let resolved = tree.resolve().unwrap();
let MergedTree::Merge(resolved) = tree.resolve().unwrap() else {
unreachable!()
};
let resolved_tree = resolved.as_resolved().unwrap().clone();
assert_eq!(
resolved_tree,
@ -458,7 +460,7 @@ fn test_resolve_root_becomes_empty() {
let tree = MergedTree::new(Merge::from_removes_adds(vec![base1], vec![side1, side2]));
let resolved = tree.resolve().unwrap();
assert_eq!(resolved.as_resolved().unwrap().id(), store.empty_tree_id());
assert_eq!(resolved.id(), store.empty_merged_tree_id());
}
#[test]
@ -484,7 +486,10 @@ fn test_resolve_with_conflict() {
let resolved_tree = tree.resolve().unwrap();
assert_eq!(
resolved_tree,
Merge::from_removes_adds(vec![expected_base1], vec![expected_side1, expected_side2])
MergedTree::new(Merge::from_removes_adds(
vec![expected_base1],
vec![expected_side1, expected_side2]
))
)
}
@ -500,10 +505,9 @@ fn test_resolve_with_conflict_containing_empty_subtree() {
let side1 = create_single_tree(repo, &[(conflict_path, "side1")]);
let side2 = create_single_tree(repo, &[]);
let original_tree = Merge::from_removes_adds(vec![base1], vec![side1, side2]);
let tree = MergedTree::new(original_tree.clone());
let tree = MergedTree::new(Merge::from_removes_adds(vec![base1], vec![side1, side2]));
let resolved_tree = tree.resolve().unwrap();
assert_eq!(resolved_tree, original_tree);
assert_eq!(resolved_tree, tree);
}
#[test]
@ -616,7 +620,7 @@ fn test_conflict_iterator() {
);
// After we resolve conflicts, there are only non-trivial conflicts left
let tree = MergedTree::Merge(tree.resolve().unwrap());
let tree = tree.resolve().unwrap();
let conflicts = tree.conflicts().collect_vec();
assert_eq!(
conflicts,