Mercurial > hg
view tests/test-rust-revlog.py @ 51871:cfd30df0f8e4
bundlerepo: fix mismatches with repository and revlog classes
Both pytype and PyCharm complained that `write()` and `_write()` in the
bundlephasecache class aren't proper overrides- indeed they seem to be missing
an argument that the base class has.
PyCharm and pytype also complained that the `revlog.revlog` class doesn't have a
`_chunk()` method. That looks like it was moved from revlog to `_InnerRevlog`
back in e8ad6d8de8b8, and wasn't caught because this module wasn't type checked.
However, I couldn't figure out a syntax with `revlog.revlog._inner._chunk(self, rev)`,
as it complained about passing too many args. `bundlerevlog._rawtext()` uses
this `super(...)` style to call the super class, so hopefully that works, even
with the wonky dynamic subclassing. The revlog class needed the `_InnerRevlog`
field typed because it isn't set in the constructor.
Finally, the vfs type hints look broken. This initially failed with:
File "/mnt/c/Users/Matt/hg/mercurial/bundlerepo.py", line 65, in __init__: Function readonlyvfs.__init__ was called with the wrong arguments [wrong-arg-types]
Expected: (self, vfs: mercurial.vfs.vfs)
Actually passed: (self, vfs: Callable)
Called from (traceback):
line 232, in dirlog
line 214, in __init__
I don't see a raw Callable, but I tried changing some of the vfs args to be typed
as `vfsmod.abstractvfs`, but that class doesn't have `options`, so it failed
elsewhere. `readonlyvfs` isn't a subclass of `vfs` (it's a subclass of
`abstractvfs`), so I'm not sure how to handle that. It would be a shame to have
to make a union of vfs subclasses (but not all of them have `options` either).
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 03 Aug 2024 01:33:13 -0400 |
parents | f94c10334bcb |
children |
line wrap: on
line source
import struct import unittest from mercurial.node import hex try: from mercurial import rustext rustext.__name__ # trigger immediate actual import except ImportError: rustext = None else: from mercurial.rustext import revlog # this would fail already without appropriate ancestor.__package__ from mercurial.rustext.ancestor import LazyAncestors from mercurial.testing import revlog as revlogtesting header = struct.unpack(">I", revlogtesting.data_non_inlined[:4])[0] @unittest.skipIf( rustext is None, "rustext module revlog relies on is not available", ) class RustRevlogIndexTest(revlogtesting.RevlogBasedTestBase): def test_heads(self): idx = self.parseindex() rustidx = revlog.Index(revlogtesting.data_non_inlined, header) self.assertEqual(rustidx.headrevs(), idx.headrevs()) def test_len(self): idx = self.parseindex() rustidx = revlog.Index(revlogtesting.data_non_inlined, header) self.assertEqual(len(rustidx), len(idx)) def test_ancestors(self): rustidx = revlog.Index(revlogtesting.data_non_inlined, header) lazy = LazyAncestors(rustidx, [3], 0, True) # we have two more references to the index: # - in its inner iterator for __contains__ and __bool__ # - in the LazyAncestors instance itself (to spawn new iterators) self.assertTrue(2 in lazy) self.assertTrue(bool(lazy)) self.assertEqual(list(lazy), [3, 2, 1, 0]) # a second time to validate that we spawn new iterators self.assertEqual(list(lazy), [3, 2, 1, 0]) # let's check bool for an empty one self.assertFalse(LazyAncestors(rustidx, [0], 0, False)) @unittest.skipIf( rustext is None, "rustext module revlog relies on is not available", ) class RustRevlogNodeTreeClassTest(revlogtesting.RustRevlogBasedTestBase): def test_standalone_nodetree(self): idx = self.parserustindex() nt = revlog.NodeTree(idx) for i in range(4): nt.insert(i) bin_nodes = [entry[7] for entry in idx] hex_nodes = [hex(n) for n in bin_nodes] for i, node in enumerate(hex_nodes): self.assertEqual(nt.prefix_rev_lookup(node), i) self.assertEqual(nt.prefix_rev_lookup(node[:5]), i) # all 4 revisions in idx (standard data set) have different # first nybbles in their Node IDs, # hence `nt.shortest()` should return 1 for them, except when # the leading nybble is 0 (ambiguity with NULL_NODE) for i, (bin_node, hex_node) in enumerate(zip(bin_nodes, hex_nodes)): shortest = nt.shortest(bin_node) expected = 2 if hex_node[0] == ord('0') else 1 self.assertEqual(shortest, expected) self.assertEqual(nt.prefix_rev_lookup(hex_node[:shortest]), i) # test invalidation (generation poisoning) detection del idx[3] self.assertTrue(nt.is_invalidated()) if __name__ == '__main__': import silenttestrunner silenttestrunner.main(__name__)