Mercurial > public > mercurial-scm > hg-stable

diff hgext/mq.py @ 36047:55e8efa2451a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: split non-core functions to new module Resolves import cycle caused by subrepo -> cmdutil. Still we have another cycle, cmdutil -> context -> subrepo, but where I think importing context is wrong. Perhaps we'll need repo.makememctx().
author Yuya Nishihara <yuya@tcha.org>
date Tue, 06 Feb 2018 22:36:38 +0900
parents f87641bf4d23
children f91b7f26c68a
line wrap: on
line diff
--- a/hgext/mq.py	Wed Feb 07 23:22:53 2018 +0900
+++ b/hgext/mq.py	Tue Feb 06 22:36:38 2018 +0900
@@ -94,7 +94,7 @@
     revsetlang,
     scmutil,
     smartset,
-    subrepo,
+    subrepoutil,
     util,
     vfs as vfsmod,
 )
@@ -970,8 +970,8 @@
                 wctx = repo[None]
                 pctx = repo['.']
                 overwrite = False
-                mergedsubstate = subrepo.submerge(repo, pctx, wctx, wctx,
-                    overwrite)
+                mergedsubstate = subrepoutil.submerge(repo, pctx, wctx, wctx,
+                                                      overwrite)
                 files += mergedsubstate.keys()
 
             match = scmutil.matchfiles(repo, files or [])