Mercurial > hg
comparison tests/test-rebase-detach.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 | b57f2734ac92 |
comparison
equal
deleted
inserted
replaced
35392:5feb782c7a95 | 35393:4441705b7111 |
---|---|
23 > EOF | 23 > EOF |
24 $ hg phase --force --secret D | 24 $ hg phase --force --secret D |
25 | 25 |
26 $ hg rebase -s D -d B | 26 $ hg rebase -s D -d B |
27 rebasing 3:e7b3f00ed42e "D" (D tip) | 27 rebasing 3:e7b3f00ed42e "D" (D tip) |
28 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg (glob) | 28 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg |
29 | 29 |
30 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 30 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
31 o 3:secret 'D' | 31 o 3:secret 'D' |
32 | | 32 | |
33 | o 2:draft 'C' | 33 | o 2:draft 'C' |
60 > EOF | 60 > EOF |
61 | 61 |
62 $ hg rebase -s D -d B | 62 $ hg rebase -s D -d B |
63 rebasing 3:e7b3f00ed42e "D" (D) | 63 rebasing 3:e7b3f00ed42e "D" (D) |
64 rebasing 4:69a34c08022a "E" (E tip) | 64 rebasing 4:69a34c08022a "E" (E tip) |
65 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob) | 65 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg |
66 | 66 |
67 $ hg tglog | 67 $ hg tglog |
68 o 4: ee79e0744528 'E' | 68 o 4: ee79e0744528 'E' |
69 | | 69 | |
70 o 3: 10530e1d72d9 'D' | 70 o 3: 10530e1d72d9 'D' |
97 > EOF | 97 > EOF |
98 | 98 |
99 $ hg rebase -s C -d B | 99 $ hg rebase -s C -d B |
100 rebasing 2:dc0947a82db8 "C" (C) | 100 rebasing 2:dc0947a82db8 "C" (C) |
101 rebasing 3:e7b3f00ed42e "D" (D tip) | 101 rebasing 3:e7b3f00ed42e "D" (D tip) |
102 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg (glob) | 102 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg |
103 | 103 |
104 $ hg tglog | 104 $ hg tglog |
105 o 3: 7375f3dbfb0f 'D' | 105 o 3: 7375f3dbfb0f 'D' |
106 | | 106 | |
107 o 2: bbfdd6cb49aa 'C' | 107 o 2: bbfdd6cb49aa 'C' |
136 $ hg phase --force --secret E | 136 $ hg phase --force --secret E |
137 | 137 |
138 $ hg rebase --collapse -s D -d B | 138 $ hg rebase --collapse -s D -d B |
139 rebasing 3:e7b3f00ed42e "D" (D) | 139 rebasing 3:e7b3f00ed42e "D" (D) |
140 rebasing 4:69a34c08022a "E" (E tip) | 140 rebasing 4:69a34c08022a "E" (E tip) |
141 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob) | 141 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg |
142 | 142 |
143 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 143 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
144 o 3:secret 'Collapsed revision | 144 o 3:secret 'Collapsed revision |
145 | * D | 145 | * D |
146 | * E' | 146 | * E' |
174 | 174 |
175 $ hg rebase -s C -d B | 175 $ hg rebase -s C -d B |
176 rebasing 2:dc0947a82db8 "C" (C) | 176 rebasing 2:dc0947a82db8 "C" (C) |
177 rebasing 3:e7b3f00ed42e "D" (D) | 177 rebasing 3:e7b3f00ed42e "D" (D) |
178 rebasing 4:69a34c08022a "E" (E tip) | 178 rebasing 4:69a34c08022a "E" (E tip) |
179 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg (glob) | 179 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg |
180 | 180 |
181 $ hg tglog | 181 $ hg tglog |
182 o 4: e3d0c70d606d 'E' | 182 o 4: e3d0c70d606d 'E' |
183 | | 183 | |
184 o 3: e9153d36a1af 'D' | 184 o 3: e9153d36a1af 'D' |
190 o 0: 426bada5c675 'A' | 190 o 0: 426bada5c675 'A' |
191 | 191 |
192 $ hg rebase -d 1 -s 3 | 192 $ hg rebase -d 1 -s 3 |
193 rebasing 3:e9153d36a1af "D" | 193 rebasing 3:e9153d36a1af "D" |
194 rebasing 4:e3d0c70d606d "E" (tip) | 194 rebasing 4:e3d0c70d606d "E" (tip) |
195 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg (glob) | 195 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg |
196 $ hg tglog | 196 $ hg tglog |
197 o 4: 2c24e540eccd 'E' | 197 o 4: 2c24e540eccd 'E' |
198 | | 198 | |
199 o 3: 73f786ed52ff 'D' | 199 o 3: 73f786ed52ff 'D' |
200 | | 200 | |
249 | 249 |
250 $ hg rebase -s I -d H --collapse --config ui.merge=internal:other | 250 $ hg rebase -s I -d H --collapse --config ui.merge=internal:other |
251 rebasing 5:b92d164ad3cb "I" (I) | 251 rebasing 5:b92d164ad3cb "I" (I) |
252 rebasing 6:0cfbc7e8faaf "Merge" | 252 rebasing 6:0cfbc7e8faaf "Merge" |
253 rebasing 7:c6aaf0d259c0 "J" (tip) | 253 rebasing 7:c6aaf0d259c0 "J" (tip) |
254 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg (glob) | 254 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg |
255 | 255 |
256 $ hg tglog | 256 $ hg tglog |
257 @ 5: 65079693dac4 'Collapsed revision | 257 @ 5: 65079693dac4 'Collapsed revision |
258 | * I | 258 | * I |
259 | * Merge | 259 | * Merge |
303 (no more unresolved files) | 303 (no more unresolved files) |
304 continue: hg rebase --continue | 304 continue: hg rebase --continue |
305 $ hg rebase -c | 305 $ hg rebase -c |
306 rebasing 3:17b4880d2402 "B2" (tip) | 306 rebasing 3:17b4880d2402 "B2" (tip) |
307 note: rebase of 3:17b4880d2402 created no changes to commit | 307 note: rebase of 3:17b4880d2402 created no changes to commit |
308 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg (glob) | 308 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg |
309 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" | 309 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
310 o 2:draft 'C' | 310 o 2:draft 'C' |
311 | | 311 | |
312 | @ 1:draft 'B' | 312 | @ 1:draft 'B' |
313 |/ | 313 |/ |