Patchwork D8161: rust-nodemap: also clear Rust data in `clearcaches`

login
register
mail settings
Submitter phabricator
Date March 11, 2020, 3:43 p.m.
Message ID <5586ab73a63c168fa8e7b81fa8da0e88@localhost.localdomain>
Download mbox | patch
Permalink /patch/45704/
State Not Applicable
Headers show

Comments

phabricator - March 11, 2020, 3:43 p.m.
Closed by commit rHGcadcc8c20860: rust-nodemap: also clear Rust data in `clearcaches` (authored by gracinet).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8161?vs=20660&id=20699

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8161/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8161

AFFECTED FILES
  rust/hg-cpython/src/revlog.rs

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/rust/hg-cpython/src/revlog.rs b/rust/hg-cpython/src/revlog.rs
--- a/rust/hg-cpython/src/revlog.rs
+++ b/rust/hg-cpython/src/revlog.rs
@@ -161,8 +161,12 @@ 
         self.call_cindex(py, "commonancestorsheads", args, kw)
     }
 
-    /// clear the index caches
+    /// Clear the index caches and inner py_class data.
+    /// It is Python's responsibility to call `update_nodemap_data` again.
     def clearcaches(&self, *args, **kw) -> PyResult<PyObject> {
+        self.nt(py).borrow_mut().take();
+        self.docket(py).borrow_mut().take();
+        self.mmap(py).borrow_mut().take();
         self.call_cindex(py, "clearcaches", args, kw)
     }
 
@@ -231,7 +235,7 @@ 
         // `index_getitem` does not handle conversion from PyLong,
         // which expressions such as [e for e in index] internally use.
         // Note that we don't seem to have a direct way to call
-        // PySequence_GetItem (does the job), which would be better for
+        // PySequence_GetItem (does the job), which would possibly be better
         // for performance
         let key = match key.extract::<Revision>(py) {
             Ok(rev) => rev.to_py_object(py).into_object(),