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

login
register
mail settings
Submitter Laurent Charignon
Date Nov. 19, 2015, 1:46 p.m.
Message ID <55aefee612e7bf75b8a8.1447940786@waste.org>
Download mbox | patch
Permalink /patch/11515/
State Accepted
Commit 5cf184398ee76bc24a8709b25fef689523ecbf31
Headers show

Comments

Laurent Charignon - Nov. 19, 2015, 1:46 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@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.
Pierre-Yves David - Nov. 19, 2015, 5:03 p.m.
On 11/19/2015 05:46 AM, Laurent Charignon wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@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

This seems to be a pushgate artefact.

> 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)
Shubhanshu Agrawal - Nov. 19, 2015, 5:17 p.m.
I was trying pushgate and accidentally pushed a 8 Patch series. Sorry :(

On Thu, Nov 19, 2015 at 10:33 PM, Pierre-Yves David <
pierre-yves.david@ens-lyon.org> wrote:

> On 11/19/2015 05:46 AM, Laurent Charignon wrote:
>
>> # HG changeset patch
>> # User Siddharth Agarwal <sid0@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
>>
>
> This seems to be a pushgate artefact.
>
>
> 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)
>>
>
> --
> Pierre-Yves David
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

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)