Mercurial > public > mercurial-scm > hg-stable
diff tests/test-commit.t @ 35400: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 | 335d45e74381 |
children | 8a0cac20a1ad |
line wrap: on
line diff
--- a/tests/test-commit.t Sun Dec 10 22:45:35 2017 -0500 +++ b/tests/test-commit.t Sun Dec 10 22:50:57 2017 -0500 @@ -61,7 +61,7 @@ $ mkdir dir $ echo boo > dir/file $ hg add - adding dir/file (glob) + adding dir/file $ hg -v commit -m commit-9 dir committing files: dir/file @@ -180,8 +180,8 @@ $ mkdir bar $ echo bar > bar/bar $ hg add - adding bar/bar (glob) - adding foo/foo (glob) + adding bar/bar + adding foo/foo $ HGEDITOR=cat hg ci -e -m commit-subdir-1 foo commit-subdir-1 @@ -680,7 +680,7 @@ > EOF $ $PYTHON evil-commit.py $ hg co --clean tip - abort: path contains illegal component: HG~1/hgrc (glob) + abort: path contains illegal component: HG~1/hgrc [255] $ hg rollback -f @@ -699,7 +699,7 @@ > EOF $ $PYTHON evil-commit.py $ hg co --clean tip - abort: path contains illegal component: HG8B6C~2/hgrc (glob) + abort: path contains illegal component: HG8B6C~2/hgrc [255] # test that an unmodified commit template message aborts