( )⚙ D11475 extensions: prevent a crash on py3 when testing a bad extension minimum

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11475

extensions: prevent a crash on py3 when testing a bad extension minimum
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa9bedc56f025: extensions: prevent a crash on py3 when testing a bad extension minimum
Summary

A None placeholder is populated for each missing component by
util.versiontuple(), which could safely be used with > on py2, but not py3.
I guess there's another hole here where if the string is entirely bogus (i.e no
numbers), it will be treated as 0.0, and always load. But that's always been
the case.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/extensions.py (6 lines)
Mtests/test-extension.t (19 lines)

Diff 30367

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)
if None in curver or util.versiontuple(minver, 2) > curver: if None in extmin:
extmin = (extmin[0] or 0, extmin[1] or 0)
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'
) )
ui.warn(msg % (shortname, minver, util.version())) ui.warn(msg % (shortname, minver, util.version()))
return return
ui.log(b'extension', b' - validating extension tables: %s\n', shortname) ui.log(b'extension', b' - validating extension tables: %s\n', shortname)
_validatetables(ui, mod) _validatetables(ui, mod)

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
$ cat > minversion4.py << EOF
> from mercurial import util
> util.version = lambda: b'3.5'
> minimumhgversion = b'3'
> EOF
$ hg --config extensions.minversion=minversion4.py version -v
Mercurial Distributed SCM (version 3.5)
(see https://mercurial-scm.org for more information)
Copyright (C) 2005-* Olivia Mackall and others (glob)
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Enabled extensions:
minversion external
Restore HGRCPATH Restore HGRCPATH
$ HGRCPATH=$ORGHGRCPATH $ HGRCPATH=$ORGHGRCPATH
$ export HGRCPATH $ export HGRCPATH
Commands handling multiple repositories at a time should invoke only Commands handling multiple repositories at a time should invoke only
"reposetup()" of extensions enabling in the target repository. "reposetup()" of extensions enabling in the target repository.