Mercurial > hg
changeset 52069:4675ab746a02
manifest: drop the CamelCase name for `manifest.manifestrevlog`
See 61557734c0ae for the reasoning.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Wed, 23 Oct 2024 16:36:50 -0400 |
| parents | c392d57e8a06 |
| children | 6641a3ae8313 |
| files | mercurial/manifest.py mercurial/unionrepo.py |
| diffstat | 2 files changed, 6 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/manifest.py Wed Oct 23 16:32:34 2024 -0400 +++ b/mercurial/manifest.py Wed Oct 23 16:36:50 2024 -0400 @@ -1672,7 +1672,7 @@ """Exception raised when fastdelta isn't usable on a manifest.""" -class ManifestRevlog: +class manifestrevlog: # (repository.imanifeststorage) """A revlog that stores manifest texts. This is responsible for caching the full-text manifest contents. """ @@ -2045,13 +2045,6 @@ self._revlog.opener = value -manifestrevlog = interfaceutil.implementer(repository.imanifeststorage)( - ManifestRevlog -) - -if typing.TYPE_CHECKING: - manifestrevlog = ManifestRevlog - AnyManifestCtx = Union['ManifestCtx', 'TreeManifestCtx'] # TODO: drop this in favor of repository.imanifestdict AnyManifestDict = Union[manifestdict, treemanifest] @@ -2174,7 +2167,7 @@ self._manifestlog = manifestlog self._manifestdict = manifestdict(manifestlog.nodeconstants.nodelen) - def _storage(self) -> ManifestRevlog: + def _storage(self) -> manifestrevlog: return self._manifestlog.getstorage(b'') def copy(self) -> 'MemManifestCtx': @@ -2226,7 +2219,7 @@ # rev = store.rev(node) # self.linkrev = store.linkrev(rev) - def _storage(self) -> 'ManifestRevlog': + def _storage(self) -> 'manifestrevlog': return self._manifestlog.getstorage(b'') def node(self) -> bytes: @@ -2382,7 +2375,7 @@ self._dir = dir self._treemanifest = treemanifest(manifestlog.nodeconstants) - def _storage(self) -> ManifestRevlog: + def _storage(self) -> manifestrevlog: return self._manifestlog.getstorage(b'') def copy(self) -> 'MemTreeManifestCtx': @@ -2435,7 +2428,7 @@ # rev = store.rev(node) # self.linkrev = store.linkrev(rev) - def _storage(self) -> ManifestRevlog: + def _storage(self) -> manifestrevlog: narrowmatch = self._manifestlog._narrowmatch if not narrowmatch.always(): if not narrowmatch.visitdir(self._dir[:-1]):
--- a/mercurial/unionrepo.py Wed Oct 23 16:32:34 2024 -0400 +++ b/mercurial/unionrepo.py Wed Oct 23 16:36:50 2024 -0400 @@ -213,7 +213,7 @@ class unionmanifest(unionrevlog, manifest.manifestrevlog): repotiprev: int - revlog2: manifest.ManifestRevlog + revlog2: manifest.manifestrevlog def __init__(self, nodeconstants, opener, opener2, linkmapper): # XXX manifestrevlog is not actually a revlog , so mixing it with