[PATCH 8 of 8] unshelve: add -k as short form of --keep
Laurent Charignon
lcharignon at fb.com
Thu Nov 19 07:46:26 CST 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1447887843 28800
# Wed Nov 18 15:04:03 2015 -0800
# Node ID 55aefee612e7bf75b8a8e49ff80096b8b9474d7f
# Parent 111782cc7592732fc911cf23dc730d0399f6a106
unshelve: add -k as short form of --keep
For parity with strip -k, rebase -k, etc.
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -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'))],
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -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)
More information about the Mercurial-devel
mailing list