This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10583

revlog: use revlog.display_id in format related errors
ClosedPublic

Authored by marmoute on May 3 2021, 7:49 AM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHG3a9f3470922c: revlog: use revlog.display_id in format related errors

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 3 2021, 7:49 AM
baymax updated this revision to Diff 27498.May 3 2021, 9:43 PM

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

Alphare accepted this revision.May 11 2021, 9:55 AM
This revision is now accepted and ready to land.May 11 2021, 9:55 AM
marmoute added a commit: rHG3a9f3470922c: revlog: use revlog.display_id in format related errors.May 11 2021, 12:58 PM
Closed by commit rHG3a9f3470922c: revlog: use revlog.display_id in format related errors (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (10 lines)
Mtests/test-requires.t (2 lines)
Mtests/test-revlog-v2.t (2 lines)
Mtests/test-revlog.t (6 lines)

Diff 27829

mercurial/revlog.py

flags = self._format_flags = versionflags & ~0xFFFF flags = self._format_flags = versionflags & ~0xFFFF
fmt = self._format_version = versionflags & 0xFFFF fmt = self._format_version = versionflags & 0xFFFF
if fmt == REVLOGV0: if fmt == REVLOGV0:
if flags: if 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.display_id)
) )
self._inline = False self._inline = False
self._generaldelta = False self._generaldelta = False
elif fmt == REVLOGV1: elif fmt == REVLOGV1:
if flags & ~REVLOGV1_FLAGS: if flags & ~REVLOGV1_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.display_id)
) )
self._inline = versionflags & FLAG_INLINE_DATA self._inline = versionflags & FLAG_INLINE_DATA
self._generaldelta = versionflags & FLAG_GENERALDELTA self._generaldelta = versionflags & FLAG_GENERALDELTA
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.display_id)
) )
# There is a bug in the transaction handling when going from an # 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 # inline revlog to a separate index and data file. Turn it off until
# it's fixed, since v2 revlogs sometimes get rewritten on exchange. # it's fixed, since v2 revlogs sometimes get rewritten on exchange.
# See issue6485 # See issue6485
self._inline = False 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.display_id)
) )
self.nodeconstants = sha1nodeconstants self.nodeconstants = sha1nodeconstants
self.nullid = self.nodeconstants.nullid self.nullid = self.nodeconstants.nullid
# sparse-revlog can't be on without general-delta (issue6056) # sparse-revlog can't be on without general-delta (issue6056)
if not self._generaldelta: if not self._generaldelta:
self._sparserevlog = False self._sparserevlog = False
yield revlogproblem(error=_(b'index contains %d extra bytes') % di) yield revlogproblem(error=_(b'index contains %d extra bytes') % di)
version = self._format_version version = self._format_version
# The verifier tells us what version revlog we should be. # The verifier tells us what version revlog we should be.
if version != state[b'expectedversion']: if version != state[b'expectedversion']:
yield revlogproblem( yield revlogproblem(
warning=_(b"warning: '%s' uses revlog format %d; expected %d") warning=_(b"warning: '%s' uses revlog format %d; expected %d")
% (self._indexfile, version, state[b'expectedversion']) % (self.display_id, version, state[b'expectedversion'])
) )
state[b'skipread'] = set() state[b'skipread'] = set()
state[b'safe_renamed'] = set() state[b'safe_renamed'] = set()
for rev in self: for rev in self:
node = self.node(rev) node = self.node(rev)

tests/test-requires.t

$ hg init t $ hg init t
$ cd t $ cd t
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m test $ hg commit -m test
$ rm .hg/requires $ rm .hg/requires
$ hg tip $ hg tip
abort: unknown version (65535) in revlog 00changelog.i abort: unknown version (65535) in revlog 00changelog
[50] [50]
$ echo indoor-pool > .hg/requires $ echo indoor-pool > .hg/requires
$ hg tip $ hg tip
abort: repository requires features unknown to this Mercurial: indoor-pool abort: repository requires features unknown to this Mercurial: indoor-pool
(see https://mercurial-scm.org/wiki/MissingRequirement for more information) (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
[255] [255]
$ echo outdoor-pool >> .hg/requires $ echo outdoor-pool >> .hg/requires
$ hg tip $ hg tip

tests/test-revlog-v2.t

$ hg log $ hg log
Unknown flags to revlog are rejected Unknown flags to revlog are rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\xff\x00\xde\xad') and None ... fh.write(b'\xff\x00\xde\xad') and None
$ hg log $ hg log
abort: unknown flags (0xff00) in version 57005 revlog 00changelog.i abort: unknown flags (0xff00) in version 57005 revlog 00changelog
[50] [50]
$ cd .. $ cd ..
Writing a simple revlog v2 works Writing a simple revlog v2 works
$ hg init simple $ hg init simple
$ cd simple $ cd simple

tests/test-revlog.t

$ hg init empty-repo $ hg init empty-repo
$ cd empty-repo $ cd empty-repo
Flags on revlog version 0 are rejected Flags on revlog version 0 are rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\x00\x01\x00\x00') and None ... fh.write(b'\x00\x01\x00\x00') and None
$ hg log $ hg log
abort: unknown flags (0x01) in version 0 revlog 00changelog.i abort: unknown flags (0x01) in version 0 revlog 00changelog
[50] [50]
Unknown flags on revlog version 1 are rejected Unknown flags on revlog version 1 are rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\x00\x04\x00\x01') and None ... fh.write(b'\x00\x04\x00\x01') and None
$ hg log $ hg log
abort: unknown flags (0x04) in version 1 revlog 00changelog.i abort: unknown flags (0x04) in version 1 revlog 00changelog
[50] [50]
Unknown version is rejected Unknown version is rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\x00\x00\xbe\xef') and None ... fh.write(b'\x00\x00\xbe\xef') and None
$ hg log $ hg log
abort: unknown version (48879) in revlog 00changelog.i abort: unknown version (48879) in revlog 00changelog
[50] [50]
$ cd .. $ cd ..
Test for CVE-2016-3630 Test for CVE-2016-3630
$ hg init $ hg init