Mercurial > hg-stable
changeset 28123:6c1b7f80f90f
histedit: suggest the correct tool to continue (not histedit)
Suggest committing (or whatever the current activity is), via
wrongtooltocontinue which uses howtocontinue.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 04 Feb 2016 03:47:00 +0000 |
| parents | 6025ddb4e649 |
| children | 983365382465 |
| files | hgext/histedit.py tests/test-histedit-arguments.t |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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