Mercurial > hg
changeset 28124:983365382465
shelve: suggest the correct tool to continue (not unshelve)
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:38 +0000 |
| parents | 6c1b7f80f90f |
| children | 3b4537ba80e9 |
| files | hgext/shelve.py tests/test-shelve.t |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/shelve.py Thu Feb 04 03:47:00 2016 +0000 +++ b/hgext/shelve.py Thu Feb 04 03:47:38 2016 +0000 @@ -628,7 +628,7 @@ except IOError as err: if err.errno != errno.ENOENT: raise - raise error.Abort(_('no unshelve operation underway')) + cmdutil.wrongtooltocontinue(repo, _('unshelve')) if abortf: return unshelveabort(ui, repo, state, opts)
--- a/tests/test-shelve.t Thu Feb 04 03:47:00 2016 +0000 +++ b/tests/test-shelve.t Thu Feb 04 03:47:38 2016 +0000 @@ -373,7 +373,7 @@ try to continue with no unshelve underway $ hg unshelve -c - abort: no unshelve operation underway + abort: no unshelve in progress [255] $ hg status A foo/foo @@ -403,6 +403,10 @@ (use 'hg unshelve --continue' or 'hg unshelve --abort') [255] + $ hg graft --continue + abort: no graft in progress + (continue: hg unshelve --continue) + [255] $ hg unshelve -c rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip) unshelve of 'default' complete