Show More
@@ -5,18 +5,47 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 node import hex, bin, nullid, nullrev, short |
|
8 | from __future__ import absolute_import | |
9 | from i18n import _ |
|
9 | ||
10 | import os, sys, errno, re, tempfile, cStringIO |
|
10 | import cStringIO | |
11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies |
|
11 | import errno | |
12 | import match as matchmod |
|
12 | import os | |
13 | import repair, graphmod, revset, phases, obsolete, pathutil |
|
13 | import re | |
14 | import changelog |
|
14 | import sys | |
15 | import bookmarks |
|
15 | import tempfile | |
16 | import encoding |
|
16 | ||
17 | import formatter |
|
17 | from .i18n import _ | |
18 | import crecord as crecordmod |
|
18 | from .node import ( | |
19 | import lock as lockmod |
|
19 | bin, | |
|
20 | hex, | |||
|
21 | nullid, | |||
|
22 | nullrev, | |||
|
23 | short, | |||
|
24 | ) | |||
|
25 | ||||
|
26 | from . import ( | |||
|
27 | bookmarks, | |||
|
28 | changelog, | |||
|
29 | copies, | |||
|
30 | crecord as crecordmod, | |||
|
31 | encoding, | |||
|
32 | error, | |||
|
33 | formatter, | |||
|
34 | graphmod, | |||
|
35 | lock as lockmod, | |||
|
36 | match as matchmod, | |||
|
37 | obsolete, | |||
|
38 | patch, | |||
|
39 | pathutil, | |||
|
40 | phases, | |||
|
41 | repair, | |||
|
42 | revlog, | |||
|
43 | revset, | |||
|
44 | scmutil, | |||
|
45 | templatekw, | |||
|
46 | templater, | |||
|
47 | util, | |||
|
48 | ) | |||
20 |
|
49 | |||
21 | def ishunk(x): |
|
50 | def ishunk(x): | |
22 | hunkclasses = (crecordmod.uihunk, patch.recordhunk) |
|
51 | hunkclasses = (crecordmod.uihunk, patch.recordhunk) | |
@@ -78,8 +107,7 b' def recordfilter(ui, originalhunks, oper' | |||||
78 |
|
107 | |||
79 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, |
|
108 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, | |
80 | filterfn, *pats, **opts): |
|
109 | filterfn, *pats, **opts): | |
81 | import merge as mergemod |
|
110 | from . import merge as mergemod | |
82 |
|
||||
83 | if not ui.interactive(): |
|
111 | if not ui.interactive(): | |
84 | if cmdsuggest: |
|
112 | if cmdsuggest: | |
85 | msg = _('running non-interactively, use %s instead') % cmdsuggest |
|
113 | msg = _('running non-interactively, use %s instead') % cmdsuggest | |
@@ -867,7 +895,7 b' def tryimportone(ui, repo, hunk, parents' | |||||
867 | updatefunc(<repo>, <node>) |
|
895 | updatefunc(<repo>, <node>) | |
868 | """ |
|
896 | """ | |
869 | # avoid cycle context -> subrepo -> cmdutil |
|
897 | # avoid cycle context -> subrepo -> cmdutil | |
870 | import context |
|
898 | from . import context | |
871 | extractdata = patch.extract(ui, hunk) |
|
899 | extractdata = patch.extract(ui, hunk) | |
872 | tmpname = extractdata.get('filename') |
|
900 | tmpname = extractdata.get('filename') | |
873 | message = extractdata.get('message') |
|
901 | message = extractdata.get('message') | |
@@ -2507,7 +2535,7 b' def commit(ui, repo, commitfunc, pats, o' | |||||
2507 |
|
2535 | |||
2508 | def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
2536 | def amend(ui, repo, commitfunc, old, extra, pats, opts): | |
2509 | # avoid cycle context -> subrepo -> cmdutil |
|
2537 | # avoid cycle context -> subrepo -> cmdutil | |
2510 | import context |
|
2538 | from . import context | |
2511 |
|
2539 | |||
2512 | # amend will reuse the existing user if not specified, but the obsolete |
|
2540 | # amend will reuse the existing user if not specified, but the obsolete | |
2513 | # marker creation requires that the current user's name is specified. |
|
2541 | # marker creation requires that the current user's name is specified. |
@@ -86,7 +86,6 b'' | |||||
86 | hgext/win32text.py not using absolute_import |
|
86 | hgext/win32text.py not using absolute_import | |
87 | i18n/check-translation.py not using absolute_import |
|
87 | i18n/check-translation.py not using absolute_import | |
88 | i18n/polib.py not using absolute_import |
|
88 | i18n/polib.py not using absolute_import | |
89 | mercurial/cmdutil.py not using absolute_import |
|
|||
90 | mercurial/commands.py not using absolute_import |
|
89 | mercurial/commands.py not using absolute_import | |
91 | setup.py not using absolute_import |
|
90 | setup.py not using absolute_import | |
92 | tests/filterpyflakes.py requires print_function |
|
91 | tests/filterpyflakes.py requires print_function |
General Comments 0
You need to be logged in to leave comments.
Login now