Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 28122:6025ddb4e649

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: suggest the correct tool to continue (not rebase) Suggest committing (or whatever the current activity is), via wrongtooltocontinue which uses howtocontinue.
author timeless <timeless@mozdev.org>
date Thu, 04 Feb 2016 03:46:38 +0000
parents 0e3835c7e1cf
children 5853878bbc2a
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Feb 04 03:45:44 2016 +0000
+++ b/hgext/rebase.py	Thu Feb 04 03:46:38 2016 +0000
@@ -915,7 +915,7 @@
     except IOError as err:
         if err.errno != errno.ENOENT:
             raise
-        raise error.Abort(_('no rebase in progress'))
+        cmdutil.wrongtooltocontinue(repo, _('rebase'))
 
     if keepbranches is None:
         raise error.Abort(_('.hg/rebasestate is incomplete'))