This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6516

rust-discovery: accept the new 'respectsize' init arg
ClosedPublic

Authored by gracinet on Jun 12 2019, 2:13 PM.

Details

Reviewers
kevincox
Group Reviewers
hg-reviewers
Commits
rHG5154701a5413: rust-discovery: accept the new 'respectsize' init arg
Summary

At this stage, we don't do anything about it: it will be meaningful
in sampling methods that aren't implemented yet.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

gracinet created this revision.Jun 12 2019, 2:13 PM
Alphare updated this revision to Diff 15931.Jul 17 2019, 12:30 PM
kevincox accepted this revision.Jul 22 2019, 11:25 AM

It seems weird to add this argument without using it. I would much rather it was added as the implementation was added.

Alphare added a subscriber: Alphare.Jul 23 2019, 5:03 AM
In D6516#97578, @kevincox wrote:

It seems weird to add this argument without using it. I would much rather it was added as the implementation was added.

I think it makes sense considering this is supposed to be a drop-in replacement for the Python implementation, though I would prefer if there were a comment about it.
I'll update with the comment as well as the new import syntax.

Alphare updated this revision to Diff 16010.Jul 23 2019, 5:14 AM
gracinet added a commit: rHG5154701a5413: rust-discovery: accept the new 'respectsize' init arg.Aug 14 2019, 4:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5154701a5413: rust-discovery: accept the new 'respectsize' init arg (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 16183

rust/hg-cpython/src/discovery.rs

use hg::discovery::PartialDiscovery as CorePartialDiscovery; use hg::discovery::PartialDiscovery as CorePartialDiscovery;
use hg::Revision; use hg::Revision;
use std::cell::RefCell; use std::cell::RefCell;
py_class!(pub class PartialDiscovery |py| { py_class!(pub class PartialDiscovery |py| {
data inner: RefCell<Box<CorePartialDiscovery<Index>>>; data inner: RefCell<Box<CorePartialDiscovery<Index>>>;
// `_respectsize` is currently only here to replicate the Python API and
// will be used in future patches inside methods that are yet to be
// implemented.
def __new__( def __new__(
_cls, _cls,
index: PyObject, index: PyObject,
targetheads: PyObject targetheads: PyObject,
_respectsize: bool
) -> PyResult<PartialDiscovery> { ) -> PyResult<PartialDiscovery> {
Self::create_instance( Self::create_instance(
py, py,
RefCell::new(Box::new(CorePartialDiscovery::new( RefCell::new(Box::new(CorePartialDiscovery::new(
Index::new(py, index)?, Index::new(py, index)?,
rev_pyiter_collect(py, &targetheads)?, rev_pyiter_collect(py, &targetheads)?,
))) )))
) )

tests/test-rust-discovery.py

self.assertEqual({i: (r[5], r[6]) for i, r in enumerate(idx)}, self.assertEqual({i: (r[5], r[6]) for i, r in enumerate(idx)},
{0: (-1, -1), {0: (-1, -1),
1: (0, -1), 1: (0, -1),
2: (1, -1), 2: (1, -1),
3: (2, -1)}) 3: (2, -1)})
def testaddcommonsmissings(self): def testaddcommonsmissings(self):
idx = self.parseindex() idx = self.parseindex()
disco = PartialDiscovery(idx, [3]) disco = PartialDiscovery(idx, [3], True)
self.assertFalse(disco.hasinfo()) self.assertFalse(disco.hasinfo())
self.assertFalse(disco.iscomplete()) self.assertFalse(disco.iscomplete())
disco.addcommons([1]) disco.addcommons([1])
self.assertTrue(disco.hasinfo()) self.assertTrue(disco.hasinfo())
self.assertFalse(disco.iscomplete()) self.assertFalse(disco.iscomplete())
disco.addmissings([2]) disco.addmissings([2])
self.assertTrue(disco.hasinfo()) self.assertTrue(disco.hasinfo())
self.assertTrue(disco.iscomplete()) self.assertTrue(disco.iscomplete())
self.assertEqual(disco.commonheads(), {1}) self.assertEqual(disco.commonheads(), {1})
def testaddmissingsstats(self): def testaddmissingsstats(self):
idx = self.parseindex() idx = self.parseindex()
disco = PartialDiscovery(idx, [3]) disco = PartialDiscovery(idx, [3], True)
self.assertIsNone(disco.stats()['undecided'], None) self.assertIsNone(disco.stats()['undecided'], None)
disco.addmissings([2]) disco.addmissings([2])
self.assertEqual(disco.stats()['undecided'], 2) self.assertEqual(disco.stats()['undecided'], 2)
def testaddinfocommonfirst(self): def testaddinfocommonfirst(self):
idx = self.parseindex() idx = self.parseindex()
disco = PartialDiscovery(idx, [3]) disco = PartialDiscovery(idx, [3], True)
disco.addinfo([(1, True), (2, False)]) disco.addinfo([(1, True), (2, False)])
self.assertTrue(disco.hasinfo()) self.assertTrue(disco.hasinfo())
self.assertTrue(disco.iscomplete()) self.assertTrue(disco.iscomplete())
self.assertEqual(disco.commonheads(), {1}) self.assertEqual(disco.commonheads(), {1})
def testaddinfomissingfirst(self): def testaddinfomissingfirst(self):
idx = self.parseindex() idx = self.parseindex()
disco = PartialDiscovery(idx, [3]) disco = PartialDiscovery(idx, [3], True)
disco.addinfo([(2, False), (1, True)]) disco.addinfo([(2, False), (1, True)])
self.assertTrue(disco.hasinfo()) self.assertTrue(disco.hasinfo())
self.assertTrue(disco.iscomplete()) self.assertTrue(disco.iscomplete())
self.assertEqual(disco.commonheads(), {1}) self.assertEqual(disco.commonheads(), {1})
if __name__ == '__main__': if __name__ == '__main__':
import silenttestrunner import silenttestrunner
silenttestrunner.main(__name__) silenttestrunner.main(__name__)