This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10586

revlog: use revlog.display_id in integrity error
ClosedPublic

Authored by marmoute on May 3 2021, 7:49 AM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0a66eef0ed97: revlog: use revlog.display_id in integrity error

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

marmoute created this revision.May 3 2021, 7:49 AM
baymax updated this revision to Diff 27501.May 3 2021, 9:43 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 11 2021, 9:56 AM
This revision is now accepted and ready to land.May 11 2021, 9:56 AM
marmoute added a commit: rHG0a66eef0ed97: revlog: use revlog.display_id in integrity error.May 11 2021, 1:03 PM
Closed by commit rHG0a66eef0ed97: revlog: use revlog.display_id in integrity error (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (2 lines)
Mtests/test-lfs.t (18 lines)
Mtests/test-verify.t (2 lines)

Diff 27832

mercurial/revlog.py

if self._revisioncache and self._revisioncache[0] == node: if self._revisioncache and self._revisioncache[0] == node:
self._revisioncache = None self._revisioncache = None
revornode = rev revornode = rev
if revornode is None: if revornode is None:
revornode = templatefilters.short(hex(node)) revornode = templatefilters.short(hex(node))
raise error.RevlogError( raise error.RevlogError(
_(b"integrity check failed on %s:%s") _(b"integrity check failed on %s:%s")
% (self._indexfile, pycompat.bytestr(revornode)) % (self.display_id, pycompat.bytestr(revornode))
) )
except error.RevlogError: except error.RevlogError:
if self._censorable and storageutil.iscensoredtext(text): if self._censorable and storageutil.iscensoredtext(text):
raise error.CensoredNodeError(self._indexfile, node, text) raise error.CensoredNodeError(self._indexfile, node, text)
raise raise
def _enforceinlinesize(self, tr, fp=None): def _enforceinlinesize(self, tr, fp=None):
"""Check if the revlog is too big for inline and convert if so. """Check if the revlog is too big for inline and convert if so.

tests/test-lfs.t

Repo with damaged lfs objects in any revision will fail verification. Repo with damaged lfs objects in any revision will fail verification.
$ hg -R repo5 verify $ hg -R repo5 verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0 l@1: unpacking 46a2f24864bc: integrity check failed on data/l:0
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 large@0: unpacking 2c531e0992ff: integrity check failed on data/large:0
checked 5 changesets with 10 changes to 4 files checked 5 changesets with 10 changes to 4 files
2 integrity errors encountered! 2 integrity errors encountered!
(first damaged changeset appears to be 0) (first damaged changeset appears to be 0)
[1] [1]
Updates work after cloning a damaged repo, if the damaged lfs objects aren't in Updates work after cloning a damaged repo, if the damaged lfs objects aren't in
the update destination. Those objects won't be added to the new repo's store the update destination. Those objects won't be added to the new repo's store
because they aren't accessed. because they aren't accessed.
$ rm -r fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e $ rm -r fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
$ hg -R fromcorrupt verify -v $ hg -R fromcorrupt verify -v
repository uses revlog format 1 repository uses revlog format 1
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0 l@1: unpacking 46a2f24864bc: integrity check failed on data/l:0
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 large@0: unpacking 2c531e0992ff: integrity check failed on data/large:0
lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
checked 5 changesets with 10 changes to 4 files checked 5 changesets with 10 changes to 4 files
2 integrity errors encountered! 2 integrity errors encountered!
(first damaged changeset appears to be 0) (first damaged changeset appears to be 0)
[1] [1]
$ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v $ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v
repository uses revlog format 1 repository uses revlog format 1
$ test -f fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b $ test -f fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
[1] [1]
$ hg -R fromcorrupt2 verify $ hg -R fromcorrupt2 verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0 l@1: unpacking 46a2f24864bc: integrity check failed on data/l:0
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 large@0: unpacking 2c531e0992ff: integrity check failed on data/large:0
checked 5 changesets with 10 changes to 4 files checked 5 changesets with 10 changes to 4 files
2 integrity errors encountered! 2 integrity errors encountered!
(first damaged changeset appears to be 0) (first damaged changeset appears to be 0)
[1] [1]
Corrupt local files are not sent upstream. (The alternate dummy remote Corrupt local files are not sent upstream. (The alternate dummy remote
avoids the corrupt lfs object in the original remote.) avoids the corrupt lfs object in the original remote.)
$ mkdir $TESTTMP/dummy-remote2 $ mkdir $TESTTMP/dummy-remote2
$ hg init dest $ hg init dest
$ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 push -v dest $ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 push -v dest
pushing to dest pushing to dest
searching for changes searching for changes
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
abort: detected corrupt lfs object: 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e abort: detected corrupt lfs object: 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
(run hg verify) (run hg verify)
[255] [255]
$ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 verify -v $ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 verify -v
repository uses revlog format 1 repository uses revlog format 1
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0 l@1: unpacking 46a2f24864bc: integrity check failed on data/l:0
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 large@0: unpacking 2c531e0992ff: integrity check failed on data/large:0
lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
checked 5 changesets with 10 changes to 4 files checked 5 changesets with 10 changes to 4 files
2 integrity errors encountered! 2 integrity errors encountered!
(first damaged changeset appears to be 0) (first damaged changeset appears to be 0)
[1] [1]
$ cat $TESTTMP/dummy-remote2/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256 $ cat $TESTTMP/dummy-remote2/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256
sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
$ cat fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256 $ cat fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256
sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
$ test -f $TESTTMP/dummy-remote2/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e $ test -f $TESTTMP/dummy-remote2/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
[1] [1]
Accessing a corrupt file will complain Accessing a corrupt file will complain
$ hg --cwd fromcorrupt2 cat -r 0 large $ hg --cwd fromcorrupt2 cat -r 0 large
abort: integrity check failed on data/large.i:0 abort: integrity check failed on data/large:0
[50] [50]
lfs -> normal -> lfs round trip conversions are possible. The 'none()' lfs -> normal -> lfs round trip conversions are possible. The 'none()'
predicate on the command line will override whatever is configured globally and predicate on the command line will override whatever is configured globally and
locally, and ensures everything converts to a regular file. For lfs -> normal, locally, and ensures everything converts to a regular file. For lfs -> normal,
there's no 'lfs' destination repo requirement. For normal -> lfs, there is. there's no 'lfs' destination repo requirement. For normal -> lfs, there is.
$ hg --config extensions.convert= --config 'lfs.track=none()' \ $ hg --config extensions.convert= --config 'lfs.track=none()' \

tests/test-verify.t

> breakbase64=$TESTTMP/break-base64.py > breakbase64=$TESTTMP/break-base64.py
> EOF > EOF
$ hg verify $ hg verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
base64@0: unpacking 794cee7777cb: integrity check failed on data/base64.i:0 base64@0: unpacking 794cee7777cb: integrity check failed on data/base64:0
checked 1 changesets with 1 changes to 1 files checked 1 changesets with 1 changes to 1 files
1 integrity errors encountered! 1 integrity errors encountered!
(first damaged changeset appears to be 0) (first damaged changeset appears to be 0)
[1] [1]
$ hg verify --config verify.skipflags=2147483647 $ hg verify --config verify.skipflags=2147483647
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 1 changesets with 1 changes to 1 files checked 1 changesets with 1 changes to 1 files