This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11821

extensions: highlight the name of the faulty extensions in the error message
ClosedPublic

Authored by marmoute on Nov 29 2021, 11:51 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe4acdf5d94a2: extensions: highlight the name of the faulty extensions in the error message
Summary

This make it easier to understand the message when the extensions name is
common.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Nov 29 2021, 11:51 AM
Alphare requested changes to this revision.Nov 30 2021, 9:33 AM
Alphare added a subscriber: Alphare.

Mhhh I might be picky but we should be using single quotes here, not double.

This revision now requires changes to proceed.Nov 30 2021, 9:33 AM
marmoute added a comment.Nov 30 2021, 9:37 AM
In D11821#181348, @Alphare wrote:

Mhhh I might be picky but we should be using single quotes here, not double.

why ? double quote seems a better fit to quote a world in an actual file.

Alphare accepted this revision.Nov 30 2021, 9:40 AM

I misremembered UK vs US quoting. Turns out you're right (and it didn't really matter)

This revision is now accepted and ready to land.Nov 30 2021, 9:40 AM

Revision Contents
Changeset List

Diff 31192

mercurial/extensions.py

) )
_disabledextensions[name] = path[1:] _disabledextensions[name] = path[1:]
continue continue
try: try:
load(ui, name, path, loadingtime) load(ui, name, path, loadingtime)
except Exception as inst: except Exception as inst:
msg = stringutil.forcebytestr(inst) msg = stringutil.forcebytestr(inst)
if path: if path:
error_msg = _(b"failed to import extension %s from %s: %s") error_msg = _(
b'failed to import extension "%s" from %s: %s'
)
error_msg %= (name, path, msg) error_msg %= (name, path, msg)
else: else:
error_msg = _(b"failed to import extension %s: %s") error_msg = _(b'failed to import extension "%s": %s')
error_msg %= (name, msg) error_msg %= (name, msg)
ui.warn((b"*** %s\n") % error_msg) ui.warn((b"*** %s\n") % error_msg)
if isinstance(inst, error.Hint) and inst.hint: if isinstance(inst, error.Hint) and inst.hint:
ui.warn(_(b"*** (%s)\n") % inst.hint) ui.warn(_(b"*** (%s)\n") % inst.hint)
ui.traceback() ui.traceback()
ui.log( ui.log(
b'extension', b'extension',

tests/test-bad-extension.t

> gpg = > gpg =
> hgext.gpg = > hgext.gpg =
> badext = $abspathexc > badext = $abspathexc
> baddocext = $abspathdoc > baddocext = $abspathdoc
> badext2 = > badext2 =
> EOF > EOF
$ hg -q help help 2>&1 |grep extension $ hg -q help help 2>&1 |grep extension
*** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
*** failed to import extension badext2: No module named *badext2* (glob) *** failed to import extension "badext2": No module named 'badext2'
show traceback show traceback
$ hg -q help help --traceback 2>&1 | egrep ' extension|^Exception|Traceback|ImportError|ModuleNotFound' $ hg -q help help --traceback 2>&1 | egrep ' extension|^Exception|Traceback|ImportError|ModuleNotFound'
*** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
Traceback (most recent call last): Traceback (most recent call last):
Exception: bit bucket overflow Exception: bit bucket overflow
*** failed to import extension badext2: No module named *badext2* (glob) *** failed to import extension "badext2": No module named 'badext2'
Traceback (most recent call last): Traceback (most recent call last):
ImportError: No module named badext2 (no-py3 !) ImportError: No module named badext2 (no-py3 !)
ImportError: No module named 'hgext.badext2' (py3 no-py36 !) ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
YYYY/MM/DD HH:MM:SS (PID)> loading extensions YYYY/MM/DD HH:MM:SS (PID)> loading extensions
YYYY/MM/DD HH:MM:SS (PID)> - processing 5 entries YYYY/MM/DD HH:MM:SS (PID)> - processing 5 entries
YYYY/MM/DD HH:MM:SS (PID)> - loading extension: gpg YYYY/MM/DD HH:MM:SS (PID)> - loading extension: gpg
YYYY/MM/DD HH:MM:SS (PID)> > gpg extension loaded in * (glob) YYYY/MM/DD HH:MM:SS (PID)> > gpg extension loaded in * (glob)
YYYY/MM/DD HH:MM:SS (PID)> - validating extension tables: gpg YYYY/MM/DD HH:MM:SS (PID)> - validating extension tables: gpg
YYYY/MM/DD HH:MM:SS (PID)> - invoking registered callbacks: gpg YYYY/MM/DD HH:MM:SS (PID)> - invoking registered callbacks: gpg
YYYY/MM/DD HH:MM:SS (PID)> > callbacks completed in * (glob) YYYY/MM/DD HH:MM:SS (PID)> > callbacks completed in * (glob)
YYYY/MM/DD HH:MM:SS (PID)> - loading extension: badext YYYY/MM/DD HH:MM:SS (PID)> - loading extension: badext
*** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
Traceback (most recent call last): Traceback (most recent call last):
Exception: bit bucket overflow Exception: bit bucket overflow
YYYY/MM/DD HH:MM:SS (PID)> - loading extension: baddocext YYYY/MM/DD HH:MM:SS (PID)> - loading extension: baddocext
YYYY/MM/DD HH:MM:SS (PID)> > baddocext extension loaded in * (glob) YYYY/MM/DD HH:MM:SS (PID)> > baddocext extension loaded in * (glob)
YYYY/MM/DD HH:MM:SS (PID)> - validating extension tables: baddocext YYYY/MM/DD HH:MM:SS (PID)> - validating extension tables: baddocext
YYYY/MM/DD HH:MM:SS (PID)> - invoking registered callbacks: baddocext YYYY/MM/DD HH:MM:SS (PID)> - invoking registered callbacks: baddocext
YYYY/MM/DD HH:MM:SS (PID)> > callbacks completed in * (glob) YYYY/MM/DD HH:MM:SS (PID)> > callbacks completed in * (glob)
YYYY/MM/DD HH:MM:SS (PID)> - loading extension: badext2 YYYY/MM/DD HH:MM:SS (PID)> - loading extension: badext2
YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext.badext2 (No module named *badext2*): trying hgext3rd.badext2 (glob) YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext.badext2 (No module named *badext2*): trying hgext3rd.badext2 (glob)
Traceback (most recent call last): Traceback (most recent call last):
ImportError: No module named badext2 (no-py3 !) ImportError: No module named badext2 (no-py3 !)
ImportError: No module named 'hgext.badext2' (py3 no-py36 !) ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext3rd.badext2 (No module named *badext2*): trying badext2 (glob) YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext3rd.badext2 (No module named *badext2*): trying badext2 (glob)
Traceback (most recent call last): Traceback (most recent call last):
ImportError: No module named badext2 (no-py3 !) ImportError: No module named badext2 (no-py3 !)
ImportError: No module named 'hgext.badext2' (py3 no-py36 !) ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
*** failed to import extension badext2: No module named *badext2* (glob) *** failed to import extension "badext2": No module named 'badext2'
Traceback (most recent call last): Traceback (most recent call last):
ImportError: No module named 'hgext.badext2' (py3 no-py36 !) ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ModuleNotFoundError: No module named 'badext2' (py36 !) ModuleNotFoundError: No module named 'badext2' (py36 !)
YYYY/MM/DD HH:MM:SS (PID)> > extension baddocext take a total of * to load (glob) YYYY/MM/DD HH:MM:SS (PID)> > extension baddocext take a total of * to load (glob)
YYYY/MM/DD HH:MM:SS (PID)> > extension gpg take a total of * to load (glob) YYYY/MM/DD HH:MM:SS (PID)> > extension gpg take a total of * to load (glob)
YYYY/MM/DD HH:MM:SS (PID)> extension loading complete YYYY/MM/DD HH:MM:SS (PID)> extension loading complete
#endif #endif
confirm that there's no crash when an extension's documentation is bad confirm that there's no crash when an extension's documentation is bad
$ hg help --keyword baddocext $ hg help --keyword baddocext
*** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
*** failed to import extension badext2: No module named *badext2* (glob) *** failed to import extension "badext2": No module named 'badext2'
Topics: Topics:
extensions Using Additional Features extensions Using Additional Features

tests/test-dispatch.t

[10] [10]
However, we can't prevent it from loading extensions and configs: However, we can't prevent it from loading extensions and configs:
$ cat <<EOF > bad.py $ cat <<EOF > bad.py
> raise Exception('bad') > raise Exception('bad')
> EOF > EOF
$ hg log -b '--config=extensions.bad=bad.py' default $ hg log -b '--config=extensions.bad=bad.py' default
*** failed to import extension bad from bad.py: bad *** failed to import extension "bad" from bad.py: bad
abort: option --config may not be abbreviated abort: option --config may not be abbreviated
[10] [10]
$ mkdir -p badrepo/.hg $ mkdir -p badrepo/.hg
$ echo 'invalid-syntax' > badrepo/.hg/hgrc $ echo 'invalid-syntax' > badrepo/.hg/hgrc
$ hg log -b -Rbadrepo default $ hg log -b -Rbadrepo default
config error at badrepo/.hg/hgrc:1: invalid-syntax config error at badrepo/.hg/hgrc:1: invalid-syntax
[30] [30]

tests/test-extension.t

> except ImportError: > except ImportError:
> pass # intentional failure > pass # intentional failure
> NO_CHECK_EOF > NO_CHECK_EOF
Python 3's lazy importer verifies modules exist before returning the lazy Python 3's lazy importer verifies modules exist before returning the lazy
module stub. Our custom lazy importer for Python 2 always returns a stub. module stub. Our custom lazy importer for Python 2 always returns a stub.
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) || true $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) || true
*** failed to import extension checkrelativity from $TESTTMP/checkrelativity.py: No module named 'extlibroot.lsub1.lsub2.notexist' (py3 !) *** failed to import extension "checkrelativity" from $TESTTMP/checkrelativity.py: No module named 'extlibroot.lsub1.lsub2.notexist'
hg: unknown command 'checkrelativity' (py3 !) hg: unknown command 'checkrelativity' (py3 !)
(use 'hg help' for a list of commands) (py3 !) (use 'hg help' for a list of commands) (py3 !)
#endif #endif
(Here, module importing tests are finished. Therefore, use other than (Here, module importing tests are finished. Therefore, use other than
NO_CHECK_* limit mark for heredoc python files, in order to apply NO_CHECK_* limit mark for heredoc python files, in order to apply
import-checker.py or so on their contents) import-checker.py or so on their contents)
> [extensions] > [extensions]
> deprecatedcmd = `pwd`/deprecatedcmd.py > deprecatedcmd = `pwd`/deprecatedcmd.py
> mq = ! > mq = !
> hgext.mq = ! > hgext.mq = !
> hgext/mq = ! > hgext/mq = !
> EOF > EOF
$ hg deprecatedcmd > /dev/null $ hg deprecatedcmd > /dev/null
*** failed to import extension deprecatedcmd from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo *** failed to import extension "deprecatedcmd" from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo
*** (use @command decorator to register 'deprecatedcmd') *** (use @command decorator to register 'deprecatedcmd')
hg: unknown command 'deprecatedcmd' hg: unknown command 'deprecatedcmd'
(use 'hg help' for a list of commands) (use 'hg help' for a list of commands)
[10] [10]
the extension shouldn't be loaded at all so the mq works: the extension shouldn't be loaded at all so the mq works:
$ hg qseries --config extensions.mq= > /dev/null $ hg qseries --config extensions.mq= > /dev/null
*** failed to import extension deprecatedcmd from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo *** failed to import extension "deprecatedcmd" from $TESTTMP/deprecated/deprecatedcmd.py: missing attributes: norepo, optionalrepo, inferrepo
*** (use @command decorator to register 'deprecatedcmd') *** (use @command decorator to register 'deprecatedcmd')
$ cd .. $ cd ..
Test synopsis and docstring extending Test synopsis and docstring extending
$ hg init exthelp $ hg init exthelp
$ cat > exthelp.py <<EOF $ cat > exthelp.py <<EOF
> print(opts[b'opt'], flush=True) > print(opts[b'opt'], flush=True)
> EOF > EOF
$ "$PYTHON" $TESTTMP/unflush.py $TESTTMP/test_unicode_default_value.py $ "$PYTHON" $TESTTMP/unflush.py $TESTTMP/test_unicode_default_value.py
$ cat > $TESTTMP/opt-unicode-default/.hg/hgrc << EOF $ cat > $TESTTMP/opt-unicode-default/.hg/hgrc << EOF
> [extensions] > [extensions]
> test_unicode_default_value = $TESTTMP/test_unicode_default_value.py > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py
> EOF > EOF
$ hg -R $TESTTMP/opt-unicode-default dummy $ hg -R $TESTTMP/opt-unicode-default dummy
*** failed to import extension test_unicode_default_value from $TESTTMP/test_unicode_default_value.py: unicode *'value' found in cmdtable.dummy (glob) *** failed to import extension "test_unicode_default_value" from $TESTTMP/test_unicode_default_value.py: unicode 'value' found in cmdtable.dummy
*** (use b'' to make it byte string) *** (use b'' to make it byte string)
hg: unknown command 'dummy' hg: unknown command 'dummy'
(did you mean summary?) (did you mean summary?)
[10] [10]

tests/test-largefiles-misc.t

extensions.largefiles= extensions.largefiles=
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [extensions] > [extensions]
> largefiles = missing.py > largefiles = missing.py
> EOF > EOF
$ hg config extensions $ hg config extensions
\*\*\* failed to import extension largefiles from missing.py: [Errno *] $ENOENT$: 'missing.py' (glob) \*\*\* failed to import extension "largefiles" from missing.py: [Errno *] $ENOENT$: 'missing.py' (glob)
abort: repository requires features unknown to this Mercurial: largefiles abort: repository requires features unknown to this Mercurial: largefiles
(see https://mercurial-scm.org/wiki/MissingRequirement for more information) (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
[255] [255]
$ cd .. $ cd ..
Each sections should be independent of each others. Each sections should be independent of each others.

tests/test-lfs.t

extensions.lfs= extensions.lfs=
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [extensions] > [extensions]
> lfs = missing.py > lfs = missing.py
> EOF > EOF
$ hg config extensions $ hg config extensions
\*\*\* failed to import extension lfs from missing.py: [Errno *] $ENOENT$: 'missing.py' (glob) \*\*\* failed to import extension "lfs" from missing.py: [Errno *] $ENOENT$: 'missing.py' (glob)
abort: repository requires features unknown to this Mercurial: lfs abort: repository requires features unknown to this Mercurial: lfs
(see https://mercurial-scm.org/wiki/MissingRequirement for more information) (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
[255] [255]
$ cd .. $ cd ..
# Initial setup # Initial setup

tests/test-qrecord.t

$ hg -R a qrecord patch $ hg -R a qrecord patch
abort: 'mq' extension not loaded abort: 'mq' extension not loaded
[255] [255]
help (bad mq) help (bad mq)
$ echo "mq=nonexistent" >> $HGRCPATH $ echo "mq=nonexistent" >> $HGRCPATH
$ hg help qrecord $ hg help qrecord
*** failed to import extension mq from nonexistent: [Errno *] * (glob) *** failed to import extension "mq" from nonexistent: [Errno *] * (glob)
hg qrecord [OPTION]... PATCH [FILE]... hg qrecord [OPTION]... PATCH [FILE]...
interactively record a new patch interactively record a new patch
See 'hg help qnew' & 'hg help record' for more information and usage. See 'hg help qnew' & 'hg help record' for more information and usage.
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)

tests/test-revset2.t

> raise error.Abort(b'intentional failure of loading extension') > raise error.Abort(b'intentional failure of loading extension')
> EOF > EOF
$ cat <<EOF > .hg/hgrc $ cat <<EOF > .hg/hgrc
> [extensions] > [extensions]
> custompredicate = $TESTTMP/custompredicate.py > custompredicate = $TESTTMP/custompredicate.py
> EOF > EOF
$ hg debugrevspec "custom1()" $ hg debugrevspec "custom1()"
*** failed to import extension custompredicate from $TESTTMP/custompredicate.py: intentional failure of loading extension *** failed to import extension "custompredicate" from $TESTTMP/custompredicate.py: intentional failure of loading extension
hg: parse error: unknown identifier: custom1 hg: parse error: unknown identifier: custom1
[10] [10]
Test repo.anyrevs with customized revset overrides Test repo.anyrevs with customized revset overrides
$ cat > $TESTTMP/printprevset.py <<EOF $ cat > $TESTTMP/printprevset.py <<EOF
> from mercurial import encoding, registrar > from mercurial import encoding, registrar
> cmdtable = {} > cmdtable = {}