martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-20 10:18:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

revset: extract dag-range calculation to function

Browse Source 
The returned reachable set can be reused to calculate roots() expression.
This commit is contained in:
Yuya Nishihara 2023-04-06 21:33:11 +09:00
parent 7dc35b82b0
commit 20aa31336e
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/src/default_revset_engine.rs
View File

@ -674,25 +674,8 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
RevsetExpression::DagRange { roots, heads } => {
let root_set = self.evaluate(roots)?;
let head_set = self.evaluate(heads)?;
let mut reachable: HashSet<_> =
root_set.iter().map(|entry| entry.position()).collect();
let mut result = vec![];
let candidates = self.walk_ancestors(&*head_set).collect_vec();
for candidate in candidates.into_iter().rev() {
if reachable.contains(&candidate.position())
|| candidate
.parent_positions()
.iter()
.any(|parent_pos| reachable.contains(parent_pos))
{
reachable.insert(candidate.position());
result.push(candidate);
}
}
result.reverse();
Ok(Box::new(EagerRevset {
index_entries: result,
}))
let (dag_range_set, _) = self.collect_dag_range(&*root_set, &*head_set);
Ok(Box::new(dag_range_set))
}
RevsetExpression::VisibleHeads => Ok(self.revset_for_commit_ids(self.visible_heads)),
RevsetExpression::Heads(candidates) => {
@ -828,6 +811,38 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
self.composite_index.walk_revs(&head_ids, &[])
}
/// 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>(
&self,
root_set: &S,
head_set: &T,
) -> (EagerRevset<'index>, HashSet<IndexPosition>)
where
S: InternalRevset<'a> + ?Sized,
T: InternalRevset<'b> + ?Sized,
{
let mut reachable: HashSet<_> = root_set.iter().map(|entry| entry.position()).collect();
let mut index_entries = vec![];
let candidates = self.walk_ancestors(head_set).collect_vec();
for candidate in candidates.into_iter().rev() {
if reachable.contains(&candidate.position())
|| candidate
.parent_positions()
.iter()
.any(|parent_pos| reachable.contains(parent_pos))
{
reachable.insert(candidate.position());
index_entries.push(candidate);
}
}
index_entries.reverse();
(EagerRevset { index_entries }, reachable)
}
fn revset_for_commit_ids(
&self,
commit_ids: &[CommitId],