mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 20:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

revset: add union_all(...) helper to concatenate multiple -rREV options

Browse source
This commit is contained in:
Yuya Nishihara 2023-06-29 17:09:34 +09:00
parent f0b9969e74
commit 7ad6357c10
1 changed files with 60 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
lib/src/revset.rs
View file

@ -424,6 +424,19 @@ impl RevsetExpression {
Rc::new(RevsetExpression::Union(self.clone(), other.clone())) Rc::new(RevsetExpression::Union(self.clone(), other.clone()))
} }
/// Commits that are in any of the `expressions`.
pub fn union_all(expressions: &[Rc<RevsetExpression>]) -> Rc<RevsetExpression> {
match expressions {
[] => Self::none(),
[expression] => expression.clone(),
_ => {
// Build balanced tree to minimize the recursion depth.
let (left, right) = expressions.split_at(expressions.len() / 2);
Self::union(&Self::union_all(left), &Self::union_all(right))
}
}
}
/// Commits that are in `self` and in `other`. /// Commits that are in `self` and in `other`.
pub fn intersection( pub fn intersection(
self: &Rc<RevsetExpression>, self: &Rc<RevsetExpression>,
@ -2285,9 +2298,12 @@ mod tests {
} }
#[test] #[test]
#[allow(clippy::redundant_clone)] // allow symbol.clone()
fn test_revset_expression_building() { fn test_revset_expression_building() {
let wc_symbol = RevsetExpression::symbol("@".to_string()); let wc_symbol = RevsetExpression::symbol("@".to_string());
let foo_symbol = RevsetExpression::symbol("foo".to_string()); let foo_symbol = RevsetExpression::symbol("foo".to_string());
let bar_symbol = RevsetExpression::symbol("bar".to_string());
let baz_symbol = RevsetExpression::symbol("baz".to_string());
assert_eq!( assert_eq!(
wc_symbol, wc_symbol,
Rc::new(RevsetExpression::CommitRef(RevsetCommitRef::Symbol( Rc::new(RevsetExpression::CommitRef(RevsetCommitRef::Symbol(
@ -2363,6 +2379,50 @@ mod tests {
wc_symbol.clone() wc_symbol.clone()
)) ))
); );
assert_eq!(
RevsetExpression::union_all(&[]),
Rc::new(RevsetExpression::None)
);
assert_eq!(RevsetExpression::union_all(&[wc_symbol.clone()]), wc_symbol);
assert_eq!(
RevsetExpression::union_all(&[wc_symbol.clone(), foo_symbol.clone()]),
Rc::new(RevsetExpression::Union(
wc_symbol.clone(),
foo_symbol.clone(),
))
);
assert_eq!(
RevsetExpression::union_all(&[
wc_symbol.clone(),
foo_symbol.clone(),
bar_symbol.clone(),
]),
Rc::new(RevsetExpression::Union(
wc_symbol.clone(),
Rc::new(RevsetExpression::Union(
foo_symbol.clone(),
bar_symbol.clone(),
))
))
);
assert_eq!(
RevsetExpression::union_all(&[
wc_symbol.clone(),
foo_symbol.clone(),
bar_symbol.clone(),
baz_symbol.clone(),
]),
Rc::new(RevsetExpression::Union(
Rc::new(RevsetExpression::Union(
wc_symbol.clone(),
foo_symbol.clone(),
)),
Rc::new(RevsetExpression::Union(
bar_symbol.clone(),
baz_symbol.clone(),
))
))
);
assert_eq!( assert_eq!(
foo_symbol.intersection(&wc_symbol), foo_symbol.intersection(&wc_symbol),
Rc::new(RevsetExpression::Intersection( Rc::new(RevsetExpression::Intersection(