This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10030

revlogv2: temporarily forbid inline revlogs
ClosedPublic

Authored by Alphare on Feb 19 2021, 6:16 AM.

Details

Reviewers
indygreg
marmoute
Group Reviewers
hg-reviewers
Commits
rHGc8bb7b89179e: revlogv2: temporarily forbid inline revlogs
Summary

See inline comments. I plan to fix the underlying issue before revlogv2 is
stabilized.

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

Alphare created this revision.Feb 19 2021, 6:16 AM
baymax updated this revision to Diff 25997.Mar 1 2021, 11:52 AM

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

marmoute accepted this revision.Mar 2 2021, 2:02 PM
Alphare updated this revision to Diff 26093.Mar 4 2021, 10:18 AM
marmoute requested changes to this revision.Mar 9 2021, 11:48 AM
marmoute added inline comments.
mercurial/revlog.py
527

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
527

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

PathPackages
Mmercurial/revlog.py (6 lines)

Diff 26382

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 | FLAG_INLINE_DATA
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)