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.
shelve: hook afterresolvedstates
authortimeless <timeless@mozdev.org>
Tue, 05 Jan 2016 22:23:27 +0000
changeset 27694 2dc363274702
parent 27693 2b9126d6588b
child 27695 fb0cc863d172
shelve: hook afterresolvedstates
hgext/shelve.py file | annotate | diff | comparison | revisions
tests/test-shelve.t file | annotate | diff | comparison | revisions 
--- a/hgext/shelve.py	Fri Jan 08 12:35:02 2016 -0600
+++ b/hgext/shelve.py	Tue Jan 05 22:23:27 2016 +0000
@@ -852,3 +852,5 @@
         [shelvedstate._filename, False, False,
          _('unshelve already in progress'),
          _("use 'hg unshelve --continue' or 'hg unshelve --abort'")])
+    cmdutil.afterresolvedstates.append(
+        [shelvedstate._filename, _('hg unshelve --continue')])
--- a/tests/test-shelve.t	Fri Jan 08 12:35:02 2016 -0600
+++ b/tests/test-shelve.t	Tue Jan 05 22:23:27 2016 +0000
@@ -395,6 +395,7 @@
   $ hg revert -r . a/a
   $ hg resolve -m a/a
   (no more unresolved files)
+  continue: hg unshelve --continue
 
   $ hg commit -m 'commit while unshelve in progress'
   abort: unshelve already in progress
@@ -840,6 +841,7 @@
   reverting a/a (glob)
   $ hg resolve -m a/a
   (no more unresolved files)
+  continue: hg unshelve --continue
   $ hg unshelve -c
   rebasing 5:e42a7da90865 "changes to: second" (tip)
   note: rebase of 5:e42a7da90865 created no changes to commit
Mercurial