mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 17:58:27 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
40 lines
1.1 KiB
Perl
40 lines
1.1 KiB
Perl
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> morecolors=
|
|
> [ui]
|
|
> color=always
|
|
> [color]
|
|
> mode=ansi
|
|
> EOF
|
|
|
|
Traceback has color:
|
|
|
|
$ cat > repocrash.py << EOF
|
|
> from edenscm.mercurial import error
|
|
> def reposetup(ui, repo):
|
|
> raise error.Abort('.')
|
|
> EOF
|
|
|
|
$ hg init repo1
|
|
$ cd repo1
|
|
|
|
$ hg commit --config extensions.repocrash=$TESTTMP/repocrash.py --traceback 2>&1 | egrep -v '^ '
|
|
Traceback (most recent call last):
|
|
\x1b[0;31;1m File "$TESTTMP/repocrash.py", line 3, in reposetup\x1b[0m (esc)
|
|
\x1b[0;31;1m raise error.Abort('.')\x1b[0m (esc)
|
|
\x1b[0;31;1mAbort: .\x1b[0m (esc)
|
|
abort: .
|
|
|
|
Uncaught exception has color:
|
|
|
|
$ cat > $TESTTMP/uncaughtcrash.py <<EOF
|
|
> def reposetup(ui, repo):
|
|
> raise RuntimeError('.')
|
|
> EOF
|
|
|
|
$ hg commit --config extensions.repocrash=$TESTTMP/uncaughtcrash.py 2>&1 | egrep -v '^ '
|
|
Traceback (most recent call last):
|
|
\x1b[0;31;1m File "$TESTTMP/uncaughtcrash.py", line 2, in reposetup\x1b[0m (esc)
|
|
\x1b[0;31;1m raise RuntimeError('.')\x1b[0m (esc)
|
|
\x1b[0;31;1mRuntimeError: .\x1b[0m (esc)
|