This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8750

extensions: make `hg nonexistent` not crash with PyOxidizer
ClosedPublic

Authored by martinvonz on Jul 14 2020, 4:18 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5d09a120b4be: extensions: make `hg nonexistent` not crash with PyOxidizer
Summary

When running hg nonexistent, we try to look for extensions that
provide that command. We do that by looking for files in the
hgext.__file__ directory. However, PyOxidizer doesn't provide a
__file__, so we crash when running with PyOxidizer.

We should be able to look for the command in built-in extensions, but
we seem to already have code for skipping the scan when running in a
frozen binary, so I just modified that code instead.

By the way, it also seems like we should be able to search for
extensions in the hgext3rd module, but we don't do that yet either
(before or after this patch).

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

martinvonz created this revision.Jul 14 2020, 4:18 PM
Alphare accepted this revision.Jul 15 2020, 12:03 PM
martinvonz added a commit: rHG5d09a120b4be: extensions: make `hg nonexistent` not crash with PyOxidizer.Jul 15 2020, 12:11 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5d09a120b4be: extensions: make `hg nonexistent` not crash with PyOxidizer (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/extensions.py (17 lines)

Diff 21906

mercurial/extensions.py

fn = getattr(fn, '_origfunc', None) fn = getattr(fn, '_origfunc', None)
return result return result
def _disabledpaths(): def _disabledpaths():
'''find paths of disabled extensions. returns a dict of {name: path}''' '''find paths of disabled extensions. returns a dict of {name: path}'''
import hgext import hgext
# The hgext might not have a __file__ attribute (e.g. in PyOxidizer) and
# it might not be on a filesystem even if it does.
if util.safehasattr(hgext, '__file__'):
extpath = os.path.dirname( extpath = os.path.dirname(
os.path.abspath(pycompat.fsencode(hgext.__file__)) os.path.abspath(pycompat.fsencode(hgext.__file__))
) )
try: # might not be a filesystem path try:
files = os.listdir(extpath) files = os.listdir(extpath)
except OSError: except OSError:
return {} return {}
else:
return {}
exts = {} exts = {}
for e in files: for e in files:
if e.endswith(b'.py'): if e.endswith(b'.py'):
name = e.rsplit(b'.', 1)[0] name = e.rsplit(b'.', 1)[0]
path = os.path.join(extpath, e) path = os.path.join(extpath, e)
else: else:
name = e name = e