Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revlog.py @ 51908: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 | f4733654f144 |
children | 5e79783d4bc7 |
comparison
equal
deleted
inserted
replaced
51907:9d4ad05bc91c | 51908:cfd30df0f8e4 |
---|---|
1308 See mercurial/revlogutils/contants.py for details about the content of an | 1308 See mercurial/revlogutils/contants.py for details about the content of an |
1309 index entry. | 1309 index entry. |
1310 """ | 1310 """ |
1311 | 1311 |
1312 _flagserrorclass = error.RevlogError | 1312 _flagserrorclass = error.RevlogError |
1313 _inner: "_InnerRevlog" | |
1313 | 1314 |
1314 opener: vfsmod.vfs | 1315 opener: vfsmod.vfs |
1315 | 1316 |
1316 @staticmethod | 1317 @staticmethod |
1317 def is_inline_index(header_bytes): | 1318 def is_inline_index(header_bytes): |