comparison tests/test-evolve-cycles.t @ 3716:e5ba6531503e mercurial-4.3

testcompat: update output for Mercurial 4.3 Lets of minor update + one major update to tests/test-evolve-phase-divergence.t since all hashed chance (different instability name).
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 25 Apr 2018 01:58:45 +0100
parents 98941c28f3e2
children
comparison
equal deleted inserted replaced
3715:a77fb9669e99 3716:e5ba6531503e
87 87
88 Check that debugobshistory never crash on a cycle 88 Check that debugobshistory never crash on a cycle
89 89
90 $ hg obslog "desc(A)" --hidden 90 $ hg obslog "desc(A)" --hidden
91 @ 2a34000d3544 (1) A 91 @ 2a34000d3544 (1) A
92 | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000) 92 | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
93 | 93 |
94 x a8df460dbbfe (3) C 94 x a8df460dbbfe (3) C
95 | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000) 95 | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
96 | 96 |
97 x c473644ee0e9 (2) B 97 x c473644ee0e9 (2) B
98 | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000) 98 | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
99 | 99 |
100 100
101 $ hg obslog "desc(B)" --hidden 101 $ hg obslog "desc(B)" --hidden
102 @ 2a34000d3544 (1) A 102 @ 2a34000d3544 (1) A
103 | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000) 103 | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
104 | 104 |
105 x a8df460dbbfe (3) C 105 x a8df460dbbfe (3) C
106 | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000) 106 | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
107 | 107 |
108 x c473644ee0e9 (2) B 108 x c473644ee0e9 (2) B
109 | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000) 109 | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
110 | 110 |
111 111
112 $ hg obslog "desc(C)" --hidden 112 $ hg obslog "desc(C)" --hidden
113 @ 2a34000d3544 (1) A 113 @ 2a34000d3544 (1) A
114 | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000) 114 | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
115 | 115 |
116 x a8df460dbbfe (3) C 116 x a8df460dbbfe (3) C
117 | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000) 117 | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
118 | 118 |
119 x c473644ee0e9 (2) B 119 x c473644ee0e9 (2) B
120 | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000) 120 | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
121 | 121 |
122 122
123 Check that all option don't crash on a cycle either 123 Check that all option don't crash on a cycle either
124 124
125 $ hg obslog "desc(C)" --hidden --all 125 $ hg obslog "desc(C)" --hidden --all
126 @ 2a34000d3544 (1) A 126 @ 2a34000d3544 (1) A
127 | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000) 127 | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
128 | 128 |
129 x a8df460dbbfe (3) C 129 x a8df460dbbfe (3) C
130 | rewritten as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000) 130 | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
131 | 131 |
132 x c473644ee0e9 (2) B 132 x c473644ee0e9 (2) B
133 | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000) 133 | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
134 | 134 |
135 135
136 Test with multiple cyles 136 Test with multiple cyles
137 ======================== 137 ========================
138 138
250 250
251 Check that debugobshistory never crash on a cycle 251 Check that debugobshistory never crash on a cycle
252 252
253 $ hg obslog "desc(D)" --hidden 253 $ hg obslog "desc(D)" --hidden
254 x 0da815c333f6 (5) E 254 x 0da815c333f6 (5) E
255 | rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000) 255 | rewritten(description, parent, content) as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
256 | 256 |
257 @ 868d2e0eb19c (4) D 257 @ 868d2e0eb19c (4) D
258 |\ rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000) 258 |\ rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
259 | | 259 | |
260 | x d9f908fde1a1 (6) F 260 | x d9f908fde1a1 (6) F
261 | | rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000) 261 | | rewritten(description, parent, content) as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
262 | | 262 | |
263 +---x 2a34000d3544 (1) A 263 +---x 2a34000d3544 (1) A
264 | | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000) 264 | | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
265 | | 265 | |
266 x | a8df460dbbfe (3) C 266 x | a8df460dbbfe (3) C
267 | | rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000) 267 | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
268 | | 268 | |
269 x | c473644ee0e9 (2) B 269 x | c473644ee0e9 (2) B
270 | | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000) 270 | | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
271 | | 271 | |
272 Check that all option don't crash either on a cycle 272 Check that all option don't crash either on a cycle
273 $ hg obslog --all --hidden "desc(F)" 273 $ hg obslog --all --hidden "desc(F)"
274 x 0da815c333f6 (5) E 274 x 0da815c333f6 (5) E
275 | rewritten as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000) 275 | rewritten(description, parent, content) as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
276 | 276 |
277 @ 868d2e0eb19c (4) D 277 @ 868d2e0eb19c (4) D
278 |\ rewritten as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000) 278 |\ rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
279 | | 279 | |
280 | x d9f908fde1a1 (6) F 280 | x d9f908fde1a1 (6) F
281 | | rewritten as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000) 281 | | rewritten(description, parent, content) as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
282 | | 282 | |
283 +---x 2a34000d3544 (1) A 283 +---x 2a34000d3544 (1) A
284 | | rewritten as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000) 284 | | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
285 | | 285 | |
286 x | a8df460dbbfe (3) C 286 x | a8df460dbbfe (3) C
287 | | rewritten as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000) 287 | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
288 | | 288 | |
289 x | c473644ee0e9 (2) B 289 x | c473644ee0e9 (2) B
290 | | rewritten as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000) 290 | | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
291 | | 291 | |
292 Check the json output is valid in this case 292 Check the json output is valid in this case
293 293
294 $ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool 294 $ hg obslog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool
295 [ 295 [
297 "markers": [ 297 "markers": [
298 { 298 {
299 "date": [ 299 "date": [
300 *, (glob) 300 *, (glob)
301 0 301 0
302 ],
303 "effect": [
304 *, (glob)
305 *, (glob)
306 "content"
302 ], 307 ],
303 "succnodes": [ 308 "succnodes": [
304 "0da815c333f6" 309 "0da815c333f6"
305 ], 310 ],
306 "user": "test", 311 "user": "test",
316 { 321 {
317 "date": [ 322 "date": [
318 *, (glob) 323 *, (glob)
319 0 324 0
320 ], 325 ],
326 "effect": [
327 *, (glob)
328 *, (glob)
329 "content"
330 ],
321 "succnodes": [ 331 "succnodes": [
322 "868d2e0eb19c" 332 "868d2e0eb19c"
323 ], 333 ],
324 "user": "test", 334 "user": "test",
325 "verb": "rewritten" 335 "verb": "rewritten"
331 }, 341 },
332 { 342 {
333 "markers": [ 343 "markers": [
334 { 344 {
335 "date": [ 345 "date": [
336 *, (glob) 346 0.0,
337 0 347 0
348 ],
349 "effect": [
350 "description",
351 "parent",
352 "content"
338 ], 353 ],
339 "succnodes": [ 354 "succnodes": [
340 "d9f908fde1a1" 355 "d9f908fde1a1"
341 ], 356 ],
342 "user": "test", 357 "user": "test",
349 }, 364 },
350 { 365 {
351 "markers": [ 366 "markers": [
352 { 367 {
353 "date": [ 368 "date": [
354 *, (glob) 369 0.0,
355 0 370 0
371 ],
372 "effect": [
373 "description",
374 "parent",
375 "content"
356 ], 376 ],
357 "succnodes": [ 377 "succnodes": [
358 "2a34000d3544", 378 "2a34000d3544",
359 "868d2e0eb19c" 379 "868d2e0eb19c"
360 ], 380 ],
368 }, 388 },
369 { 389 {
370 "markers": [ 390 "markers": [
371 { 391 {
372 "date": [ 392 "date": [
373 *, (glob) 393 0.0,
374 0 394 0
395 ],
396 "effect": [
397 "description",
398 "parent",
399 "content"
375 ], 400 ],
376 "succnodes": [ 401 "succnodes": [
377 "a8df460dbbfe" 402 "a8df460dbbfe"
378 ], 403 ],
379 "user": "test", 404 "user": "test",
386 }, 411 },
387 { 412 {
388 "markers": [ 413 "markers": [
389 { 414 {
390 "date": [ 415 "date": [
391 *, (glob) 416 0.0,
392 0 417 0
418 ],
419 "effect": [
420 "description",
421 "parent",
422 "content"
393 ], 423 ],
394 "succnodes": [ 424 "succnodes": [
395 "c473644ee0e9" 425 "c473644ee0e9"
396 ], 426 ],
397 "user": "test", 427 "user": "test",