Patchwork D7365: unshelve: correct help string; unshelve does not accept file list

login
register
mail settings
Submitter phabricator
Date Nov. 8, 2019, 10:29 p.m.
Message ID <differential-rev-PHID-DREV-s5x25a65roh4e7agogcn-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/42983/
State Superseded
Headers show

Comments

phabricator - Nov. 8, 2019, 10:29 p.m.
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D7365

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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