# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1401548913 -32400
# Node ID 635a8201e356257e6e730db83c8e2f7f5ea74614
# Parent  7a51bced398be17034513147376c7d2dd39b8899
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.

diff -r 7a51bced398b -r 635a8201e356 hgext/mq.py
--- 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 = []
diff -r 7a51bced398b -r 635a8201e356 tests/test-mq-qfold.t
--- a/tests/test-mq-qfold.t	Sun Jun 01 00:08:32 2014 +0900
+++ b/tests/test-mq-qfold.t	Sun Jun 01 00:08:33 2014 +0900
@@ -174,10 +174,11 @@
   $ hg tip --template "{files}\n"
   aa
 
-(test that editor is not invoked before transaction starting)
+(test that editor is not invoked before transaction starting,
+and that combination of '--edit' and '--message' doesn't abort execution)
 
   $ rm -f .hg/last-message.txt
-  $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e p3
+  $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e -m MESSAGE p3
   refresh interrupted while patch was popped! (revert --all, qpush to recover)
   abort: emulating unexpected abort
   [255]