Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
35392:5feb782c7a95 | 35393:4441705b7111 |
---|---|
45 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 45 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46 $ cd server | 46 $ cd server |
47 $ mkcommit B0 | 47 $ mkcommit B0 |
48 $ cd ../client | 48 $ cd ../client |
49 $ hg pull | 49 $ hg pull |
50 pulling from $TESTTMP/C2/server (glob) | 50 pulling from $TESTTMP/C2/server |
51 searching for changes | 51 searching for changes |
52 adding changesets | 52 adding changesets |
53 adding manifests | 53 adding manifests |
54 adding file changes | 54 adding file changes |
55 added 1 changesets with 1 changes to 1 files | 55 added 1 changesets with 1 changes to 1 files |
73 | 73 |
74 Actual testing | 74 Actual testing |
75 -------------- | 75 -------------- |
76 | 76 |
77 $ hg push --rev 'desc(A1)' | 77 $ hg push --rev 'desc(A1)' |
78 pushing to $TESTTMP/C2/server (glob) | 78 pushing to $TESTTMP/C2/server |
79 searching for changes | 79 searching for changes |
80 abort: push creates new remote head f6082bc4ffef! | 80 abort: push creates new remote head f6082bc4ffef! |
81 (merge or see 'hg help push' for details about pushing new heads) | 81 (merge or see 'hg help push' for details about pushing new heads) |
82 [255] | 82 [255] |
83 | 83 |