Mercurial > hg
diff tests/test-push-checkheads-partial-C2.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 | eb586ed5d8ce |
children | 9b3f95d9783d |
line wrap: on
line diff
--- a/tests/test-push-checkheads-partial-C2.t Sun Dec 10 22:45:35 2017 -0500 +++ b/tests/test-push-checkheads-partial-C2.t Sun Dec 10 22:50:57 2017 -0500 @@ -47,7 +47,7 @@ $ mkcommit B0 $ cd ../client $ hg pull - pulling from $TESTTMP/C2/server (glob) + pulling from $TESTTMP/C2/server searching for changes adding changesets adding manifests @@ -75,7 +75,7 @@ -------------- $ hg push --rev 'desc(A1)' - pushing to $TESTTMP/C2/server (glob) + pushing to $TESTTMP/C2/server searching for changes abort: push creates new remote head f6082bc4ffef! (merge or see 'hg help push' for details about pushing new heads)