--- a/tests/test-commit-amend.t Thu Apr 15 19:54:03 2021 +0200
+++ b/tests/test-commit-amend.t Tue May 11 12:22:26 2021 -0700
@@ -957,6 +957,7 @@
$ cat >> .hg/hgrc <<EOF
> [committemplate]
> changeset.commit.amend = {desc}\n
+ > HG: {revset('parents()') % 'parent: {desc|firstline}\n'}
> HG: M: {file_mods}
> HG: A: {file_adds}
> HG: R: {file_dels}
@@ -971,6 +972,8 @@
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
expecting diff of foo
+ HG: parent: editor should be suppressed
+
HG: M:
HG: A: foo
HG: R:
@@ -985,6 +988,8 @@
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
expecting diff of foo and y
+ HG: parent: expecting diff of foo
+
HG: M:
HG: A: foo y
HG: R:
@@ -1003,6 +1008,8 @@
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
expecting diff of a, foo and y
+ HG: parent: expecting diff of foo and y
+
HG: M:
HG: A: foo y
HG: R: a
@@ -1027,6 +1034,8 @@
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
expecting diff of a, foo, x and y
+ HG: parent: expecting diff of a, foo and y
+
HG: M:
HG: A: foo y
HG: R: a x
@@ -1058,6 +1067,8 @@
$ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
cc should be excluded
+ HG: parent: expecting diff of a, foo, x and y
+
HG: M:
HG: A: foo y
HG: R: a x