Mercurial > hg
diff tests/test-mq-qfold.t @ 12375:02990e22150b
tests: require regexes in unified tests to be marked with " (re)"
Consider this test:
$ hg glog --template '{rev}:{node|short} "{desc}"\n'
@ 2:20c4f79fd7ac "3"
|
| o 1:38f24201dcab "2"
|/
o 0:2a18120dc1c9 "1"
Because each line beginning with "|" can be compiled as a regular
expression (equivalent to ".*|"), they will match any output.
Similarly:
$ echo foo
The blank output line can be compiled as a regular expression and will
also match any output.
With this patch, none of the above output lines will be matched as
regular expressions. A line must end in " (re)" in order to be matched
as one.
Lines are still matched literally first, so the following will pass:
$ echo 'foo (re)'
foo (re)
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Wed, 22 Sep 2010 16:06:00 -0500 |
parents | b701610f6c56 |
children | 97ffc68f71d3 |
line wrap: on
line diff
--- a/tests/test-mq-qfold.t Wed Sep 22 16:05:59 2010 -0500 +++ b/tests/test-mq-qfold.t Wed Sep 22 16:06:00 2010 -0500 @@ -59,7 +59,7 @@ [255] $ hg diff -c . - diff -r 07f494440405 -r ............ a + diff -r 07f494440405 -r ............ a (re) --- a/a +++ b/a @@ -1,1 +1,3 @@ @@ -85,7 +85,7 @@ $ cat .hg/patches/regular # HG changeset patch - # Parent ........................................ + # Parent ........................................ (re) diff --git a/a b/a --- a/a @@ -127,7 +127,7 @@ $ cat .hg/patches/git # HG changeset patch - # Parent ........................................ + # Parent ........................................ (re) diff --git a/a b/aa copy from a