comparison tests/test-rebase-mq-skip.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 469b06b4c3ca
children db06c4bb2158
comparison
equal deleted inserted replaced
35392:5feb782c7a95 35393:4441705b7111
65 rebasing 3:148775c71080 "P1" (p1.patch qtip) 65 rebasing 3:148775c71080 "P1" (p1.patch qtip)
66 resolving manifests 66 resolving manifests
67 note: rebase of 3:148775c71080 created no changes to commit 67 note: rebase of 3:148775c71080 created no changes to commit
68 rebase merging completed 68 rebase merging completed
69 updating mq patch p0.patch to 5:9ecc820b1737 69 updating mq patch p0.patch to 5:9ecc820b1737
70 $TESTTMP/a/.hg/patches/p0.patch (glob) 70 $TESTTMP/a/.hg/patches/p0.patch
71 2 changesets found 71 2 changesets found
72 uncompressed size of bundle content: 72 uncompressed size of bundle content:
73 348 (changelog) 73 348 (changelog)
74 324 (manifests) 74 324 (manifests)
75 129 p0 75 129 p0
76 129 p1 76 129 p1
77 saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-rebase.hg (glob) 77 saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-rebase.hg
78 2 changesets found 78 2 changesets found
79 uncompressed size of bundle content: 79 uncompressed size of bundle content:
80 403 (changelog) 80 403 (changelog)
81 324 (manifests) 81 324 (manifests)
82 129 p0 82 129 p0
164 rebasing 4:094320fec554 "r4" (r4) 164 rebasing 4:094320fec554 "r4" (r4)
165 note: rebase of 4:094320fec554 created no changes to commit 165 note: rebase of 4:094320fec554 created no changes to commit
166 rebasing 5:681a378595ba "r5" (r5) 166 rebasing 5:681a378595ba "r5" (r5)
167 rebasing 6:512a1f24768b "r6" (qtip r6) 167 rebasing 6:512a1f24768b "r6" (qtip r6)
168 note: rebase of 6:512a1f24768b created no changes to commit 168 note: rebase of 6:512a1f24768b created no changes to commit
169 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg (glob) 169 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
170 170
171 $ hg tglog 171 $ hg tglog
172 @ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip 172 @ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip
173 | 173 |
174 o 7: 1660ab13ce9a 'r2' tags: qbase r2 174 o 7: 1660ab13ce9a 'r2' tags: qbase r2