comparison tests/test-rebase-emptycommit.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 f61f5af5ed31
children 09680349cc2d
comparison
equal deleted inserted replaced
35392:5feb782c7a95 35393:4441705b7111
86 rebasing 3:e7b3f00ed42e "D" (BOOK-D) 86 rebasing 3:e7b3f00ed42e "D" (BOOK-D)
87 note: rebase of 3:e7b3f00ed42e created no changes to commit 87 note: rebase of 3:e7b3f00ed42e created no changes to commit
88 rebasing 4:69a34c08022a "E" (BOOK-E) 88 rebasing 4:69a34c08022a "E" (BOOK-E)
89 note: rebase of 4:69a34c08022a created no changes to commit 89 note: rebase of 4:69a34c08022a created no changes to commit
90 rebasing 5:6b2aeab91270 "F" (BOOK-F F) 90 rebasing 5:6b2aeab91270 "F" (BOOK-F F)
91 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob) 91 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg
92 $ hg log -G -T '{rev} {desc} {bookmarks}' 92 $ hg log -G -T '{rev} {desc} {bookmarks}'
93 o 5 F BOOK-F 93 o 5 F BOOK-F
94 | 94 |
95 o 4 C BOOK-C BOOK-D BOOK-E 95 o 4 C BOOK-C BOOK-D BOOK-E
96 | 96 |
134 note: rebase of 2:dc0947a82db8 created no changes to commit 134 note: rebase of 2:dc0947a82db8 created no changes to commit
135 rebasing 3:b18e25de2cf5 "D" (BOOK-D) 135 rebasing 3:b18e25de2cf5 "D" (BOOK-D)
136 note: rebase of 3:b18e25de2cf5 created no changes to commit 136 note: rebase of 3:b18e25de2cf5 created no changes to commit
137 rebasing 4:86a1f6686812 "E" (BOOK-E E) 137 rebasing 4:86a1f6686812 "E" (BOOK-E E)
138 note: rebase of 4:86a1f6686812 created no changes to commit 138 note: rebase of 4:86a1f6686812 created no changes to commit
139 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob) 139 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg
140 140
141 $ hg log -G -T '{rev} {desc} {bookmarks}' 141 $ hg log -G -T '{rev} {desc} {bookmarks}'
142 o 4 H BOOK-C BOOK-D BOOK-E 142 o 4 H BOOK-C BOOK-D BOOK-E
143 | 143 |
144 o 3 D 144 o 3 D
184 rebasing 3:b18e25de2cf5 "D" (BOOK-D D) 184 rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
185 rebasing 4:03ca77807e91 "E" (BOOK-E E) 185 rebasing 4:03ca77807e91 "E" (BOOK-E E)
186 rebasing 5:ad6717a6a58e "F" (BOOK-F) 186 rebasing 5:ad6717a6a58e "F" (BOOK-F)
187 note: rebase of 5:ad6717a6a58e created no changes to commit 187 note: rebase of 5:ad6717a6a58e created no changes to commit
188 rebasing 6:c58e8bdac1f4 "G" (BOOK-G G) 188 rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
189 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob) 189 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg
190 190
191 $ hg log -G -T '{rev} {desc} {bookmarks}' 191 $ hg log -G -T '{rev} {desc} {bookmarks}'
192 o 7 G BOOK-G 192 o 7 G BOOK-G
193 |\ 193 |\
194 | o 6 E BOOK-E 194 | o 6 E BOOK-E