diff tests/test-hgrc.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)

--- a/tests/test-hgrc.t	Wed Sep 22 16:05:59 2010 -0500
+++ b/tests/test-hgrc.t	Wed Sep 22 16:06:00 2010 -0500
@@ -1,6 +1,6 @@
   $ echo "invalid" > $HGRCPATH
   $ hg version
-  hg: parse error at .*/\.hgrc:1: invalid
+  hg: parse error at .*/\.hgrc:1: invalid (re)
   [255]
   $ echo "" > $HGRCPATH
 
@@ -14,12 +14,12 @@
   $ cd foobar
   $ cat .hg/hgrc
   [paths]
-  default = .*/foo%bar
+  default = .*/foo%bar (re)
   $ hg paths
-  default = .*/foo%bar
+  default = .*/foo%bar (re)
   $ hg showconfig
-  bundle\.mainreporoot=.*/foobar
-  paths\.default=.*/foo%bar
+  bundle\.mainreporoot=.*/foobar (re)
+  paths\.default=.*/foo%bar (re)
   $ cd ..
 
 issue1829: wrong indentation
@@ -27,7 +27,7 @@
   $ echo '[foo]' > $HGRCPATH
   $ echo '  x = y' >> $HGRCPATH
   $ hg version
-  hg: parse error at .*/\.hgrc:2:   x = y
+  hg: parse error at .*/\.hgrc:2:   x = y (re)
   [255]
 
   $ python -c "print '[foo]\nbar = a\n b\n c \n  de\n fg \nbaz = bif cb \n'" \
@@ -40,7 +40,7 @@
   $ export FAKEPATH
   $ echo '%include $FAKEPATH/no-such-file' > $HGRCPATH
   $ hg version
-  hg: parse error at .*/\.hgrc:1: cannot include /path/to/nowhere/no-such-file \(No such file or directory\)
+  hg: parse error at .*/\.hgrc:1: cannot include /path/to/nowhere/no-such-file \(No such file or directory\) (re)
   [255]
   $ unset FAKEPATH
 
@@ -90,23 +90,23 @@
 customized hgrc
 
   $ hg showconfig
-  read config from: .*/\.hgrc
-  .*/\.hgrc:13: alias\.log=log -g
-  .*/\.hgrc:11: defaults\.identify=-n
-  .*/\.hgrc:2: ui\.debug=true
-  .*/\.hgrc:3: ui\.fallbackencoding=ASCII
-  .*/\.hgrc:4: ui\.quiet=true
-  .*/\.hgrc:5: ui\.slash=true
-  .*/\.hgrc:6: ui\.traceback=true
-  .*/\.hgrc:7: ui\.verbose=true
-  .*/\.hgrc:8: ui\.style=~/.hgstyle
-  .*/\.hgrc:9: ui\.logtemplate=\{node\}
+  read config from: .*/\.hgrc (re)
+  .*/\.hgrc:13: alias\.log=log -g (re)
+  .*/\.hgrc:11: defaults\.identify=-n (re)
+  .*/\.hgrc:2: ui\.debug=true (re)
+  .*/\.hgrc:3: ui\.fallbackencoding=ASCII (re)
+  .*/\.hgrc:4: ui\.quiet=true (re)
+  .*/\.hgrc:5: ui\.slash=true (re)
+  .*/\.hgrc:6: ui\.traceback=true (re)
+  .*/\.hgrc:7: ui\.verbose=true (re)
+  .*/\.hgrc:8: ui\.style=~/.hgstyle (re)
+  .*/\.hgrc:9: ui\.logtemplate=\{node\} (re)
 
 plain hgrc
 
   $ HGPLAIN=; export HGPLAIN
   $ hg showconfig --config ui.traceback=True --debug
-  read config from: .*/\.hgrc
+  read config from: .*/\.hgrc (re)
   none: ui.traceback=True
   none: ui.verbose=False
   none: ui.debug=True