This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10784

revlog: simplify "partial read" error message
ClosedPublic

Authored by marmoute on May 28 2021, 6:56 PM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0d0fb091c49f: revlog: simplify "partial read" error message
Summary

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.

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 28 2021, 6:56 PM
Alphare accepted this revision as: Alphare.May 31 2021, 6:22 AM
baymax updated this revision to Diff 28297.May 31 2021, 6:37 AM

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

baymax updated this revision to Diff 28394.Jun 1 2021, 11:10 PM

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

baymax updated this revision to Diff 28443.Jun 4 2021, 9:54 AM

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

marmoute added a commit: rHG0d0fb091c49f: revlog: simplify "partial read" error message.Jun 7 2021, 5:22 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0d0fb091c49f: revlog: simplify "partial read" error message (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (37 lines)

Diff 28487

mercurial/revlog.py

index, cache = parse_index_v1(data, inline) index, cache = parse_index_v1(data, inline)
return rustrevlog.MixedIndex(index), cache return rustrevlog.MixedIndex(index), cache
# corresponds to uncompressed length of indexformatng (2 gigs, 4-byte # corresponds to uncompressed length of indexformatng (2 gigs, 4-byte
# signed integer) # signed integer)
_maxentrysize = 0x7FFFFFFF _maxentrysize = 0x7FFFFFFF
PARTIAL_READ_MSG = _(
b'partial read of revlog %s; expected %d bytes from offset %d, got %d'
)
class revlog(object): class revlog(object):
""" """
the underlying revision storage object the underlying revision storage object
A revlog consists of two parts, an index and the revision data. A revlog consists of two parts, an index and the revision data.
The index is a file with a fixed record size containing The index is a file with a fixed record size containing
with self._datareadfp(df) as df: with self._datareadfp(df) as df:
df.seek(realoffset) df.seek(realoffset)
d = df.read(reallength) d = df.read(reallength)
self._cachesegment(realoffset, d) self._cachesegment(realoffset, d)
if offset != realoffset or reallength != length: if offset != realoffset or reallength != length:
startoffset = offset - realoffset startoffset = offset - realoffset
if len(d) - startoffset < length: if len(d) - startoffset < length:
raise error.RevlogError( filename = self._indexfile if self._inline else self._datafile
_( got = len(d) - startoffset
b'partial read of revlog %s; expected %d bytes from ' m = PARTIAL_READ_MSG % (filename, length, offset, got)
b'offset %d, got %d' raise error.RevlogError(m)
)
% (
self._indexfile if self._inline else self._datafile,
length,
offset,
len(d) - startoffset,
)
)
return util.buffer(d, startoffset, length) return util.buffer(d, startoffset, length)
if len(d) < length: if len(d) < length:
raise error.RevlogError( filename = self._indexfile if self._inline else self._datafile
_( got = len(d) - startoffset
b'partial read of revlog %s; expected %d bytes from offset ' m = PARTIAL_READ_MSG % (filename, length, offset, got)
b'%d, got %d' raise error.RevlogError(m)
)
% (
self._indexfile if self._inline else self._datafile,
length,
offset,
len(d),
)
)
return d return d
def _getsegment(self, offset, length, df=None): def _getsegment(self, offset, length, df=None):
"""Obtain a segment of raw data from the revlog. """Obtain a segment of raw data from the revlog.
Accepts an absolute offset, length of bytes to obtain, and an Accepts an absolute offset, length of bytes to obtain, and an
optional file handle to the already-opened revlog. If the file optional file handle to the already-opened revlog. If the file