mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 03:22:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merged_tree: use merged_tree_entry_diff() in stream version

Browse source
This commit is contained in:
Yuya Nishihara 2023-11-30 14:56:32 +09:00
parent 97a260b1bf
commit 076b49b610
1 changed files with 47 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/merged_tree.rs
View file

@ -1029,10 +1029,7 @@ impl<'matcher> TreeDiffStreamImpl<'matcher> {
}
};
for basename in merged_tree_basenames(&tree1, &tree2) {
let value_before = tree1.value(basename);
let value_after = tree2.value(basename);
if value_after != value_before {
for (basename, value_before, value_after) in merged_tree_entry_diff(&tree1, &tree2) {
let path = dir.join(basename);
let before = value_before.to_merge();
let after = value_after.to_merge();
@ -1083,7 +1080,6 @@ impl<'matcher> TreeDiffStreamImpl<'matcher> {
.insert(DiffStreamKey::normal(path), Ok((before, after)));
}
}
}
fn poll_tree_futures(&mut self, cx: &mut Context<'_>) {
let mut pending_index = 0;