# HG changeset patch # User timeless # Date 1454557620 0 # Node ID 6c1b7f80f90f7599495948380c4361ce14e51bc8 # Parent 6025ddb4e649e24aa7d37704b2ad6850fb8ad0dd histedit: suggest the correct tool to continue (not histedit) Suggest committing (or whatever the current activity is), via wrongtooltocontinue which uses howtocontinue. diff -r 6025ddb4e649 -r 6c1b7f80f90f hgext/histedit.py --- 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() diff -r 6025ddb4e649 -r 6c1b7f80f90f tests/test-histedit-arguments.t --- 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