Show More
@@ -5,9 +5,17 b'' | |||||
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
|
8 | from __future__ import absolute_import | |||
|
9 | ||||
8 | import re |
|
10 | import re | |
9 | import parser, error, util, merge |
|
11 | ||
10 | from i18n import _ |
|
12 | from .i18n import _ | |
|
13 | from . import ( | |||
|
14 | error, | |||
|
15 | merge, | |||
|
16 | parser, | |||
|
17 | util, | |||
|
18 | ) | |||
11 |
|
19 | |||
12 | elements = { |
|
20 | elements = { | |
13 | # token-type: binding-strength, primary, prefix, infix, suffix |
|
21 | # token-type: binding-strength, primary, prefix, infix, suffix | |
@@ -410,7 +418,7 b' def subrepo(mctx, x):' | |||||
410 | # i18n: "subrepo" is a keyword |
|
418 | # i18n: "subrepo" is a keyword | |
411 | pat = getstring(x, _("subrepo requires a pattern or no arguments")) |
|
419 | pat = getstring(x, _("subrepo requires a pattern or no arguments")) | |
412 |
|
420 | |||
413 | import match as matchmod # avoid circular import issues |
|
421 | from . import match as matchmod # avoid circular import issues | |
414 | fast = not matchmod.patkind(pat) |
|
422 | fast = not matchmod.patkind(pat) | |
415 | if fast: |
|
423 | if fast: | |
416 | def m(s): |
|
424 | def m(s): |
@@ -112,9 +112,6 b' hidden by deduplication algorithm in the' | |||||
112 | these may expose other cycles. |
|
112 | these may expose other cycles. | |
113 |
|
113 | |||
114 | $ hg locate 'mercurial/**.py' 'hgext/**.py' | sed 's-\\-/-g' | python "$import_checker" - |
|
114 | $ hg locate 'mercurial/**.py' 'hgext/**.py' | sed 's-\\-/-g' | python "$import_checker" - | |
115 | mercurial/fileset.py mixed imports |
|
|||
116 | stdlib: parser |
|
|||
117 | relative: error, merge, util |
|
|||
118 | mercurial/revset.py mixed imports |
|
115 | mercurial/revset.py mixed imports | |
119 | stdlib: parser |
|
116 | stdlib: parser | |
120 | relative: error, hbisect, phases, util |
|
117 | relative: error, hbisect, phases, util |
General Comments 0
You need to be logged in to leave comments.
Login now