diff mercurial/cmdutil.py @ 30503:c1149533676b

checkunresolved: move to new package to help avoid import cycles This will allow localrepo to stop using cmdutil, which should avoid some future import cycles. There's room for an adventurous soul to delve deeper into merge.py and figure out how to disentangle more of it - it appears to be a nexus of cycle problems. Some of it might be able to move into this new mergeutil package.
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:31:45 -0500
parents 762c8a128357
children 002fa4d79466
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Mon Nov 21 21:16:54 2016 -0500
+++ b/mercurial/cmdutil.py	Mon Nov 21 21:31:45 2016 -0500
@@ -34,6 +34,7 @@
     graphmod,
     lock as lockmod,
     match as matchmod,
+    mergeutil,
     obsolete,
     patch,
     pathutil,
@@ -3407,13 +3408,7 @@
 
     return cmd
 
-def checkunresolved(ms):
-    if list(ms.unresolved()):
-        raise error.Abort(_("unresolved merge conflicts "
-                            "(see 'hg help resolve')"))
-    if ms.mdstate() != 's' or list(ms.driverresolved()):
-        raise error.Abort(_('driver-resolved merge conflicts'),
-                          hint=_('run "hg resolve --all" to resolve'))
+checkunresolved = mergeutil.checkunresolved
 
 # a list of (ui, repo, otherpeer, opts, missing) functions called by
 # commands.outgoing.  "missing" is "missing" of the result of