comparison tests/test-topic-stack-data.t @ 2939:7759d040d48d

topic: provide more information when behind count cannot be computed The behind count has been confusing for various user and the associated error message is even worth. We try to clarify it to see if that helps.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 17 Sep 2017 19:59:25 +0200
parents 38db1466c6fb
children f63c97c01f92
comparison
equal deleted inserted replaced
2938:9872526fc39f 2939:7759d040d48d
173 verbose 173 verbose
174 174
175 $ hg topic --verbose 175 $ hg topic --verbose
176 bar (on branch: default, 5 changesets, 1 troubled, 2 heads) 176 bar (on branch: default, 5 changesets, 1 troubled, 2 heads)
177 baz (on branch: default, 2 changesets, 2 behind) 177 baz (on branch: default, 2 changesets, 2 behind)
178 * foo (on branch: lake, 2 changesets, ambiguous destination) 178 * foo (on branch: lake, 2 changesets, ambiguous destination: branch 'lake' has 2 heads)
179 fuz (on branch: default, 3 changesets, 2 troubled, 1 behind) 179 fuz (on branch: default, 3 changesets, 2 troubled, 1 behind)
180 180
181 json 181 json
182 182
183 $ hg topic -T json 183 $ hg topic -T json
219 "changesetcount": 2, 219 "changesetcount": 2,
220 "topic": "baz" 220 "topic": "baz"
221 }, 221 },
222 { 222 {
223 "active": true, 223 "active": true,
224 "behinderror": "ambiguous destination", 224 "behinderror": "ambiguous destination: branch 'lake' has 2 heads",
225 "branches+": "lake", 225 "branches+": "lake",
226 "changesetcount": 2, 226 "changesetcount": 2,
227 "topic": "foo" 227 "topic": "foo"
228 }, 228 },
229 { 229 {
265 t2: add baz_b 265 t2: add baz_b
266 t1: add baz_a 266 t1: add baz_a
267 t0^ add base_c (base) 267 t0^ add base_c (base)
268 $ hg stack foo 268 $ hg stack foo
269 ### topic: foo 269 ### topic: foo
270 ### branch: lake, ambigious rebase destination 270 ### branch: lake, ambigious rebase destination - branch 'lake' has 2 heads
271 t2@ add foo_b (current) 271 t2@ add foo_b (current)
272 t1: add foo_a 272 t1: add foo_a
273 t0^ add lake_a (base) 273 t0^ add lake_a (base)
274 $ hg stack fuz 274 $ hg stack fuz
275 ### topic: fuz 275 ### topic: fuz