##// END OF EJS Templates
copies: iterate over children directly (instead of parents)...
copies: iterate over children directly (instead of parents) Before this change we would gather all parent → child edges and iterate on all parent, gathering copy information for children and aggregating them from there. They are not strict requirement for edges to be processed in that specific order. We could also simply iterate over all "children" revision and aggregate data from both parents at the same time. This patch does that. It make various things simpler: * since both parents are processed at the same time, we no longer need to cache data for merge (see next changeset for details), * we no longer need nested loop to process data, * we no longer need to store partial merge data for a rev from distinct loop interaction to another when processing merges, * we no longer need to build a full parent -> children mapping (we only rely on a simpler "parent -> number of children" map (for memory efficiency), * the data access pattern is now simpler (from lower revisions to higher revisions) and entirely predicable. That predictability open the way to prefetching and parallel processing. So that new iterations order requires simpler code and open the way to interesting optimisation. The effect on performance is quite good. In the worse case, we don't see any significant negative impact. And in the best case, the reduction of roundtrip to Python provide us with a significant speed. Some example below: Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev # full comparison between the previous changeset and this one Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000048 s, 0.000041 s, -0.000007 s, × 0.8542, 41 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000153 s, 0.000102 s, -0.000051 s, × 0.6667, 17 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004209 s, 0.004254 s, +0.000045 s, × 1.0107, 4 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000203 s, 0.000282 s, +0.000079 s, × 1.3892, 31 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000059 s, 0.000048 s, -0.000011 s, × 0.8136, 48 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000194 s, 0.000211 s, +0.000017 s, × 1.0876, 30 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000380 s, 0.000375 s, -0.000005 s, × 0.9868, 375 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010588 s, 0.010574 s, -0.000014 s, × 0.9987, 1762 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.048961 s, 0.049974 s, +0.001013 s, × 1.0207, 10 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.083612 s, 0.084300 s, +0.000688 s, × 1.0082, 12 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.058579 s, 0.060128 s, +0.001549 s, × 1.0264, 11 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.736783 s, 0.686542 s, -0.050241 s, × 0.9318, 15 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.022050 s, 0.009277 s, -0.012773 s, × 0.4207, 4638 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.120800 s, 0.114733 s, -0.006067 s, × 0.9498, 10 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000140 s, 0.000081 s, -0.000059 s, × 0.5786, 40 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000114 s, 0.000107 s, -0.000007 s, × 0.9386, 53 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000224 s, 0.000173 s, -0.000051 s, × 0.7723, 57 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000723 s, 0.000698 s, -0.000025 s, × 0.9654, 77 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.009665 s, 0.009248 s, -0.000417 s, × 0.9569, 6 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.014820 s, 0.015446 s, +0.000626 s, × 1.0422, 10 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.076049 s, 0.074373 s, -0.001676 s, × 0.9780, 12 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.683603 s, 0.639870 s, -0.043733 s, × 0.9360, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000161 s, 0.000088 s, -0.000073 s, × 0.5466, 44 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000234 s, 0.000199 s, -0.000035 s, × 0.8504, 24 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000247 s, 0.000171 s, -0.000076 s, × 0.6923, 19 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000630 s, 0.000592 s, -0.000038 s, × 0.9397, 84 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003286 s, 0.003151 s, -0.000135 s, × 0.9589, 1050 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062441 s, 0.061612 s, -0.000829 s, × 0.9867, 10268 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005423 s, 0.005381 s, -0.000042 s, × 0.9923, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005919 s, 0.003742 s, -0.002177 s, × 0.6322, 91 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.062597 s, 0.061983 s, -0.000614 s, × 0.9902, 7 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.043551 s, 0.019861 s, -0.023690 s, × 0.4560, 32 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.192475 s, 0.188101 s, -0.004374 s, × 0.9773, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.955575 s, 1.806696 s, -0.148879 s, × 0.9239, 11 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 2.886501 s, 2.682987 s, -0.203514 s, × 0.9295, 13 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001181 s, 0.000852 s, -0.000329 s, × 0.7214, 426 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001189 s, 0.000859 s, -0.000330 s, × 0.7225, 429 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000563 s, 0.000150 s, -0.000413 s, × 0.2664, 37 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001548 s, 0.001158 s, -0.000390 s, × 0.7481, 579 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.027782 s, 0.027240 s, -0.000542 s, × 0.9805, 27240 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062781 s, 0.062824 s, +0.000043 s, × 1.0007, 10470 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005778 s, 0.005463 s, -0.000315 s, × 0.9455, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.006192 s, 0.004238 s, -0.001954 s, × 0.6844, 103 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.065391 s, 0.064113 s, -0.001278 s, × 0.9805, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.317216 s, 0.294063 s, -0.023153 s, × 0.9270, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.303119 s, 0.281493 s, -0.021626 s, × 0.9287, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.045739 s, 0.020390 s, -0.025349 s, × 0.4458, 33 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 3.098021 s, 3.023879 s, -0.074142 s, × 0.9761, 31 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.771480 s, 0.735549 s, -0.035931 s, × 0.9534, 14 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 18.813422 s, 18.568900 s, -0.244522 s, × 0.9870, 51 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 18.684923 s, 18.356645 s, -0.328278 s, × 0.9824, 50 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 18.296305 s, 18.250393 s, -0.045912 s, × 0.9975, 50 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 3.061887 s, 2.792459 s, -0.269428 s, × 0.9120, 14 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 103.869641 s, 107.697264 s, +3.827623 s, × 1.0369, 470 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 64.262957 s, 63.961040 s, -0.301917 s, × 0.9953, 167 µs/rev Differential Revision: https://phab.mercurial-scm.org/D9422

File last commit:

r45500:26114bd6 default
r46764:294d5aca default
Show More
ancestors.rs
787 lines | 25.5 KiB | application/rls-services+xml | RustLexer
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 // ancestors.rs
//
// Copyright 2018 Georges Racinet <gracinet@anybox.fr>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//! Rust versions of generic DAG ancestors algorithms for Mercurial
use super::{Graph, GraphError, Revision, NULL_REVISION};
Raphaël Gomès
rust-filepatterns: add a Rust implementation of pattern-related utils...
r42514 use crate::dagops;
Georges Racinet
rust: translation of missingancestors...
r40995 use std::cmp::max;
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 use std::collections::{BinaryHeap, HashSet};
/// Iterator over the ancestors of a given list of revisions
/// This is a generic type, defined and implemented for any Graph, so that
/// it's easy to
///
/// - unit test in pure Rust
/// - bind to main Mercurial code, potentially in several ways and have these
/// bindings evolve over time
pub struct AncestorsIterator<G: Graph> {
graph: G,
visit: BinaryHeap<Revision>,
seen: HashSet<Revision>,
stoprev: Revision,
}
Georges Racinet
rust: core implementation for lazyancestors...
r41084 /// Lazy ancestors set, backed by AncestorsIterator
pub struct LazyAncestors<G: Graph + Clone> {
graph: G,
containsiter: AncestorsIterator<G>,
initrevs: Vec<Revision>,
stoprev: Revision,
inclusive: bool,
}
Georges Racinet
rust: translation of missingancestors...
r40995 pub struct MissingAncestors<G: Graph> {
graph: G,
bases: HashSet<Revision>,
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 max_base: Revision,
Georges Racinet
rust: translation of missingancestors...
r40995 }
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 impl<G: Graph> AncestorsIterator<G> {
/// Constructor.
///
/// if `inclusive` is true, then the init revisions are emitted in
/// particular, otherwise iteration starts from their parents.
Yuya Nishihara
rust: use 'impl Trait' in method argument of AncestorsIterator...
r41138 pub fn new(
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 graph: G,
Yuya Nishihara
rust: use 'impl Trait' in method argument of AncestorsIterator...
r41138 initrevs: impl IntoIterator<Item = Revision>,
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 stoprev: Revision,
inclusive: bool,
Yuya Nishihara
rust: use 'impl Trait' in method argument of AncestorsIterator...
r41138 ) -> Result<Self, GraphError> {
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 let filtered_initrevs = initrevs.into_iter().filter(|&r| r >= stoprev);
if inclusive {
let visit: BinaryHeap<Revision> = filtered_initrevs.collect();
Raphaël Gomès
rust: do a clippy pass...
r45500 let seen = visit.iter().cloned().collect();
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 return Ok(AncestorsIterator {
Raphaël Gomès
rust: do a clippy pass...
r45500 visit,
seen,
stoprev,
graph,
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 });
}
let mut this = AncestorsIterator {
visit: BinaryHeap::new(),
seen: HashSet::new(),
Raphaël Gomès
rust: do a clippy pass...
r45500 stoprev,
graph,
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 };
this.seen.insert(NULL_REVISION);
for rev in filtered_initrevs {
Georges Racinet
rust: changed Graph.parents to return [Revision; 2]...
r40969 for parent in this.graph.parents(rev)?.iter().cloned() {
this.conditionally_push_rev(parent);
}
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 }
Ok(this)
}
#[inline]
fn conditionally_push_rev(&mut self, rev: Revision) {
Georges Racinet
rust: less set lookups in AncestorsIterator...
r41863 if self.stoprev <= rev && self.seen.insert(rev) {
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 self.visit.push(rev);
}
}
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 /// Consumes partially the iterator to tell if the given target
/// revision
/// is in the ancestors it emits.
/// This is meant for iterators actually dedicated to that kind of
/// purpose
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 pub fn contains(&mut self, target: Revision) -> Result<bool, GraphError> {
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 if self.seen.contains(&target) && target != NULL_REVISION {
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 return Ok(true);
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 }
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 for item in self {
let rev = item?;
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 if rev == target {
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 return Ok(true);
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 }
if rev < target {
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 return Ok(false);
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 }
}
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 Ok(false)
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 }
Georges Racinet
rust: core implementation for lazyancestors...
r41084
pub fn peek(&self) -> Option<Revision> {
Raphaël Gomès
rust: do a clippy pass...
r45500 self.visit.peek().cloned()
Georges Racinet
rust: core implementation for lazyancestors...
r41084 }
/// Tell if the iterator is about an empty set
///
/// The result does not depend whether the iterator has been consumed
/// or not.
/// This is mostly meant for iterators backing a lazy ancestors set
pub fn is_empty(&self) -> bool {
if self.visit.len() > 0 {
return false;
}
if self.seen.len() > 1 {
return false;
}
// at this point, the seen set is at most a singleton.
// If not `self.inclusive`, it's still possible that it has only
// the null revision
self.seen.is_empty() || self.seen.contains(&NULL_REVISION)
}
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 }
Georges Racinet
rust: core implementation for lazyancestors...
r41084 /// Main implementation for the iterator
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 ///
/// The algorithm is the same as in `_lazyancestorsiter()` from `ancestors.py`
/// with a few non crucial differences:
///
/// - there's no filtering of invalid parent revisions. Actually, it should be
/// consistent and more efficient to filter them from the end caller.
Georges Racinet
rust: improved docstring...
r40968 /// - we don't have the optimization for adjacent revisions (i.e., the case
/// where `p1 == rev - 1`), because it amounts to update the first element of
/// the heap without sifting, which Rust's BinaryHeap doesn't let us do.
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 /// - we save a few pushes by comparing with `stoprev` before pushing
impl<G: Graph> Iterator for AncestorsIterator<G> {
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 type Item = Result<Revision, GraphError>;
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 fn next(&mut self) -> Option<Self::Item> {
Georges Racinet
rust: peek_mut optim for lazy ancestors...
r40847 let current = match self.visit.peek() {
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 None => {
return None;
}
Georges Racinet
rust: peek_mut optim for lazy ancestors...
r40847 Some(c) => *c,
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 };
Georges Racinet
rust: changed Graph.parents to return [Revision; 2]...
r40969 let [p1, p2] = match self.graph.parents(current) {
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 Ok(ps) => ps,
Err(e) => return Some(Err(e)),
};
Georges Racinet
rust: less set lookups in AncestorsIterator...
r41863 if p1 < self.stoprev || !self.seen.insert(p1) {
Georges Racinet
rust: peek_mut optim for lazy ancestors...
r40847 self.visit.pop();
} else {
*(self.visit.peek_mut().unwrap()) = p1;
};
Georges Racinet
rust: rename local variables in AncestorsIterator::next...
r40867 self.conditionally_push_rev(p2);
Yuya Nishihara
rust: propagate error of index_get_parents() properly...
r40898 Some(Ok(current))
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 }
}
Georges Racinet
rust: core implementation for lazyancestors...
r41084 impl<G: Graph + Clone> LazyAncestors<G> {
pub fn new(
graph: G,
initrevs: impl IntoIterator<Item = Revision>,
stoprev: Revision,
inclusive: bool,
) -> Result<Self, GraphError> {
let v: Vec<Revision> = initrevs.into_iter().collect();
Ok(LazyAncestors {
graph: graph.clone(),
containsiter: AncestorsIterator::new(
graph,
v.iter().cloned(),
stoprev,
inclusive,
)?,
initrevs: v,
Raphaël Gomès
rust: do a clippy pass...
r45500 stoprev,
inclusive,
Georges Racinet
rust: core implementation for lazyancestors...
r41084 })
}
pub fn contains(&mut self, rev: Revision) -> Result<bool, GraphError> {
self.containsiter.contains(rev)
}
pub fn is_empty(&self) -> bool {
self.containsiter.is_empty()
}
pub fn iter(&self) -> AncestorsIterator<G> {
// the arguments being the same as for self.containsiter, we know
// for sure that AncestorsIterator constructor can't fail
AncestorsIterator::new(
self.graph.clone(),
self.initrevs.iter().cloned(),
self.stoprev,
self.inclusive,
)
.unwrap()
}
}
Georges Racinet
rust: translation of missingancestors...
r40995 impl<G: Graph> MissingAncestors<G> {
pub fn new(graph: G, bases: impl IntoIterator<Item = Revision>) -> Self {
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 let mut created = MissingAncestors {
Raphaël Gomès
rust: do a clippy pass...
r45500 graph,
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 bases: HashSet::new(),
max_base: NULL_REVISION,
};
created.add_bases(bases);
created
Georges Racinet
rust: translation of missingancestors...
r40995 }
pub fn has_bases(&self) -> bool {
Georges Racinet
rust: stop putting NULL_REVISION in MissingAncestors.bases...
r41865 !self.bases.is_empty()
Georges Racinet
rust: translation of missingancestors...
r40995 }
/// Return a reference to current bases.
///
/// This is useful in unit tests, but also setdiscovery.py does
/// read the bases attribute of a ancestor.missingancestors instance.
pub fn get_bases<'a>(&'a self) -> &'a HashSet<Revision> {
&self.bases
}
Georges Racinet
rust: MissingAncestors.basesheads()...
r41282 /// Computes the relative heads of current bases.
///
/// The object is still usable after this.
pub fn bases_heads(&self) -> Result<HashSet<Revision>, GraphError> {
dagops::heads(&self.graph, self.bases.iter())
}
/// Consumes the object and returns the relative heads of its bases.
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 pub fn into_bases_heads(
mut self,
) -> Result<HashSet<Revision>, GraphError> {
Georges Racinet
rust: MissingAncestors.basesheads()...
r41282 dagops::retain_heads(&self.graph, &mut self.bases)?;
Ok(self.bases)
}
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 /// Add some revisions to `self.bases`
///
/// Takes care of keeping `self.max_base` up to date.
Georges Racinet
rust: translation of missingancestors...
r40995 pub fn add_bases(
&mut self,
new_bases: impl IntoIterator<Item = Revision>,
) {
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 let mut max_base = self.max_base;
self.bases.extend(
new_bases
.into_iter()
.filter(|&rev| rev != NULL_REVISION)
.map(|r| {
if r > max_base {
max_base = r;
}
r
}),
);
self.max_base = max_base;
Georges Racinet
rust: translation of missingancestors...
r40995 }
/// Remove all ancestors of self.bases from the revs set (in place)
pub fn remove_ancestors_from(
&mut self,
revs: &mut HashSet<Revision>,
) -> Result<(), GraphError> {
revs.retain(|r| !self.bases.contains(r));
Georges Racinet
rust: stop putting NULL_REVISION in MissingAncestors.bases...
r41865 // the null revision is always an ancestor. Logically speaking
// it's debatable in case bases is empty, but the Python
// implementation always adds NULL_REVISION to bases, making it
// unconditionnally true.
Georges Racinet
rust: translation of missingancestors...
r40995 revs.remove(&NULL_REVISION);
if revs.is_empty() {
return Ok(());
}
// anything in revs > start is definitely not an ancestor of bases
// revs <= start need to be investigated
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 if self.max_base == NULL_REVISION {
return Ok(());
}
Georges Racinet
rust: translation of missingancestors...
r40995 // whatever happens, we'll keep at least keepcount of them
// knowing this gives us a earlier stop condition than
// going all the way to the root
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 let keepcount = revs.iter().filter(|r| **r > self.max_base).count();
Georges Racinet
rust: translation of missingancestors...
r40995
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 let mut curr = self.max_base;
Georges Racinet
rust: translation of missingancestors...
r40995 while curr != NULL_REVISION && revs.len() > keepcount {
if self.bases.contains(&curr) {
revs.remove(&curr);
self.add_parents(curr)?;
}
curr -= 1;
}
Ok(())
}
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 /// Add the parents of `rev` to `self.bases`
///
/// This has no effect on `self.max_base`
Georges Racinet
rust: translation of missingancestors...
r40995 #[inline]
fn add_parents(&mut self, rev: Revision) -> Result<(), GraphError> {
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 if rev == NULL_REVISION {
return Ok(());
}
Georges Racinet
rust: translation of missingancestors...
r40995 for p in self.graph.parents(rev)?.iter().cloned() {
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 // No need to bother the set with inserting NULL_REVISION over and
// over
Georges Racinet
rust: translation of missingancestors...
r40995 if p != NULL_REVISION {
self.bases.insert(p);
}
}
Ok(())
}
/// Return all the ancestors of revs that are not ancestors of self.bases
///
/// This may include elements from revs.
///
/// Equivalent to the revset (::revs - ::self.bases). Revs are returned in
/// revision number order, which is a topological order.
pub fn missing_ancestors(
&mut self,
revs: impl IntoIterator<Item = Revision>,
) -> Result<Vec<Revision>, GraphError> {
// just for convenience and comparison with Python version
let bases_visit = &mut self.bases;
let mut revs: HashSet<Revision> = revs
.into_iter()
.filter(|r| !bases_visit.contains(r))
.collect();
let revs_visit = &mut revs;
let mut both_visit: HashSet<Revision> =
revs_visit.intersection(&bases_visit).cloned().collect();
if revs_visit.is_empty() {
return Ok(Vec::new());
}
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 let max_revs = revs_visit.iter().cloned().max().unwrap();
let start = max(self.max_base, max_revs);
Georges Racinet
rust: translation of missingancestors...
r40995
// TODO heuristics for with_capacity()?
let mut missing: Vec<Revision> = Vec::new();
Yuya Nishihara
rust: use .rev() for reverse range...
r41137 for curr in (0..=start).rev() {
Georges Racinet
rust: translation of missingancestors...
r40995 if revs_visit.is_empty() {
break;
}
Georges Racinet
rust: less set lookups in MissingAncestors...
r41864 if both_visit.remove(&curr) {
Georges Racinet
rust: translation of missingancestors...
r40995 // curr's parents might have made it into revs_visit through
// another path
for p in self.graph.parents(curr)?.iter().cloned() {
if p == NULL_REVISION {
continue;
}
revs_visit.remove(&p);
bases_visit.insert(p);
both_visit.insert(p);
}
Yuya Nishihara
rust-ancestors: adjust branches and inline comments per previous change...
r41170 } else if revs_visit.remove(&curr) {
Yuya Nishihara
rust-ancestors: adjust indent level to make next change easier to follow
r41167 missing.push(curr);
for p in self.graph.parents(curr)?.iter().cloned() {
if p == NULL_REVISION {
continue;
}
Georges Racinet
rust: less set lookups in MissingAncestors...
r41864 if bases_visit.contains(&p) {
// p is already known to be an ancestor of revs_visit
revs_visit.remove(&p);
both_visit.insert(p);
} else if both_visit.contains(&p) {
// p should have been in bases_visit
Yuya Nishihara
rust-ancestors: adjust indent level to make next change easier to follow
r41167 revs_visit.remove(&p);
Georges Racinet
rust: translation of missingancestors...
r40995 bases_visit.insert(p);
Yuya Nishihara
rust-ancestors: adjust indent level to make next change easier to follow
r41167 } else {
// visit later
Yuya Nishihara
rust-ancestors: remove unreachable conditions from missing_ancestors()
r41169 revs_visit.insert(p);
Georges Racinet
rust: translation of missingancestors...
r40995 }
}
Yuya Nishihara
rust-ancestors: duplicate loop that visits parents of revs/bases...
r41168 } else if bases_visit.contains(&curr) {
for p in self.graph.parents(curr)?.iter().cloned() {
if p == NULL_REVISION {
continue;
}
Georges Racinet
rust: less set lookups in MissingAncestors...
r41864 if revs_visit.remove(&p) || both_visit.contains(&p) {
Yuya Nishihara
rust-ancestors: adjust branches and inline comments per previous change...
r41170 // p is an ancestor of bases_visit, and is implicitly
// in revs_visit, which means p is ::revs & ::bases.
Yuya Nishihara
rust-ancestors: duplicate loop that visits parents of revs/bases...
r41168 bases_visit.insert(p);
both_visit.insert(p);
} else {
Yuya Nishihara
rust-ancestors: remove unreachable conditions from missing_ancestors()
r41169 bases_visit.insert(p);
Yuya Nishihara
rust-ancestors: duplicate loop that visits parents of revs/bases...
r41168 }
}
Georges Racinet
rust: translation of missingancestors...
r40995 }
}
missing.reverse();
Ok(missing)
}
}
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 #[cfg(test)]
mod tests {
use super::*;
Georges Racinet
rust: factorized testing Graphs...
r41277 use crate::testing::{SampleGraph, VecGraph};
Georges Racinet
rust: translation of missingancestors...
r40995 use std::iter::FromIterator;
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307
fn list_ancestors<G: Graph>(
graph: G,
initrevs: Vec<Revision>,
stoprev: Revision,
inclusive: bool,
) -> Vec<Revision> {
AncestorsIterator::new(graph, initrevs, stoprev, inclusive)
.unwrap()
Georges Racinet
rust: adapted hg-core tests for iteration over Result...
r40965 .map(|res| res.unwrap())
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 .collect()
}
#[test]
/// Same tests as test-ancestor.py, without membership
/// (see also test-ancestor.py.out)
fn test_list_ancestor() {
Georges Racinet
rust: factorized testing Graphs...
r41277 assert_eq!(list_ancestors(SampleGraph, vec![], 0, false), vec![]);
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 assert_eq!(
Georges Racinet
rust: factorized testing Graphs...
r41277 list_ancestors(SampleGraph, vec![11, 13], 0, false),
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 vec![8, 7, 4, 3, 2, 1, 0]
);
assert_eq!(
Georges Racinet
rust: factorized testing Graphs...
r41277 list_ancestors(SampleGraph, vec![1, 3], 0, false),
vec![1, 0]
);
assert_eq!(
list_ancestors(SampleGraph, vec![11, 13], 0, true),
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 vec![13, 11, 8, 7, 4, 3, 2, 1, 0]
);
assert_eq!(
Georges Racinet
rust: factorized testing Graphs...
r41277 list_ancestors(SampleGraph, vec![11, 13], 6, false),
vec![8, 7]
);
assert_eq!(
list_ancestors(SampleGraph, vec![11, 13], 6, true),
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 vec![13, 11, 8, 7]
);
Georges Racinet
rust: factorized testing Graphs...
r41277 assert_eq!(
list_ancestors(SampleGraph, vec![11, 13], 11, true),
vec![13, 11]
);
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 assert_eq!(
Georges Racinet
rust: factorized testing Graphs...
r41277 list_ancestors(SampleGraph, vec![11, 13], 12, true),
vec![13]
);
assert_eq!(
list_ancestors(SampleGraph, vec![10, 1], 0, true),
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 vec![10, 5, 4, 2, 1, 0]
);
}
#[test]
/// Corner case that's not directly in test-ancestors.py, but
/// that happens quite often, as demonstrated by running the whole
/// suite.
/// For instance, run tests/test-obsolete-checkheads.t
fn test_nullrev_input() {
let mut iter =
Georges Racinet
rust: factorized testing Graphs...
r41277 AncestorsIterator::new(SampleGraph, vec![-1], 0, false).unwrap();
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 assert_eq!(iter.next(), None)
}
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 #[test]
fn test_contains() {
let mut lazy =
Georges Racinet
rust: factorized testing Graphs...
r41277 AncestorsIterator::new(SampleGraph, vec![10, 1], 0, true).unwrap();
Georges Racinet
rust: adapted hg-core tests for iteration over Result...
r40965 assert!(lazy.contains(1).unwrap());
assert!(!lazy.contains(3).unwrap());
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336
let mut lazy =
Georges Racinet
rust: factorized testing Graphs...
r41277 AncestorsIterator::new(SampleGraph, vec![0], 0, false).unwrap();
Georges Racinet
rust: adapted hg-core tests for iteration over Result...
r40965 assert!(!lazy.contains(NULL_REVISION).unwrap());
Georges Racinet
rust: rustlazyancestors.__contains__...
r40336 }
Georges Racinet
rust: core implementation for lazyancestors...
r41084 #[test]
fn test_peek() {
let mut iter =
Georges Racinet
rust: factorized testing Graphs...
r41277 AncestorsIterator::new(SampleGraph, vec![10], 0, true).unwrap();
Georges Racinet
rust: core implementation for lazyancestors...
r41084 // peek() gives us the next value
assert_eq!(iter.peek(), Some(10));
// but it's not been consumed
assert_eq!(iter.next(), Some(Ok(10)));
// and iteration resumes normally
assert_eq!(iter.next(), Some(Ok(5)));
// let's drain the iterator to test peek() at the end
while iter.next().is_some() {}
assert_eq!(iter.peek(), None);
}
#[test]
fn test_empty() {
let mut iter =
Georges Racinet
rust: factorized testing Graphs...
r41277 AncestorsIterator::new(SampleGraph, vec![10], 0, true).unwrap();
Georges Racinet
rust: core implementation for lazyancestors...
r41084 assert!(!iter.is_empty());
while iter.next().is_some() {}
assert!(!iter.is_empty());
Georges Racinet
rust: factorized testing Graphs...
r41277 let iter =
AncestorsIterator::new(SampleGraph, vec![], 0, true).unwrap();
Georges Racinet
rust: core implementation for lazyancestors...
r41084 assert!(iter.is_empty());
// case where iter.seen == {NULL_REVISION}
Georges Racinet
rust: factorized testing Graphs...
r41277 let iter =
AncestorsIterator::new(SampleGraph, vec![0], 0, false).unwrap();
Georges Racinet
rust: core implementation for lazyancestors...
r41084 assert!(iter.is_empty());
}
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 /// A corrupted Graph, supporting error handling tests
Georges Racinet
rust: core implementation for lazyancestors...
r41084 #[derive(Clone, Debug)]
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 struct Corrupted;
impl Graph for Corrupted {
Georges Racinet
rust: changed Graph.parents to return [Revision; 2]...
r40969 fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> {
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 match rev {
Georges Racinet
rust: changed Graph.parents to return [Revision; 2]...
r40969 1 => Ok([0, -1]),
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 r => Err(GraphError::ParentOutOfRange(r)),
}
}
}
#[test]
fn test_initrev_out_of_range() {
// inclusive=false looks up initrev's parents right away
Georges Racinet
rust: factorized testing Graphs...
r41277 match AncestorsIterator::new(SampleGraph, vec![25], 0, false) {
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 Ok(_) => panic!("Should have been ParentOutOfRange"),
Err(e) => assert_eq!(e, GraphError::ParentOutOfRange(25)),
}
}
#[test]
fn test_next_out_of_range() {
// inclusive=false looks up initrev's parents right away
let mut iter =
AncestorsIterator::new(Corrupted, vec![1], 0, false).unwrap();
Georges Racinet
rust: adapted hg-core tests for iteration over Result...
r40965 assert_eq!(iter.next(), Some(Err(GraphError::ParentOutOfRange(0))));
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 }
Georges Racinet
rust: translation of missingancestors...
r40995
#[test]
Georges Racinet
rust: core implementation for lazyancestors...
r41084 fn test_lazy_iter_contains() {
let mut lazy =
Georges Racinet
rust: factorized testing Graphs...
r41277 LazyAncestors::new(SampleGraph, vec![11, 13], 0, false).unwrap();
Georges Racinet
rust: core implementation for lazyancestors...
r41084
let revs: Vec<Revision> = lazy.iter().map(|r| r.unwrap()).collect();
// compare with iterator tests on the same initial revisions
assert_eq!(revs, vec![8, 7, 4, 3, 2, 1, 0]);
// contains() results are correct, unaffected by the fact that
// we consumed entirely an iterator out of lazy
assert_eq!(lazy.contains(2), Ok(true));
assert_eq!(lazy.contains(9), Ok(false));
}
#[test]
fn test_lazy_contains_iter() {
let mut lazy =
Georges Racinet
rust: factorized testing Graphs...
r41277 LazyAncestors::new(SampleGraph, vec![11, 13], 0, false).unwrap(); // reminder: [8, 7, 4, 3, 2, 1, 0]
Georges Racinet
rust: core implementation for lazyancestors...
r41084
assert_eq!(lazy.contains(2), Ok(true));
assert_eq!(lazy.contains(6), Ok(false));
// after consumption of 2 by the inner iterator, results stay
// consistent
assert_eq!(lazy.contains(2), Ok(true));
assert_eq!(lazy.contains(5), Ok(false));
// iter() still gives us a fresh iterator
let revs: Vec<Revision> = lazy.iter().map(|r| r.unwrap()).collect();
assert_eq!(revs, vec![8, 7, 4, 3, 2, 1, 0]);
}
#[test]
Georges Racinet
rust: MissingAncestors.basesheads()...
r41282 /// Test constructor, add/get bases and heads
fn test_missing_bases() -> Result<(), GraphError> {
Georges Racinet
rust: translation of missingancestors...
r40995 let mut missing_ancestors =
Georges Racinet
rust: factorized testing Graphs...
r41277 MissingAncestors::new(SampleGraph, [5, 3, 1, 3].iter().cloned());
Georges Racinet
rust: translation of missingancestors...
r40995 let mut as_vec: Vec<Revision> =
missing_ancestors.get_bases().iter().cloned().collect();
as_vec.sort();
assert_eq!(as_vec, [1, 3, 5]);
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 assert_eq!(missing_ancestors.max_base, 5);
Georges Racinet
rust: translation of missingancestors...
r40995
missing_ancestors.add_bases([3, 7, 8].iter().cloned());
as_vec = missing_ancestors.get_bases().iter().cloned().collect();
as_vec.sort();
assert_eq!(as_vec, [1, 3, 5, 7, 8]);
Georges Racinet
rust: itering less on MissingAncestors.bases for max()...
r41866 assert_eq!(missing_ancestors.max_base, 8);
Georges Racinet
rust: MissingAncestors.basesheads()...
r41282
as_vec = missing_ancestors.bases_heads()?.iter().cloned().collect();
as_vec.sort();
assert_eq!(as_vec, [3, 5, 7, 8]);
Ok(())
Georges Racinet
rust: translation of missingancestors...
r40995 }
fn assert_missing_remove(
bases: &[Revision],
revs: &[Revision],
expected: &[Revision],
) {
let mut missing_ancestors =
Georges Racinet
rust: factorized testing Graphs...
r41277 MissingAncestors::new(SampleGraph, bases.iter().cloned());
Georges Racinet
rust: translation of missingancestors...
r40995 let mut revset: HashSet<Revision> = revs.iter().cloned().collect();
missing_ancestors
.remove_ancestors_from(&mut revset)
.unwrap();
let mut as_vec: Vec<Revision> = revset.into_iter().collect();
as_vec.sort();
assert_eq!(as_vec.as_slice(), expected);
}
#[test]
fn test_missing_remove() {
assert_missing_remove(
&[1, 2, 3, 4, 7],
Vec::from_iter(1..10).as_slice(),
&[5, 6, 8, 9],
);
assert_missing_remove(&[10], &[11, 12, 13, 14], &[11, 12, 13, 14]);
assert_missing_remove(&[7], &[1, 2, 3, 4, 5], &[3, 5]);
}
fn assert_missing_ancestors(
bases: &[Revision],
revs: &[Revision],
expected: &[Revision],
) {
let mut missing_ancestors =
Georges Racinet
rust: factorized testing Graphs...
r41277 MissingAncestors::new(SampleGraph, bases.iter().cloned());
Georges Racinet
rust: translation of missingancestors...
r40995 let missing = missing_ancestors
.missing_ancestors(revs.iter().cloned())
.unwrap();
assert_eq!(missing.as_slice(), expected);
}
#[test]
fn test_missing_ancestors() {
// examples taken from test-ancestors.py by having it run
// on the same graph (both naive and fast Python algs)
assert_missing_ancestors(&[10], &[11], &[3, 7, 11]);
assert_missing_ancestors(&[11], &[10], &[5, 10]);
assert_missing_ancestors(&[7], &[9, 11], &[3, 6, 9, 11]);
}
/// An interesting case found by a random generator similar to
/// the one in test-ancestor.py. An early version of Rust MissingAncestors
/// failed this, yet none of the integration tests of the whole suite
/// catched it.
#[test]
fn test_remove_ancestors_from_case1() {
let graph: VecGraph = vec![
[NULL_REVISION, NULL_REVISION],
[0, NULL_REVISION],
[1, 0],
[2, 1],
[3, NULL_REVISION],
[4, NULL_REVISION],
[5, 1],
[2, NULL_REVISION],
[7, NULL_REVISION],
[8, NULL_REVISION],
[9, NULL_REVISION],
[10, 1],
[3, NULL_REVISION],
[12, NULL_REVISION],
[13, NULL_REVISION],
[14, NULL_REVISION],
[4, NULL_REVISION],
[16, NULL_REVISION],
[17, NULL_REVISION],
[18, NULL_REVISION],
[19, 11],
[20, NULL_REVISION],
[21, NULL_REVISION],
[22, NULL_REVISION],
[23, NULL_REVISION],
[2, NULL_REVISION],
[3, NULL_REVISION],
[26, 24],
[27, NULL_REVISION],
[28, NULL_REVISION],
[12, NULL_REVISION],
[1, NULL_REVISION],
[1, 9],
[32, NULL_REVISION],
[33, NULL_REVISION],
[34, 31],
[35, NULL_REVISION],
[36, 26],
[37, NULL_REVISION],
[38, NULL_REVISION],
[39, NULL_REVISION],
[40, NULL_REVISION],
[41, NULL_REVISION],
[42, 26],
[0, NULL_REVISION],
[44, NULL_REVISION],
[45, 4],
[40, NULL_REVISION],
[47, NULL_REVISION],
[36, 0],
[49, NULL_REVISION],
[NULL_REVISION, NULL_REVISION],
[51, NULL_REVISION],
[52, NULL_REVISION],
[53, NULL_REVISION],
[14, NULL_REVISION],
[55, NULL_REVISION],
[15, NULL_REVISION],
[23, NULL_REVISION],
[58, NULL_REVISION],
[59, NULL_REVISION],
[2, NULL_REVISION],
[61, 59],
[62, NULL_REVISION],
[63, NULL_REVISION],
[NULL_REVISION, NULL_REVISION],
[65, NULL_REVISION],
[66, NULL_REVISION],
[67, NULL_REVISION],
[68, NULL_REVISION],
[37, 28],
[69, 25],
[71, NULL_REVISION],
[72, NULL_REVISION],
[50, 2],
[74, NULL_REVISION],
[12, NULL_REVISION],
[18, NULL_REVISION],
[77, NULL_REVISION],
[78, NULL_REVISION],
[79, NULL_REVISION],
[43, 33],
[81, NULL_REVISION],
[82, NULL_REVISION],
[83, NULL_REVISION],
[84, 45],
[85, NULL_REVISION],
[86, NULL_REVISION],
[NULL_REVISION, NULL_REVISION],
[88, NULL_REVISION],
[NULL_REVISION, NULL_REVISION],
[76, 83],
[44, NULL_REVISION],
[92, NULL_REVISION],
[93, NULL_REVISION],
[9, NULL_REVISION],
[95, 67],
[96, NULL_REVISION],
[97, NULL_REVISION],
[NULL_REVISION, NULL_REVISION],
];
let problem_rev = 28 as Revision;
let problem_base = 70 as Revision;
// making the problem obvious: problem_rev is a parent of problem_base
assert_eq!(graph.parents(problem_base).unwrap()[1], problem_rev);
let mut missing_ancestors: MissingAncestors<VecGraph> =
MissingAncestors::new(
graph,
[60, 26, 70, 3, 96, 19, 98, 49, 97, 47, 1, 6]
.iter()
.cloned(),
);
assert!(missing_ancestors.bases.contains(&problem_base));
let mut revs: HashSet<Revision> =
[4, 12, 41, 28, 68, 38, 1, 30, 56, 44]
.iter()
.cloned()
.collect();
missing_ancestors.remove_ancestors_from(&mut revs).unwrap();
assert!(!revs.contains(&problem_rev));
}
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 }