revlog: simplify "partial read" error message
ClosedPublic

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

Download Raw Diff

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

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.May 28 2021, 6:56 PM

Herald added a reviewer: indygreg. · View Herald TranscriptMay 28 2021, 6:56 PM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D10785: revlog: use dedicated code for reading sidedata.May 28 2021, 6:56 PM

Alphare accepted this revision as: Alphare.May 31 2021, 6:22 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

			Path	Packages
M			mercurial/revlog.py (37 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28244		May 28 2021, 6:56 PM	★	★
Diff 2	28297		May 31 2021, 6:37 AM	★	★
Diff 3	28394		Jun 1 2021, 11:10 PM	★	★
Diff 4	28443		Jun 4 2021, 9:54 AM	★	★
Diff 5	28487	rHG0d0fb091c49f73a3eb6deaaa875f490ea307d7de	May 26 2021, 10:09 PM	★	★

Commit	Parents	Author	Summary	Date
a4c7701e6b43	565347468f9f	Pierre-Yves David		May 26 2021, 10:09 PM

Status	Author	Revision
Closed	marmoute	D10800 revlog: allow to pass an existing docket to `_loadindex()`
Closed	marmoute	D10799 revlog: add a ways to blacklist some revision when searching for a delta
Closed	marmoute	D10798 util: add `nb_bytes` argument to `copyfile` to partially copy a file
Closed	marmoute	D10797 revlog: move `revisioninfo` in `revlogutils`
Closed	marmoute	D10796 revlog: use the `entry` function in bundlerepo
Closed	marmoute	D10795 revlog: use entry in revlogv0.py
Closed	marmoute	D10794 revlog: use the new `entry` function in revlog.py
Closed	marmoute	D10793 revlog: add a function to build index entry tuple
Closed	marmoute	D10792 revlog: move `offset_type` to `revlogutils`
Closed	marmoute	D10791 revlog: move entry documentation alongside new related constants
Closed	marmoute	D10790 censor: drop size limitation on the tombstone
Closed	marmoute	D10789 revlog: move censoring code in a dedicated module
Closed	marmoute	D10788 censor: reduce risk of censor test blowing up output limit
Closed	marmoute	D10787 revlog: store sidedata in their own file
Closed	marmoute	D10786 revlog: fix docket.date_filepath docstring
Closed	marmoute	D10785 revlog: use dedicated code for reading sidedata
Closed	marmoute	D10784 revlog: simplify "partial read" error message
Closed	marmoute	D10783 revlog: no longer return sidedata from `_revisiondata`
Closed	marmoute	D10782 revlog: use `self.sidedata` directly in `revlog.clone`
Closed	marmoute	D10781 revlog: use `self.sidedata` directly to construct changelogrevision
Closed	marmoute	D10780 revlog: implement sidedata without using _revisiondata
Closed	marmoute	D10779 revlogv2: drop "sidedatacompression" from the list of todos
Closed	marmoute	D10831 index: use an explicit constant for INDEX_HEADER format and use it for docket

Diff 28244

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

This is an archive of the discontinued Mercurial Phabricator instance.

revlog: simplify "partial read" error messageClosedPublic