##// END OF EJS Templates
mq: more qdelete help text tweaks
Brendan Cully -
r4737:2ececafa default
parent child Browse files
Show More
@@ -533,7 +533,8 class queue:
533
533
534 def delete(self, repo, patches, opts):
534 def delete(self, repo, patches, opts):
535 if not patches and not opts.get('rev'):
535 if not patches and not opts.get('rev'):
536 raise util.Abort(_('missing patch name'))
536 raise util.Abort(_('qdelete requires at least one revision or '
537 'patch name'))
537
538
538 realpatches = []
539 realpatches = []
539 for patch in patches:
540 for patch in patches:
@@ -1383,11 +1384,13 class queue:
1383 def delete(ui, repo, *patches, **opts):
1384 def delete(ui, repo, *patches, **opts):
1384 """remove patches from queue
1385 """remove patches from queue
1385
1386
1386 With --rev, mq will stop managing the named revisions. The
1387 The patches must not be applied, unless they are arguments to
1387 patches must be applied and at the base of the stack. This option
1388 the --rev parameter. At least one patch or revision is required.
1388 is useful when the patches have been applied upstream.
1389
1389
1390 Otherwise, the patches must not be applied.
1390 With --rev, mq will stop managing the named revisions (converting
1391 them to regular mercurial changesets). The patches must be applied
1392 and at the base of the stack. This option is useful when the patches
1393 have been applied upstream.
1391
1394
1392 With --keep, the patch files are preserved in the patch directory."""
1395 With --keep, the patch files are preserved in the patch directory."""
1393 q = repo.mq
1396 q = repo.mq
@@ -2109,7 +2112,7 cmdtable = {
2109 (delete,
2112 (delete,
2110 [('k', 'keep', None, _('keep patch file')),
2113 [('k', 'keep', None, _('keep patch file')),
2111 ('r', 'rev', [], _('stop managing a revision'))],
2114 ('r', 'rev', [], _('stop managing a revision'))],
2112 _('hg qdelete [-k] [-r REV]... PATCH...')),
2115 _('hg qdelete [-k] [-r REV]... [PATCH]...')),
2113 'qfold':
2116 'qfold':
2114 (fold,
2117 (fold,
2115 [('e', 'edit', None, _('edit patch header')),
2118 [('e', 'edit', None, _('edit patch header')),
@@ -1,5 +1,5
1 adding base
1 adding base
2 abort: missing patch name
2 abort: qdelete requires at least one revision or patch name
3 abort: cannot delete applied patch c
3 abort: cannot delete applied patch c
4 Now at: b
4 Now at: b
5 a
5 a
General Comments 0
You need to be logged in to leave comments. Login now