mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +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
42 lines
869 B
Perl
42 lines
869 B
Perl
Set up repository
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo "[extensions]" >> .hg/hgrc
|
|
$ echo "extorder=" >> .hg/hgrc
|
|
$ echo "rebase =" >> .hg/hgrc
|
|
$ echo "dummyext1 = $TESTDIR/dummyext1.py" >> .hg/hgrc
|
|
$ echo "dummyext2 = $TESTDIR/dummyext2.py" >> .hg/hgrc
|
|
$ echo "histedit =" >> .hg/hgrc
|
|
|
|
Simple Dependency
|
|
|
|
$ hg id
|
|
ext1: uisetup
|
|
ext2: uisetup
|
|
ext1: extsetup
|
|
ext2: extsetup
|
|
000000000000 tip
|
|
|
|
$ cat >> .hg/hgrc << EOF
|
|
> [extorder]
|
|
> dummyext1 = dummyext2
|
|
> preferfirst = histedit
|
|
> preferlast = rebase
|
|
> EOF
|
|
|
|
$ hg id
|
|
ext1: uisetup
|
|
ext2: uisetup
|
|
ext2: extsetup
|
|
ext1: extsetup
|
|
000000000000 tip
|
|
|
|
Conflicting deps
|
|
|
|
$ echo "dummyext2 = dummyext1" >> .hg/hgrc
|
|
$ hg id > out.txt 2>&1
|
|
[1]
|
|
$ grep MercurialExtOrderException: < out.txt
|
|
edenscm.hgext.extorder.MercurialExtOrderException: extorder: conflicting extension order
|