Show More
@@ -10,7 +10,7 b' from i18n import _' | |||||
10 | import os, sys, errno, re, tempfile, cStringIO, shutil |
|
10 | import os, sys, errno, re, tempfile, cStringIO, shutil | |
11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies |
|
11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies | |
12 | import match as matchmod |
|
12 | import match as matchmod | |
13 |
import |
|
13 | import repair, graphmod, revset, phases, obsolete, pathutil | |
14 | import changelog |
|
14 | import changelog | |
15 | import bookmarks |
|
15 | import bookmarks | |
16 | import encoding |
|
16 | import encoding | |
@@ -848,6 +848,8 b' def tryimportone(ui, repo, hunk, parents' | |||||
848 | :updatefunc: a function that update a repo to a given node |
|
848 | :updatefunc: a function that update a repo to a given node | |
849 | updatefunc(<repo>, <node>) |
|
849 | updatefunc(<repo>, <node>) | |
850 | """ |
|
850 | """ | |
|
851 | # avoid cycle context -> subrepo -> cmdutil | |||
|
852 | import context | |||
851 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
853 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ | |
852 | patch.extract(ui, hunk) |
|
854 | patch.extract(ui, hunk) | |
853 |
|
855 | |||
@@ -2464,6 +2466,9 b' def commit(ui, repo, commitfunc, pats, o' | |||||
2464 | return commitfunc(ui, repo, message, matcher, opts) |
|
2466 | return commitfunc(ui, repo, message, matcher, opts) | |
2465 |
|
2467 | |||
2466 | def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
2468 | def amend(ui, repo, commitfunc, old, extra, pats, opts): | |
|
2469 | # avoid cycle context -> subrepo -> cmdutil | |||
|
2470 | import context | |||
|
2471 | ||||
2467 | # amend will reuse the existing user if not specified, but the obsolete |
|
2472 | # amend will reuse the existing user if not specified, but the obsolete | |
2468 | # marker creation requires that the current user's name is specified. |
|
2473 | # marker creation requires that the current user's name is specified. | |
2469 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
2474 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
@@ -127,7 +127,6 b' these may expose other cycles.' | |||||
127 | mercurial/ui.py mixed imports |
|
127 | mercurial/ui.py mixed imports | |
128 | stdlib: formatter |
|
128 | stdlib: formatter | |
129 | relative: config, error, progress, scmutil, util |
|
129 | relative: config, error, progress, scmutil, util | |
130 | Import cycle: mercurial.cmdutil -> mercurial.context -> mercurial.subrepo -> mercurial.cmdutil |
|
|||
131 | Import cycle: hgext.largefiles.basestore -> hgext.largefiles.localstore -> hgext.largefiles.basestore |
|
130 | Import cycle: hgext.largefiles.basestore -> hgext.largefiles.localstore -> hgext.largefiles.basestore | |
132 | Import cycle: mercurial.commands -> mercurial.commandserver -> mercurial.dispatch -> mercurial.commands |
|
131 | Import cycle: mercurial.commands -> mercurial.commandserver -> mercurial.dispatch -> mercurial.commands | |
133 | [1] |
|
132 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now