evolve: comparison tests/test-topic-stack.t

equal deleted inserted replaced

-:7cc79fc0e637
+:a61634f52742
 $ hg up other
 switching to topic other
 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 $ hg topic --list
 ### topic: other
-### branch: default
+### target: default (branch)
 t2@ c_b (current)
 t1: c_a
 $ hg phase --public 'topic("other")'
 active topic 'other' is now empty
 $ hg topic
 foo
 * other
 $ hg stack
 ### topic: other
-### branch: default
+### target: default (branch)
 (stack is empty)
 t0^ c_b (base)
 $ hg up foo
 switching to topic foo
 $ hg topic
 * foo
 $ hg stack
 ### topic: foo
-### branch: default
+### target: default (branch)
 t4@ c_f (current)
 t3: c_e
 t2: c_d
 t1: c_c
 t0^ c_b (base)
 $ hg stack -v
 ### topic: foo
-### branch: default
+### target: default (branch)
 t4(6559e6d93aea)@ c_f (current)
 t3(0f9ac936c87d): c_e
 t2(e629654d7050): c_d
 t1(8522f9e3fee9): c_c
 t0(ea705abc4f51)^ c_b (base)
 $ hg topics
 * foo
 $ hg stack
 ### topic: foo
-### branch: default
+### target: default (branch)
 t4@ c_f (current)
 t3: c_e
 t2: c_d
 t1: c_c
 t0^ c_b (base)
 $ hg topics --config ui.strict=true
 * foo
 $ hg stack --config ui.strict=true
 ### topic: foo
-### branch: default
+### target: default (branch)
 t4@ c_f (current)
 t3: c_e
 t2: c_d
 t1: c_c
 t0^ c_b (base)
 error case, nothing to list
 $ hg topic --clear
 $ hg stack
-### branch: default
+### target: default (branch)
 (stack is empty)
 b0^ c_f (base)
 Test "t#" reference
 -------------------
 |
 o  0 default {} public c_a
 $ hg topic --list
 ### topic: foo
-### branch: default
+### target: default (branch)
 t4$ c_f (unstable)
 t3$ c_e (unstable)
 t2@ c_d (current)
 t1: c_c
 t0^ c_b (base)
 $ hg up t3
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg topic --list
 ### topic: foo
-### branch: default
+### target: default (branch)
 t4$ c_f (unstable)
 t3$ c_e (current unstable)
 t2: c_d
 t1: c_c
 t0^ c_b (base)
 $ hg topic --list --color=debug
 [topic.stack.summary.topic|### topic: [topic.active|foo]]
-[topic.stack.summary.branches|### branch: default]
+[topic.stack.summary.branches|### target: default (branch)]
 [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)]
 [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)]
 [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d]
 [topic.stack.index topic.stack.index.clean|t1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c]
 [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)]
 Test output
 $ hg top -l
 ### topic: foo (2 heads)
-### branch: default
+### target: default (branch)
 t6@ c_h (current)
 t5: c_g
 t2^ c_d (base)
 t4: c_f
 t3: c_e
 o  0 default {} public c_a
 $ hg topic --list
 ### topic: foo (2 heads)
-### branch: default
+### target: default (branch)
 t6: c_h
 t5: c_g
 t2^ c_D (base)
 t4$ c_f (unstable)
 t3$ c_e (unstable)
 XXX: The following should show single heads
 XXX: The behind count is weird, because the topic are interleaved.
 $ hg stack
 ### topic: foobar
-### branch: default, 3 behind
+### target: default (branch), 3 behind
 t2@ c_e (current)
 ^ c_h
 t1: c_D
 t0^ c_c (base)
 $ hg stack foo
 ### topic: foo
-### branch: default, ambigious rebase destination - topic 'foo' has 3 heads
+### target: default (branch), ambigious rebase destination - topic 'foo' has 3 heads
 t4: c_f
 ^ c_e
 t3: c_h
 t2: c_g
 ^ c_D
 o  0 default {} draft c_A
 $ hg stack red
 ### topic: red
-### branch: default, 6 behind
+### target: default (branch), 6 behind
 t5: c_H
 ^ c_G
 ^ c_D
 t4: c_C
 t1^ c_B (base)
 t2: c_E
 t1: c_B
 t0^ c_A (base)
 $ hg stack blue
 ### topic: blue
-### branch: default, ambigious rebase destination - topic 'blue' has 3 heads
+### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
 t3@ c_I (current)
 ^ c_H
 t2: c_D
 ^ c_C
 t1: c_G
 o  0 default {} draft c_A
 $ hg stack red
 ### topic: red
-### branch: default, ambigious rebase destination - topic 'red' has 3 heads
+### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads
 t5$ c_H (unstable)
 ^ c_G
 ^ c_D
 t4$ c_C (unstable)
 t1^ c_B (base)
 t2$ c_E (unstable)
 t1: c_B
 t0^ c_A (base)
 $ hg stack blue
 ### topic: blue
-### branch: default, ambigious rebase destination - topic 'blue' has 3 heads
+### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
 t3$ c_I (unstable)
 ^ c_H
 t2$ c_G (unstable)
 ^ c_F
 t1$ c_D (current unstable)
 o  0 default {} draft c_A
 $ hg stack red
 ### topic: red
-### branch: default, ambigious rebase destination - topic 'red' has 3 heads
+### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads
 t5$ c_H (unstable)
 ^ c_G
 ^ c_D
 t4$ c_F (unstable)
 t3$ c_E (unstable)
 t2$ c_C (unstable)
 t1: c_B
 t0^ c_A (base)
 $ hg stack blue
 ### topic: blue
-### branch: default, ambigious rebase destination - topic 'blue' has 3 heads
+### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
 t3$ c_I (unstable)
 ^ c_H
 t2$ c_G (unstable)
 ^ c_F
 t1$ c_D (current unstable)

changeset 2997	a61634f52742
parent 2988	62201935e1a7
child 3000	bd7e8be29542