Mercurial > public > mercurial-scm > hg-stable
diff rust/hg-cpython/src/cindex.rs @ 41310:ab0d762d89ef stable
rust-cpython: raising error.WdirUnsupported
The Graph implementation of hg-cpython returns the appropriate error
upon encounter with the working directory special revision number, and
this gives us in particular a code path to test from test-rust-ancestors.py
In the current implementation, the exception is actually raised from
the iterator instantiation; we are nonetheless consuming the iterator
in the test with `list()` in order not to depend on implementation details.
| author | Georges Racinet <georges.racinet@octobus.net> |
|---|---|
| date | Wed, 23 Jan 2019 07:49:36 -0500 |
| parents | ef54bd33b476 |
| children | 326fdce22fb2 |
line wrap: on
line diff
--- a/rust/hg-cpython/src/cindex.rs Wed Jan 23 07:47:04 2019 -0500 +++ b/rust/hg-cpython/src/cindex.rs Wed Jan 23 07:49:36 2019 -0500 @@ -16,7 +16,7 @@ use self::python_sys::PyCapsule_Import; use cpython::{PyClone, PyErr, PyObject, PyResult, Python}; -use hg::{Graph, GraphError, Revision}; +use hg::{Graph, GraphError, Revision, WORKING_DIRECTORY_REVISION}; use libc::c_int; use std::ffi::CStr; use std::mem::transmute; @@ -86,6 +86,9 @@ impl Graph for Index { /// wrap a call to the C extern parents function fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> { + if rev == WORKING_DIRECTORY_REVISION { + return Err(GraphError::WorkingDirectoryUnsupported); + } let mut res: [c_int; 2] = [0; 2]; let code = unsafe { (self.parents)(