--- a/tests/test-commit.t Sat Aug 02 21:46:27 2014 +0900
+++ b/tests/test-commit.t Sat Aug 02 21:46:27 2014 +0900
@@ -359,6 +359,20 @@
$ cat >> .hg/hgrc <<EOF
> [committemplate]
+ > changeset.commit.normal = HG: this is "commit.normal" template
+ > HG: {extramsg}
+ > {if(currentbookmark,
+ > "HG: bookmark '{currentbookmark}' is activated\n",
+ > "HG: no bookmark is activated\n")}{subrepos %
+ > "HG: subrepo '{subrepo}' is changed\n"}
+ >
+ > changeset.commit = HG: this is "commit" template
+ > HG: {extramsg}
+ > {if(currentbookmark,
+ > "HG: bookmark '{currentbookmark}' is activated\n",
+ > "HG: no bookmark is activated\n")}{subrepos %
+ > "HG: subrepo '{subrepo}' is changed\n"}
+ >
> changeset = HG: this is customized commit template
> HG: {extramsg}
> {if(currentbookmark,
@@ -373,7 +387,7 @@
$ echo 'sub2 = sub2' >> .hgsub
$ HGEDITOR=cat hg commit -S -q
- HG: this is customized commit template
+ HG: this is "commit.normal" template
HG: Leave message empty to abort commit.
HG: bookmark 'currentbookmark' is activated
HG: subrepo 'sub' is changed
@@ -381,9 +395,28 @@
abort: empty commit message
[255]
+ $ cat >> .hg/hgrc <<EOF
+ > [committemplate]
+ > changeset.commit.normal =
+ > # now, "changeset.commit" should be chosen for "hg commit"
+ > EOF
+
$ hg bookmark --inactive currentbookmark
$ hg forget .hgsub
$ HGEDITOR=cat hg commit -q
+ HG: this is "commit" template
+ HG: Leave message empty to abort commit.
+ HG: no bookmark is activated
+ abort: empty commit message
+ [255]
+
+ $ cat >> .hg/hgrc <<EOF
+ > [committemplate]
+ > changeset.commit =
+ > # now, "changeset" should be chosen for "hg commit"
+ > EOF
+
+ $ HGEDITOR=cat hg commit -q
HG: this is customized commit template
HG: Leave message empty to abort commit.
HG: no bookmark is activated