This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9363

extensions: gracefully warn when doing min version check with no local version
ClosedPublic

Authored by mharbison72 on Nov 21 2020, 4:59 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe402a45261db: extensions: gracefully warn when doing min version check with no local version
rHGf96059fa519c: extensions: gracefully warn when doing min version check with no local version
Summary

After doing a make clean, I started getting cryptic failures to import
extensions with the minimumhgversion attribute on py3:

  • failed to import extension evolve: '>' not supported between instances of 'int' and 'NoneType'
  • failed to import extension topic: '>' not supported between instances of 'int' and 'NoneType'

This now handles the (None, None) tuple before comparing, and disables the
extension with the same friendly message as in py2.

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 (17 lines)

Diff 23621

mercurial/extensions.py

if loadingtime is not None: if loadingtime is not None:
loadingtime[shortname] += stats.elapsed loadingtime[shortname] += stats.elapsed
# 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 and util.versiontuple(minver, 2) > util.versiontuple(n=2): if minver:
curver = util.versiontuple(n=2)
if None in curver or util.versiontuple(minver, 2) > 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)
_extensions[shortname] = mod _extensions[shortname] = mod
_order.append(shortname) _order.append(shortname)
ui.log( ui.log(
b'extension', b' - invoking registered callbacks: %s\n', shortname b'extension', b' - invoking registered callbacks: %s\n', shortname
) )