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

test_meregd_tree: test diffing with a matcher

Browse source 
We didn't have any tests at all for `MergedTree::diff()` with a
matcher other than `EverythingMatcher`. This patch adds a few.
This commit is contained in:
Martin von Zweigbergk 2023-11-05 10:06:47 -08:00 committed by Martin von Zweigbergk
parent 16aa8e8f10
commit 9af09ec236
1 changed files with 68 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
lib/tests/test_merged_tree.rs
View file

@ -15,7 +15,7 @@
use itertools::Itertools;
use jj_lib::backend::{FileId, MergedTreeId, TreeValue};
use jj_lib::files::MergeResult;
use jj_lib::matchers::{EverythingMatcher, FilesMatcher};
use jj_lib::matchers::{EverythingMatcher, FilesMatcher, PrefixMatcher};
use jj_lib::merge::{Merge, MergeBuilder};
use jj_lib::merged_tree::{MergedTree, MergedTreeBuilder, MergedTreeVal};
use jj_lib::repo::Repo;
@ -1037,6 +1037,73 @@ fn test_diff_dir_file() {
];
assert_eq!(actual_diff, expected_diff);
}
// Diff while filtering by `path1` (file1 -> directory1) as a file
{
let actual_diff = left_merged
.diff(&right_merged, &FilesMatcher::new(&[path1.clone()]))
.map(|(path, diff)| (path, diff.unwrap()))
.collect_vec();
let expected_diff = vec![
// path1: file1 -> directory1
(
path1.clone(),
(left_merged.path_value(&path1), Merge::absent()),
),
];
assert_eq!(actual_diff, expected_diff);
}
// Diff while filtering by `path1/file` (file1 -> directory1) as a file
{
let actual_diff = left_merged
.diff(&right_merged, &FilesMatcher::new(&[path1.join(&file)]))
.map(|(path, diff)| (path, diff.unwrap()))
.collect_vec();
let expected_diff = vec![
// path1: file1 -> directory1
(
path1.join(&file),
(Merge::absent(), right_merged.path_value(&path1.join(&file))),
),
];
assert_eq!(actual_diff, expected_diff);
}
// Diff while filtering by `path1` (file1 -> directory1) as a prefix
{
let actual_diff = left_merged
.diff(&right_merged, &PrefixMatcher::new(&[path1.clone()]))
.map(|(path, diff)| (path, diff.unwrap()))
.collect_vec();
let expected_diff = vec![
(
path1.clone(),
(left_merged.path_value(&path1), Merge::absent()),
),
(
path1.join(&file),
(Merge::absent(), right_merged.path_value(&path1.join(&file))),
),
];
assert_eq!(actual_diff, expected_diff);
}
// Diff while filtering by `path6` (directory1 -> file1+(directory1-absent)) as
// a file. We don't see the directory at `path6` on the left side, but we
// do see the directory that's included in the conflict with a file on the right
// side.
{
let actual_diff = left_merged
.diff(&right_merged, &FilesMatcher::new(&[path6.clone()]))
.map(|(path, diff)| (path, diff.unwrap()))
.collect_vec();
let expected_diff = vec![(
path6.clone(),
(Merge::absent(), right_merged.path_value(&path6)),
)];
assert_eq!(actual_diff, expected_diff);
}
}
/// Merge 3 resolved trees that can be resolved