Mercurial > hg-stable
changeset 21713:7a51bced398b
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.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 01 Jun 2014 00:08:32 +0900 |
| parents | 51035af2c0bf |
| children | 635a8201e356 |
| files | hgext/mq.py tests/test-mq-qrefresh-replace-log-message.t |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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'