Re: [PATCH 1 of 3 V2] shelve: new keep option

2019-03-23 Thread Yuya Nishihara
On Fri, 22 Mar 2019 13:18:29 -0400, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso 
> # Date 1553268263 14400
> #  Fri Mar 22 11:24:23 2019 -0400
> # Node ID 773e8b313d28d85002c459ea69d3671e7a0bc05e
> # Parent  b1bc6e5f5249d0633db73be3c6853273485f3919
> shelve: new keep option

Queued, thanks.

> +  ('k', 'keep', False,
> +   _('shelve, but keep changes in the working directory')),

We'll probably need to update the allowables table. Can you send a follow up?
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


[PATCH 1 of 3 V2] shelve: new keep option

2019-03-22 Thread Jordi Gutiérrez Hermoso
# HG changeset patch
# User Jordi Gutiérrez Hermoso 
# Date 1553268263 14400
#  Fri Mar 22 11:24:23 2019 -0400
# Node ID 773e8b313d28d85002c459ea69d3671e7a0bc05e
# Parent  b1bc6e5f5249d0633db73be3c6853273485f3919
shelve: new keep option

Does nothing yet. The docstring describes what it will soon be doing.

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -1055,6 +1055,8 @@ def _dounshelve(ui, repo, *shelved, **op
_('delete the named shelved change(s)')),
   ('e', 'edit', False,
_('invoke editor on commit messages')),
+  ('k', 'keep', False,
+   _('shelve, but keep changes in the working directory')),
   ('l', 'list', None,
_('list current shelves')),
   ('m', 'message', '',
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -76,6 +76,7 @@ shelve has a help message
   --date DATE   shelve with the specified commit date
-d --delete  delete the named shelved change(s)
-e --editinvoke editor on commit messages
+   -k --keepshelve, but keep changes in the working directory
-l --listlist current shelves
-m --message TEXTuse text as shelve message
-n --name NAME   use the given name for the shelved commit
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel