This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7658

rust-index: expose a method to retrieve the C index
ClosedPublic

Authored by marmoute on Dec 13 2019, 3:12 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG443dc1655923: rust-index: expose a method to retrieve the C index
Summary

The code for shortesthexnodeidprefix need to access the actual C index. For
now we grant its wish and expose a method to do so. Once we have the nodemap in
Rust, we will be able to implement the same feature from rust and we will be
able to drop this method.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

marmoute created this revision.Dec 13 2019, 3:12 PM
marmoute updated this revision to Diff 18891.Dec 19 2019, 1:10 PM
Alphare accepted this revision.Dec 20 2019, 3:39 AM
marmoute updated this revision to Diff 18942.Dec 27 2019, 12:12 PM
gracinet added a commit: rHG443dc1655923: rust-index: expose a method to retrieve the C index.Jan 8 2020, 1:10 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG443dc1655923: rust-index: expose a method to retrieve the C index (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18891

rust/hg-cpython/src/revlog.rs

py_class!(pub class MixedIndex |py| { py_class!(pub class MixedIndex |py| {
data cindex: RefCell<cindex::Index>; data cindex: RefCell<cindex::Index>;
def __new__(_cls, cindex: PyObject) -> PyResult<MixedIndex> { def __new__(_cls, cindex: PyObject) -> PyResult<MixedIndex> {
Self::create_instance(py, RefCell::new( Self::create_instance(py, RefCell::new(
cindex::Index::new(py, cindex)?)) cindex::Index::new(py, cindex)?))
} }
/// Compatibility layer used for Python consumers needing access to the C index
///
/// Only use case so far is `scmutil.shortesthexnodeidprefix`,
/// that may need to build a custom `nodetree`, based on a specified revset.
/// With a Rust implementation of the nodemap, we will be able to get rid of
/// this, by exposing our own standalone nodemap class,
/// ready to accept `MixedIndex`.
def get_cindex(&self) -> PyResult<PyObject> {
Ok(self.cindex(py).borrow().inner().clone_ref(py))
}
// Reforwarded C index API // Reforwarded C index API
// index_methods (tp_methods). Same ordering as in revlog.c // index_methods (tp_methods). Same ordering as in revlog.c
/// return the gca set of the given revs /// return the gca set of the given revs
def ancestors(&self, *args, **kw) -> PyResult<PyObject> { def ancestors(&self, *args, **kw) -> PyResult<PyObject> {
self.call_cindex(py, "ancestors", args, kw) self.call_cindex(py, "ancestors", args, kw)

tests/test-rust-revlog.py

rustext is None, "rustext module ancestor relies on is not available", rustext is None, "rustext module ancestor relies on is not available",
) )
class RustRevlogIndexTest(revlogtesting.RevlogBasedTestBase): class RustRevlogIndexTest(revlogtesting.RevlogBasedTestBase):
def test_heads(self): def test_heads(self):
idx = self.parseindex() idx = self.parseindex()
rustidx = revlog.MixedIndex(idx) rustidx = revlog.MixedIndex(idx)
self.assertEqual(rustidx.headrevs(), idx.headrevs()) self.assertEqual(rustidx.headrevs(), idx.headrevs())
def test_get_cindex(self):
# drop me once we no longer need the method for shortest node
idx = self.parseindex()
rustidx = revlog.MixedIndex(idx)
cidx = rustidx.get_cindex()
self.assertTrue(idx is cidx)
def test_len(self): def test_len(self):
idx = self.parseindex() idx = self.parseindex()
rustidx = revlog.MixedIndex(idx) rustidx = revlog.MixedIndex(idx)
self.assertEqual(len(rustidx), len(idx)) self.assertEqual(len(rustidx), len(idx))
def test_ancestors(self): def test_ancestors(self):
idx = self.parseindex() idx = self.parseindex()
rustidx = revlog.MixedIndex(idx) rustidx = revlog.MixedIndex(idx)