Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help/config.txt @ 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 | f5ff18f65b73 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sat Aug 16 10:19:26 2014 -0700 +++ b/mercurial/help/config.txt Sat Aug 16 10:43:59 2014 +0900 @@ -395,7 +395,8 @@ - ``changeset.backout`` for :hg:`backout` - ``changeset.commit.amend`` for :hg:`commit --amend` -- ``changeset.commit.normal`` for :hg:`commit` without ``--amend`` +- ``changeset.commit.normal.merge`` for :hg:`commit` on merges +- ``changeset.commit.normal.normal`` for :hg:`commit` on other - ``changeset.fetch`` for :hg:`fetch` (impling merge commit) - ``changeset.gpg.sign`` for :hg:`sign` - ``changeset.graft`` for :hg:`graft` @@ -422,7 +423,7 @@ At the external editor invocation for committing, corresponding dot-separated list of names without ``changeset.`` prefix -(e.g. ``commit.normal``) is in ``HGEDITFORM`` environment variable. +(e.g. ``commit.normal.normal``) is in ``HGEDITFORM`` environment variable. In this section, items other than ``changeset`` can be referred from others. For example, the configuration to list committed files up