# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1478113169 0
# Node ID 86f4ef63d507f76b6c17ac0979aca1d1fb4d44f1
# Parent  3d38a0bc774fd28ffb0a22465d9a1ed005cc2db0
rebase: check for conflicts before continuing

When there are unresolved merge conflicts, there is no reason
to make the user wait for rebase to process all of the
already rebased commits just to complain that it cannot do
anything. Abort early.

diff -r 3d38a0bc774f -r 86f4ef63d507 hgext/rebase.py
--- a/hgext/rebase.py	Wed Nov 02 18:45:53 2016 +0000
+++ b/hgext/rebase.py	Wed Nov 02 18:59:29 2016 +0000
@@ -661,6 +661,9 @@
                     _('abort and continue do not allow specifying revisions'))
             if abortf and opts.get('tool', False):
                 ui.warn(_('tool option will be ignored\n'))
+            if contf:
+                ms = mergemod.mergestate.read(repo)
+                cmdutil.checkunresolved(ms)
 
             retcode = rbsrt._prepareabortorcontinue(abortf)
             if retcode is not None:
diff -r 3d38a0bc774f -r 86f4ef63d507 tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t	Wed Nov 02 18:45:53 2016 +0000
+++ b/tests/test-rebase-conflicts.t	Wed Nov 02 18:59:29 2016 +0000
@@ -73,8 +73,6 @@
 Try to continue without solving the conflict:
 
   $ hg rebase --continue
-  already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
-  rebasing 4:46f0b057b5c0 "L2"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]