mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-08 21:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

index: extract a couple of RevWalk helper functions to inner struct

Browse source
This commit is contained in:
Yuya Nishihara 2022-11-23 17:55:01 +09:00
parent a124f84949
commit 03eff13d52
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/src/index.rs
View file

@ -1017,6 +1017,18 @@ impl<'a> RevWalkQueue<'a> {
self.unwanted_count += 1;
}
fn push_wanted_parents(&mut self, entry: &IndexEntry<'_>) {
for pos in entry.parent_positions() {
self.push_wanted(pos);
}
}
fn push_unwanted_parents(&mut self, entry: &IndexEntry<'_>) {
for pos in entry.parent_positions() {
self.push_unwanted(pos);
}
}
fn pop(&mut self) -> Option<RevWalkWorkItem<'a>> {
if let Some(x) = self.items.pop() {
self.unwanted_count -= !x.is_wanted() as usize;
@ -1068,18 +1080,14 @@ impl<'a> Iterator for RevWalk<'a> {
while let Some(item) = self.queue.pop() {
self.queue.skip_while_eq(&item.entry.0);
if item.is_wanted() {
for parent_pos in item.entry.0.parent_positions() {
self.add_wanted(parent_pos);
}
self.queue.push_wanted_parents(&item.entry.0);
return Some(item.entry.0);
} else if self.queue.items.len() == self.queue.unwanted_count {
// No more wanted entries to walk
debug_assert!(!self.queue.items.iter().any(|x| x.is_wanted()));
return None;
} else {
for parent_pos in item.entry.0.parent_positions() {
self.add_unwanted(parent_pos);
}
self.queue.push_unwanted_parents(&item.entry.0);
}
}