Mercurial > hg-stable

changeset 38714:abcf500d527c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: improve help text for --patch and --stat It's not currently obvious why "hg shelve -p" fails, since -p doesn't take an argument. Differential Revision: https://phab.mercurial-scm.org/D3949
author Danny Hooper <hooper@google.com>
date Fri, 13 Jul 2018 13:48:56 -0700
parents 27391d74aaa2
children 905b66681004
files hgext/shelve.py tests/test-shelve.t
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/shelve.py	Thu Jul 12 18:46:10 2018 +0200
+++ b/hgext/shelve.py	Fri Jul 13 13:48:56 2018 -0700
@@ -1011,11 +1011,14 @@
           ('n', 'name', '',
            _('use the given name for the shelved commit'), _('NAME')),
           ('p', 'patch', None,
-           _('show patch')),
+           _('output patches for changes (provide the names of the shelved '
+             'changes as positional arguments)')),
           ('i', 'interactive', None,
            _('interactive mode, only works while creating a shelve')),
           ('', 'stat', None,
-           _('output diffstat-style summary of changes'))] + cmdutil.walkopts,
+           _('output diffstat-style summary of changes (provide the names of '
+             'the shelved changes as positional arguments)')
+           )] + cmdutil.walkopts,
          _('hg shelve [OPTION]... [FILE]...'))
 def shelvecmd(ui, repo, *pats, **opts):
     '''save and set aside changes from the working directory
--- a/tests/test-shelve.t	Thu Jul 12 18:46:10 2018 +0200
+++ b/tests/test-shelve.t	Fri Jul 13 13:48:56 2018 -0700
@@ -68,9 +68,12 @@
    -l --list                list current shelves
    -m --message TEXT        use text as shelve message
    -n --name NAME           use the given name for the shelved commit
-   -p --patch               show patch
+   -p --patch               output patches for changes (provide the names of the
+                            shelved changes as positional arguments)
    -i --interactive         interactive mode, only works while creating a shelve
-      --stat                output diffstat-style summary of changes
+      --stat                output diffstat-style summary of changes (provide
+                            the names of the shelved changes as positional
+                            arguments)
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns
       --mq                  operate on patch repository