##// END OF EJS Templates
qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time...
FUJIWARA Katsunori -
r21713:7a51bced default
parent child Browse files
Show More
@@ -2489,9 +2489,6 b' def refresh(ui, repo, *pats, **opts):'
2489 """
2489 """
2490 q = repo.mq
2490 q = repo.mq
2491 message = cmdutil.logmessage(ui, opts)
2491 message = cmdutil.logmessage(ui, opts)
2492 if opts.get('edit'):
2493 if message:
2494 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
2495 setupheaderopts(ui, opts)
2492 setupheaderopts(ui, opts)
2496 wlock = repo.wlock()
2493 wlock = repo.wlock()
2497 try:
2494 try:
@@ -26,9 +26,19 b" Should display 'First commit message'"
26 First commit message
26 First commit message
27
27
28 Testing changing message with -m
28 Testing changing message with -m
29 (this tests also that '--edit' can be used with '--message')
29
30
30 $ echo bbbb > file
31 $ echo bbbb > file
31 $ hg qrefresh -m "Second commit message"
32 $ HGEDITOR=cat hg qrefresh -m "Second commit message" -e
33 Second commit message
34
35
36 HG: Enter commit message. Lines beginning with 'HG:' are removed.
37 HG: Leave message empty to use default message.
38 HG: --
39 HG: user: test
40 HG: branch 'default'
41 HG: added file
32
42
33 Should display 'Second commit message'
43 Should display 'Second commit message'
34
44
General Comments 0
You need to be logged in to leave comments. Login now