Mercurial > hg
diff tests/test-commit.t @ 22248:75618a223e18
commit: change "editform" to distinguish merge commits from others
"editform" argument for "getcommiteditor" is decided according to the
format below:
COMMAND[.ROUTE]
- COMMAND: name of command
- ROUTE: name of route, if there are two or more routes in COMMAND
This patch uses "normal.normal" and "normal.merge" as ROUTE of
"editform" instead of "normal", to distinguish merge commits from
others in "hg commit" without "--amend" case.
This patch assumes "editform" variations for "hg commit" below:
commit.normal.normal
commit.normal.merge
commit.amend.normal
commit.amend.merge
"mergeeditform" is factored out for subsequent patches. It takes
"ctxorbool" argument, because context object can't be passed in some
cases.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 16 Aug 2014 10:43:59 +0900 |
parents | 9fa429723f26 |
children | db03ed8cbfa3 c02a05cc6f5e |
line wrap: on
line diff
--- a/tests/test-commit.t Sat Aug 16 10:19:26 2014 -0700 +++ b/tests/test-commit.t Sat Aug 16 10:43:59 2014 +0900 @@ -9,7 +9,7 @@ > true > EOF $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg commit -m "" - HGEDITFORM=commit.normal + HGEDITFORM=commit.normal.normal abort: empty commit message [255] $ hg commit -d '0 0' -m commit-1 @@ -282,7 +282,8 @@ should succeed - $ hg ci -mmerge + $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg ci -mmerge --edit + HGEDITFORM=commit.normal.merge $ cd ..