# HG changeset patch # User Danny Hooper # Date 2018-07-13 20:48:56 # Node ID abcf500d527c5f0a82a7363f9a48f4e7482f3566 # Parent 27391d74aaa2b0040f8ae5cfed305901e09a1751 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 diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -1011,11 +1011,14 @@ def _dounshelve(ui, repo, *shelved, **op ('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 diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -68,9 +68,12 @@ shelve has a help message -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