Mercurial > hg

comparison tests/test-rebase-cache.t @ 35393:4441705b7111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3b7cb3d17137
children 09680349cc2d
comparison
equal deleted inserted replaced
35392:5feb782c7a95 35393:4441705b7111
102 0: 'A' 102 0: 'A'
103 103
104 $ hg rebase -s 5 -d 8 104 $ hg rebase -s 5 -d 8
105 rebasing 5:635859577d0b "D" 105 rebasing 5:635859577d0b "D"
106 rebasing 6:5097051d331d "E" 106 rebasing 6:5097051d331d "E"
107 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-rebase.hg (glob) 107 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-rebase.hg
108 108
109 $ hg branches 109 $ hg branches
110 branch3 8:466cdfb14b62 110 branch3 8:466cdfb14b62
111 branch2 4:e4fdb121d036 111 branch2 4:e4fdb121d036
112 branch1 2:0a03079c47fd 112 branch1 2:0a03079c47fd
164 |/ 164 |/
165 o 0: 'A' 165 o 0: 'A'
166 166
167 $ hg rebase -s 8 -d 6 167 $ hg rebase -s 8 -d 6
168 rebasing 8:4666b71e8e32 "F" (tip) 168 rebasing 8:4666b71e8e32 "F" (tip)
169 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg (glob) 169 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-rebase.hg
170 170
171 $ hg branches 171 $ hg branches
172 branch2 8:6b4bdc1b5ac0 172 branch2 8:6b4bdc1b5ac0
173 branch3 7:653b9feb4616 173 branch3 7:653b9feb4616
174 branch1 2:0a03079c47fd (inactive) 174 branch1 2:0a03079c47fd (inactive)
231 231
232 $ hg rebase -s 7 -d 6 232 $ hg rebase -s 7 -d 6
233 rebasing 7:653b9feb4616 "branch3" 233 rebasing 7:653b9feb4616 "branch3"
234 note: rebase of 7:653b9feb4616 created no changes to commit 234 note: rebase of 7:653b9feb4616 created no changes to commit
235 rebasing 8:4666b71e8e32 "F" (tip) 235 rebasing 8:4666b71e8e32 "F" (tip)
236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg (glob) 236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg
237 237
238 $ hg branches 238 $ hg branches
239 branch2 7:6b4bdc1b5ac0 239 branch2 7:6b4bdc1b5ac0
240 branch1 2:0a03079c47fd (inactive) 240 branch1 2:0a03079c47fd (inactive)
241 default 0:1994f17a630e (inactive) 241 default 0:1994f17a630e (inactive)
268 Stripping multiple branches in one go bypasses the fast-case code to 268 Stripping multiple branches in one go bypasses the fast-case code to
269 update the branch cache. 269 update the branch cache.
270 270
271 $ hg strip 2 271 $ hg strip 2
272 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 272 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
273 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg (glob) 273 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg
274 274
275 $ hg tglog 275 $ hg tglog
276 o 3: 'C' branch2 276 o 3: 'C' branch2
277 | 277 |
278 o 2: 'branch2' branch2 278 o 2: 'branch2' branch2
327 2: 'A' branch1 327 2: 'A' branch1
328 1: 'branch2' branch2 328 1: 'branch2' branch2
329 329
330 $ hg strip 2 330 $ hg strip 2
331 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 331 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
332 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg (glob) 332 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg
333 333
334 $ hg theads 334 $ hg theads
335 1: 'branch2' branch2 335 1: 'branch2' branch2
336 0: 'branch1' branch1 336 0: 'branch1' branch1
337 337
372 o 0: 'A' 372 o 0: 'A'
373 373
374 374
375 $ hg strip 3 4 375 $ hg strip 3 4
376 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 376 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
377 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg (glob) 377 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg
378 378
379 $ hg theads 379 $ hg theads
380 2: 'C' 380 2: 'C'
381 381
382 $ hg strip 2 1 382 $ hg strip 2 1
383 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 383 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
384 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob) 384 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg
385 385
386 $ hg theads 386 $ hg theads
387 0: 'A' 387 0: 'A'
388 388
389 Make sure rebase does not break for phase/filter related reason 389 Make sure rebase does not break for phase/filter related reason
478 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e 478 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
479 rebasing 5:361a99976cc9 "F" 479 rebasing 5:361a99976cc9 "F"
480 HGEDITFORM=rebase.merge 480 HGEDITFORM=rebase.merge
481 rebasing 8:326cfedc031c "I" (tip) 481 rebasing 8:326cfedc031c "I" (tip)
482 HGEDITFORM=rebase.normal 482 HGEDITFORM=rebase.normal
483 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg (glob) 483 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-rebase.hg