Mercurial > evolve

comparison tests/test-topic-stack.t @ 2997:a61634f52742

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: try to clarify the "branch" part in stack The idea is to clarify the meaning of "behind" with using the "target" word.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Sep 2017 11:30:14 +0200
parents 62201935e1a7
children bd7e8be29542
comparison
equal deleted inserted replaced
2996:7cc79fc0e637 2997:a61634f52742
55 $ hg up other 55 $ hg up other
56 switching to topic other 56 switching to topic other
57 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 57 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
58 $ hg topic --list 58 $ hg topic --list
59 ### topic: other 59 ### topic: other
60 ### branch: default 60 ### target: default (branch)
61 t2@ c_b (current) 61 t2@ c_b (current)
62 t1: c_a 62 t1: c_a
63 $ hg phase --public 'topic("other")' 63 $ hg phase --public 'topic("other")'
64 active topic 'other' is now empty 64 active topic 'other' is now empty
65 65
68 $ hg topic 68 $ hg topic
69 foo 69 foo
70 * other 70 * other
71 $ hg stack 71 $ hg stack
72 ### topic: other 72 ### topic: other
73 ### branch: default 73 ### target: default (branch)
74 (stack is empty) 74 (stack is empty)
75 t0^ c_b (base) 75 t0^ c_b (base)
76 76
77 $ hg up foo 77 $ hg up foo
78 switching to topic foo 78 switching to topic foo
85 85
86 $ hg topic 86 $ hg topic
87 * foo 87 * foo
88 $ hg stack 88 $ hg stack
89 ### topic: foo 89 ### topic: foo
90 ### branch: default 90 ### target: default (branch)
91 t4@ c_f (current) 91 t4@ c_f (current)
92 t3: c_e 92 t3: c_e
93 t2: c_d 93 t2: c_d
94 t1: c_c 94 t1: c_c
95 t0^ c_b (base) 95 t0^ c_b (base)
96 $ hg stack -v 96 $ hg stack -v
97 ### topic: foo 97 ### topic: foo
98 ### branch: default 98 ### target: default (branch)
99 t4(6559e6d93aea)@ c_f (current) 99 t4(6559e6d93aea)@ c_f (current)
100 t3(0f9ac936c87d): c_e 100 t3(0f9ac936c87d): c_e
101 t2(e629654d7050): c_d 101 t2(e629654d7050): c_d
102 t1(8522f9e3fee9): c_c 102 t1(8522f9e3fee9): c_c
103 t0(ea705abc4f51)^ c_b (base) 103 t0(ea705abc4f51)^ c_b (base)
207 207
208 $ hg topics 208 $ hg topics
209 * foo 209 * foo
210 $ hg stack 210 $ hg stack
211 ### topic: foo 211 ### topic: foo
212 ### branch: default 212 ### target: default (branch)
213 t4@ c_f (current) 213 t4@ c_f (current)
214 t3: c_e 214 t3: c_e
215 t2: c_d 215 t2: c_d
216 t1: c_c 216 t1: c_c
217 t0^ c_b (base) 217 t0^ c_b (base)
218 $ hg topics --config ui.strict=true 218 $ hg topics --config ui.strict=true
219 * foo 219 * foo
220 $ hg stack --config ui.strict=true 220 $ hg stack --config ui.strict=true
221 ### topic: foo 221 ### topic: foo
222 ### branch: default 222 ### target: default (branch)
223 t4@ c_f (current) 223 t4@ c_f (current)
224 t3: c_e 224 t3: c_e
225 t2: c_d 225 t2: c_d
226 t1: c_c 226 t1: c_c
227 t0^ c_b (base) 227 t0^ c_b (base)
228 228
229 error case, nothing to list 229 error case, nothing to list
230 230
231 $ hg topic --clear 231 $ hg topic --clear
232 $ hg stack 232 $ hg stack
233 ### branch: default 233 ### target: default (branch)
234 (stack is empty) 234 (stack is empty)
235 b0^ c_f (base) 235 b0^ c_f (base)
236 236
237 Test "t#" reference 237 Test "t#" reference
238 ------------------- 238 -------------------
277 | 277 |
278 o 0 default {} public c_a 278 o 0 default {} public c_a
279 279
280 $ hg topic --list 280 $ hg topic --list
281 ### topic: foo 281 ### topic: foo
282 ### branch: default 282 ### target: default (branch)
283 t4$ c_f (unstable) 283 t4$ c_f (unstable)
284 t3$ c_e (unstable) 284 t3$ c_e (unstable)
285 t2@ c_d (current) 285 t2@ c_d (current)
286 t1: c_c 286 t1: c_c
287 t0^ c_b (base) 287 t0^ c_b (base)
288 $ hg up t3 288 $ hg up t3
289 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 289 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
290 $ hg topic --list 290 $ hg topic --list
291 ### topic: foo 291 ### topic: foo
292 ### branch: default 292 ### target: default (branch)
293 t4$ c_f (unstable) 293 t4$ c_f (unstable)
294 t3$ c_e (current unstable) 294 t3$ c_e (current unstable)
295 t2: c_d 295 t2: c_d
296 t1: c_c 296 t1: c_c
297 t0^ c_b (base) 297 t0^ c_b (base)
298 $ hg topic --list --color=debug 298 $ hg topic --list --color=debug
299 [topic.stack.summary.topic|### topic: [topic.active|foo]] 299 [topic.stack.summary.topic|### topic: [topic.active|foo]]
300 [topic.stack.summary.branches|### branch: default] 300 [topic.stack.summary.branches|### target: default (branch)]
301 [topic.stack.index topic.stack.index.unstable|t4][topic.stack.state topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.unstable|c_f][topic.stack.state topic.stack.state.unstable| (unstable)] 301 [topic.stack.index topic.stack.index.unstable|t4][topic.stack.state topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.unstable|c_f][topic.stack.state topic.stack.state.unstable| (unstable)]
302 [topic.stack.index topic.stack.index.current topic.stack.index.unstable|t3][topic.stack.state topic.stack.state.current topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.unstable|c_e][topic.stack.state topic.stack.state.current topic.stack.state.unstable| (current unstable)] 302 [topic.stack.index topic.stack.index.current topic.stack.index.unstable|t3][topic.stack.state topic.stack.state.current topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.unstable|c_e][topic.stack.state topic.stack.state.current topic.stack.state.unstable| (current unstable)]
303 [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] 303 [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d]
304 [topic.stack.index topic.stack.index.clean|t1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] 304 [topic.stack.index topic.stack.index.clean|t1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c]
305 [topic.stack.index topic.stack.index.base|t0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)] 305 [topic.stack.index topic.stack.index.base|t0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)]
375 375
376 Test output 376 Test output
377 377
378 $ hg top -l 378 $ hg top -l
379 ### topic: foo (2 heads) 379 ### topic: foo (2 heads)
380 ### branch: default 380 ### target: default (branch)
381 t6@ c_h (current) 381 t6@ c_h (current)
382 t5: c_g 382 t5: c_g
383 t2^ c_d (base) 383 t2^ c_d (base)
384 t4: c_f 384 t4: c_f
385 t3: c_e 385 t3: c_e
419 o 0 default {} public c_a 419 o 0 default {} public c_a
420 420
421 421
422 $ hg topic --list 422 $ hg topic --list
423 ### topic: foo (2 heads) 423 ### topic: foo (2 heads)
424 ### branch: default 424 ### target: default (branch)
425 t6: c_h 425 t6: c_h
426 t5: c_g 426 t5: c_g
427 t2^ c_D (base) 427 t2^ c_D (base)
428 t4$ c_f (unstable) 428 t4$ c_f (unstable)
429 t3$ c_e (unstable) 429 t3$ c_e (unstable)
543 XXX: The following should show single heads 543 XXX: The following should show single heads
544 XXX: The behind count is weird, because the topic are interleaved. 544 XXX: The behind count is weird, because the topic are interleaved.
545 545
546 $ hg stack 546 $ hg stack
547 ### topic: foobar 547 ### topic: foobar
548 ### branch: default, 3 behind 548 ### target: default (branch), 3 behind
549 t2@ c_e (current) 549 t2@ c_e (current)
550 ^ c_h 550 ^ c_h
551 t1: c_D 551 t1: c_D
552 t0^ c_c (base) 552 t0^ c_c (base)
553 553
554 $ hg stack foo 554 $ hg stack foo
555 ### topic: foo 555 ### topic: foo
556 ### branch: default, ambigious rebase destination - topic 'foo' has 3 heads 556 ### target: default (branch), ambigious rebase destination - topic 'foo' has 3 heads
557 t4: c_f 557 t4: c_f
558 ^ c_e 558 ^ c_e
559 t3: c_h 559 t3: c_h
560 t2: c_g 560 t2: c_g
561 ^ c_D 561 ^ c_D
631 o 0 default {} draft c_A 631 o 0 default {} draft c_A
632 632
633 633
634 $ hg stack red 634 $ hg stack red
635 ### topic: red 635 ### topic: red
636 ### branch: default, 6 behind 636 ### target: default (branch), 6 behind
637 t5: c_H 637 t5: c_H
638 ^ c_G 638 ^ c_G
639 ^ c_D 639 ^ c_D
640 t4: c_C 640 t4: c_C
641 t1^ c_B (base) 641 t1^ c_B (base)
643 t2: c_E 643 t2: c_E
644 t1: c_B 644 t1: c_B
645 t0^ c_A (base) 645 t0^ c_A (base)
646 $ hg stack blue 646 $ hg stack blue
647 ### topic: blue 647 ### topic: blue
648 ### branch: default, ambigious rebase destination - topic 'blue' has 3 heads 648 ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
649 t3@ c_I (current) 649 t3@ c_I (current)
650 ^ c_H 650 ^ c_H
651 t2: c_D 651 t2: c_D
652 ^ c_C 652 ^ c_C
653 t1: c_G 653 t1: c_G
696 o 0 default {} draft c_A 696 o 0 default {} draft c_A
697 697
698 698
699 $ hg stack red 699 $ hg stack red
700 ### topic: red 700 ### topic: red
701 ### branch: default, ambigious rebase destination - topic 'red' has 3 heads 701 ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads
702 t5$ c_H (unstable) 702 t5$ c_H (unstable)
703 ^ c_G 703 ^ c_G
704 ^ c_D 704 ^ c_D
705 t4$ c_C (unstable) 705 t4$ c_C (unstable)
706 t1^ c_B (base) 706 t1^ c_B (base)
708 t2$ c_E (unstable) 708 t2$ c_E (unstable)
709 t1: c_B 709 t1: c_B
710 t0^ c_A (base) 710 t0^ c_A (base)
711 $ hg stack blue 711 $ hg stack blue
712 ### topic: blue 712 ### topic: blue
713 ### branch: default, ambigious rebase destination - topic 'blue' has 3 heads 713 ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
714 t3$ c_I (unstable) 714 t3$ c_I (unstable)
715 ^ c_H 715 ^ c_H
716 t2$ c_G (unstable) 716 t2$ c_G (unstable)
717 ^ c_F 717 ^ c_F
718 t1$ c_D (current unstable) 718 t1$ c_D (current unstable)
770 o 0 default {} draft c_A 770 o 0 default {} draft c_A
771 771
772 772
773 $ hg stack red 773 $ hg stack red
774 ### topic: red 774 ### topic: red
775 ### branch: default, ambigious rebase destination - topic 'red' has 3 heads 775 ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads
776 t5$ c_H (unstable) 776 t5$ c_H (unstable)
777 ^ c_G 777 ^ c_G
778 ^ c_D 778 ^ c_D
779 t4$ c_F (unstable) 779 t4$ c_F (unstable)
780 t3$ c_E (unstable) 780 t3$ c_E (unstable)
782 t2$ c_C (unstable) 782 t2$ c_C (unstable)
783 t1: c_B 783 t1: c_B
784 t0^ c_A (base) 784 t0^ c_A (base)
785 $ hg stack blue 785 $ hg stack blue
786 ### topic: blue 786 ### topic: blue
787 ### branch: default, ambigious rebase destination - topic 'blue' has 3 heads 787 ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
788 t3$ c_I (unstable) 788 t3$ c_I (unstable)
789 ^ c_H 789 ^ c_H
790 t2$ c_G (unstable) 790 t2$ c_G (unstable)
791 ^ c_F 791 ^ c_F
792 t1$ c_D (current unstable) 792 t1$ c_D (current unstable)