ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

revset: resolve "all()" prior to evaluation

Browse source
This commit is contained in:
Yuya Nishihara 2023-04-06 13:03:20 +09:00
parent f43f0d24b8
commit 7e1e9efa38
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/default_revset_engine.rs
View file

@ -574,17 +574,6 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> {
expression: &ResolvedExpression,
) -> Result<Box<dyn InternalRevset<'index> + 'index>, RevsetEvaluationError> {
match expression {
ResolvedExpression::All => {
// Since `all()` does not include hidden commits, some of the logical
// transformation rules may subtly change the evaluated set. For example,
// `all() & x` is not `x` if `x` is hidden. This wouldn't matter in practice,
// but if it does, the heads set could be extended to include the commits
// (and `remote_branches()`) specified in the revset expression. Alternatively,
// some optimization rules could be removed, but that means `author(_) & x`
// would have to test `:visble_heads() & x`.
let walk = self.composite_index.walk_revs(self.visible_heads, &[]);
Ok(Box::new(RevWalkRevset { walk }))
}
ResolvedExpression::Commits(commit_ids) => {
Ok(Box::new(self.revset_for_commit_ids(commit_ids)))
}

13
lib/src/revset.rs
View file

@ -460,7 +460,6 @@ pub enum ResolvedPredicateExpression {
/// Use `RevsetExpression` API to build a query programmatically.
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum ResolvedExpression {
All, // TODO: should be substituted at resolve_visibility()
Commits(Vec<CommitId>),
Children {
roots: Box<ResolvedExpression>,
@ -1901,7 +1900,17 @@ impl VisibilityResolutionContext {
}
fn resolve_all(&self) -> ResolvedExpression {
ResolvedExpression::All
// Since `all()` does not include hidden commits, some of the logical
// transformation rules may subtly change the evaluated set. For example,
// `all() & x` is not `x` if `x` is hidden. This wouldn't matter in practice,
// but if it does, the heads set could be extended to include the commits
// (and `remote_branches()`) specified in the revset expression. Alternatively,
// some optimization rules could be removed, but that means `author(_) & x`
// would have to test `:visble_heads() & x`.
ResolvedExpression::Ancestors {
heads: self.resolve_visible_heads().into(),
generation: GENERATION_RANGE_FULL,
}
}
fn resolve_visible_heads(&self) -> ResolvedExpression {