unshelve: add -k as short form of --keep
For parity with strip -k, rebase -k, etc.
--- a/hgext/shelve.py Sun Nov 01 13:55:21 2015 +0900
+++ b/hgext/shelve.py Wed Nov 18 15:04:03 2015 -0800
@@ -572,7 +572,7 @@
_('abort an incomplete unshelve operation')),
('c', 'continue', None,
_('continue an incomplete unshelve operation')),
- ('', 'keep', None,
+ ('k', 'keep', None,
_('keep shelve after unshelving')),
('', 'date', '',
_('set date for temporary commits (DEPRECATED)'), _('DATE'))],
--- a/tests/test-shelve.t Sun Nov 01 13:55:21 2015 +0900
+++ b/tests/test-shelve.t Wed Nov 18 15:04:03 2015 -0800
@@ -493,7 +493,7 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg shelve --list
default (*) changes to 'create conflict' (glob)
- $ hg unshelve --keep
+ $ hg unshelve -k
unshelving change 'default'
$ hg shelve --list
default (*) changes to 'create conflict' (glob)