Mercurial > hg
diff tests/test-bookmarks-pushpull.t @ 35393:4441705b7111
tests: remove (glob) annotations that were only for '\' matches
# skip-blame because this was mechanically rewritten the following script. I
ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t
ones appear to be, and they run without addition failures on both Windows and
Linux.
import argparse
import os
import re
ap = argparse.ArgumentParser()
ap.add_argument('path', nargs='+')
opts = ap.parse_args()
globre = re.compile(r'^(.*) \(glob\)(.*)$')
for p in opts.path:
tmp = p + '.tmp'
with open(p, 'rb') as src, open(tmp, 'wb') as dst:
for line in src:
m = globre.match(line)
if not m or '$LOCALIP' in line or '*' in line:
dst.write(line)
continue
if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'):
dst.write(line)
continue
dst.write(m.group(1) + m.group(2) + '\n')
os.unlink(p)
os.rename(tmp, p)
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 10 Dec 2017 22:50:57 -0500 |
parents | a1e70c1dbec0 |
children | 1d118f9f4f57 |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Sun Dec 10 22:45:35 2017 -0500 +++ b/tests/test-bookmarks-pushpull.t Sun Dec 10 22:50:57 2017 -0500 @@ -409,7 +409,7 @@ * foobar 1:9b140be10808 $ hg pull --config paths.foo=../a foo --config "$TESTHOOK" - pulling from $TESTTMP/a (glob) + pulling from $TESTTMP/a searching for changes adding changesets adding manifests @@ -485,7 +485,7 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark X) $ hg pull --config paths.foo=../a foo -B . --config "$TESTHOOK" - pulling from $TESTTMP/a (glob) + pulling from $TESTTMP/a no changes found divergent bookmark @ stored as @foo importing bookmark X @@ -840,12 +840,12 @@ be exchanged) $ hg -R repo1 incoming -B - comparing with $TESTTMP/bmcomparison/source (glob) + comparing with $TESTTMP/bmcomparison/source searching for changed bookmarks no changed bookmarks found [1] $ hg -R repo1 outgoing -B - comparing with $TESTTMP/bmcomparison/source (glob) + comparing with $TESTTMP/bmcomparison/source searching for changed bookmarks no changed bookmarks found [1] @@ -989,7 +989,7 @@ $ echo 2 > f2 $ hg ci -qAmr $ hg push -B X - pushing to $TESTTMP/addmarks (glob) + pushing to $TESTTMP/addmarks searching for changes remote has heads on branch 'default' that are not known locally: a2a606d9ff1b abort: push creates new remote head 54694f811df9 with bookmark 'X'! @@ -1072,7 +1072,7 @@ #if b2-pushkey $ hg push -B @ local - pushing to $TESTTMP/issue4455-dest (glob) + pushing to $TESTTMP/issue4455-dest searching for changes no changes found pushkey-abort: prepushkey hook exited with status 1 @@ -1083,7 +1083,7 @@ #if b2-binary $ hg push -B @ local - pushing to $TESTTMP/issue4455-dest (glob) + pushing to $TESTTMP/issue4455-dest searching for changes no changes found abort: prepushkey hook exited with status 1