Mercurial > hg
comparison tests/test-largefiles-update.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 | feecfefeba25 |
children | 41ef02ba329b |
comparison
equal
deleted
inserted
replaced
35392:5feb782c7a95 | 35393:4441705b7111 |
---|---|
438 Test that the internal linear merging works correctly | 438 Test that the internal linear merging works correctly |
439 (both heads are stripped to keep pairing of revision number and commit log) | 439 (both heads are stripped to keep pairing of revision number and commit log) |
440 | 440 |
441 $ hg update -q -C 2 | 441 $ hg update -q -C 2 |
442 $ hg strip 3 4 | 442 $ hg strip 3 4 |
443 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg (glob) | 443 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg |
444 $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP | 444 $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP |
445 | 445 |
446 (internal linear merging at "hg pull --update") | 446 (internal linear merging at "hg pull --update") |
447 | 447 |
448 $ echo 'large1 for linear merge (conflict)' > large1 | 448 $ echo 'large1 for linear merge (conflict)' > large1 |
449 $ echo 'large2 for linear merge (conflict with normal file)' > large2 | 449 $ echo 'large2 for linear merge (conflict with normal file)' > large2 |
450 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg | 450 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
451 pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg (glob) | 451 pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
452 searching for changes | 452 searching for changes |
453 adding changesets | 453 adding changesets |
454 adding manifests | 454 adding manifests |
455 adding file changes | 455 adding file changes |
456 added 3 changesets with 5 changes to 5 files | 456 added 3 changesets with 5 changes to 5 files |