Mercurial > hg
annotate tests/test-default-push.t @ 19933:621a26eb3a99
demandimport: allow extensions to import own modules by absolute name
Before this patch, python modules of each extensions can't import
another one in own extension by absolute name, because root modules of
each extensions are loaded with "hgext_" prefix.
For example, "import extroot.bar" in "extroot/foo.py" of "extroot"
extension fails, even though "import bar" in it succeeds.
Installing extensions into site-packages of python library path can
avoid this problem, but this solution is not reasonable in some cases:
using binary package of Mercurial on Windows, for example.
This patch retries to import with "hgext_" prefix after ImportError,
if the module in the extension may try to import another one in own
extension.
This patch doesn't change some "_import()"/"_origimport()" invocations
below, because ordinary extensions shouldn't cause such invocations.
- invocation of "_import()" when root module imports sub-module by
absolute path without "fromlist"
for example, "import a.b" in "a.__init__.py".
extensions are loaded with "hgext_" prefix, and this causes
execution of another (= fixed by this patch) code path.
- invocation of "_origimport()" when "level != -1" with "fromlist"
for example, importing after "from __future__ import
absolute_import" (level == 0), or "from . import b" or "from .a
import b" (0 < level),
for portability between python versions and environments,
extensions shouldn't cause "level != -1".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 05 Oct 2013 01:02:22 +0900 |
parents | 9910f60a37ee |
children | c4f45ce85351 |
rev | line source |
---|---|
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
1 $ hg init a |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
2 |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
3 $ echo a > a/a |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
4 $ hg --cwd a ci -Ama |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
5 adding a |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
7 $ hg clone a c |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
8 updating to branch default |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
11 $ hg clone a b |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
12 updating to branch default |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
14 |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
15 $ echo b >> b/a |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
16 $ hg --cwd b ci -mb |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
17 |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
18 Push should push to 'default' when 'default-push' not set: |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
20 $ hg --cwd b push |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
21 pushing to $TESTTMP/a (glob) |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
22 searching for changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
23 adding changesets |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
24 adding manifests |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
25 adding file changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
26 added 1 changesets with 1 changes to 1 files |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
27 |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
28 Push should push to 'default-push' when set: |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
30 $ echo 'default-push = ../c' >> b/.hg/hgrc |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
31 $ hg --cwd b push |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
32 pushing to $TESTTMP/c (glob) |
12287
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
33 searching for changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
34 adding changesets |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
35 adding manifests |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
36 adding file changes |
d8707306d667
tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents:
2496
diff
changeset
|
37 added 1 changesets with 1 changes to 1 files |
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 |