# HG changeset patch # User Brodie Rao # Date 1285189558 18000 # Node ID 5163e3c8aa5253468ba8aae0e4f61a15abedd235 # Parent 48a4acd1ccf173e5be04e80978a33577ea3dbe1c tests: improve regexes in unified tests diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-archive.t --- a/tests/test-archive.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-archive.t Wed Sep 22 16:05:58 2010 -0500 @@ -229,7 +229,7 @@ Archive: ../old.zip \s*Length.* .*-----.* - .*147.*80.*00:00.*old/.hg_archival.txt + .*147.*80.*00:00.*old/\.hg_archival\.txt .*0.*80.*00:00.*old/old .*-----.* \s*147\s+2 files diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-audit-path.t --- a/tests/test-audit-path.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-audit-path.t Wed Sep 22 16:05:58 2010 -0500 @@ -78,5 +78,5 @@ $ hg manifest -r4 /tmp/test $ hg update -Cr4 - abort: No such file or directory: .*/test-audit-path.t/target//tmp/test + abort: No such file or directory: .*/test-audit-path\.t/target//tmp/test [255] diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-help.t --- a/tests/test-help.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-help.t Wed Sep 22 16:05:58 2010 -0500 @@ -189,7 +189,7 @@ Test short command list with verbose option $ hg -v help shortlist - Mercurial Distributed SCM \(version .*?\) + Mercurial Distributed SCM \(version .*\) Copyright (C) 2005-2010 Matt Mackall and others This is free software; see the source for copying conditions. There is NO diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-hgignore.t --- a/tests/test-hgignore.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-hgignore.t Wed Sep 22 16:05:58 2010 -0500 @@ -44,7 +44,7 @@ $ echo "*.o" > .hgignore $ hg status - abort: .*/.hgignore: invalid pattern \(relre\): \*.o + abort: .*/\.hgignore: invalid pattern \(relre\): \*\.o [255] $ echo ".*\.o" > .hgignore @@ -88,7 +88,7 @@ $ echo "syntax: invalid" > .hgignore $ hg status - .*/.hgignore: ignoring invalid syntax 'invalid' + .*/\.hgignore: ignoring invalid syntax 'invalid' A dir/b.o ? .hgignore ? a.c diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-hgrc.t --- a/tests/test-hgrc.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-hgrc.t Wed Sep 22 16:05:58 2010 -0500 @@ -18,8 +18,8 @@ $ hg paths default = .*/foo%bar $ hg showconfig - bundle.mainreporoot=.*/foobar - paths.default=.*/foo%bar + bundle\.mainreporoot=.*/foobar + paths\.default=.*/foo%bar $ cd .. issue1829: wrong indentation @@ -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\) [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 + .*/\.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\} plain hgrc $ HGPLAIN=; export HGPLAIN $ hg showconfig --config ui.traceback=True --debug - read config from: .*/.hgrc + read config from: .*/\.hgrc none: ui.traceback=True none: ui.verbose=False none: ui.debug=True diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-hook.t --- a/tests/test-hook.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-hook.t Wed Sep 22 16:05:58 2010 -0500 @@ -415,12 +415,12 @@ $ echo >> foo $ hg ci --debug -d '0 0' -m 'change foo' foo - calling hook commit.auto: + calling hook commit\.auto: Automatically installed hook committed changeset 1:52998019f6252a2b893452765fcb0a47351a5708 $ hg showconfig hooks - hooks.commit.auto= + hooks\.commit\.auto= test python hook configured with python:[file]:[hook] syntax diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-install.t --- a/tests/test-install.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-install.t Wed Sep 22 16:05:58 2010 -0500 @@ -1,7 +1,7 @@ hg debuginstall $ hg debuginstall Checking encoding (ascii)... - Checking installed modules \(.*/mercurial\)... + Checking installed modules \(.*/mercurial\)\.\.\. Checking templates... Checking patch... Checking commit editor... @@ -11,7 +11,7 @@ hg debuginstall with no username $ HGUSER= hg debuginstall Checking encoding (ascii)... - Checking installed modules \(.*/mercurial\)... + Checking installed modules \(.*/mercurial\)\.\.\. Checking templates... Checking patch... Checking commit editor... diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-keyword.t --- a/tests/test-keyword.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-keyword.t Wed Sep 22 16:05:58 2010 -0500 @@ -26,14 +26,14 @@ RCSfile = {file|basename},v Revision = {node|short} Source = {root}/{file},v - \$Author: test \$ + $Author: test $ \$Date: ..../../.. ..:..:.. \$ - \$Header: .*/demo.txt,v ............ ..../../.. ..:..:.. test \$ - \$Id: demo.txt,v ............ ..../../.. ..:..:.. test \$ - \$RCSFile: demo.txt,v \$ - \$RCSfile: demo.txt,v \$ + \$Header: .*/demo\.txt,v ............ ..../../.. ..:..:.. test \$ + \$Id: demo\.txt,v ............ ..../../.. ..:..:.. test \$ + $RCSFile: demo.txt,v $ + $RCSfile: demo.txt,v $ \$Revision: ............ \$ - \$Source: .*/demo.txt,v \$ + \$Source: .*/demo\.txt,v \$ $ hg --quiet kwdemo "Branch = {branches}" [extensions] @@ -71,7 +71,7 @@ hg bundle --base null ../test-keyword.hg $ hg pull -u "$TESTDIR"/test-keyword.hg - pulling from .*test-keyword.hg + pulling from .*test-keyword\.hg requesting all changes adding changesets adding manifests @@ -199,11 +199,11 @@ Subject: changeset in .* From: mercurial X-Hg-Notification: changeset a2392c293916 - Message-Id: + Message-Id: To: Test changeset a2392c293916 in .* - details: .*?cmd=changeset;node=a2392c293916 + details: .*\?cmd=changeset;node=a2392c293916 description: addsym @@ -222,11 +222,11 @@ Subject: changeset in.* From: User Name X-Hg-Notification: changeset ef63ca68695b - Message-Id: + Message-Id: To: Test changeset ef63ca68695b in .* - details: .*?cmd=changeset;node=ef63ca68695b + details: .*\?cmd=changeset;node=ef63ca68695b description: absym @@ -648,7 +648,7 @@ > default = ../Test > EOF $ hg incoming - comparing with .*test-keyword.t/Test + comparing with .*test-keyword\.t/Test searching for changes changeset: 2:bb948857c743 tag: tip diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-mq-merge.t --- a/tests/test-mq-merge.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-mq-merge.t Wed Sep 22 16:05:58 2010 -0500 @@ -32,7 +32,7 @@ Save the patch queue so we can merge it later: $ hg qsave -c -e - copy .*/t/.hg/patches to .*/t/.hg/patches.1 + copy .*/t/\.hg/patches to .*/t/\.hg/patches\.1 $ checkundo Update b and commit in an "update" changeset: @@ -52,7 +52,7 @@ b $ hg qpush -a -m - merging with queue at: .*/t/.hg/patches.1 + merging with queue at: .*/t/\.hg/patches\.1 applying rm_a now at: rm_a @@ -91,14 +91,14 @@ Create the reference queue: $ hg qsave -c -e -n refqueue - copy .*/t2/.hg/patches to .*/t2/.hg/refqueue + copy .*/t2/\.hg/patches to .*/t2/\.hg/refqueue $ hg up -C 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved Merge: $ HGMERGE=internal:other hg qpush -a -m -n refqueue - merging with queue at: .*/t2/.hg/refqueue + merging with queue at: .*/t2/\.hg/refqueue applying patcha patching file a Hunk #1 FAILED at 0 diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-mq-safety.t --- a/tests/test-mq-safety.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-mq-safety.t Wed Sep 22 16:05:58 2010 -0500 @@ -39,7 +39,7 @@ abort: popping would remove a revision not managed by this patch queue [255] $ hg qpop -n patches - using patch queue: .*/repo/.hg/patches + using patch queue: .*/repo/\.hg/patches abort: popping would remove a revision not managed by this patch queue [255] $ hg qrefresh diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-patchbomb.t --- a/tests/test-patchbomb.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-patchbomb.t Wed Sep 22 16:05:58 2010 -0500 @@ -25,7 +25,7 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab - Message-Id: <8580ff50825a50c8f716.60@.* + Message-Id: <8580ff50825a50c8f716\.60@.* User-Agent: Mercurial-patchbomb/.* Date: Thu, 01 Jan 1970 00:01:00 +0000 From: quux @@ -80,7 +80,7 @@ MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 0 of 2] test - Message-Id: ]*> + Message-Id: ]*> User-Agent: Mercurial-patchbomb/.* Date: Thu, 01 Jan 1970 00:02:00 +0000 From: quux @@ -94,9 +94,9 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH 1 of 2] a X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab - Message-Id: <8580ff50825a50c8f716.121@[^>]*> - In-Reply-To: ]*> - References: ]*> + Message-Id: <8580ff50825a50c8f716\.121@[^>]*> + In-Reply-To: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Thu, 01 Jan 1970 00:02:01 +0000 From: quux @@ -122,9 +122,9 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH 2 of 2] b X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 - Message-Id: <97d72e5f12c7e84f8506.122@[^>]*> - In-Reply-To: ]*> - References: ]*> + Message-Id: <97d72e5f12c7e84f8506\.122@[^>]*> + In-Reply-To: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Thu, 01 Jan 1970 00:02:02 +0000 From: quux @@ -241,7 +241,7 @@ Content-Transfer-Encoding: base64 Subject: [PATCH] charset=utf-8; content-transfer-encoding: base64 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a - Message-Id: ]*> - References: ]*> + Message-Id: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:01 +0000 From: test @@ -1897,9 +1897,9 @@ Content-Transfer-Encoding: 8bit Subject: [PATCH 2 of 8] charset=utf-8; content-transfer-encoding: base64 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a - Message-Id: ]*> - References: ]*> + Message-Id: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:02 +0000 From: test @@ -1932,9 +1932,9 @@ Subject: [PATCH 3 of 8] charset=utf-8; content-transfer-encoding: quoted-printable X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376 - Message-Id: ]*> - References: ]*> + Message-Id: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:03 +0000 From: test @@ -1975,9 +1975,9 @@ Content-Transfer-Encoding: 8bit Subject: [PATCH 4 of 8] charset=us-ascii; content-transfer-encoding: 8bit X-Mercurial-Node: 22d0f96be12f5945fd67d101af58f7bc8263c835 - Message-Id: <22d0f96be12f5945fd67.315532864@.* - In-Reply-To: ]*> - References: ]*> + Message-Id: <22d0f96be12f5945fd67\.315532864@.* + In-Reply-To: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:04 +0000 From: test @@ -2002,9 +2002,9 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a X-Mercurial-Node: dd9c2b4b8a8a0934d5523c15f2c119b362360903 - Message-Id: ]*> - References: ]*> + Message-Id: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:05 +0000 From: test @@ -2030,9 +2030,9 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 X-Mercurial-Node: eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff - Message-Id: ]*> - References: ]*> + Message-Id: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:06 +0000 From: test @@ -2060,9 +2060,9 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6 - Message-Id: ]*> - References: ]*> + Message-Id: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:07 +0000 From: test @@ -2091,9 +2091,9 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH 8 of 8] d X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 - Message-Id: <2f9fa9b998c5fe3ac2bd.315532868[^>]*> - In-Reply-To: ]*> - References: ]*> + Message-Id: <2f9fa9b998c5fe3ac2bd\.315532868[^>]*> + In-Reply-To: ]*> + References: ]*> User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:08 +0000 From: test @@ -2129,7 +2129,7 @@ Content-Transfer-Encoding: 7bit Subject: [PATCH] test X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 - Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@.* + Message-Id: <2f9fa9b998c5fe3ac2bd\.315532860@.* User-Agent: Mercurial-patchbomb/.* Date: Tue, 01 Jan 1980 00:01:00 +0000 From: test diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-paths.t --- a/tests/test-paths.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-paths.t Wed Sep 22 16:05:58 2010 -0500 @@ -6,11 +6,11 @@ $ echo '[paths]' >> .hg/hgrc $ echo 'dupe = ../b' >> .hg/hgrc $ hg in dupe - comparing with .*/test-paths.t/b + comparing with .*/test-paths\.t/b no changes found [1] $ cd .. $ hg -R a in dupe - comparing with .*/test-paths.t/b + comparing with .*/test-paths\.t/b no changes found [1] diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-relink.t --- a/tests/test-relink.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-relink.t Wed Sep 22 16:05:58 2010 -0500 @@ -60,7 +60,7 @@ relink $ hg relink --debug | fix_path - relinking .*/.hg/store + relinking .*/\.hg/store tip has 2 files, estimated total number of files: 3 collecting: 00changelog.i 1/3 files (33.33%) collecting: 00manifest.i 2/3 files (66.67%) diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-subrepo-paths.t --- a/tests/test-subrepo-paths.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-subrepo-paths.t Wed Sep 22 16:05:58 2010 -0500 @@ -28,5 +28,5 @@ > .* = \1 > EOF $ hg debugsub - abort: bad subrepository pattern in .*/test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference + abort: bad subrepository pattern in .*/test-subrepo-paths\.t/outer/\.hg/hgrc:2: invalid group reference [255] diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-subrepo-recursion.t --- a/tests/test-subrepo-recursion.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-subrepo-recursion.t Wed Sep 22 16:05:58 2010 -0500 @@ -252,13 +252,13 @@ $ cd .. $ hg clone repo repo2 updating to branch default - pulling subrepo foo from .*/test-subrepo-recursion.t/repo/foo + pulling subrepo foo from .*/test-subrepo-recursion\.t/repo/foo requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 7 changes to 3 files - pulling subrepo foo/bar from .*/test-subrepo-recursion.t/repo/foo/bar + pulling subrepo foo/bar from .*/test-subrepo-recursion\.t/repo/foo/bar requesting all changes adding changesets adding manifests @@ -267,10 +267,10 @@ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd repo2 $ hg outgoing -S - comparing with .*/test-subrepo-recursion.t/repo + comparing with .*/test-subrepo-recursion\.t/repo searching for changes no changes found - comparing with .*/test-subrepo-recursion.t/repo/foo + comparing with .*/test-subrepo-recursion\.t/repo/foo searching for changes no changes found [1] @@ -290,7 +290,7 @@ $ hg commit -m 3-4-2 committing subrepository foo $ hg outgoing -S - comparing with .*/test-subrepo-recursion.t/repo + comparing with .*/test-subrepo-recursion\.t/repo searching for changes changeset: 3:2655b8ecc4ee tag: tip @@ -298,7 +298,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: 3-4-2 - comparing with .*/test-subrepo-recursion.t/repo/foo + comparing with .*/test-subrepo-recursion\.t/repo/foo searching for changes changeset: 4:e96193d6cb36 tag: tip @@ -316,7 +316,7 @@ Test incoming: $ hg incoming -S - comparing with .*/test-subrepo-recursion.t/repo2 + comparing with .*/test-subrepo-recursion\.t/repo2 searching for changes changeset: 3:2655b8ecc4ee tag: tip @@ -324,7 +324,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: 3-4-2 - comparing with .*/test-subrepo-recursion.t/repo2/foo + comparing with .*/test-subrepo-recursion\.t/repo2/foo searching for changes changeset: 4:e96193d6cb36 tag: tip diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-subrepo.t --- a/tests/test-subrepo.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-subrepo.t Wed Sep 22 16:05:58 2010 -0500 @@ -541,9 +541,9 @@ $ cat mercurial2/main/nested_absolute/.hg/hgrc \ > mercurial2/main/nested_relative/.hg/hgrc [paths] - default = .*/test-subrepo.t/sub/mercurial/nested_absolute + default = .*/test-subrepo\.t/sub/mercurial/nested_absolute [paths] - default = .*/test-subrepo.t/sub/mercurial/nested_relative + default = .*/test-subrepo\.t/sub/mercurial/nested_relative $ rm -rf mercurial mercurial2 issue 1977 diff -r 48a4acd1ccf1 -r 5163e3c8aa52 tests/test-walk.t --- a/tests/test-walk.t Wed Sep 22 00:14:57 2010 +0200 +++ b/tests/test-walk.t Wed Sep 22 16:05:58 2010 -0500 @@ -216,7 +216,7 @@ f beans/pinto beans/pinto f beans/turtle beans/turtle $ hg debugwalk `pwd`/.. - abort: .*/.. not under root + abort: .*/\.\. not under root [255] Test patterns: