diff hgext/mq.py @ 21714:635a8201e356

qfold: allow to specify '--message/'--logfile' and '--edit' at the same time

Before this patch, 'hg qfold' disallows to specify
'--message/'--logfile' and '--edit' at the same time.

'hg qfold' has disallowed such combination since Mercurial 0.9.2, but
this restriction seems not to be reasonable for recent Mercurial,
because all other commands creating new changeset allow it.

This patch allows 'hg qfold' to specify '--message/'--logfile' and
'--edit' at the same time like other commands creating new changeset.

--- a/hgext/mq.py	Sun Jun 01 00:08:32 2014 +0900
+++ b/hgext/mq.py	Sun Jun 01 00:08:33 2014 +0900
@@ -2546,9 +2546,6 @@
     q.checklocalchanges(repo)
 
     message = cmdutil.logmessage(ui, opts)
-    if opts.get('edit'):
-        if message:
-            raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
 
     parent = q.lookup('qtip')
     patches = []