Mercurial > hg

comparison tests/test-rebase-collapse.t @ 23516:328afbad6e57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make 'saved backup' globbing less narrow in rebase tests Globbing the hash made it harder to maintain tests with run-tests -i when it was so far by the generated test output. The hashes are stable and we just need to add a (glob).
author Mads Kiilerich <madski@unity3d.com>
date Sun, 07 Dec 2014 20:04:45 +0100
parents dfa44e25bb53
children 4f18e80d9c30
comparison
equal deleted inserted replaced
23515:7856a87bbb02 23516:328afbad6e57
73 HG: branch 'default' 73 HG: branch 'default'
74 HG: added B 74 HG: added B
75 HG: added C 75 HG: added C
76 HG: added D 76 HG: added D
77 ==== 77 ====
78 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) 78 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
79 79
80 $ hg tglogp 80 $ hg tglogp
81 @ 5:secret 'Collapsed revision 81 @ 5:secret 'Collapsed revision
82 | * B 82 | * B
83 | * C 83 | * C
111 $ hg clone -q -u . a a2 111 $ hg clone -q -u . a a2
112 $ cd a2 112 $ cd a2
113 113
114 $ hg phase --force --secret 6 114 $ hg phase --force --secret 6
115 $ hg rebase --source 4 --collapse 115 $ hg rebase --source 4 --collapse
116 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) 116 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-backup.hg (glob)
117 117
118 $ hg tglog 118 $ hg tglog
119 o 6: 'Collapsed revision 119 o 6: 'Collapsed revision
120 | * E 120 | * E
121 | * G' 121 | * G'
152 > env | grep HGEDITFORM 152 > env | grep HGEDITFORM
153 > true 153 > true
154 > EOF 154 > EOF
155 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e 155 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source 4 --collapse -m 'custom message' -e
156 HGEDITFORM=rebase.collapse 156 HGEDITFORM=rebase.collapse
157 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) 157 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob)
158 158
159 $ hg tglog 159 $ hg tglog
160 o 6: 'custom message' 160 o 6: 'custom message'
161 | 161 |
162 @ 5: 'H' 162 @ 5: 'H'
259 [255] 259 [255]
260 260
261 Rebase and collapse - E onto H: 261 Rebase and collapse - E onto H:
262 262
263 $ hg rebase -s 4 --collapse # root (4) is not a merge 263 $ hg rebase -s 4 --collapse # root (4) is not a merge
264 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob) 264 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
265 265
266 $ hg tglog 266 $ hg tglog
267 o 5: 'Collapsed revision 267 o 5: 'Collapsed revision
268 |\ * E 268 |\ * E
269 | | * F 269 | | * F
408 $ hg clone -q -u . c c1 408 $ hg clone -q -u . c c1
409 $ cd c1 409 $ cd c1
410 410
411 $ hg rebase -s 4 --collapse # root (4) is not a merge 411 $ hg rebase -s 4 --collapse # root (4) is not a merge
412 merging E 412 merging E
413 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/*-backup.hg (glob) 413 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
414 414
415 $ hg tglog 415 $ hg tglog
416 o 5: 'Collapsed revision 416 o 5: 'Collapsed revision
417 |\ * E 417 |\ * E
418 | | * F 418 | | * F
497 497
498 $ hg clone -q -u . d d1 498 $ hg clone -q -u . d d1
499 $ cd d1 499 $ cd d1
500 500
501 $ hg rebase -s 1 --collapse 501 $ hg rebase -s 1 --collapse
502 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/*-backup.hg (glob) 502 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-backup.hg (glob)
503 503
504 $ hg tglog 504 $ hg tglog
505 o 2: 'Collapsed revision 505 o 2: 'Collapsed revision
506 | * B 506 | * B
507 | * C 507 | * C
581 | o 1: 'B' one 581 | o 1: 'B' one
582 |/ 582 |/
583 o 0: 'A' 583 o 0: 'A'
584 584
585 $ hg rebase -s 5 -d 4 585 $ hg rebase -s 5 -d 4
586 saved backup bundle to $TESTTMP/e/.hg/strip-backup/*-backup.hg (glob) 586 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-backup.hg (glob)
587 $ hg tglog 587 $ hg tglog
588 @ 4: 'E' 588 @ 4: 'E'
589 | 589 |
590 o 3: 'D' 590 o 3: 'D'
591 | 591 |
637 merging a and d to d 637 merging a and d to d
638 merging b and e to e 638 merging b and e to e
639 merging c and f to f 639 merging c and f to f
640 merging f and c to c 640 merging f and c to c
641 merging e and g to g 641 merging e and g to g
642 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) 642 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-backup.hg (glob)
643 $ hg st 643 $ hg st
644 $ hg st --copies --change tip 644 $ hg st --copies --change tip
645 A d 645 A d
646 a 646 a
647 A g 647 A g
676 [255] 676 [255]
677 677
678 Test collapsing in place 678 Test collapsing in place
679 679
680 $ hg rebase --collapse -b . -d 0 680 $ hg rebase --collapse -b . -d 0
681 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob) 681 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-backup.hg (glob)
682 $ hg st --change tip --copies 682 $ hg st --change tip --copies
683 M a 683 M a
684 M c 684 M c
685 A d 685 A d
686 a 686 a
735 2:c5cefa58fd557f84b72b87f970135984337acbc5 default: C 735 2:c5cefa58fd557f84b72b87f970135984337acbc5 default: C
736 1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B 736 1:27547f69f25460a52fff66ad004e58da7ad3fb56 default: B
737 737
738 $ hg strip 2 738 $ hg strip 2
739 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 739 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
740 saved backup bundle to $TESTTMP/f/.hg/strip-backup/*-backup.hg (glob) 740 saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-backup.hg (glob)
741 741
742 $ hg tglog 742 $ hg tglog
743 o 1: 'B' 743 o 1: 'B'
744 | 744 |
745 @ 0: 'A' 745 @ 0: 'A'
766 $ touch b 766 $ touch b
767 $ hg commit -Am b 767 $ hg commit -Am b
768 adding b 768 adding b
769 $ hg book foo 769 $ hg book foo
770 $ hg rebase -d 0 -r "1::2" --collapse -m collapsed 770 $ hg rebase -d 0 -r "1::2" --collapse -m collapsed
771 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/*-backup.hg (glob) 771 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-backup.hg (glob)
772 $ hg log -G --template "{rev}: '{desc}' {bookmarks}" 772 $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
773 @ 1: 'collapsed' foo 773 @ 1: 'collapsed' foo
774 | 774 |
775 o 0: 'base' 775 o 0: 'base'
776 776