unshelve: correct help string; unshelve does not accept file list
authorKyle Lippincott <spectral@google.com>
Fri, 08 Nov 2019 14:21:52 -0800
changeset 43511 8e175a3d64bd
parent 43510 85628a595c37
child 43512 5a0a4fa055ff
unshelve: correct help string; unshelve does not accept file list The non-option arguments to `hg unshelve` are interpreted as the name of the shelve to unshelve, not the list of files to unshelve. While that functionality would probably be nice to have, that's well beyond the scope of this documentation fix. Differential Revision: https://phab.mercurial-scm.org/D7365
mercurial/commands.py
--- a/mercurial/commands.py	Fri Nov 08 11:23:22 2019 -0800
+++ b/mercurial/commands.py	Fri Nov 08 14:21:52 2019 -0800
@@ -7525,7 +7525,7 @@
             _(b'DATE'),
         ),
     ],
-    _(b'hg unshelve [OPTION]... [FILE]... [-n SHELVED]'),
+    _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
     helpcategory=command.CATEGORY_WORKING_DIRECTORY,
 )
 def unshelve(ui, repo, *shelved, **opts):
@@ -7549,9 +7549,9 @@
     that causes a conflict. This reverts the unshelved changes, and
     leaves the bundle in place.)
 
-    If bare shelved change (when no files are specified, without interactive,
-    include and exclude option) was done on newly created branch it would
-    restore branch information to the working directory.
+    If bare shelved change (without interactive, include and exclude
+    option) was done on newly created branch it would restore branch
+    information to the working directory.
 
     After a successful unshelve, the shelved changes are stored in a
     backup directory. Only the N most recent backups are kept. N