comparison tests/test-evolve-cycles.t @ 2484:262d684851dc

obshistory: add the all option to obslog to show the while obs tree Add a --all option to obslog in order to display also the successors of each obs markers. It has the effect of showing a more comprehensive graph when a split or a divergence happened.
author Boris Feld <boris.feld@octobus.net>
date Tue, 23 May 2017 19:48:04 +0200
parents a147ea7fb579
children 9019d41998ab
comparison
equal deleted inserted replaced
2483:db565cc05987 2484:262d684851dc
105 x c473644ee0e9 (2) B 105 x c473644ee0e9 (2) B
106 | rewritten by test (*) as a8df460dbbfe (glob) 106 | rewritten by test (*) as a8df460dbbfe (glob)
107 | 107 |
108 108
109 $ hg obslog "desc(C)" --hidden 109 $ hg obslog "desc(C)" --hidden
110 @ 2a34000d3544 (1) A
111 | rewritten by test (*) as c473644ee0e9 (glob)
112 |
113 x a8df460dbbfe (3) C
114 | rewritten by test (*) as 2a34000d3544 (glob)
115 |
116 x c473644ee0e9 (2) B
117 | rewritten by test (*) as a8df460dbbfe (glob)
118 |
119
120 Check that all option don't crash on a cycle either
121
122 $ hg obslog "desc(C)" --hidden --all
110 @ 2a34000d3544 (1) A 123 @ 2a34000d3544 (1) A
111 | rewritten by test (*) as c473644ee0e9 (glob) 124 | rewritten by test (*) as c473644ee0e9 (glob)
112 | 125 |
113 x a8df460dbbfe (3) C 126 x a8df460dbbfe (3) C
114 | rewritten by test (*) as 2a34000d3544 (glob) 127 | rewritten by test (*) as 2a34000d3544 (glob)
245 | | rewritten by test (*) as 2a34000d3544, 868d2e0eb19c (glob) 258 | | rewritten by test (*) as 2a34000d3544, 868d2e0eb19c (glob)
246 | | 259 | |
247 x | c473644ee0e9 (2) B 260 x | c473644ee0e9 (2) B
248 | | rewritten by test (*) as a8df460dbbfe (glob) 261 | | rewritten by test (*) as a8df460dbbfe (glob)
249 | | 262 | |
250 263 Check that all option don't crash either on a cycle
264 $ hg obslog --all --hidden "desc(F)"
265 x 0da815c333f6 (5) E
266 | rewritten by test (*) as d9f908fde1a1 (glob)
267 |
268 @ 868d2e0eb19c (4) D
269 |\ rewritten by test (*) as 0da815c333f6 (glob)
270 | |
271 | x d9f908fde1a1 (6) F
272 | | rewritten by test (*) as 868d2e0eb19c (glob)
273 | |
274 +---x 2a34000d3544 (1) A
275 | | rewritten by test (*) as c473644ee0e9 (glob)
276 | |
277 x | a8df460dbbfe (3) C
278 | | rewritten by test (*) as 2a34000d3544, 868d2e0eb19c (glob)
279 | |
280 x | c473644ee0e9 (2) B
281 | | rewritten by test (*) as a8df460dbbfe (glob)
282 | |
251 Check the json output is valid in this case 283 Check the json output is valid in this case
252 284
253 $ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool 285 $ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool
254 [ 286 [
255 { 287 {
360 "debugobshistory.node": "2a34000d3544", 392 "debugobshistory.node": "2a34000d3544",
361 "debugobshistory.rev": 1, 393 "debugobshistory.rev": 1,
362 "debugobshistory.shortdescription": "A" 394 "debugobshistory.shortdescription": "A"
363 } 395 }
364 ] 396 ]
397