Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revlog.py @ 47174:0a66eef0ed97
revlog: use revlog.display_id in integrity error
Differential Revision: https://phab.mercurial-scm.org/D10586
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 May 2021 12:24:18 +0200 |
| parents | 1ec64f59dc27 |
| children | f574734eb2b7 |
comparison
equal
deleted
inserted
replaced
| 47173:1ec64f59dc27 | 47174:0a66eef0ed97 |
|---|---|
| 1939 revornode = rev | 1939 revornode = rev |
| 1940 if revornode is None: | 1940 if revornode is None: |
| 1941 revornode = templatefilters.short(hex(node)) | 1941 revornode = templatefilters.short(hex(node)) |
| 1942 raise error.RevlogError( | 1942 raise error.RevlogError( |
| 1943 _(b"integrity check failed on %s:%s") | 1943 _(b"integrity check failed on %s:%s") |
| 1944 % (self._indexfile, pycompat.bytestr(revornode)) | 1944 % (self.display_id, pycompat.bytestr(revornode)) |
| 1945 ) | 1945 ) |
| 1946 except error.RevlogError: | 1946 except error.RevlogError: |
| 1947 if self._censorable and storageutil.iscensoredtext(text): | 1947 if self._censorable and storageutil.iscensoredtext(text): |
| 1948 raise error.CensoredNodeError(self._indexfile, node, text) | 1948 raise error.CensoredNodeError(self._indexfile, node, text) |
| 1949 raise | 1949 raise |