Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 43559:8e175a3d64bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Kyle Lippincott <spectral@google.com>
date Fri, 08 Nov 2019 14:21:52 -0800
parents 9f70512ae2cf
children 95d0532ad171
comparison
equal deleted inserted replaced
43558:85628a595c37 43559:8e175a3d64bd
7523 b'', 7523 b'',
7524 _(b'set date for temporary commits (DEPRECATED)'), 7524 _(b'set date for temporary commits (DEPRECATED)'),
7525 _(b'DATE'), 7525 _(b'DATE'),
7526 ), 7526 ),
7527 ], 7527 ],
7528 _(b'hg unshelve [OPTION]... [FILE]... [-n SHELVED]'), 7528 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7529 helpcategory=command.CATEGORY_WORKING_DIRECTORY, 7529 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7530 ) 7530 )
7531 def unshelve(ui, repo, *shelved, **opts): 7531 def unshelve(ui, repo, *shelved, **opts):
7532 """restore a shelved change to the working directory 7532 """restore a shelved change to the working directory
7533 7533
7547 7547
7548 (Alternatively, you can use ``--abort`` to abandon an unshelve 7548 (Alternatively, you can use ``--abort`` to abandon an unshelve
7549 that causes a conflict. This reverts the unshelved changes, and 7549 that causes a conflict. This reverts the unshelved changes, and
7550 leaves the bundle in place.) 7550 leaves the bundle in place.)
7551 7551
7552 If bare shelved change (when no files are specified, without interactive, 7552 If bare shelved change (without interactive, include and exclude
7553 include and exclude option) was done on newly created branch it would 7553 option) was done on newly created branch it would restore branch
7554 restore branch information to the working directory. 7554 information to the working directory.
7555 7555
7556 After a successful unshelve, the shelved changes are stored in a 7556 After a successful unshelve, the shelved changes are stored in a
7557 backup directory. Only the N most recent backups are kept. N 7557 backup directory. Only the N most recent backups are kept. N
7558 defaults to 10 but can be overridden using the ``shelve.maxbackups`` 7558 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7559 configuration option. 7559 configuration option.