Mercurial > evolve
diff tests/test-topic-stack.t @ 4432:5da1d162ad50
stack: rename unstable -> orphan
That's the only instability stack can currently show, but it's about to show
more and showing "unstable" for one type of instability just isn't good.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 07 Mar 2019 19:13:45 +0800 |
parents | 41f38bf15b4c |
children | ef155f624670 |
line wrap: on
line diff
--- a/tests/test-topic-stack.t Wed Mar 06 21:47:08 2019 +0800 +++ b/tests/test-topic-stack.t Thu Mar 07 19:13:45 2019 +0800 @@ -331,8 +331,8 @@ $ hg topic --list ### topic: foo ### target: default (branch) - s4$ c_f (unstable) - s3$ c_e (unstable) + s4$ c_f (orphan) + s3$ c_e (orphan) s2@ c_d (current) s1: c_c s0^ c_b (base) @@ -341,16 +341,16 @@ $ hg topic --list ### topic: foo ### target: default (branch) - s4$ c_f (unstable) - s3$ c_e (current unstable) + s4$ c_f (orphan) + s3$ c_e (current orphan) s2: c_d s1: c_c s0^ c_b (base) $ hg topic --list --color=debug [topic.stack.summary.topic|### topic: [topic.active|foo]] [topic.stack.summary.branches|### target: default (branch)] - [topic.stack.index topic.stack.index.unstable|s4][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|s3][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.orphan|s4][topic.stack.state topic.stack.state.orphan|$] [topic.stack.desc topic.stack.desc.orphan|c_f][topic.stack.state topic.stack.state.orphan| (orphan)] + [topic.stack.index topic.stack.index.current topic.stack.index.orphan|s3][topic.stack.state topic.stack.state.current topic.stack.state.orphan|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.orphan|c_e][topic.stack.state topic.stack.state.current topic.stack.state.orphan| (current orphan)] [topic.stack.index topic.stack.index.clean|s2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] [topic.stack.index topic.stack.index.clean|s1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] [topic.stack.index topic.stack.index.base|s0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)] @@ -488,8 +488,8 @@ s6: c_h s5: c_g s2^ c_D (base current) - s4$ c_f (unstable) - s3$ c_e (unstable) + s4$ c_f (orphan) + s3$ c_e (orphan) s2@ c_D (current) s1: c_c s0^ c_b (base) @@ -767,24 +767,24 @@ $ hg stack red ### topic: red ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads - s5$ c_H (unstable) + s5$ c_H (orphan) ^ c_G ^ c_D - s4$ c_C (unstable) + s4$ c_C (orphan) s1^ c_B (base) - s3$ c_F (unstable) - s2$ c_E (unstable) + s3$ c_F (orphan) + s2$ c_E (orphan) s1: c_B s0^ c_A (base) $ hg stack blue ### topic: blue ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads - s3$ c_I (unstable) + s3$ c_I (orphan) ^ c_H - s2$ c_G (unstable) + s2$ c_G (orphan) ^ c_F - s1$ c_D (current unstable) - s0^ c_C (base unstable) + s1$ c_D (current orphan) + s0^ c_C (base orphan) more obsolescence @@ -841,24 +841,24 @@ $ hg stack red ### topic: red ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads - s5$ c_H (unstable) + s5$ c_H (orphan) ^ c_G ^ c_D - s4$ c_F (unstable) - s3$ c_E (unstable) + s4$ c_F (orphan) + s3$ c_E (orphan) s1^ c_B (base) - s2$ c_C (unstable) + s2$ c_C (orphan) s1: c_B s0^ c_A (base) $ hg stack blue ### topic: blue ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads - s3$ c_I (unstable) + s3$ c_I (orphan) ^ c_H - s2$ c_G (unstable) + s2$ c_G (orphan) ^ c_F - s1$ c_D (current unstable) - s0^ c_C (base unstable) + s1$ c_D (current orphan) + s0^ c_C (base orphan) Test stack behavior with a split -------------------------------- @@ -897,7 +897,7 @@ $ hg stack ### topic: blue ### target: default (branch) - s3$ c_I (unstable) + s3$ c_I (orphan) s2@ c_G (current) s1: c_D s0^ c_A (base) @@ -977,7 +977,7 @@ $ hg stack ### topic: blue ### target: default (branch) - s4$ c_I (unstable) + s4$ c_I (orphan) s3@ c_G (current) s2: c_G s1: c_D