Mercurial > hg
annotate tests/test-revert-flags.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 | f2719b387380 |
children | 7a9cbb315d84 |
rev | line source |
---|---|
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
1 $ "$TESTDIR/hghave" execbit || exit 80 |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
3 $ hg init repo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
4 $ cd repo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
5 $ echo foo > foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
6 $ chmod 644 foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
7 $ hg ci -qAm '644' |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
8 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
9 $ chmod 755 foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
10 $ hg ci -qAm '755' |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
12 reverting to rev 0 |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
14 $ hg revert -a -r 0 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
15 reverting foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
16 $ hg st |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
17 M foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
18 $ hg diff --git |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
19 diff --git a/foo b/foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
20 old mode 100755 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
21 new mode 100644 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12110
diff
changeset
|
22 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12110
diff
changeset
|
23 $ cd .. |