Patchwork [1,of,3,unshelve] unshelve: add -k as short form of --keep

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 18, 2015, 11:20 p.m.
Message ID <0e58d7373411d9304073.1447888857@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11495/
State Superseded
Commit 5cf184398ee76bc24a8709b25fef689523ecbf31
Headers show

Comments

Siddharth Agarwal - Nov. 18, 2015, 11:20 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447887843 28800
#      Wed Nov 18 15:04:03 2015 -0800
# Node ID 0e58d7373411d93040739e3c4b8c418408b3fe8e
# Parent  65351015f3ca03102f39e00167864e139d48e477
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 0e58d7373411
unshelve: add -k as short form of --keep

For parity with strip -k, rebase -k, etc.

Patch

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -572,7 +572,7 @@  def unshelvecontinue(ui, repo, state, op
            _('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 @@  test keep and cleanup
   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)