cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-22 15:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

revset: replace children node with descendants of generation 1..2

Browse Source
This commit is contained in:
Yuya Nishihara 2023-04-19 20:05:46 +09:00
parent a99b82c634
commit 32253fed5e
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/src/default_revset_engine.rs
View File

@ -586,11 +586,6 @@ impl<'index> EvaluationContext<'index> {
ResolvedExpression::Commits(commit_ids) => {
Ok(Box::new(self.revset_for_commit_ids(commit_ids)))
}
ResolvedExpression::Children { roots, heads } => {
let root_set = self.evaluate(roots)?;
let head_set = self.evaluate(heads)?;
Ok(Box::new(self.walk_children(&*root_set, &*head_set)))
}
ResolvedExpression::Ancestors { heads, generation } => {
let head_set = self.evaluate(heads)?;
let walk = self.walk_ancestors(&*head_set);
@ -625,9 +620,13 @@ impl<'index> EvaluationContext<'index> {
} => {
let root_set = self.evaluate(roots)?;
let head_set = self.evaluate(heads)?;
assert_eq!(generation_from_roots, &GENERATION_RANGE_FULL); // TODO
let (dag_range_set, _) = self.collect_dag_range(&*root_set, &*head_set);
Ok(Box::new(dag_range_set))
if generation_from_roots == &(1..2) {
Ok(Box::new(self.walk_children(&*root_set, &*head_set)))
} else {
assert_eq!(generation_from_roots, &GENERATION_RANGE_FULL); // TODO
let (dag_range_set, _) = self.collect_dag_range(&*root_set, &*head_set);
Ok(Box::new(dag_range_set))
}
}
ResolvedExpression::Heads(candidates) => {
let candidate_set = self.evaluate(candidates)?;

30
lib/src/revset.rs
View File

@ -232,7 +232,6 @@ pub enum RevsetExpression {
All,
Commits(Vec<CommitId>),
CommitRef(RevsetCommitRef),
Children(Rc<RevsetExpression>),
Ancestors {
heads: Rc<RevsetExpression>,
generation: Range<u64>,
@ -360,7 +359,10 @@ impl RevsetExpression {
/// Children of `self`.
pub fn children(self: &Rc<RevsetExpression>) -> Rc<RevsetExpression> {
Rc::new(RevsetExpression::Children(self.clone()))
Rc::new(RevsetExpression::Descendants {
roots: self.clone(),
generation: 1..2,
})
}
/// Descendants of `self`, including `self`.
@ -470,10 +472,6 @@ pub enum ResolvedPredicateExpression {
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum ResolvedExpression {
Commits(Vec<CommitId>),
Children {
roots: Box<ResolvedExpression>,
heads: Box<ResolvedExpression>,
},
Ancestors {
heads: Box<ResolvedExpression>,
generation: Range<u64>,
@ -1244,9 +1242,6 @@ fn try_transform_expression<E>(
RevsetExpression::All => None,
RevsetExpression::Commits(_) => None,
RevsetExpression::CommitRef(_) => None,
RevsetExpression::Children(roots) => {
transform_rec(roots, pre, post)?.map(RevsetExpression::Children)
}
RevsetExpression::Ancestors { heads, generation } => transform_rec(heads, pre, post)?
.map(|heads| RevsetExpression::Ancestors {
heads,
@ -1840,10 +1835,6 @@ impl VisibilityResolutionContext<'_> {
RevsetExpression::CommitRef(_) => {
panic!("Expression '{expression:?}' should have been resolved by caller");
}
RevsetExpression::Children(roots) => ResolvedExpression::Children {
roots: self.resolve(roots).into(),
heads: self.resolve_visible_heads().into(),
},
RevsetExpression::Ancestors { heads, generation } => ResolvedExpression::Ancestors {
heads: self.resolve(heads).into(),
generation: generation.clone(),
@ -1947,7 +1938,6 @@ impl VisibilityResolutionContext<'_> {
| RevsetExpression::All
| RevsetExpression::Commits(_)
| RevsetExpression::CommitRef(_)
| RevsetExpression::Children(_)
| RevsetExpression::Ancestors { .. }
| RevsetExpression::Descendants { .. }
| RevsetExpression::Range { .. }
@ -2202,7 +2192,10 @@ mod tests {
);
assert_eq!(
foo_symbol.children(),
Rc::new(RevsetExpression::Children(foo_symbol.clone()))
Rc::new(RevsetExpression::Descendants {
roots: foo_symbol.clone(),
generation: 1..2
}),
);
assert_eq!(
foo_symbol.descendants(),
@ -3789,8 +3782,8 @@ mod tests {
// 'foo-+' is not 'foo'.
insta::assert_debug_snapshot!(optimize(parse("foo---+").unwrap()), @r###"
Children(
Ancestors {
Descendants {
roots: Ancestors {
heads: CommitRef(
Symbol(
"foo",
@ -3798,7 +3791,8 @@ mod tests {
),
generation: 3..4,
},
)
generation: 1..2,
}
"###);
// For 'roots..heads', heads can be folded.