Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 19478:e5a5790a3185 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add checkunfinished support (issue3955)
author Matt Mackall <mpm@selenic.com>
date Wed, 24 Jul 2013 23:51:44 -0500
parents e9351f0d9a2a
children 607191a45f8c
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Jul 24 23:51:44 2013 -0500
+++ b/hgext/rebase.py	Wed Jul 24 23:51:44 2013 -0500
@@ -174,6 +174,7 @@
                 raise util.Abort(_('cannot specify both a '
                                    'revision and a source'))
 
+            cmdutil.checkunfinished(repo)
             cmdutil.bailifchanged(repo)
 
             if not destf:
@@ -798,3 +799,6 @@
     entry[1].append(('t', 'tool', '',
                      _("specify merge tool for rebase")))
     cmdutil.summaryhooks.add('rebase', summaryhook)
+    cmdutil.unfinishedstates.append(
+        ['rebasestate', False, _('rebase in progress'),
+         _("use 'hg rebase --continue' or 'hg rebase --abort'")])