From patchwork Wed Feb 26 17:37:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D8161: rust-nodemap: also clear Rust data in `clearcaches` From: phabricator X-Patchwork-Id: 45342 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Wed, 26 Feb 2020 17:37:14 +0000 Alphare created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default 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 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 @@ -152,8 +152,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 { + 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) } @@ -222,7 +226,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::(py) { Ok(rev) => rev.to_py_object(py).into_object(),