D11947: hg-cpython: use ancestor iterator impls from vcsgraph
pacien (Pacien)
phabricator at mercurial-scm.org
Tue Dec 21 15:06:59 UTC 2021
pacien created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D11947
AFFECTED FILES
rust/hg-cpython/src/ancestors.rs
rust/hg-cpython/src/exceptions.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/exceptions.rs b/rust/hg-cpython/src/exceptions.rs
--- a/rust/hg-cpython/src/exceptions.rs
+++ b/rust/hg-cpython/src/exceptions.rs
@@ -37,6 +37,32 @@
}
}
}
+
+ pub fn pynew_from_vcsgraph(
+ py: Python,
+ inner: vcsgraph::graph::GraphReadError,
+ ) -> PyErr {
+ match inner {
+ vcsgraph::graph::GraphReadError::InconsistentGraphData => {
+ GraphError::new(py, "InconsistentGraphData")
+ }
+ vcsgraph::graph::GraphReadError::InvalidKey => {
+ GraphError::new(py, "ParentOutOfRange")
+ }
+ vcsgraph::graph::GraphReadError::KeyedInvalidKey(r) => {
+ GraphError::new(py, ("ParentOutOfRange", r))
+ }
+ vcsgraph::graph::GraphReadError::WorkingDirectoryUnsupported => {
+ match py
+ .import("mercurial.error")
+ .and_then(|m| m.get(py, "WdirUnsupported"))
+ {
+ Err(e) => e,
+ Ok(cls) => PyErr::from_instance(py, cls),
+ }
+ }
+ }
+ }
}
py_exception!(rustext, HgPathPyError, RuntimeError);
diff --git a/rust/hg-cpython/src/ancestors.rs b/rust/hg-cpython/src/ancestors.rs
--- a/rust/hg-cpython/src/ancestors.rs
+++ b/rust/hg-cpython/src/ancestors.rs
@@ -42,20 +42,21 @@
ObjectProtocol, PyClone, PyDict, PyList, PyModule, PyObject, PyResult,
Python, PythonObject, ToPyObject,
};
+use hg::MissingAncestors as CoreMissing;
use hg::Revision;
-use hg::{
- AncestorsIterator as CoreIterator, LazyAncestors as CoreLazy,
- MissingAncestors as CoreMissing,
-};
use std::cell::RefCell;
use std::collections::HashSet;
+use vcsgraph::lazy_ancestors::{
+ AncestorsIterator as VCGAncestorsIterator,
+ LazyAncestors as VCGLazyAncestors,
+};
py_class!(pub class AncestorsIterator |py| {
- data inner: RefCell<Box<CoreIterator<Index>>>;
+ data inner: RefCell<Box<VCGAncestorsIterator<Index>>>;
def __next__(&self) -> PyResult<Option<Revision>> {
match self.inner(py).borrow_mut().next() {
- Some(Err(e)) => Err(GraphError::pynew(py, e)),
+ Some(Err(e)) => Err(GraphError::pynew_from_vcsgraph(py, e)),
None => Ok(None),
Some(Ok(r)) => Ok(Some(r)),
}
@@ -63,7 +64,7 @@
def __contains__(&self, rev: Revision) -> PyResult<bool> {
self.inner(py).borrow_mut().contains(rev)
- .map_err(|e| GraphError::pynew(py, e))
+ .map_err(|e| GraphError::pynew_from_vcsgraph(py, e))
}
def __iter__(&self) -> PyResult<Self> {
@@ -73,32 +74,35 @@
def __new__(_cls, index: PyObject, initrevs: PyObject, stoprev: Revision,
inclusive: bool) -> PyResult<AncestorsIterator> {
let initvec: Vec<Revision> = rev_pyiter_collect(py, &initrevs)?;
- let ait = CoreIterator::new(
+ let ait = VCGAncestorsIterator::new(
pyindex_to_graph(py, index)?,
initvec,
stoprev,
inclusive,
)
- .map_err(|e| GraphError::pynew(py, e))?;
+ .map_err(|e| GraphError::pynew_from_vcsgraph(py, e))?;
AncestorsIterator::from_inner(py, ait)
}
});
impl AncestorsIterator {
- pub fn from_inner(py: Python, ait: CoreIterator<Index>) -> PyResult<Self> {
+ pub fn from_inner(
+ py: Python,
+ ait: VCGAncestorsIterator<Index>,
+ ) -> PyResult<Self> {
Self::create_instance(py, RefCell::new(Box::new(ait)))
}
}
py_class!(pub class LazyAncestors |py| {
- data inner: RefCell<Box<CoreLazy<Index>>>;
+ data inner: RefCell<Box<VCGLazyAncestors<Index>>>;
def __contains__(&self, rev: Revision) -> PyResult<bool> {
self.inner(py)
.borrow_mut()
.contains(rev)
- .map_err(|e| GraphError::pynew(py, e))
+ .map_err(|e| GraphError::pynew_from_vcsgraph(py, e))
}
def __iter__(&self) -> PyResult<AncestorsIterator> {
@@ -114,9 +118,9 @@
let initvec: Vec<Revision> = rev_pyiter_collect(py, &initrevs)?;
let lazy =
- CoreLazy::new(pyindex_to_graph(py, index)?,
+ VCGLazyAncestors::new(pyindex_to_graph(py, index)?,
initvec, stoprev, inclusive)
- .map_err(|e| GraphError::pynew(py, e))?;
+ .map_err(|e| GraphError::pynew_from_vcsgraph(py, e))?;
Self::create_instance(py, RefCell::new(Box::new(lazy)))
}
To: pacien, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list