# HG changeset patch # User Pierre-Yves David # Date 1622081350 -7200 # Node ID 0d0fb091c49f73a3eb6deaaa875f490ea307d7de # Parent 9d9eb22b9b6982a6c8a744f89ac5bbf49e7e1aa4 revlog: simplify "partial read" error message We are about to reuse this message in more places and the current handling is pretty hard to read. So we eat two pie with one stone and clean up this. Differential Revision: https://phab.mercurial-scm.org/D10784 diff -r 9d9eb22b9b69 -r 0d0fb091c49f mercurial/revlog.py --- a/mercurial/revlog.py Thu May 27 03:41:02 2021 +0200 +++ b/mercurial/revlog.py Thu May 27 04:09:10 2021 +0200 @@ -256,6 +256,10 @@ # signed integer) _maxentrysize = 0x7FFFFFFF +PARTIAL_READ_MSG = _( + b'partial read of revlog %s; expected %d bytes from offset %d, got %d' +) + class revlog(object): """ @@ -1709,34 +1713,17 @@ if offset != realoffset or reallength != length: startoffset = offset - realoffset if len(d) - startoffset < length: - raise error.RevlogError( - _( - b'partial read of revlog %s; expected %d bytes from ' - b'offset %d, got %d' - ) - % ( - self._indexfile if self._inline else self._datafile, - length, - offset, - len(d) - startoffset, - ) - ) - + filename = self._indexfile if self._inline else self._datafile + got = len(d) - startoffset + m = PARTIAL_READ_MSG % (filename, length, offset, got) + raise error.RevlogError(m) return util.buffer(d, startoffset, length) if len(d) < length: - raise error.RevlogError( - _( - b'partial read of revlog %s; expected %d bytes from offset ' - b'%d, got %d' - ) - % ( - self._indexfile if self._inline else self._datafile, - length, - offset, - len(d), - ) - ) + filename = self._indexfile if self._inline else self._datafile + got = len(d) - startoffset + m = PARTIAL_READ_MSG % (filename, length, offset, got) + raise error.RevlogError(m) return d