This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11476

extensions: prevent a crash on py3 with a `minimumhgversion` str value
ClosedPublic

Authored by mharbison72 on Sep 21 2021, 11:39 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5caec48d9a01: extensions: prevent a crash on py3 with a `minimumhgversion` str value
Summary

The expectation is that this field is bytes, but unported extensions are a thing
and it shouldn't explode on a bad value. We already do this transformation in
the version reporting mechanism.

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

mharbison72 created this revision.Sep 21 2021, 11:39 AM
Alphare accepted this revision.Sep 22 2021, 3:53 AM
This revision is now accepted and ready to land.Sep 22 2021, 3:53 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/extensions.py (2 lines)
Mtests/test-extension.t (5 lines)

Diff 30368

mercurial/extensions.py

# Before we do anything with the extension, check against minimum stated # Before we do anything with the extension, check against minimum stated
# compatibility. This gives extension authors a mechanism to have their # compatibility. This gives extension authors a mechanism to have their
# extensions short circuit when loaded with a known incompatible version # extensions short circuit when loaded with a known incompatible version
# of Mercurial. # of Mercurial.
minver = getattr(mod, 'minimumhgversion', None) minver = getattr(mod, 'minimumhgversion', None)
if minver: if minver:
curver = util.versiontuple(n=2) curver = util.versiontuple(n=2)
extmin = util.versiontuple(minver, 2) extmin = util.versiontuple(stringutil.forcebytestr(minver), 2)
if None in extmin: if None in extmin:
extmin = (extmin[0] or 0, extmin[1] or 0) extmin = (extmin[0] or 0, extmin[1] or 0)
if None in curver or extmin > curver: if None in curver or extmin > curver:
msg = _( msg = _(
b'(third party extension %s requires version %s or newer ' b'(third party extension %s requires version %s or newer '
b'of Mercurial (current: %s); disabling)\n' b'of Mercurial (current: %s); disabling)\n'

tests/test-extension.t

$ cat > minversion3.py << EOF $ cat > minversion3.py << EOF
> from mercurial import util > from mercurial import util
> util.version = lambda: b'3.5' > util.version = lambda: b'3.5'
> minimumhgversion = b'3.5' > minimumhgversion = b'3.5'
> EOF > EOF
$ hg --config extensions.minversion=minversion3.py version 2>&1 | egrep '\(third' $ hg --config extensions.minversion=minversion3.py version 2>&1 | egrep '\(third'
[1] [1]
Don't explode on py3 with a bad version number Don't explode on py3 with a bad version number (both str vs bytes, and not enough
parts)
$ cat > minversion4.py << EOF $ cat > minversion4.py << EOF
> from mercurial import util > from mercurial import util
> util.version = lambda: b'3.5' > util.version = lambda: b'3.5'
> minimumhgversion = b'3' > minimumhgversion = '3'
> EOF > EOF
$ hg --config extensions.minversion=minversion4.py version -v $ hg --config extensions.minversion=minversion4.py version -v
Mercurial Distributed SCM (version 3.5) Mercurial Distributed SCM (version 3.5)
(see https://mercurial-scm.org for more information) (see https://mercurial-scm.org for more information)
Copyright (C) 2005-* Olivia Mackall and others (glob) Copyright (C) 2005-* Olivia Mackall and others (glob)
This is free software; see the source for copying conditions. There is NO This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.