Show More
@@ -5,16 +5,25 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 | import re |
|
8 | from __future__ import absolute_import | |
9 | import parser, util, error, hbisect, phases |
|
9 | ||
10 | import node |
|
|||
11 | import heapq |
|
10 | import heapq | |
12 | import match as matchmod |
|
11 | import re | |
13 | from i18n import _ |
|
12 | ||
14 | import encoding |
|
13 | from .i18n import _ | |
15 | import obsolete as obsmod |
|
14 | from . import ( | |
16 | import pathutil |
|
15 | encoding, | |
17 | import repoview |
|
16 | error, | |
|
17 | hbisect, | |||
|
18 | match as matchmod, | |||
|
19 | node, | |||
|
20 | obsolete as obsmod, | |||
|
21 | parser, | |||
|
22 | pathutil, | |||
|
23 | phases, | |||
|
24 | repoview, | |||
|
25 | util, | |||
|
26 | ) | |||
18 |
|
27 | |||
19 | def _revancestors(repo, revs, followfirst): |
|
28 | def _revancestors(repo, revs, followfirst): | |
20 | """Like revlog.ancestors(), but supports followfirst.""" |
|
29 | """Like revlog.ancestors(), but supports followfirst.""" | |
@@ -1435,8 +1444,10 b' def outgoing(repo, subset, x):' | |||||
1435 | default push location. |
|
1444 | default push location. | |
1436 | """ |
|
1445 | """ | |
1437 | # Avoid cycles. |
|
1446 | # Avoid cycles. | |
1438 | import discovery |
|
1447 | from . import ( | |
1439 | import hg |
|
1448 | discovery, | |
|
1449 | hg, | |||
|
1450 | ) | |||
1440 | # i18n: "outgoing" is a keyword |
|
1451 | # i18n: "outgoing" is a keyword | |
1441 | l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) |
|
1452 | l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) | |
1442 | # i18n: "outgoing" is a keyword |
|
1453 | # i18n: "outgoing" is a keyword | |
@@ -1617,7 +1628,7 b' def remote(repo, subset, x):' | |||||
1617 | synonym for the current local branch. |
|
1628 | synonym for the current local branch. | |
1618 | """ |
|
1629 | """ | |
1619 |
|
1630 | |||
1620 | import hg # avoid start-up nasties |
|
1631 | from . import hg # avoid start-up nasties | |
1621 | # i18n: "remote" is a keyword |
|
1632 | # i18n: "remote" is a keyword | |
1622 | l = getargs(x, 0, 2, _("remote takes one, two or no arguments")) |
|
1633 | l = getargs(x, 0, 2, _("remote takes one, two or no arguments")) | |
1623 |
|
1634 |
@@ -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/revset.py mixed imports |
|
|||
116 | stdlib: parser |
|
|||
117 | relative: error, hbisect, phases, util |
|
|||
118 | mercurial/templater.py mixed imports |
|
115 | mercurial/templater.py mixed imports | |
119 | stdlib: parser |
|
116 | stdlib: parser | |
120 | relative: config, error, templatefilters, templatekw, util |
|
117 | relative: config, error, templatefilters, templatekw, util |
General Comments 0
You need to be logged in to leave comments.
Login now