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

revset: reorder match arms in evaluate_expression() to group filter stuff

Browse source
This commit is contained in:
Yuya Nishihara 2022-10-25 13:17:43 +09:00
parent 9548b6ad49
commit 030e0069f6
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/src/revset.rs
View file

@ -1264,17 +1264,6 @@ pub fn evaluate_expression<'repo>(
}
Ok(Box::new(EagerRevset { index_entries }))
}
RevsetExpression::ParentCount {
candidates,
parent_count_range,
} => {
let candidates = candidates.evaluate(repo, workspace_ctx)?;
let parent_count_range = parent_count_range.clone();
Ok(Box::new(FilterRevset {
candidates,
predicate: Box::new(move |entry| parent_count_range.contains(&entry.num_parents())),
}))
}
RevsetExpression::PublicHeads => Ok(revset_for_commit_ids(
repo,
&repo.view().public_heads().iter().cloned().collect_vec(),
@ -1315,6 +1304,17 @@ pub fn evaluate_expression<'repo>(
let commit_ids = repo.view().git_head().into_iter().collect_vec();
Ok(revset_for_commit_ids(repo, &commit_ids))
}
RevsetExpression::ParentCount {
candidates,
parent_count_range,
} => {
let candidates = candidates.evaluate(repo, workspace_ctx)?;
let parent_count_range = parent_count_range.clone();
Ok(Box::new(FilterRevset {
candidates,
predicate: Box::new(move |entry| parent_count_range.contains(&entry.num_parents())),
}))
}
RevsetExpression::Description { needle, candidates } => {
let candidates = candidates.evaluate(repo, workspace_ctx)?;
let repo = repo;