Show More
@@ -54,6 +54,7 b' from mercurial.node import (' | |||
|
54 | 54 | ) |
|
55 | 55 | from mercurial import ( |
|
56 | 56 | context, |
|
57 | diffutil, | |
|
57 | 58 | error, |
|
58 | 59 | hg, |
|
59 | 60 | patch, |
@@ -62,7 +63,6 b' from mercurial import (' | |||
|
62 | 63 | ) |
|
63 | 64 | from mercurial.utils import ( |
|
64 | 65 | dateutil, |
|
65 | diffutil, | |
|
66 | 66 | ) |
|
67 | 67 | |
|
68 | 68 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
@@ -9,9 +9,9 b'' | |||
|
9 | 9 | |
|
10 | 10 | from __future__ import absolute_import |
|
11 | 11 | |
|
12 |
from |
|
|
12 | from .i18n import _ | |
|
13 | 13 | |
|
14 |
from |
|
|
14 | from . import ( | |
|
15 | 15 | mdiff, |
|
16 | 16 | pycompat, |
|
17 | 17 | ) |
@@ -25,6 +25,7 b' from .common import (' | |||
|
25 | 25 | |
|
26 | 26 | from .. import ( |
|
27 | 27 | context, |
|
28 | diffutil, | |
|
28 | 29 | error, |
|
29 | 30 | match, |
|
30 | 31 | mdiff, |
@@ -41,7 +42,6 b' from .. import (' | |||
|
41 | 42 | ) |
|
42 | 43 | |
|
43 | 44 | from ..utils import ( |
|
44 | diffutil, | |
|
45 | 45 | stringutil, |
|
46 | 46 | ) |
|
47 | 47 |
@@ -11,13 +11,13 b' import re' | |||
|
11 | 11 | |
|
12 | 12 | from .i18n import _ |
|
13 | 13 | from . import ( |
|
14 | diffutil, | |
|
14 | 15 | node as nodemod, |
|
15 | 16 | phases, |
|
16 | 17 | util, |
|
17 | 18 | ) |
|
18 | 19 | from .utils import ( |
|
19 | 20 | dateutil, |
|
20 | diffutil, | |
|
21 | 21 | ) |
|
22 | 22 | |
|
23 | 23 | ### obsolescence marker flag |
@@ -28,6 +28,7 b' from .node import (' | |||
|
28 | 28 | from . import ( |
|
29 | 29 | copies, |
|
30 | 30 | diffhelper, |
|
31 | diffutil, | |
|
31 | 32 | encoding, |
|
32 | 33 | error, |
|
33 | 34 | mail, |
@@ -41,7 +42,6 b' from . import (' | |||
|
41 | 42 | ) |
|
42 | 43 | from .utils import ( |
|
43 | 44 | dateutil, |
|
44 | diffutil, | |
|
45 | 45 | procutil, |
|
46 | 46 | stringutil, |
|
47 | 47 | ) |
@@ -13,6 +13,7 b' from .i18n import _' | |||
|
13 | 13 | from . import ( |
|
14 | 14 | dagop, |
|
15 | 15 | destutil, |
|
16 | diffutil, | |
|
16 | 17 | encoding, |
|
17 | 18 | error, |
|
18 | 19 | hbisect, |
@@ -33,7 +34,6 b' from . import (' | |||
|
33 | 34 | ) |
|
34 | 35 | from .utils import ( |
|
35 | 36 | dateutil, |
|
36 | diffutil, | |
|
37 | 37 | stringutil, |
|
38 | 38 | ) |
|
39 | 39 |
General Comments 0
You need to be logged in to leave comments.
Login now