comparison tests/test-win32text.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 75be14993fda
children d7238d125aa2
comparison
equal deleted inserted replaced
35392:5feb782c7a95 35393:4441705b7111
110 transaction abort! 110 transaction abort!
111 rollback completed 111 rollback completed
112 abort: pretxncommit.crlf hook failed 112 abort: pretxncommit.crlf hook failed
113 [255] 113 [255]
114 $ hg revert -a 114 $ hg revert -a
115 forgetting d/f2 (glob) 115 forgetting d/f2
116 $ rm d/f2 116 $ rm d/f2
117 117
118 $ hg rem f 118 $ hg rem f
119 $ hg ci -m 4 119 $ hg ci -m 4
120 120
175 updating to branch default 175 updating to branch default
176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
177 177
178 $ for x in a b c d; do echo content > dupe/$x; done 178 $ for x in a b c d; do echo content > dupe/$x; done
179 $ hg -R dupe add 179 $ hg -R dupe add
180 adding dupe/a (glob) 180 adding dupe/a
181 adding dupe/b (glob) 181 adding dupe/b
182 adding dupe/c (glob) 182 adding dupe/c
183 adding dupe/d (glob) 183 adding dupe/d
184 $ $PYTHON unix2dos.py dupe/b dupe/c dupe/d 184 $ $PYTHON unix2dos.py dupe/b dupe/c dupe/d
185 $ hg -R dupe ci -m a dupe/a 185 $ hg -R dupe ci -m a dupe/a
186 $ hg -R dupe ci -m b/c dupe/[bc] 186 $ hg -R dupe ci -m b/c dupe/[bc]
187 $ hg -R dupe ci -m d dupe/d 187 $ hg -R dupe ci -m d dupe/d
188 $ hg -R dupe log -v 188 $ hg -R dupe log -v
383 $ rm f3 f4.bat bin 383 $ rm f3 f4.bat bin
384 $ hg co -C 384 $ hg co -C
385 WARNING: f4.bat already has CRLF line endings 385 WARNING: f4.bat already has CRLF line endings
386 and does not need EOL conversion by the win32text plugin. 386 and does not need EOL conversion by the win32text plugin.
387 Before your next commit, please reconsider your encode/decode settings in 387 Before your next commit, please reconsider your encode/decode settings in
388 Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob) 388 Mercurial.ini or $TESTTMP/t/.hg/hgrc.
389 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 389 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
390 $ cat bin 390 $ cat bin
391 hello\x00\r (esc) 391 hello\x00\r (esc)
392 $ cat f3 392 $ cat f3
393 some\r (esc) 393 some\r (esc)