[PATCH 5 of 5] shelve: suggest the correct tool to continue (not unshelve)
timeless
timeless at mozdev.org
Wed Feb 3 22:56:24 EST 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1454557658 0
# Thu Feb 04 03:47:38 2016 +0000
# Node ID 073ff57cc9f9d67eb97eb2a13644eafa658b8040
# Parent 1586929e0a93cd4e3f75ad1fb5182cf3684feeeb
shelve: suggest the correct tool to continue (not unshelve)
Suggest committing (or whatever the current activity is), via
wrongtooltocontinue which uses howtocontinue.
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -628,7 +628,8 @@
except IOError as err:
if err.errno != errno.ENOENT:
raise
- raise error.Abort(_('no unshelve operation underway'))
+ cmdutil.wrongtooltocontinue(repo,
+ _('no unshelve operation underway'))
if abortf:
return unshelveabort(ui, repo, state, opts)
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -374,6 +374,7 @@
$ hg unshelve -c
abort: no unshelve operation underway
+ (continue: hg commit)
[255]
$ hg status
A foo/foo
More information about the Mercurial-devel
mailing list