Mercurial > evolve
changeset 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 | f109917f5c28 |
| children | a19d8196b0c9 |
| files | hgext3rd/topic/__init__.py hgext3rd/topic/stack.py tests/test-evolve-topic.t tests/test-stack-branch.t tests/test-topic-stack-complex.t tests/test-topic-stack-data.t tests/test-topic-stack.t tests/test-topic-tutorial.t |
| diffstat | 8 files changed, 57 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Wed Mar 06 21:47:08 2019 +0800 +++ b/hgext3rd/topic/__init__.py Thu Mar 07 19:13:45 2019 +0800 @@ -167,7 +167,7 @@ 'topic.stack.state.current': 'cyan bold', # random pick 'topic.stack.desc.current': 'cyan', # random pick 'topic.stack.shortnode.current': 'cyan', # random pick - 'topic.stack.state.unstable': 'red', + 'topic.stack.state.orphan': 'red', 'topic.stack.summary.behindcount': 'cyan', 'topic.stack.summary.behinderror': 'red', 'topic.stack.summary.headcount.multiple': 'yellow',
--- a/hgext3rd/topic/stack.py Wed Mar 06 21:47:08 2019 +0800 +++ b/hgext3rd/topic/stack.py Thu Mar 07 19:13:45 2019 +0800 @@ -343,9 +343,9 @@ if ctx.orphan(): symbol = '$' if msg: - states.append('unstable - ' + msg) + states.append('orphan - ' + msg) else: - states.append('unstable') + states.append('orphan') if not isentry: symbol = '^'
--- a/tests/test-evolve-topic.t Wed Mar 06 21:47:08 2019 +0800 +++ b/tests/test-evolve-topic.t Thu Mar 07 19:13:45 2019 +0800 @@ -126,8 +126,8 @@ $ hg stack ### topic: foo ### target: default (branch) - s4$ add fff (current unstable) - s3$ add eee (unstable) + s4$ add fff (current orphan) + s3$ add eee (orphan) s2: add ddd s1: add ccc s0^ add bbb (base) @@ -265,10 +265,10 @@ $ hg stack ### topic: bar ### target: default (branch) - s5$ add jjj (unstable) - s4$ add iii (unstable) - s3$ add hhh (unstable) - s2$ add ggg (current unstable) + s5$ add jjj (orphan) + s4$ add iii (orphan) + s3$ add hhh (orphan) + s2$ add ggg (current orphan) s1: add fff s0^ add eee (base)
--- a/tests/test-stack-branch.t Wed Mar 06 21:47:08 2019 +0800 +++ b/tests/test-stack-branch.t Thu Mar 07 19:13:45 2019 +0800 @@ -127,8 +127,8 @@ $ hg stack ### target: foo (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) @@ -136,8 +136,8 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg stack ### target: foo (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) @@ -255,8 +255,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) @@ -289,8 +289,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) @@ -300,8 +300,8 @@ s5: c_h s4: c_g s1^ c_D (base current) - s3$ c_f (unstable) - s2$ c_e (unstable) + s3$ c_f (orphan) + s2$ c_e (orphan) s1@ c_D (current) s0^ c_c (base) @@ -312,7 +312,7 @@ changed topic on 2 changesets to "sometopic" $ hg stack ### target: foo (branch) - s3$ c_f (unstable) - s2$ c_e (unstable) + s3$ c_f (orphan) + s2$ c_e (orphan) s1@ c_D (current) s0^ c_c (base)
--- a/tests/test-topic-stack-complex.t Wed Mar 06 21:47:08 2019 +0800 +++ b/tests/test-topic-stack-complex.t Thu Mar 07 19:13:45 2019 +0800 @@ -86,7 +86,7 @@ $ hg stack ### topic: foo ### target: default (branch) - s4$ Added e and f (unstable) + s4$ Added e and f (orphan) s3@ split2 (current) s2: split1 s1: Added a and b @@ -129,8 +129,8 @@ $ hg stack ### topic: foo (2 heads) ### target: default (branch), 2 behind - s4$ Added e and f (unstable) - s3$ split2 (unstable) + s4$ Added e and f (orphan) + s3$ split2 (orphan) s2@ split1 (current) s1: Added a and b s0^ Added foo (base)
--- a/tests/test-topic-stack-data.t Wed Mar 06 21:47:08 2019 +0800 +++ b/tests/test-topic-stack-data.t Thu Mar 07 19:13:45 2019 +0800 @@ -266,7 +266,7 @@ ### target: default (branch) s5: add bar_c s2^ add bar_b (base) - s4$ add bar_e (unstable) + s4$ add bar_e (orphan) s3: bar1_d s2: add bar_b s1: add bar_a @@ -276,7 +276,7 @@ ### target: default (branch) s5(9cbadf11b44d): add bar_c s2(e555c7e8c767)^ add bar_b (base) - s4(a920412b5a05)$ add bar_e (unstable) + s4(a920412b5a05)$ add bar_e (orphan) s3(6915989374b1): bar1_d s2(e555c7e8c767): add bar_b s1(a5c2b4e00bbf): add bar_a @@ -296,7 +296,7 @@ $ hg stack fuz ### topic: fuz ### target: default (branch), 1 behind - s3$ add fuz_c (unstable) - s2$ add fuz_b (unstable) + s3$ add fuz_c (orphan) + s2$ add fuz_b (orphan) s1: fuz1_a s0^ add base_d (base)
--- 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
--- a/tests/test-topic-tutorial.t Wed Mar 06 21:47:08 2019 +0800 +++ b/tests/test-topic-tutorial.t Thu Mar 07 19:13:45 2019 +0800 @@ -1358,8 +1358,8 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - s3$ Adding drill (unstable) - s2$ Adding saw (unstable) + s3$ Adding drill (orphan) + s2$ Adding saw (orphan) s1@ Adding hammer to the shopping list (current) s0^ add a pair of shoes (base) @@ -1375,7 +1375,7 @@ $ hg stack ### topic: tools ### target: default (branch), 2 behind - s3$ Adding drill (unstable) + s3$ Adding drill (orphan) s2@ Adding saw (current) s1: Adding hammer to the shopping list s0^ add a pair of shoes (base)