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

tree: extract helper method that sets up subdir iterator

Browse source 
This will be reimplemented as a constructor of subdir item.
This commit is contained in:
Yuya Nishihara 2023-05-04 15:32:02 +09:00
parent 3f7b0929d7
commit a8f77e46a9
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/src/tree.rs
View file

@ -449,6 +449,29 @@ impl<'matcher> TreeDiffIterator<'matcher> {
subdir_iterator: None, subdir_iterator: None,
} }
} }
fn visit_subdir(
&mut self,
name: &RepoPathComponent,
before: Option<&TreeValue>,
after: Option<&TreeValue>,
) {
let subdir_path = self.dir.join(name);
let before_tree = match before {
Some(TreeValue::Tree(id_before)) => self.tree1.known_sub_tree(name, id_before),
_ => Tree::null(self.tree1.store().clone(), subdir_path.clone()),
};
let after_tree = match after {
Some(TreeValue::Tree(id_after)) => self.tree2.known_sub_tree(name, id_after),
_ => Tree::null(self.tree2.store().clone(), subdir_path.clone()),
};
self.subdir_iterator = Some(Box::new(TreeDiffIterator::new(
subdir_path,
before_tree,
after_tree,
self.matcher,
)));
}
} }
impl Iterator for TreeDiffIterator<'_> { impl Iterator for TreeDiffIterator<'_> {
@ -473,21 +496,7 @@ impl Iterator for TreeDiffIterator<'_> {
let tree_before = matches!(before, Some(TreeValue::Tree(_))); let tree_before = matches!(before, Some(TreeValue::Tree(_)));
let tree_after = matches!(after, Some(TreeValue::Tree(_))); let tree_after = matches!(after, Some(TreeValue::Tree(_)));
if tree_before || tree_after { if tree_before || tree_after {
let subdir_path = self.dir.join(name); self.visit_subdir(name, before, after);
let before_tree = match before {
Some(TreeValue::Tree(id_before)) => self.tree1.known_sub_tree(name, id_before),
_ => Tree::null(self.tree1.store().clone(), subdir_path.clone()),
};
let after_tree = match after {
Some(TreeValue::Tree(id_after)) => self.tree2.known_sub_tree(name, id_after),
_ => Tree::null(self.tree2.store().clone(), subdir_path.clone()),
};
self.subdir_iterator = Some(Box::new(TreeDiffIterator::new(
subdir_path,
before_tree,
after_tree,
self.matcher,
)));
} }
let file_path = self.dir.join(name); let file_path = self.dir.join(name);
if self.matcher.matches(&file_path) { if self.matcher.matches(&file_path) {