Mercurial > hg

diff mercurial/localrepo.py @ 30272:3d38a0bc774f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: refactor checkunresolved localrepo.commit had code to check for unresolved merge conflicts, it would be helpful for at least rebase to be able to use that code without calling commit().
author timeless <timeless@mozdev.org>
date Wed, 02 Nov 2016 18:45:53 +0000
parents 3c8811efdddc
children 318a24b52eeb
line wrap: on
line diff
--- a/mercurial/localrepo.py	Wed Nov 02 18:56:07 2016 +0000
+++ b/mercurial/localrepo.py	Wed Nov 02 18:45:53 2016 +0000
@@ -1633,13 +1633,7 @@
                 raise error.Abort(_("cannot commit merge with missing files"))
 
             ms = mergemod.mergestate.read(self)
-
-            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'))
+            cmdutil.checkunresolved(ms)
 
             if editor:
                 cctx._text = editor(self, cctx, subs)