revlogv2: temporarily forbid inline revlogs
ClosedPublic

mercurial/revlog.py
541	Should we really drop this ? If we don't use the inline revlog right now, but will do in the future, it is better to keep this. Or am I missing something.

This revision now requires changes to proceed.Mar 9 2021, 11:48 AM

Alphare added inline comments.Mar 10 2021, 1:44 PM

mercurial/revlog.py
541	I guess it's better to leave it here, yes.

Alphare updated this revision to Diff 26224.Mar 10 2021, 2:12 PM

marmoute accepted this revision.Mar 11 2021, 1:16 PM

Alphare updated this revision to Diff 26258.Mar 12 2021, 6:34 AM

Alphare updated this revision to Diff 26335.Mar 15 2021, 6:24 AM

Alphare added a commit: rHGc8bb7b89179e: revlogv2: temporarily forbid inline revlogs.Mar 15 2021, 2:34 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGc8bb7b89179e: revlogv2: temporarily forbid inline revlogs (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/revlog.py (8 lines)
M			tests/test-revlog-v2.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25675		Feb 19 2021, 6:16 AM	★	★
Diff 2	25997		Mar 1 2021, 11:52 AM	★	★
Diff 3	26093		Mar 4 2021, 10:18 AM	★	★
Diff 4	26224		Mar 10 2021, 2:12 PM	★	★
Diff 5	26258		Mar 12 2021, 6:34 AM	★	★
Diff 6	26335		Mar 15 2021, 6:24 AM	★	★
Diff 7	26382	rHGc8bb7b89179e8d0dc437fb04f94be8659a8cd7f3	Feb 19 2021, 5:04 AM	★	★

Commit	Parents	Author	Summary	Date
c84135d576bd	886db8a99fdf	Raphaël Gomès		Feb 19 2021, 5:04 AM

Status	Author	Revision
Closed	Alphare	D10106 requirements: also add a generaldelta constant
Closed	Alphare	D10105 requirements: add constant for revlog v1 requirement
Closed	Alphare	D10024 error: add `hint` attribute to `SidedataHashError`
Closed	Alphare	D10023 changegroup: use the local variable instead of reaching through self
Closed	Alphare	D10216 configitems: add TODOs blocking the move out of experimental for revlogv2
Closed	Alphare	D10032 sidedata-exchange: rewrite sidedata on-the-fly whenever possible
Closed	Alphare	D10031 revlog-index: add `replace_sidedata_info` method
Closed	Alphare	D10030 revlogv2: temporarily forbid inline revlogs
Closed	Alphare	D10029 changegroupv4: add sidedata helpers
Closed	Alphare	D10151 revlog: add attribute on revlogs that specifies its kind
Closed	Alphare	D10028 sidedata-exchange: add `wanted_sidedata` and `sidedata_computers` to repos
Closed	Alphare	D10027 delta: add sidedata field to revision delta
Closed	Alphare	D10026 changegroup: add v4 changegroup for revlog v2 exchange
Closed	Alphare	D10025 revlogv2: don't assume that the sidedata of the last rev is right after data
Closed	Alphare	D9993 sidedata: move to new sidedata storage in revlogv2
Closed	Alphare	D9846 cext: add support for revlogv2
Closed	Alphare	D9845 bitmanipulation: add utils to read/write bigendian 64bit integers
Closed	Alphare	D10113 format: remove sidedata format variant
Closed	Alphare	D9844 revlogv2: allow upgrading to v2
Closed	Alphare	D9843 revlog: introduce v2 format
Closed	Alphare	D10109 requirements: also add a fncache constant
Closed	Alphare	D10108 requirements: also add a store constant
Closed	Alphare	D10107 requirements: also add a dotencode constant
Closed	Alphare	D10104 pure-parsers: document index class constants

Diff 25997

mercurial/revlog.py


	self._concurrencychecker = concurrencychecker			self._concurrencychecker = concurrencychecker

	def _loadindex(self):			def _loadindex(self):
	mmapindexthreshold = None			mmapindexthreshold = None
	opts = self.opener.options			opts = self.opener.options

	if b'revlogv2' in opts:			if b'revlogv2' in opts:
	newversionflags = REVLOGV2 \| FLAG_INLINE_DATA			newversionflags = REVLOGV2
				marmouteUnsubmitted Not Done Should we really drop this ? If we don't use the inline revlog right now, but will do in the future, it is better to keep this. Or am I missing something. marmoute: Should we really drop this ? If we don't use the inline revlog right now, but will do in the…
				AlphareAuthorUnsubmitted Done I guess it's better to leave it here, yes. Alphare: I guess it's better to leave it here, yes.
	elif b'revlogv1' in opts:			elif b'revlogv1' in opts:
	newversionflags = REVLOGV1 \| FLAG_INLINE_DATA			newversionflags = REVLOGV1 \| FLAG_INLINE_DATA
	if b'generaldelta' in opts:			if b'generaldelta' in opts:
	newversionflags \|= FLAG_GENERALDELTA			newversionflags \|= FLAG_GENERALDELTA
	elif b'revlogv0' in self.opener.options:			elif b'revlogv0' in self.opener.options:
	newversionflags = REVLOGV0			newversionflags = REVLOGV0
	else:			else:
	newversionflags = REVLOG_DEFAULT_VERSION			newversionflags = REVLOG_DEFAULT_VERSION

	elif fmt == REVLOGV2:			elif fmt == REVLOGV2:
	if flags & ~REVLOGV2_FLAGS:			if flags & ~REVLOGV2_FLAGS:
	raise error.RevlogError(			raise error.RevlogError(
	_(b'unknown flags (%#04x) in version %d revlog %s')			_(b'unknown flags (%#04x) in version %d revlog %s')
	% (flags >> 16, fmt, self.indexfile)			% (flags >> 16, fmt, self.indexfile)
	)			)

	self._inline = versionflags & FLAG_INLINE_DATA			# There is a bug in the transaction handling when going from an
				# inline revlog to a separate index and data file. Turn it off until
				# it's fixed, since v2 revlogs sometimes get rewritten on exchange.
				# See issue6485
				self._inline = False
	# generaldelta implied by version 2 revlogs.			# generaldelta implied by version 2 revlogs.
	self._generaldelta = True			self._generaldelta = True

	else:			else:
	raise error.RevlogError(			raise error.RevlogError(
	_(b'unknown version (%d) in revlog %s') % (fmt, self.indexfile)			_(b'unknown version (%d) in revlog %s') % (fmt, self.indexfile)
	)			)
	# sparse-revlog can't be on without general-delta (issue6056)			# sparse-revlog can't be on without general-delta (issue6056)

tests/test-revlog-v2.t

	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: initial			summary: initial

	Header written as expected			Header written as expected

	$ f --hexdump --bytes 4 .hg/store/00changelog.i			$ f --hexdump --bytes 4 .hg/store/00changelog.i
	.hg/store/00changelog.i:			.hg/store/00changelog.i:
	0000: 00 01 de ad \|....\|			0000: 00 00 de ad \|....\|

	$ f --hexdump --bytes 4 .hg/store/data/foo.i			$ f --hexdump --bytes 4 .hg/store/data/foo.i
	.hg/store/data/foo.i:			.hg/store/data/foo.i:
	0000: 00 01 de ad \|....\|			0000: 00 00 de ad \|....\|

This is an archive of the discontinued Mercurial Phabricator instance.

revlogv2: temporarily forbid inline revlogsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 25997

mercurial/revlog.py

tests/test-revlog-v2.t

revlogv2: temporarily forbid inline revlogs
ClosedPublic

Revision Contents
Changeset List