Mercurial > hg-stable
changeset 2771:519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 02 Aug 2006 15:07:37 -0700 |
| parents | 5f8259e4d292 |
| children | 4720e79486d3 |
| files | hgext/mq.py |
| diffstat | 1 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Wed Aug 02 14:48:59 2006 -0700 +++ b/hgext/mq.py Wed Aug 02 15:07:37 2006 -0700 @@ -1321,7 +1321,13 @@ def fold(ui, repo, *files, **opts): """fold the named patches into the current patch - Patches must not yet be applied. + Patches must not yet be applied. Each patch will be successively + applied to the current patch in the order given. If all the + patches apply successfully, the current patch will be refreshed + with the new cumulative patch, and the folded patches will + be deleted. With -f/--force, the folded patch files will + be removed afterwards. + The header for each folded patch will be concatenated with the current patch header, separated by a line of '* * *'.""" @@ -1369,7 +1375,7 @@ q.refresh(repo, msg=message) for patch in patches: - q.delete(repo, patch) + q.delete(repo, patch, force=opts['force']) q.save_dirty() @@ -1602,6 +1608,7 @@ 'qfold': (fold, [('e', 'edit', None, _('edit patch header')), + ('f', 'force', None, _('delete folded patch files')), ('m', 'message', '', _('set patch header to <text>')), ('l', 'logfile', '', _('set patch header to contents of <file>'))], 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'),