Mercurial > hg
comparison tests/test-subrepo-deep-nested-change.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 | 92e30e135581 |
children | 97ffc68f71d3 |
comparison
equal
deleted
inserted
replaced
12374:4e7dd28db0dd | 12375:02990e22150b |
---|---|
25 $ hg init main | 25 $ hg init main |
26 $ echo main > main/main | 26 $ echo main > main/main |
27 $ echo "sub1 = ../sub1" > main/.hgsub | 27 $ echo "sub1 = ../sub1" > main/.hgsub |
28 $ hg clone sub1 main/sub1 | 28 $ hg clone sub1 main/sub1 |
29 updating to branch default | 29 updating to branch default |
30 pulling subrepo sub2 from .*/sub2 | 30 pulling subrepo sub2 from .*/sub2 (re) |
31 requesting all changes | 31 requesting all changes |
32 adding changesets | 32 adding changesets |
33 adding manifests | 33 adding manifests |
34 adding file changes | 34 adding file changes |
35 added 1 changesets with 1 changes to 1 files | 35 added 1 changesets with 1 changes to 1 files |
53 | 53 |
54 Clone main | 54 Clone main |
55 | 55 |
56 $ hg clone main cloned | 56 $ hg clone main cloned |
57 updating to branch default | 57 updating to branch default |
58 pulling subrepo sub1 from .*/sub1 | 58 pulling subrepo sub1 from .*/sub1 (re) |
59 requesting all changes | 59 requesting all changes |
60 adding changesets | 60 adding changesets |
61 adding manifests | 61 adding manifests |
62 adding file changes | 62 adding file changes |
63 added 1 changesets with 3 changes to 3 files | 63 added 1 changesets with 3 changes to 3 files |
64 pulling subrepo sub1/sub2 from .*/sub2 | 64 pulling subrepo sub1/sub2 from .*/sub2 (re) |
65 requesting all changes | 65 requesting all changes |
66 adding changesets | 66 adding changesets |
67 adding manifests | 67 adding manifests |
68 adding file changes | 68 adding file changes |
69 added 1 changesets with 1 changes to 1 files | 69 added 1 changesets with 1 changes to 1 files |