Patchwork [1,of,2] commit: update test to actually modify template text

login
register
mail settings
Submitter Yuya Nishihara
Date Jan. 6, 2017, 2:30 p.m.
Message ID <b5247f031aed69bb2f7c.1483713024@mimosa>
Download mbox | patch
Permalink /patch/18112/
State Accepted
Headers show

Comments

Yuya Nishihara - Jan. 6, 2017, 2:30 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1483710279 -32400
#      Fri Jan 06 22:44:39 2017 +0900
# Node ID b5247f031aed69bb2f7c6a3a8d1c9b076a7384d5
# Parent  011122b3b1c42374fb0489d107418e1be3665ca6
commit: update test to actually modify template text

We have a check for unmodified commit message (introduced by bec1a579ebc4),
which should be enabled for the "--- >8 ---" magic but currently not.

Patch

diff --git a/tests/test-commit.t b/tests/test-commit.t
--- a/tests/test-commit.t
+++ b/tests/test-commit.t
@@ -692,6 +692,11 @@  verify pathauditor blocks evil filepaths
 
 test that text below the --- >8 --- special string is ignored
 
+  $ cat <<'EOF' > $TESTTMP/lowercaseline.sh
+  > cat $1 | sed s/LINE/line/ | tee $1.new
+  > mv $1.new $1
+  > EOF
+
   $ hg init ignore_below_special_string
   $ cd ignore_below_special_string
   $ echo foo > foo
@@ -699,7 +704,7 @@  test that text below the --- >8 --- spec
   $ hg commit -m "foo"
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
-  > changeset.commit = first line
+  > changeset.commit = first LINE
   >     HG: this is customized commit template
   >     HG: {extramsg}
   >     HG: ------------------------ >8 ------------------------
@@ -707,7 +712,7 @@  test that text below the --- >8 --- spec
   > EOF
   $ echo foo2 > foo2
   $ hg add foo2
-  $ HGEDITOR=cat hg ci
+  $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci
   first line
   HG: this is customized commit template
   HG: Leave message empty to abort commit.
@@ -725,7 +730,7 @@  a line
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
-  > changeset.commit = first line2
+  > changeset.commit = first LINE2
   >     another line HG: ------------------------ >8 ------------------------
   >     HG: this is customized commit template
   >     HG: {extramsg}
@@ -733,7 +738,7 @@  a line
   >     {diff()}
   > EOF
   $ echo foo >> foo
-  $ HGEDITOR=cat hg ci
+  $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci
   first line2
   another line HG: ------------------------ >8 ------------------------
   HG: this is customized commit template
@@ -754,7 +759,7 @@  at the end
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
-  > changeset.commit = first line3
+  > changeset.commit = first LINE3
   >     HG: ------------------------ >8 ------------------------foobar
   >     second line
   >     HG: this is customized commit template
@@ -763,7 +768,7 @@  at the end
   >     {diff()}
   > EOF
   $ echo foo >> foo
-  $ HGEDITOR=cat hg ci
+  $ HGEDITOR="sh $TESTTMP/lowercaseline.sh" hg ci
   first line3
   HG: ------------------------ >8 ------------------------foobar
   second line