mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-20 11:25:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

revset: extract children() evaluation to function

Browse source 
I'm going to add generation parameter to Children/DagRange nodes, and
'Children { .. }' will be substituted to 'DagRange { .., gen: 1 }'. This
commit helps future code move.

Lifetime bounds of the arguments are unnecessarily restricted. It appears
walk_ancestors_until_roots() captures arguments lifetime on rustc 1.64.0.
I think the problem will go away if walk_*() functions are extracted to
RevWalk methods where input arguments will become less generic.
This commit is contained in:
Yuya Nishihara 2023-04-19 20:20:12 +09:00
parent d9d2b405e1
commit eadf8faded
1 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lib/src/default_revset_engine.rs
View file

@ -589,22 +589,7 @@ impl<'index> EvaluationContext<'index> {
ResolvedExpression::Children { roots, heads } => {
let root_set = self.evaluate(roots)?;
let head_set = self.evaluate(heads)?;
let (walk, root_positions) =
self.walk_ancestors_until_roots(&*root_set, &*head_set);
let roots: HashSet<_> = root_positions.into_iter().collect();
let candidates = Box::new(RevWalkRevset { walk });
let predicate = PurePredicateFn(move |entry: &IndexEntry| {
entry
.parent_positions()
.iter()
.any(|parent_pos| roots.contains(parent_pos))
});
// TODO: Suppose heads include all visible heads, ToPredicateFn version can be
// optimized to only test the predicate()
Ok(Box::new(FilterRevset {
candidates,
predicate,
}))
Ok(Box::new(self.walk_children(&*root_set, &*head_set)))
}
ResolvedExpression::Ancestors { heads, generation } => {
let head_set = self.evaluate(heads)?;
@ -735,7 +720,7 @@ impl<'index> EvaluationContext<'index> {
root_set: &S,
head_set: &T,
) -> (
impl Iterator<Item = IndexEntry<'index>> + Clone,
impl Iterator<Item = IndexEntry<'index>> + Clone + 'index,
Vec<IndexPosition>,
)
where
@ -753,6 +738,34 @@ impl<'index> EvaluationContext<'index> {
(walk, root_positions)
}
fn walk_children<'a, 'b, S, T>(
&self,
root_set: &S,
head_set: &T,
) -> impl InternalRevset<'index> + 'index
where
// TODO: 'index shouldn't be required, but rustc 1.64.0 failed to deduce lifetime of
// walk. The problem appears to be fixed somewhere between 1.64.0 and 1.69.0.
S: InternalRevset<'a> + ?Sized + 'index,
T: InternalRevset<'b> + ?Sized + 'index,
{
let (walk, root_positions) = self.walk_ancestors_until_roots(root_set, head_set);
let root_positions: HashSet<_> = root_positions.into_iter().collect();
let candidates = Box::new(RevWalkRevset { walk });
let predicate = PurePredicateFn(move |entry: &IndexEntry| {
entry
.parent_positions()
.iter()
.any(|parent_pos| root_positions.contains(parent_pos))
});
// TODO: Suppose heads include all visible heads, ToPredicateFn version can be
// optimized to only test the predicate()
FilterRevset {
candidates,
predicate,
}
}
/// Calculates `root_set:head_set`.
fn collect_dag_range<'a, 'b, S, T>(
&self,