Mercurial > evolve

comparison tests/test-topic-stack.t @ 2626:bc36a608e9e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stack: show unstable state for the current revision if it is one (issue5553) Before this patch if the current revision is unstable, hg stack does not show the unstable state. This patch fixes that by showing both current and unstable state for the current revision if that's unstable.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 19 Jun 2017 02:50:35 +0530
parents 5737e0680f10
children 42abd3bd30ee
comparison
equal deleted inserted replaced
2625:8f2901f4749e 2626:bc36a608e9e4
186 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 186 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
187 $ hg topic --list 187 $ hg topic --list
188 ### topic: foo 188 ### topic: foo
189 ### branch: default 189 ### branch: default
190 t4$ c_f (unstable) 190 t4$ c_f (unstable)
191 t3@ c_e (current) 191 t3$ c_e (current unstable)
192 t2: c_d 192 t2: c_d
193 t1: c_c 193 t1: c_c
194 ^ c_b 194 ^ c_b
195 $ hg topic --list --color=debug 195 $ hg topic --list --color=debug
196 [topic.stack.summary.topic|### topic: [topic.active|foo]] 196 [topic.stack.summary.topic|### topic: [topic.active|foo]]
197 [topic.stack.summary.branches|### branch: default] 197 [topic.stack.summary.branches|### branch: default]
198 [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)] 198 [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)]
199 [topic.stack.index topic.stack.index.current|t3][topic.stack.state topic.stack.state.current|@] [topic.stack.desc topic.stack.desc.current|c_e][topic.stack.state topic.stack.state.current| (current)] 199 [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)]
200 [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] 200 [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d]
201 [topic.stack.index topic.stack.index.clean|t1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] 201 [topic.stack.index topic.stack.index.clean|t1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c]
202 [topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b] 202 [topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b]
203 $ hg up t2 203 $ hg up t2
204 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 204 1 files updated, 0 files merged, 1 files removed, 0 files unresolved