Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: suggest the correct tool to continue (not histedit)
authortimeless <timeless@mozdev.org>
Thu, 04 Feb 2016 03:47:00 +0000
changeset 28123 6c1b7f80f90f
parent 28122 6025ddb4e649
child 28124 983365382465
histedit: suggest the correct tool to continue (not histedit) Suggest committing (or whatever the current activity is), via wrongtooltocontinue which uses howtocontinue.
hgext/histedit.py file | annotate | diff | comparison | revisions
tests/test-histedit-arguments.t file | annotate | diff | comparison | revisions 
--- a/hgext/histedit.py	Thu Feb 04 03:46:38 2016 +0000
+++ b/hgext/histedit.py	Thu Feb 04 03:47:00 2016 +0000
@@ -279,7 +279,7 @@
         except IOError as err:
             if err.errno != errno.ENOENT:
                 raise
-            raise error.Abort(_('no histedit in progress'))
+            cmdutil.wrongtooltocontinue(self.repo, _('histedit'))
 
         if state.startswith('v1\n'):
             data = self._load()
--- a/tests/test-histedit-arguments.t	Thu Feb 04 03:46:38 2016 +0000
+++ b/tests/test-histedit-arguments.t	Thu Feb 04 03:47:00 2016 +0000
@@ -133,6 +133,11 @@
   (hg histedit --continue to resume)
   [1]
 
+  $ hg graft --continue
+  abort: no graft in progress
+  (continue: hg histedit --continue)
+  [255]
+
   $ mv .hg/histedit-state .hg/histedit-state.back
   $ hg update --quiet --clean 2
   $ echo alpha >> alpha
Mercurial