Mercurial > hg
comparison tests/test-bundle.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 | b89a7ef29013 |
comparison
equal
deleted
inserted
replaced
35392:5feb782c7a95 | 35393:4441705b7111 |
---|---|
854 summary: 0 | 854 summary: 0 |
855 | 855 |
856 $ hg bundle --base 1 -r 3 ../update2bundled.hg | 856 $ hg bundle --base 1 -r 3 ../update2bundled.hg |
857 1 changesets found | 857 1 changesets found |
858 $ hg strip -r 3 | 858 $ hg strip -r 3 |
859 saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg (glob) | 859 saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg |
860 $ hg merge -R ../update2bundled.hg -r 3 | 860 $ hg merge -R ../update2bundled.hg -r 3 |
861 setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle | 861 setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle |
862 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 862 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
863 (branch merge, don't forget to commit) | 863 (branch merge, don't forget to commit) |
864 | 864 |