This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4703

filelog: stop proxying checksize() (API)
ClosedPublic

Authored by indygreg on Sep 24 2018, 12:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0cb3e02e1d1b: filelog: stop proxying checksize() (API)
Summary

This was only used by verify code. And the check using it is now
implemented as part of verifyintegrity(). The method is unused
and is revlog-centric, which means it isn't appropriate for the file
storage interface. So remove it.

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

indygreg created this revision.Sep 24 2018, 12:12 PM
Closed by commit rHG0cb3e02e1d1b: filelog: stop proxying checksize() (API) (authored by indygreg). · Explain WhySep 26 2018, 1:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filelog.py (4 lines)
Mmercurial/repository.py (6 lines)
Mtests/simplestorerepo.py (4 lines)

Diff 11375

mercurial/filelog.py

return self._revlog.strip(minlink, transaction) return self._revlog.strip(minlink, transaction)
def censorrevision(self, tr, node, tombstone=b''): def censorrevision(self, tr, node, tombstone=b''):
return self._revlog.censorrevision(node, tombstone=tombstone) return self._revlog.censorrevision(node, tombstone=tombstone)
def files(self): def files(self):
return self._revlog.files() return self._revlog.files()
# Used by verify.
def checksize(self):
return self._revlog.checksize()
def read(self, node): def read(self, node):
t = self.revision(node) t = self.revision(node)
if not t.startswith('\1\n'): if not t.startswith('\1\n'):
return t return t
s = t.index('\1\n', 2) s = t.index('\1\n', 2)
return t[s + 2:] return t[s + 2:]
def add(self, text, meta, transaction, link, p1=None, p2=None): def add(self, text, meta, transaction, link, p1=None, p2=None):

mercurial/repository.py

def files(): def files():
"""Obtain paths that are backing storage for this file. """Obtain paths that are backing storage for this file.
TODO this is used heavily by verify code and there should probably TODO this is used heavily by verify code and there should probably
be a better API for that. be a better API for that.
""" """
def checksize():
"""Obtain the expected sizes of backing files.
TODO this is used by verify and it should not be part of the interface.
"""
def verifyintegrity(state): def verifyintegrity(state):
"""Verifies the integrity of file storage. """Verifies the integrity of file storage.
``state`` is a dict holding state of the verifier process. It can be ``state`` is a dict holding state of the verifier process. It can be
used to communicate data between invocations of multiple storage used to communicate data between invocations of multiple storage
primitives. primitives.
The method yields objects conforming to the ``iverifyproblem`` The method yields objects conforming to the ``iverifyproblem``

tests/simplestorerepo.py

entries = self._svfs.listdir(self._storepath) entries = self._svfs.listdir(self._storepath)
# Strip out undo.backup.* files created as part of transaction # Strip out undo.backup.* files created as part of transaction
# recording. # recording.
entries = [f for f in entries if not f.startswith('undo.backup.')] entries = [f for f in entries if not f.startswith('undo.backup.')]
return [b'/'.join((self._storepath, f)) for f in entries] return [b'/'.join((self._storepath, f)) for f in entries]
# Required by verify.
def checksize(self):
return 0, 0
def add(self, text, meta, transaction, linkrev, p1, p2): def add(self, text, meta, transaction, linkrev, p1, p2):
if meta or text.startswith(b'\1\n'): if meta or text.startswith(b'\1\n'):
text = revlog.packmeta(meta, text) text = revlog.packmeta(meta, text)
return self.addrevision(text, transaction, linkrev, p1, p2) return self.addrevision(text, transaction, linkrev, p1, p2)
def addrevision(self, text, transaction, linkrev, p1, p2, node=None, def addrevision(self, text, transaction, linkrev, p1, p2, node=None,
flags=revlog.REVIDX_DEFAULT_FLAGS, cachedelta=None): flags=revlog.REVIDX_DEFAULT_FLAGS, cachedelta=None):