This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10540

extensions: ignore exceptions from an extension's `getversion()` method
ClosedPublic

Authored by mharbison72 on Apr 30 2021, 8:47 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG553451522113: extensions: ignore exceptions from an extension's `getversion()` method
Summary

This method is usually called when there's a stacktrace being generated, or with
hg version -v. Raising another exception risks mangling the bug report info.

I hit this issue when trying to add the method to the keyring extension to
report the version of the extension and the underlying module, and ran into
demandimport issues prior to py3.8. It seems like a wise thing to do anyway,
though unfortunately there's no convenient ui object around to issue a
warning. Use 'unknown' to signal that it tried to report a version and failed,
unlike the default case of printing nothing.

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.Apr 30 2021, 8:47 PM
mharbison72 edited the summary of this revision. (Show Details)Apr 30 2021, 9:08 PM
mharbison72 updated this revision to Diff 27267.
pulkit accepted this revision.May 3 2021, 5:47 AM
This revision is now accepted and ready to land.May 3 2021, 5:47 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/extensions.py (6 lines)

Diff 27439

mercurial/extensions.py

return [ return [
name for name, mod in pycompat.iteritems(_extensions) if mod is None name for name, mod in pycompat.iteritems(_extensions) if mod is None
] ]
def moduleversion(module): def moduleversion(module):
'''return version information from given module as a string''' '''return version information from given module as a string'''
if util.safehasattr(module, b'getversion') and callable(module.getversion): if util.safehasattr(module, b'getversion') and callable(module.getversion):
try:
version = module.getversion() version = module.getversion()
except Exception:
version = b'unknown'
elif util.safehasattr(module, b'__version__'): elif util.safehasattr(module, b'__version__'):
version = module.__version__ version = module.__version__
else: else:
version = b'' version = b''
if isinstance(version, (list, tuple)): if isinstance(version, (list, tuple)):
version = b'.'.join(pycompat.bytestr(o) for o in version) version = b'.'.join(pycompat.bytestr(o) for o in version)
else: else:
# version data should be bytes, but not all extensions are ported # version data should be bytes, but not all extensions are ported
# to py3. # to py3.
version = stringutil.forcebytestr(version) version = stringutil.forcebytestr(version)
return version return version
def ismoduleinternal(module): def ismoduleinternal(module):
exttestedwith = getattr(module, 'testedwith', None) exttestedwith = getattr(module, 'testedwith', None)
return exttestedwith == b"ships-with-hg-core" return exttestedwith == b"ships-with-hg-core"