Mercurial > hg > mercurial-source
diff tests/test-revert-interactive.t @ 36176: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 | 3649c3f2cd90 |
children | a228b2f55ad6 |
line wrap: on
line diff
--- a/tests/test-revert-interactive.t +++ b/tests/test-revert-interactive.t @@ -52,9 +52,9 @@ > n > EOF reverting f - reverting folder1/g (glob) - removing folder1/i (glob) - reverting folder2/h (glob) + reverting folder1/g + removing folder1/i + reverting folder2/h remove added file folder1/i (Yn)? y diff --git a/f b/f 2 hunks, 2 lines changed @@ -140,8 +140,8 @@ Test that --interactive lift the need for --all $ echo q | hg revert -i -r 2 - reverting folder1/g (glob) - reverting folder2/h (glob) + reverting folder1/g + reverting folder2/h diff --git a/folder1/g b/folder1/g 1 hunks, 1 lines changed examine changes to 'folder1/g'? [Ynesfdaq?] q @@ -198,9 +198,9 @@ > n > EOF reverting f - reverting folder1/g (glob) - removing folder1/i (glob) - reverting folder2/h (glob) + reverting folder1/g + removing folder1/i + reverting folder2/h remove added file folder1/i (Yn)? n diff --git a/f b/f 2 hunks, 2 lines changed