##// END OF EJS Templates
merge: cut import cycle at merge -> extensions...
Yuya Nishihara -
r36027:46a54de9 default
parent child Browse files
Show More
@@ -31,6 +31,7 b' from . import ('
31 31 formatter,
32 32 logcmdutil,
33 33 match as matchmod,
34 merge as mergemod,
34 35 obsolete,
35 36 patch,
36 37 pathutil,
@@ -220,7 +221,6 b' def recordfilter(ui, originalhunks, oper'
220 221
221 222 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
222 223 filterfn, *pats, **opts):
223 from . import merge as mergemod
224 224 opts = pycompat.byteskwargs(opts)
225 225 if not ui.interactive():
226 226 if cmdsuggest:
@@ -557,8 +557,6 b' def _commentlines(raw):'
557 557 return '\n'.join(commentedlines) + '\n'
558 558
559 559 def _conflictsmsg(repo):
560 # avoid merge cycle
561 from . import merge as mergemod
562 560 mergestate = mergemod.mergestate.read(repo)
563 561 if not mergestate.active():
564 562 return
@@ -25,7 +25,6 b' from .node import ('
25 25 from . import (
26 26 copies,
27 27 error,
28 extensions,
29 28 filemerge,
30 29 match as matchmod,
31 30 obsutil,
@@ -1992,6 +1991,8 b' def update(repo, node, branchmerge, forc'
1992 1991 fsmonitorthreshold = repo.ui.configint('fsmonitor',
1993 1992 'warn_update_file_count')
1994 1993 try:
1994 # avoid cycle: extensions -> cmdutil -> merge
1995 from . import extensions
1995 1996 extensions.find('fsmonitor')
1996 1997 fsmonitorenabled = repo.ui.config('fsmonitor', 'mode') != 'off'
1997 1998 # We intentionally don't look at whether fsmonitor has disabled
General Comments 0
You need to be logged in to leave comments. Login now