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

revset: exclude unreachable roots from collect_dag_range() result

Browse source 
It doesn't matter, but can simplify the function interface. I'll probably
extract this function to RevWalk so the descendants with/without generation
filter can be tested without using revset API.
This commit is contained in:
Yuya Nishihara 2023-04-22 16:36:17 +09:00
parent 3b49eb8064
commit 36e7afe0db
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/default_revset_engine.rs
View file

@ -754,10 +754,6 @@ impl<'index> EvaluationContext<'index> {
} }
/// Calculates `root_set:head_set`. /// Calculates `root_set:head_set`.
///
/// The returned `HashSet` contains all `root_set` positions no matter if
/// the entry isn't an ancestor of the `head_set`. The `EagerRevset`
/// only contains entries reachable from the `head_set`.
fn collect_dag_range<'a, 'b, S, T>( fn collect_dag_range<'a, 'b, S, T>(
&self, &self,
root_set: &S, root_set: &S,
@ -768,21 +764,22 @@ impl<'index> EvaluationContext<'index> {
T: InternalRevset<'b> + ?Sized, T: InternalRevset<'b> + ?Sized,
{ {
let (walk, root_positions) = self.walk_ancestors_until_roots(root_set, head_set); let (walk, root_positions) = self.walk_ancestors_until_roots(root_set, head_set);
let mut reachable: HashSet<_> = root_positions.into_iter().collect(); let root_positions: HashSet<_> = root_positions.into_iter().collect();
let mut reachable_positions = HashSet::new();
let mut index_entries = vec![]; let mut index_entries = vec![];
for candidate in walk.collect_vec().into_iter().rev() { for candidate in walk.collect_vec().into_iter().rev() {
if reachable.contains(&candidate.position()) if root_positions.contains(&candidate.position())
|| candidate || candidate
.parent_positions() .parent_positions()
.iter() .iter()
.any(|parent_pos| reachable.contains(parent_pos)) .any(|parent_pos| reachable_positions.contains(parent_pos))
{ {
reachable.insert(candidate.position()); reachable_positions.insert(candidate.position());
index_entries.push(candidate); index_entries.push(candidate);
} }
} }
index_entries.reverse(); index_entries.reverse();
(EagerRevset { index_entries }, reachable) (EagerRevset { index_entries }, reachable_positions)
} }
fn revset_for_commit_ids(&self, commit_ids: &[CommitId]) -> EagerRevset<'index> { fn revset_for_commit_ids(&self, commit_ids: &[CommitId]) -> EagerRevset<'index> {