Mercurial > hg

diff mercurial/merge.py @ 36010:46a54de96a54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: cut import cycle at merge -> extensions This seems less bad because checking fsmonitor looks like a temporary hack, and cmdutil -> mergemod should be a valid dependency.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 06 Feb 2018 22:55:02 +0900
parents 55e8efa2451a
children 4fe2041007ed
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Feb 06 22:36:38 2018 +0900
+++ b/mercurial/merge.py	Tue Feb 06 22:55:02 2018 +0900
@@ -25,7 +25,6 @@
 from . import (
     copies,
     error,
-    extensions,
     filemerge,
     match as matchmod,
     obsutil,
@@ -1992,6 +1991,8 @@
         fsmonitorthreshold = repo.ui.configint('fsmonitor',
                                                'warn_update_file_count')
         try:
+            # avoid cycle: extensions -> cmdutil -> merge
+            from . import extensions
             extensions.find('fsmonitor')
             fsmonitorenabled = repo.ui.config('fsmonitor', 'mode') != 'off'
             # We intentionally don't look at whether fsmonitor has disabled