Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revlog.py @ 47175:f574734eb2b7
revlog: use revlog.display_id in censor related errors
Differential Revision: https://phab.mercurial-scm.org/D10587
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 May 2021 12:24:29 +0200 |
| parents | 0a66eef0ed97 |
| children | dfe8074239de |
comparison
equal
deleted
inserted
replaced
| 47174:0a66eef0ed97 | 47175:f574734eb2b7 |
|---|---|
| 1943 _(b"integrity check failed on %s:%s") | 1943 _(b"integrity check failed on %s:%s") |
| 1944 % (self.display_id, 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.display_id, node, text) |
| 1949 raise | 1949 raise |
| 1950 | 1950 |
| 1951 def _enforceinlinesize(self, tr, fp=None): | 1951 def _enforceinlinesize(self, tr, fp=None): |
| 1952 """Check if the revlog is too big for inline and convert if so. | 1952 """Check if the revlog is too big for inline and convert if so. |
| 1953 | 1953 |
| 2477 hlen = struct.calcsize(b">lll") | 2477 hlen = struct.calcsize(b">lll") |
| 2478 oldlen = self.rawsize(baserev) | 2478 oldlen = self.rawsize(baserev) |
| 2479 newlen = len(delta) - hlen | 2479 newlen = len(delta) - hlen |
| 2480 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen): | 2480 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen): |
| 2481 raise error.CensoredBaseError( | 2481 raise error.CensoredBaseError( |
| 2482 self._indexfile, self.node(baserev) | 2482 self.display_id, self.node(baserev) |
| 2483 ) | 2483 ) |
| 2484 | 2484 |
| 2485 if not flags and self._peek_iscensored(baserev, delta, flush): | 2485 if not flags and self._peek_iscensored(baserev, delta, flush): |
| 2486 flags |= REVIDX_ISCENSORED | 2486 flags |= REVIDX_ISCENSORED |
| 2487 | 2487 |