diff rust/hg-cpython/src/revlog.rs @ 52411:c2480ac4c5e2

rust-pyo3: retrieving the InnerRevlog of hg-cpython This allows PyO3-based code to use the InnerRevlog, access its shared data (core InnerRevlog), which will then allow, e.g., to retrieve references on the core Index. On the `hg-cpython` (`rusthg` crate, `rustext` Python extension module), we had to also build as a Rust library, and open up some accesses (see notably the public accessor for `inner`, the core `InnerRevlog`). Retrieving the Rust struct underlying a Python object defined by another extension module written in Rust is tricky because the Python type objects are duplicated in the extension modules, leading to failure of the normal type checking. See the doc-comment of `convert_cpython::extract_inner_revlog` for a complete explanation. To solve this, we import the Python type object of `rustext` (defined by `hg-cpython`) and perform a manual check. Checking the Python type is necessary, as PyO3 documentation clearly state that downcasting an object that has not the proper type is Undefined Behaviour. At this point, we do not have conversion facilities for exceptions (`PyErr` on both sides), hence the remaining unwraps).
author Georges Racinet <georges.racinet@cloudcrane.io>
date Sat, 30 Nov 2024 20:57:02 +0100
parents bd8081e9fd62
children 2fb13c3f4496
line wrap: on
line diff
--- a/rust/hg-cpython/src/revlog.rs	Thu Dec 05 18:58:56 2024 +0100
+++ b/rust/hg-cpython/src/revlog.rs	Sat Nov 30 20:57:02 2024 +0100
@@ -16,7 +16,7 @@
     buffer::{Element, PyBuffer},
     exc::{IndexError, ValueError},
     ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyInt, PyList,
-    PyModule, PyObject, PyResult, PySet, PyTuple, PyType, Python,
+    PyModule, PyObject, PyResult, PySet, PySharedRef, PyTuple, PyType, Python,
     PythonObject, ToPyObject, UnsafePyLeaked,
 };
 use hg::{
@@ -51,7 +51,7 @@
 
 pub struct PySharedIndex {
     /// The underlying hg-core index
-    pub(crate) inner: &'static Index,
+    pub inner: &'static Index,
 }
 
 /// Return a Struct implementing the Graph trait
@@ -1488,6 +1488,13 @@
 
 /// Forwarded index methods?
 impl InnerRevlog {
+    pub fn pub_inner<'p, 'a: 'p>(
+        &'a self,
+        py: Python<'p>,
+    ) -> PySharedRef<'p, CoreInnerRevlog> {
+        self.inner(py)
+    }
+
     fn len(&self, py: Python) -> PyResult<usize> {
         let rust_index_len = self.inner(py).borrow().index.len();
         Ok(rust_index_len)