Mercurial > public > mercurial-scm > hg-stable
diff tests/test-mq-qrefresh-replace-log-message.t @ 21423:7d408720453d
mq: use the editor gotten by "getcommiteditor()" instead of "ui.edit()" (qrefresh/qfold)
This patch also replaces "editor = False" by "editor =
cmdutil.getcommiteditor()", because:
- it allows to hook commit message determination easily, even in the
case without "--edit"
- it avoids regression (or additional care) around saving
"last-message.txt", even if MQ's "newcommit()" changes its
implementation logic from "localrepository.commit" to
"localrepository.commitctx" with "memctx" in the future
to save commit message into "last-messge.txt" with "memctx",
"editor" should be valid function.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 11 May 2014 00:49:36 +0900 |
| parents | 49148d7868df |
| children | 7a51bced398b |
line wrap: on
line diff
--- a/tests/test-mq-qrefresh-replace-log-message.t Sun May 11 00:49:36 2014 +0900 +++ b/tests/test-mq-qrefresh-replace-log-message.t Sun May 11 00:49:36 2014 +0900 @@ -6,6 +6,8 @@ $ hg qinit Should fail if no patches applied +(this tests also that editor is not invoked if '--edit' is not +specified) $ hg qrefresh no patches applied @@ -16,7 +18,7 @@ $ hg qnew -m "First commit message" first-patch $ echo aaaa > file $ hg add file - $ hg qrefresh + $ HGEDITOR=cat hg qrefresh Should display 'First commit message' @@ -126,10 +128,20 @@ > EOF $ rm -f .hg/last-message.txt + $ hg status --rev "second-patch^1" -arm + A file2 $ HGEDITOR="sh $TESTTMP/editor.sh" hg qrefresh -e ==== before editing Fifth commit message This is the 5th log 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 file2 ==== transaction abort! rollback completed @@ -141,4 +153,6 @@ Fifth commit message This is the 5th log message + + test saving last-message.txt