# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1401548912 -32400
# Node ID 7a51bced398be17034513147376c7d2dd39b8899
# Parent  51035af2c0bfb988aadf273ff5c68bcd5e125b22
qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time

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

'hg qrefresh' 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 qrefresh' to specify '--message/'--logfile' and
'--edit' at the same time like other commands creating new changeset.

diff -r 51035af2c0bf -r 7a51bced398b hgext/mq.py
--- a/hgext/mq.py	Sun Jun 01 00:08:32 2014 +0900
+++ b/hgext/mq.py	Sun Jun 01 00:08:32 2014 +0900
@@ -2489,9 +2489,6 @@
     """
     q = repo.mq
     message = cmdutil.logmessage(ui, opts)
-    if opts.get('edit'):
-        if message:
-            raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
     setupheaderopts(ui, opts)
     wlock = repo.wlock()
     try:
diff -r 51035af2c0bf -r 7a51bced398b tests/test-mq-qrefresh-replace-log-message.t
--- a/tests/test-mq-qrefresh-replace-log-message.t	Sun Jun 01 00:08:32 2014 +0900
+++ b/tests/test-mq-qrefresh-replace-log-message.t	Sun Jun 01 00:08:32 2014 +0900
@@ -26,9 +26,19 @@
   First commit message
 
 Testing changing message with -m
+(this tests also that '--edit' can be used with '--message')
 
   $ echo bbbb > file
-  $ hg qrefresh -m "Second commit message"
+  $ HGEDITOR=cat hg qrefresh -m "Second commit message" -e
+  Second commit message
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to use default message.
+  HG: --
+  HG: user: test
+  HG: branch 'default'
+  HG: added file
 
 Should display 'Second commit message'