Mercurial > evolve
comparison tests/test-evolve-obshistory.t @ 3001:67b59d1657cf mercurial-4.2
compat-test: merge future 6.7.0 into 4.2 compat branch
Couple feature to disable and other various test impact.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 27 Sep 2017 01:07:22 +0200 |
parents | 2280461343e5 bd7e8be29542 |
children | 00e4d31b8cdb 9c9c8c1eeb93 |
comparison
equal
deleted
inserted
replaced
2808:f47ed78ab17b | 3001:67b59d1657cf |
---|---|
57 ----------- | 57 ----------- |
58 $ hg obslog --patch 4ae3a4151de9 | 58 $ hg obslog --patch 4ae3a4151de9 |
59 @ 4ae3a4151de9 (3) A1 | 59 @ 4ae3a4151de9 (3) A1 |
60 | | 60 | |
61 x 471f378eab4c (1) A0 | 61 x 471f378eab4c (1) A0 |
62 rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) | 62 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
63 --- a/471f378eab4c-changeset-description | 63 --- a/471f378eab4c-changeset-description |
64 +++ b/4ae3a4151de9-changeset-description | 64 +++ b/4ae3a4151de9-changeset-description |
65 @@ -1,1 +1,3 @@ | 65 @@ -1,1 +1,3 @@ |
66 -A0 | 66 -A0 |
67 +A1 | 67 +A1 |
74 @@ -1,1 +1,2 @@ | 74 @@ -1,1 +1,2 @@ |
75 A0 | 75 A0 |
76 +42 | 76 +42 |
77 | 77 |
78 | 78 |
79 | |
80 $ hg obslog --no-graph --patch 4ae3a4151de9 | |
81 4ae3a4151de9 (3) A1 | |
82 471f378eab4c (1) A0 | |
83 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) | |
84 --- a/471f378eab4c-changeset-description | |
85 +++ b/4ae3a4151de9-changeset-description | |
86 @@ -1,1 +1,3 @@ | |
87 -A0 | |
88 +A1 | |
89 + | |
90 +Better commit message | |
91 | |
92 diff -r 471f378eab4c -r 4ae3a4151de9 A0 | |
93 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 | |
94 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 | |
95 @@ -1,1 +1,2 @@ | |
96 A0 | |
97 +42 | |
98 | |
99 | |
100 $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' | |
101 @ A1 | |
102 | | |
103 x A0 at * by test (glob) | |
104 | |
79 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool | 105 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
80 [ | 106 [ |
81 { | 107 { |
82 "debugobshistory.markers": [], | 108 "markers": [], |
83 "debugobshistory.node": "4ae3a4151de9", | 109 "node": "4ae3a4151de9", |
84 "debugobshistory.rev": 3, | 110 "rev": 3, |
85 "debugobshistory.shortdescription": "A1" | 111 "shortdescription": "A1" |
86 }, | 112 }, |
87 { | 113 { |
88 "debugobshistory.markers": [ | 114 "markers": [ |
89 { | 115 { |
90 "debugobshistory.effect": [ | 116 "date": [ |
117 *, (glob) | |
118 0 (glob) | |
119 ], | |
120 "effect": [ | |
91 "description", | 121 "description", |
92 "content" | 122 "content" |
93 ], | 123 ], |
94 "debugobshistory.marker_date": [ | 124 "succnodes": [ |
95 *, (glob) | |
96 0 (glob) | |
97 ], | |
98 "debugobshistory.marker_user": "test", | |
99 "debugobshistory.succnodes": [ | |
100 "4ae3a4151de9" | 125 "4ae3a4151de9" |
101 ], | 126 ], |
102 "debugobshistory.verb": "rewritten" | 127 "user": "test", |
128 "verb": "rewritten" | |
103 } | 129 } |
104 ], | 130 ], |
105 "debugobshistory.node": "471f378eab4c", | 131 "node": "471f378eab4c", |
106 "debugobshistory.rev": 1, | 132 "rev": 1, |
107 "debugobshistory.shortdescription": "A0" | 133 "shortdescription": "A0" |
108 } | 134 } |
109 ] | 135 ] |
110 $ hg obslog --hidden --patch 471f378eab4c | 136 $ hg obslog --hidden --patch 471f378eab4c |
111 x 471f378eab4c (1) A0 | 137 x 471f378eab4c (1) A0 |
112 rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) | 138 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
113 --- a/471f378eab4c-changeset-description | 139 --- a/471f378eab4c-changeset-description |
114 +++ b/4ae3a4151de9-changeset-description | 140 +++ b/4ae3a4151de9-changeset-description |
115 @@ -1,1 +1,3 @@ | 141 @@ -1,1 +1,3 @@ |
116 -A0 | 142 -A0 |
117 +A1 | 143 +A1 |
127 | 153 |
128 | 154 |
129 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool | 155 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
130 [ | 156 [ |
131 { | 157 { |
132 "debugobshistory.markers": [ | 158 "markers": [ |
133 { | 159 { |
134 "debugobshistory.effect": [ | 160 "date": [ |
161 *, (glob) | |
162 0 (glob) | |
163 ], | |
164 "effect": [ | |
135 *, (glob) | 165 *, (glob) |
136 "content" | 166 "content" |
137 ], | 167 ], |
138 "debugobshistory.marker_date": [ | 168 "succnodes": [ |
139 *, (glob) | |
140 0 (glob) | |
141 ], | |
142 "debugobshistory.marker_user": "test", | |
143 "debugobshistory.succnodes": [ | |
144 "4ae3a4151de9" | 169 "4ae3a4151de9" |
145 ], | 170 ], |
146 "debugobshistory.verb": "rewritten" | 171 "user": "test", |
172 "verb": "rewritten" | |
147 } | 173 } |
148 ], | 174 ], |
149 "debugobshistory.node": "471f378eab4c", | 175 "node": "471f378eab4c", |
150 "debugobshistory.rev": 1, | 176 "rev": 1, |
151 "debugobshistory.shortdescription": "A0" | 177 "shortdescription": "A0" |
152 } | 178 } |
153 ] | 179 ] |
154 $ hg update 471f378eab4c | 180 $ hg update 471f378eab4c |
155 abort: hidden revision '471f378eab4c'! | 181 abort: hidden revision '471f378eab4c'! |
156 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) | 182 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) |
219 (No patch available yet, no successors) | 245 (No patch available yet, no successors) |
220 | 246 |
221 $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool | 247 $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool |
222 [ | 248 [ |
223 { | 249 { |
224 "debugobshistory.markers": [ | 250 "markers": [ |
225 { | 251 { |
226 "debugobshistory.marker_date": [ | 252 "date": [ |
227 *, (glob) | 253 *, (glob) |
228 0 (glob) | 254 0 (glob) |
229 ], | 255 ], |
230 "debugobshistory.marker_user": "test", | 256 "user": "test", |
231 "debugobshistory.verb": "pruned" | 257 "verb": "pruned" |
232 } | 258 } |
233 ], | 259 ], |
234 "debugobshistory.node": "0dec01379d3b", | 260 "node": "0dec01379d3b", |
235 "debugobshistory.rev": 2, | 261 "rev": 2, |
236 "debugobshistory.shortdescription": "B0" | 262 "shortdescription": "B0" |
237 } | 263 } |
238 ] | 264 ] |
239 $ hg obslog 'desc(A0)' --patch | 265 $ hg obslog 'desc(A0)' --patch |
240 @ 471f378eab4c (1) A0 | 266 @ 471f378eab4c (1) A0 |
241 | 267 |
242 $ hg obslog 'desc(A0)' --no-graph -Tjson | python -m json.tool | 268 $ hg obslog 'desc(A0)' --no-graph -Tjson | python -m json.tool |
243 [ | 269 [ |
244 { | 270 { |
245 "debugobshistory.markers": [], | 271 "markers": [], |
246 "debugobshistory.node": "471f378eab4c", | 272 "node": "471f378eab4c", |
247 "debugobshistory.rev": 1, | 273 "rev": 1, |
248 "debugobshistory.shortdescription": "A0" | 274 "shortdescription": "A0" |
249 } | 275 } |
250 ] | 276 ] |
251 $ hg up 1 | 277 $ hg up 1 |
252 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 278 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
253 $ hg up 0dec01379d3b | 279 $ hg up 0dec01379d3b |
347 ----------- | 373 ----------- |
348 | 374 |
349 Check that debugobshistory on splitted commit show both targets | 375 Check that debugobshistory on splitted commit show both targets |
350 $ hg obslog 471597cad322 --hidden --patch | 376 $ hg obslog 471597cad322 --hidden --patch |
351 x 471597cad322 (1) A0 | 377 x 471597cad322 (1) A0 |
352 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) | 378 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
353 (No patch available yet, too many successors (2)) | 379 (No patch available yet, too many successors (2)) |
354 | 380 |
355 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool | 381 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
356 [ | 382 [ |
357 { | 383 { |
358 "debugobshistory.markers": [ | 384 "markers": [ |
359 { | 385 { |
360 "debugobshistory.effect": [ | 386 "date": [ |
387 *, (glob) | |
388 0 (glob) | |
389 ], | |
390 "effect": [ | |
361 "parent", | 391 "parent", |
362 "content" | 392 "content" |
363 ], | 393 ], |
364 "debugobshistory.marker_date": [ | 394 "succnodes": [ |
365 *, (glob) | |
366 0 (glob) | |
367 ], | |
368 "debugobshistory.marker_user": "test", | |
369 "debugobshistory.succnodes": [ | |
370 "337fec4d2edc", | 395 "337fec4d2edc", |
371 "f257fde29c7a" | 396 "f257fde29c7a" |
372 ], | 397 ], |
373 "debugobshistory.verb": "rewritten" | 398 "user": "test", |
399 "verb": "rewritten" | |
374 } | 400 } |
375 ], | 401 ], |
376 "debugobshistory.node": "471597cad322", | 402 "node": "471597cad322", |
377 "debugobshistory.rev": 1, | 403 "rev": 1, |
378 "debugobshistory.shortdescription": "A0" | 404 "shortdescription": "A0" |
379 } | 405 } |
380 ] | 406 ] |
381 Check that debugobshistory on the first successor after split show | 407 Check that debugobshistory on the first successor after split show |
382 the revision plus the splitted one | 408 the revision plus the splitted one |
383 $ hg obslog 337fec4d2edc --patch | 409 $ hg obslog 337fec4d2edc --patch |
384 o 337fec4d2edc (2) A0 | 410 o 337fec4d2edc (2) A0 |
385 | | 411 | |
386 x 471597cad322 (1) A0 | 412 x 471597cad322 (1) A0 |
387 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) | 413 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
388 (No patch available yet, too many successors (2)) | 414 (No patch available yet, too many successors (2)) |
389 | 415 |
390 With the all option, it should show the three changesets | 416 With the all option, it should show the three changesets |
391 $ hg obslog --all 337fec4d2edc --patch | 417 $ hg obslog --all 337fec4d2edc --patch |
392 o 337fec4d2edc (2) A0 | 418 o 337fec4d2edc (2) A0 |
393 | | 419 | |
394 | @ f257fde29c7a (3) A0 | 420 | @ f257fde29c7a (3) A0 |
395 |/ | 421 |/ |
396 x 471597cad322 (1) A0 | 422 x 471597cad322 (1) A0 |
397 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) | 423 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
398 (No patch available yet, too many successors (2)) | 424 (No patch available yet, too many successors (2)) |
399 | 425 |
400 Check that debugobshistory on the second successor after split show | 426 Check that debugobshistory on the second successor after split show |
401 the revision plus the splitted one | 427 the revision plus the splitted one |
402 $ hg obslog f257fde29c7a --patch | 428 $ hg obslog f257fde29c7a --patch |
403 @ f257fde29c7a (3) A0 | 429 @ f257fde29c7a (3) A0 |
404 | | 430 | |
405 x 471597cad322 (1) A0 | 431 x 471597cad322 (1) A0 |
406 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) | 432 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
407 (No patch available yet, too many successors (2)) | 433 (No patch available yet, too many successors (2)) |
408 | 434 |
409 With the all option, it should show the three changesets | 435 With the all option, it should show the three changesets |
410 $ hg obslog f257fde29c7a --all --patch | 436 $ hg obslog f257fde29c7a --all --patch |
411 o 337fec4d2edc (2) A0 | 437 o 337fec4d2edc (2) A0 |
412 | | 438 | |
413 | @ f257fde29c7a (3) A0 | 439 | @ f257fde29c7a (3) A0 |
414 |/ | 440 |/ |
415 x 471597cad322 (1) A0 | 441 x 471597cad322 (1) A0 |
416 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) | 442 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
417 (No patch available yet, too many successors (2)) | 443 (No patch available yet, too many successors (2)) |
418 | 444 |
419 Obslog with all option all should also works on the splitted commit | 445 Obslog with all option all should also works on the splitted commit |
420 $ hg obslog -a 471597cad322 --hidden --patch | 446 $ hg obslog -a 471597cad322 --hidden --patch |
421 o 337fec4d2edc (2) A0 | 447 o 337fec4d2edc (2) A0 |
422 | | 448 | |
423 | @ f257fde29c7a (3) A0 | 449 | @ f257fde29c7a (3) A0 |
424 |/ | 450 |/ |
425 x 471597cad322 (1) A0 | 451 x 471597cad322 (1) A0 |
426 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) | 452 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
427 (No patch available yet, too many successors (2)) | 453 (No patch available yet, too many successors (2)) |
428 | 454 |
429 Check that debugobshistory on both successors after split show | 455 Check that debugobshistory on both successors after split show |
430 a coherent graph | 456 a coherent graph |
431 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch | 457 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
432 o 337fec4d2edc (2) A0 | 458 o 337fec4d2edc (2) A0 |
433 | | 459 | |
434 | @ f257fde29c7a (3) A0 | 460 | @ f257fde29c7a (3) A0 |
435 |/ | 461 |/ |
436 x 471597cad322 (1) A0 | 462 x 471597cad322 (1) A0 |
437 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) | 463 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
438 (No patch available yet, too many successors (2)) | 464 (No patch available yet, too many successors (2)) |
439 | 465 |
440 $ hg update 471597cad322 | 466 $ hg update 471597cad322 |
441 abort: hidden revision '471597cad322'! | 467 abort: hidden revision '471597cad322'! |
442 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) | 468 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
599 Actual test | 625 Actual test |
600 ----------- | 626 ----------- |
601 | 627 |
602 $ hg obslog de7290d8b885 --hidden --patch | 628 $ hg obslog de7290d8b885 --hidden --patch |
603 x de7290d8b885 (1) A0 | 629 x de7290d8b885 (1) A0 |
604 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) | 630 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
605 (No patch available yet, too many successors (4)) | 631 (No patch available yet, too many successors (4)) |
606 | 632 |
607 $ hg obslog de7290d8b885 --hidden --all --patch | 633 $ hg obslog de7290d8b885 --hidden --all --patch |
608 o 1ae8bc733a14 (4) A0 | 634 o 1ae8bc733a14 (4) A0 |
609 | | 635 | |
612 | @ c7f044602e9b (5) A0 | 638 | @ c7f044602e9b (5) A0 |
613 |/ | 639 |/ |
614 | o f257fde29c7a (3) A0 | 640 | o f257fde29c7a (3) A0 |
615 |/ | 641 |/ |
616 x de7290d8b885 (1) A0 | 642 x de7290d8b885 (1) A0 |
617 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) | 643 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
618 (No patch available yet, too many successors (4)) | 644 (No patch available yet, too many successors (4)) |
619 | 645 |
620 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool | 646 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
621 [ | 647 [ |
622 { | 648 { |
623 "debugobshistory.markers": [ | 649 "markers": [ |
624 { | 650 { |
625 "debugobshistory.effect": [ | 651 "date": [ |
652 *, (glob) | |
653 0 (glob) | |
654 ], | |
655 "effect": [ | |
626 "parent", | 656 "parent", |
627 "content" | 657 "content" |
628 ], | 658 ], |
629 "debugobshistory.marker_date": [ | 659 "succnodes": [ |
630 *, (glob) | |
631 0 (glob) | |
632 ], | |
633 "debugobshistory.marker_user": "test", | |
634 "debugobshistory.succnodes": [ | |
635 "1ae8bc733a14", | 660 "1ae8bc733a14", |
636 "337fec4d2edc", | 661 "337fec4d2edc", |
637 "c7f044602e9b", | 662 "c7f044602e9b", |
638 "f257fde29c7a" | 663 "f257fde29c7a" |
639 ], | 664 ], |
640 "debugobshistory.verb": "rewritten" | 665 "user": "test", |
666 "verb": "rewritten" | |
641 } | 667 } |
642 ], | 668 ], |
643 "debugobshistory.node": "de7290d8b885", | 669 "node": "de7290d8b885", |
644 "debugobshistory.rev": 1, | 670 "rev": 1, |
645 "debugobshistory.shortdescription": "A0" | 671 "shortdescription": "A0" |
646 } | 672 } |
647 ] | 673 ] |
648 $ hg obslog c7f044602e9b --patch | 674 $ hg obslog c7f044602e9b --patch |
649 @ c7f044602e9b (5) A0 | 675 @ c7f044602e9b (5) A0 |
650 | | 676 | |
651 x de7290d8b885 (1) A0 | 677 x de7290d8b885 (1) A0 |
652 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) | 678 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
653 (No patch available yet, too many successors (4)) | 679 (No patch available yet, too many successors (4)) |
654 | 680 |
655 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool | 681 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
656 [ | 682 [ |
657 { | 683 { |
658 "debugobshistory.markers": [], | 684 "markers": [], |
659 "debugobshistory.node": "c7f044602e9b", | 685 "node": "c7f044602e9b", |
660 "debugobshistory.rev": 5, | 686 "rev": 5, |
661 "debugobshistory.shortdescription": "A0" | 687 "shortdescription": "A0" |
662 }, | 688 }, |
663 { | 689 { |
664 "debugobshistory.markers": [ | 690 "markers": [ |
665 { | 691 { |
666 "debugobshistory.effect": [ | 692 "date": [ |
693 *, (glob) | |
694 0 (glob) | |
695 ], | |
696 "effect": [ | |
667 "parent", | 697 "parent", |
668 "content" | 698 "content" |
669 ], | 699 ], |
670 "debugobshistory.marker_date": [ | 700 "succnodes": [ |
671 *, (glob) | |
672 0 (glob) | |
673 ], | |
674 "debugobshistory.marker_user": "test", | |
675 "debugobshistory.succnodes": [ | |
676 "1ae8bc733a14", | 701 "1ae8bc733a14", |
677 "337fec4d2edc", | 702 "337fec4d2edc", |
678 "c7f044602e9b", | 703 "c7f044602e9b", |
679 "f257fde29c7a" | 704 "f257fde29c7a" |
680 ], | 705 ], |
681 "debugobshistory.verb": "rewritten" | 706 "user": "test", |
707 "verb": "rewritten" | |
682 } | 708 } |
683 ], | 709 ], |
684 "debugobshistory.node": "de7290d8b885", | 710 "node": "de7290d8b885", |
685 "debugobshistory.rev": 1, | 711 "rev": 1, |
686 "debugobshistory.shortdescription": "A0" | 712 "shortdescription": "A0" |
687 } | 713 } |
688 ] | 714 ] |
689 Check that debugobshistory on all heads show a coherent graph | 715 Check that debugobshistory on all heads show a coherent graph |
690 $ hg obslog 2::5 --patch | 716 $ hg obslog 2::5 --patch |
691 o 1ae8bc733a14 (4) A0 | 717 o 1ae8bc733a14 (4) A0 |
695 | @ c7f044602e9b (5) A0 | 721 | @ c7f044602e9b (5) A0 |
696 |/ | 722 |/ |
697 | o f257fde29c7a (3) A0 | 723 | o f257fde29c7a (3) A0 |
698 |/ | 724 |/ |
699 x de7290d8b885 (1) A0 | 725 x de7290d8b885 (1) A0 |
700 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) | 726 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
701 (No patch available yet, too many successors (4)) | 727 (No patch available yet, too many successors (4)) |
702 | 728 |
703 $ hg obslog 5 --all --patch | 729 $ hg obslog 5 --all --patch |
704 o 1ae8bc733a14 (4) A0 | 730 o 1ae8bc733a14 (4) A0 |
705 | | 731 | |
708 | @ c7f044602e9b (5) A0 | 734 | @ c7f044602e9b (5) A0 |
709 |/ | 735 |/ |
710 | o f257fde29c7a (3) A0 | 736 | o f257fde29c7a (3) A0 |
711 |/ | 737 |/ |
712 x de7290d8b885 (1) A0 | 738 x de7290d8b885 (1) A0 |
713 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) | 739 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
714 (No patch available yet, too many successors (4)) | 740 (No patch available yet, too many successors (4)) |
715 | 741 |
716 $ hg update de7290d8b885 | 742 $ hg update de7290d8b885 |
717 abort: hidden revision 'de7290d8b885'! | 743 abort: hidden revision 'de7290d8b885'! |
718 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) | 744 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
781 | 807 |
782 Check that debugobshistory on the first folded revision show only | 808 Check that debugobshistory on the first folded revision show only |
783 the revision with the target | 809 the revision with the target |
784 $ hg obslog --hidden 471f378eab4c --patch | 810 $ hg obslog --hidden 471f378eab4c --patch |
785 x 471f378eab4c (1) A0 | 811 x 471f378eab4c (1) A0 |
786 rewritten(description, content) by test (*) as eb5a0daa2192 (glob) | 812 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
787 --- a/471f378eab4c-changeset-description | 813 --- a/471f378eab4c-changeset-description |
788 +++ b/eb5a0daa2192-changeset-description | 814 +++ b/eb5a0daa2192-changeset-description |
789 @@ -1,1 +1,1 @@ | 815 @@ -1,1 +1,1 @@ |
790 -A0 | 816 -A0 |
791 +C0 | 817 +C0 |
800 Check that with all option, all changesets are shown | 826 Check that with all option, all changesets are shown |
801 $ hg obslog --hidden --all 471f378eab4c --patch | 827 $ hg obslog --hidden --all 471f378eab4c --patch |
802 @ eb5a0daa2192 (3) C0 | 828 @ eb5a0daa2192 (3) C0 |
803 |\ | 829 |\ |
804 x | 0dec01379d3b (2) B0 | 830 x | 0dec01379d3b (2) B0 |
805 / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) | 831 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
806 | (No patch available yet, changesets rebased) | 832 | (No patch available yet, changesets rebased) |
807 | | 833 | |
808 x 471f378eab4c (1) A0 | 834 x 471f378eab4c (1) A0 |
809 rewritten(description, content) by test (*) as eb5a0daa2192 (glob) | 835 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
810 --- a/471f378eab4c-changeset-description | 836 --- a/471f378eab4c-changeset-description |
811 +++ b/eb5a0daa2192-changeset-description | 837 +++ b/eb5a0daa2192-changeset-description |
812 @@ -1,1 +1,1 @@ | 838 @@ -1,1 +1,1 @@ |
813 -A0 | 839 -A0 |
814 +C0 | 840 +C0 |
822 | 848 |
823 Check that debugobshistory on the second folded revision show only | 849 Check that debugobshistory on the second folded revision show only |
824 the revision with the target | 850 the revision with the target |
825 $ hg obslog --hidden 0dec01379d3b --patch | 851 $ hg obslog --hidden 0dec01379d3b --patch |
826 x 0dec01379d3b (2) B0 | 852 x 0dec01379d3b (2) B0 |
827 rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) | 853 rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
828 (No patch available yet, changesets rebased) | 854 (No patch available yet, changesets rebased) |
829 | 855 |
830 Check that with all option, all changesets are shown | 856 Check that with all option, all changesets are shown |
831 $ hg obslog --hidden --all 0dec01379d3b --patch | 857 $ hg obslog --hidden --all 0dec01379d3b --patch |
832 @ eb5a0daa2192 (3) C0 | 858 @ eb5a0daa2192 (3) C0 |
833 |\ | 859 |\ |
834 x | 0dec01379d3b (2) B0 | 860 x | 0dec01379d3b (2) B0 |
835 / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) | 861 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
836 | (No patch available yet, changesets rebased) | 862 | (No patch available yet, changesets rebased) |
837 | | 863 | |
838 x 471f378eab4c (1) A0 | 864 x 471f378eab4c (1) A0 |
839 rewritten(description, content) by test (*) as eb5a0daa2192 (glob) | 865 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
840 --- a/471f378eab4c-changeset-description | 866 --- a/471f378eab4c-changeset-description |
841 +++ b/eb5a0daa2192-changeset-description | 867 +++ b/eb5a0daa2192-changeset-description |
842 @@ -1,1 +1,1 @@ | 868 @@ -1,1 +1,1 @@ |
843 -A0 | 869 -A0 |
844 +C0 | 870 +C0 |
854 graph | 880 graph |
855 $ hg obslog eb5a0daa2192 --patch | 881 $ hg obslog eb5a0daa2192 --patch |
856 @ eb5a0daa2192 (3) C0 | 882 @ eb5a0daa2192 (3) C0 |
857 |\ | 883 |\ |
858 x | 0dec01379d3b (2) B0 | 884 x | 0dec01379d3b (2) B0 |
859 / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) | 885 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
860 | (No patch available yet, changesets rebased) | 886 | (No patch available yet, changesets rebased) |
861 | | 887 | |
862 x 471f378eab4c (1) A0 | 888 x 471f378eab4c (1) A0 |
863 rewritten(description, content) by test (*) as eb5a0daa2192 (glob) | 889 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
864 --- a/471f378eab4c-changeset-description | 890 --- a/471f378eab4c-changeset-description |
865 +++ b/eb5a0daa2192-changeset-description | 891 +++ b/eb5a0daa2192-changeset-description |
866 @@ -1,1 +1,1 @@ | 892 @@ -1,1 +1,1 @@ |
867 -A0 | 893 -A0 |
868 +C0 | 894 +C0 |
875 | 901 |
876 | 902 |
877 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool | 903 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
878 [ | 904 [ |
879 { | 905 { |
880 "debugobshistory.markers": [], | 906 "markers": [], |
881 "debugobshistory.node": "eb5a0daa2192", | 907 "node": "eb5a0daa2192", |
882 "debugobshistory.rev": 3, | 908 "rev": 3, |
883 "debugobshistory.shortdescription": "C0" | 909 "shortdescription": "C0" |
884 }, | 910 }, |
885 { | 911 { |
886 "debugobshistory.markers": [ | 912 "markers": [ |
887 { | 913 { |
888 "debugobshistory.effect": [ | 914 "date": [ |
889 "description", | 915 *, (glob) |
916 0 (glob) | |
917 ], | |
918 "effect": [ | |
919 *, (glob) | |
890 "content" | 920 "content" |
891 ], | 921 ], |
892 "debugobshistory.marker_date": [ | 922 "succnodes": [ |
893 *, (glob) | |
894 0 (glob) | |
895 ], | |
896 "debugobshistory.marker_user": "test", | |
897 "debugobshistory.succnodes": [ | |
898 "eb5a0daa2192" | 923 "eb5a0daa2192" |
899 ], | 924 ], |
900 "debugobshistory.verb": "rewritten" | 925 "user": "test", |
926 "verb": "rewritten" | |
901 } | 927 } |
902 ], | 928 ], |
903 "debugobshistory.node": "471f378eab4c", | 929 "node": "471f378eab4c", |
904 "debugobshistory.rev": 1, | 930 "rev": 1, |
905 "debugobshistory.shortdescription": "A0" | 931 "shortdescription": "A0" |
906 }, | 932 }, |
907 { | 933 { |
908 "debugobshistory.markers": [ | 934 "markers": [ |
909 { | 935 { |
910 "debugobshistory.effect": [ | 936 "date": [ |
937 *, (glob) | |
938 0 (glob) | |
939 ], | |
940 "effect": [ | |
911 "description", | 941 "description", |
912 "parent", | 942 "parent", |
913 "content" | 943 "content" |
914 ], | 944 ], |
915 "debugobshistory.marker_date": [ | 945 "succnodes": [ |
916 *, (glob) | |
917 0 (glob) | |
918 ], | |
919 "debugobshistory.marker_user": "test", | |
920 "debugobshistory.succnodes": [ | |
921 "eb5a0daa2192" | 946 "eb5a0daa2192" |
922 ], | 947 ], |
923 "debugobshistory.verb": "rewritten" | 948 "user": "test", |
949 "verb": "rewritten" | |
924 } | 950 } |
925 ], | 951 ], |
926 "debugobshistory.node": "0dec01379d3b", | 952 "node": "0dec01379d3b", |
927 "debugobshistory.rev": 2, | 953 "rev": 2, |
928 "debugobshistory.shortdescription": "B0" | 954 "shortdescription": "B0" |
929 } | 955 } |
930 ] | 956 ] |
931 $ hg update 471f378eab4c | 957 $ hg update 471f378eab4c |
932 abort: hidden revision '471f378eab4c'! | 958 abort: hidden revision '471f378eab4c'! |
933 (use --hidden to access hidden revisions; successor: eb5a0daa2192) | 959 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1012 ----------- | 1038 ----------- |
1013 | 1039 |
1014 Check that debugobshistory on the divergent revision show both destinations | 1040 Check that debugobshistory on the divergent revision show both destinations |
1015 $ hg obslog --hidden 471f378eab4c --patch | 1041 $ hg obslog --hidden 471f378eab4c --patch |
1016 x 471f378eab4c (1) A0 | 1042 x 471f378eab4c (1) A0 |
1017 rewritten(description) by test (*) as 65b757b745b9 (glob) | 1043 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1018 --- a/471f378eab4c-changeset-description | 1044 --- a/471f378eab4c-changeset-description |
1019 +++ b/65b757b745b9-changeset-description | 1045 +++ b/65b757b745b9-changeset-description |
1020 @@ -1,1 +1,1 @@ | 1046 @@ -1,1 +1,1 @@ |
1021 -A0 | 1047 -A0 |
1022 +A2 | 1048 +A2 |
1023 | 1049 |
1024 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1050 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1025 --- a/471f378eab4c-changeset-description | 1051 --- a/471f378eab4c-changeset-description |
1026 +++ b/fdf9bde5129a-changeset-description | 1052 +++ b/fdf9bde5129a-changeset-description |
1027 @@ -1,1 +1,1 @@ | 1053 @@ -1,1 +1,1 @@ |
1028 -A0 | 1054 -A0 |
1029 +A1 | 1055 +A1 |
1035 @ 65b757b745b9 (3) A2 | 1061 @ 65b757b745b9 (3) A2 |
1036 | | 1062 | |
1037 | o fdf9bde5129a (2) A1 | 1063 | o fdf9bde5129a (2) A1 |
1038 |/ | 1064 |/ |
1039 x 471f378eab4c (1) A0 | 1065 x 471f378eab4c (1) A0 |
1040 rewritten(description) by test (*) as 65b757b745b9 (glob) | 1066 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1041 --- a/471f378eab4c-changeset-description | 1067 --- a/471f378eab4c-changeset-description |
1042 +++ b/65b757b745b9-changeset-description | 1068 +++ b/65b757b745b9-changeset-description |
1043 @@ -1,1 +1,1 @@ | 1069 @@ -1,1 +1,1 @@ |
1044 -A0 | 1070 -A0 |
1045 +A2 | 1071 +A2 |
1046 | 1072 |
1047 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1073 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1048 --- a/471f378eab4c-changeset-description | 1074 --- a/471f378eab4c-changeset-description |
1049 +++ b/fdf9bde5129a-changeset-description | 1075 +++ b/fdf9bde5129a-changeset-description |
1050 @@ -1,1 +1,1 @@ | 1076 @@ -1,1 +1,1 @@ |
1051 -A0 | 1077 -A0 |
1052 +A1 | 1078 +A1 |
1053 | 1079 |
1054 | 1080 |
1055 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool | 1081 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
1056 [ | 1082 [ |
1057 { | 1083 { |
1058 "debugobshistory.markers": [ | 1084 "markers": [ |
1059 { | 1085 { |
1060 "debugobshistory.effect": [ | 1086 "date": [ |
1087 *, (glob) | |
1088 0 (glob) | |
1089 ], | |
1090 "effect": [ | |
1061 "description" | 1091 "description" |
1062 ], | 1092 ], |
1063 "debugobshistory.marker_date": [ | 1093 "succnodes": [ |
1064 *, (glob) | |
1065 0 (glob) | |
1066 ], | |
1067 "debugobshistory.marker_user": "test", | |
1068 "debugobshistory.succnodes": [ | |
1069 "65b757b745b9" | 1094 "65b757b745b9" |
1070 ], | 1095 ], |
1071 "debugobshistory.verb": "rewritten" | 1096 "user": "test", |
1097 "verb": "rewritten" | |
1072 }, | 1098 }, |
1073 { | 1099 { |
1074 "debugobshistory.effect": [ | 1100 "date": [ |
1101 *, (glob) | |
1102 0 (glob) | |
1103 ], | |
1104 "effect": [ | |
1075 "description" | 1105 "description" |
1076 ], | 1106 ], |
1077 "debugobshistory.marker_date": [ | 1107 "succnodes": [ |
1078 *, (glob) | |
1079 0 (glob) | |
1080 ], | |
1081 "debugobshistory.marker_user": "test", | |
1082 "debugobshistory.succnodes": [ | |
1083 "fdf9bde5129a" | 1108 "fdf9bde5129a" |
1084 ], | 1109 ], |
1085 "debugobshistory.verb": "rewritten" | 1110 "user": "test", |
1111 "verb": "rewritten" | |
1086 } | 1112 } |
1087 ], | 1113 ], |
1088 "debugobshistory.node": "471f378eab4c", | 1114 "node": "471f378eab4c", |
1089 "debugobshistory.rev": 1, | 1115 "rev": 1, |
1090 "debugobshistory.shortdescription": "A0" | 1116 "shortdescription": "A0" |
1091 } | 1117 } |
1092 ] | 1118 ] |
1093 Check that debugobshistory on the first diverged revision show the revision | 1119 Check that debugobshistory on the first diverged revision show the revision |
1094 and the diverent one | 1120 and the diverent one |
1095 $ hg obslog fdf9bde5129a --patch | 1121 $ hg obslog fdf9bde5129a --patch |
1096 o fdf9bde5129a (2) A1 | 1122 o fdf9bde5129a (2) A1 |
1097 | | 1123 | |
1098 x 471f378eab4c (1) A0 | 1124 x 471f378eab4c (1) A0 |
1099 rewritten(description) by test (*) as 65b757b745b9 (glob) | 1125 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1100 --- a/471f378eab4c-changeset-description | 1126 --- a/471f378eab4c-changeset-description |
1101 +++ b/65b757b745b9-changeset-description | 1127 +++ b/65b757b745b9-changeset-description |
1102 @@ -1,1 +1,1 @@ | 1128 @@ -1,1 +1,1 @@ |
1103 -A0 | 1129 -A0 |
1104 +A2 | 1130 +A2 |
1105 | 1131 |
1106 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1132 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1107 --- a/471f378eab4c-changeset-description | 1133 --- a/471f378eab4c-changeset-description |
1108 +++ b/fdf9bde5129a-changeset-description | 1134 +++ b/fdf9bde5129a-changeset-description |
1109 @@ -1,1 +1,1 @@ | 1135 @@ -1,1 +1,1 @@ |
1110 -A0 | 1136 -A0 |
1111 +A1 | 1137 +A1 |
1117 @ 65b757b745b9 (3) A2 | 1143 @ 65b757b745b9 (3) A2 |
1118 | | 1144 | |
1119 | o fdf9bde5129a (2) A1 | 1145 | o fdf9bde5129a (2) A1 |
1120 |/ | 1146 |/ |
1121 x 471f378eab4c (1) A0 | 1147 x 471f378eab4c (1) A0 |
1122 rewritten(description) by test (*) as 65b757b745b9 (glob) | 1148 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1123 --- a/471f378eab4c-changeset-description | 1149 --- a/471f378eab4c-changeset-description |
1124 +++ b/65b757b745b9-changeset-description | 1150 +++ b/65b757b745b9-changeset-description |
1125 @@ -1,1 +1,1 @@ | 1151 @@ -1,1 +1,1 @@ |
1126 -A0 | 1152 -A0 |
1127 +A2 | 1153 +A2 |
1128 | 1154 |
1129 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1155 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1130 --- a/471f378eab4c-changeset-description | 1156 --- a/471f378eab4c-changeset-description |
1131 +++ b/fdf9bde5129a-changeset-description | 1157 +++ b/fdf9bde5129a-changeset-description |
1132 @@ -1,1 +1,1 @@ | 1158 @@ -1,1 +1,1 @@ |
1133 -A0 | 1159 -A0 |
1134 +A1 | 1160 +A1 |
1138 and the diverent one | 1164 and the diverent one |
1139 $ hg obslog 65b757b745b9 --patch | 1165 $ hg obslog 65b757b745b9 --patch |
1140 @ 65b757b745b9 (3) A2 | 1166 @ 65b757b745b9 (3) A2 |
1141 | | 1167 | |
1142 x 471f378eab4c (1) A0 | 1168 x 471f378eab4c (1) A0 |
1143 rewritten(description) by test (*) as 65b757b745b9 (glob) | 1169 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1144 --- a/471f378eab4c-changeset-description | 1170 --- a/471f378eab4c-changeset-description |
1145 +++ b/65b757b745b9-changeset-description | 1171 +++ b/65b757b745b9-changeset-description |
1146 @@ -1,1 +1,1 @@ | 1172 @@ -1,1 +1,1 @@ |
1147 -A0 | 1173 -A0 |
1148 +A2 | 1174 +A2 |
1149 | 1175 |
1150 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1176 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1151 --- a/471f378eab4c-changeset-description | 1177 --- a/471f378eab4c-changeset-description |
1152 +++ b/fdf9bde5129a-changeset-description | 1178 +++ b/fdf9bde5129a-changeset-description |
1153 @@ -1,1 +1,1 @@ | 1179 @@ -1,1 +1,1 @@ |
1154 -A0 | 1180 -A0 |
1155 +A1 | 1181 +A1 |
1160 @ 65b757b745b9 (3) A2 | 1186 @ 65b757b745b9 (3) A2 |
1161 | | 1187 | |
1162 | o fdf9bde5129a (2) A1 | 1188 | o fdf9bde5129a (2) A1 |
1163 |/ | 1189 |/ |
1164 x 471f378eab4c (1) A0 | 1190 x 471f378eab4c (1) A0 |
1165 rewritten(description) by test (*) as 65b757b745b9 (glob) | 1191 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1166 --- a/471f378eab4c-changeset-description | 1192 --- a/471f378eab4c-changeset-description |
1167 +++ b/65b757b745b9-changeset-description | 1193 +++ b/65b757b745b9-changeset-description |
1168 @@ -1,1 +1,1 @@ | 1194 @@ -1,1 +1,1 @@ |
1169 -A0 | 1195 -A0 |
1170 +A2 | 1196 +A2 |
1171 | 1197 |
1172 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1198 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1173 --- a/471f378eab4c-changeset-description | 1199 --- a/471f378eab4c-changeset-description |
1174 +++ b/fdf9bde5129a-changeset-description | 1200 +++ b/fdf9bde5129a-changeset-description |
1175 @@ -1,1 +1,1 @@ | 1201 @@ -1,1 +1,1 @@ |
1176 -A0 | 1202 -A0 |
1177 +A1 | 1203 +A1 |
1183 @ 65b757b745b9 (3) A2 | 1209 @ 65b757b745b9 (3) A2 |
1184 | | 1210 | |
1185 | o fdf9bde5129a (2) A1 | 1211 | o fdf9bde5129a (2) A1 |
1186 |/ | 1212 |/ |
1187 x 471f378eab4c (1) A0 | 1213 x 471f378eab4c (1) A0 |
1188 rewritten(description) by test (*) as 65b757b745b9 (glob) | 1214 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1189 --- a/471f378eab4c-changeset-description | 1215 --- a/471f378eab4c-changeset-description |
1190 +++ b/65b757b745b9-changeset-description | 1216 +++ b/65b757b745b9-changeset-description |
1191 @@ -1,1 +1,1 @@ | 1217 @@ -1,1 +1,1 @@ |
1192 -A0 | 1218 -A0 |
1193 +A2 | 1219 +A2 |
1194 | 1220 |
1195 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1221 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1196 --- a/471f378eab4c-changeset-description | 1222 --- a/471f378eab4c-changeset-description |
1197 +++ b/fdf9bde5129a-changeset-description | 1223 +++ b/fdf9bde5129a-changeset-description |
1198 @@ -1,1 +1,1 @@ | 1224 @@ -1,1 +1,1 @@ |
1199 -A0 | 1225 -A0 |
1200 +A1 | 1226 +A1 |
1201 | 1227 |
1202 | 1228 |
1203 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool | 1229 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool |
1204 [ | 1230 [ |
1205 { | 1231 { |
1206 "debugobshistory.markers": [], | 1232 "markers": [], |
1207 "debugobshistory.node": "65b757b745b9", | 1233 "node": "65b757b745b9", |
1208 "debugobshistory.rev": 3, | 1234 "rev": 3, |
1209 "debugobshistory.shortdescription": "A2" | 1235 "shortdescription": "A2" |
1210 }, | 1236 }, |
1211 { | 1237 { |
1212 "debugobshistory.markers": [ | 1238 "markers": [ |
1213 { | 1239 { |
1214 "debugobshistory.effect": [ | 1240 "date": [ |
1241 *, (glob) | |
1242 0 (glob) | |
1243 ], | |
1244 "effect": [ | |
1215 "description" | 1245 "description" |
1216 ], | 1246 ], |
1217 "debugobshistory.marker_date": [ | 1247 "succnodes": [ |
1218 *, (glob) | |
1219 0 (glob) | |
1220 ], | |
1221 "debugobshistory.marker_user": "test", | |
1222 "debugobshistory.succnodes": [ | |
1223 "65b757b745b9" | 1248 "65b757b745b9" |
1224 ], | 1249 ], |
1225 "debugobshistory.verb": "rewritten" | 1250 "user": "test", |
1251 "verb": "rewritten" | |
1226 }, | 1252 }, |
1227 { | 1253 { |
1228 "debugobshistory.effect": [ | 1254 "date": [ |
1255 *, (glob) | |
1256 0 (glob) | |
1257 ], | |
1258 "effect": [ | |
1229 "description" | 1259 "description" |
1230 ], | 1260 ], |
1231 "debugobshistory.marker_date": [ | 1261 "succnodes": [ |
1232 *, (glob) | |
1233 0 (glob) | |
1234 ], | |
1235 "debugobshistory.marker_user": "test", | |
1236 "debugobshistory.succnodes": [ | |
1237 "fdf9bde5129a" | 1262 "fdf9bde5129a" |
1238 ], | 1263 ], |
1239 "debugobshistory.verb": "rewritten" | 1264 "user": "test", |
1265 "verb": "rewritten" | |
1240 } | 1266 } |
1241 ], | 1267 ], |
1242 "debugobshistory.node": "471f378eab4c", | 1268 "node": "471f378eab4c", |
1243 "debugobshistory.rev": 1, | 1269 "rev": 1, |
1244 "debugobshistory.shortdescription": "A0" | 1270 "shortdescription": "A0" |
1245 }, | 1271 }, |
1246 { | 1272 { |
1247 "debugobshistory.markers": [], | 1273 "markers": [], |
1248 "debugobshistory.node": "fdf9bde5129a", | 1274 "node": "fdf9bde5129a", |
1249 "debugobshistory.rev": 2, | 1275 "rev": 2, |
1250 "debugobshistory.shortdescription": "A1" | 1276 "shortdescription": "A1" |
1251 } | 1277 } |
1252 ] | 1278 ] |
1253 $ hg update 471f378eab4c | 1279 $ hg update 471f378eab4c |
1254 abort: hidden revision '471f378eab4c'! | 1280 abort: hidden revision '471f378eab4c'! |
1255 (use --hidden to access hidden revisions; diverged) | 1281 (use --hidden to access hidden revisions; diverged) |
1256 [255] | 1282 [255] |
1257 $ hg update --hidden 'desc(A0)' | 1283 $ hg update --hidden 'desc(A0)' |
1258 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1284 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1259 working directory parent is obsolete! (471f378eab4c) | 1285 working directory parent is obsolete! (471f378eab4c) |
1260 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) | 1286 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
1261 | 1287 |
1262 Test output with amended + folded commit | 1288 Test output with amended + folded commit |
1263 ======================================== | 1289 ======================================== |
1264 | 1290 |
1265 Test setup | 1291 Test setup |
1332 Check that debugobshistory on head show a coherent graph | 1358 Check that debugobshistory on head show a coherent graph |
1333 $ hg obslog eb5a0daa2192 --patch | 1359 $ hg obslog eb5a0daa2192 --patch |
1334 @ eb5a0daa2192 (4) C0 | 1360 @ eb5a0daa2192 (4) C0 |
1335 |\ | 1361 |\ |
1336 x | 471f378eab4c (1) A0 | 1362 x | 471f378eab4c (1) A0 |
1337 / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) | 1363 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1338 | --- a/471f378eab4c-changeset-description | 1364 | --- a/471f378eab4c-changeset-description |
1339 | +++ b/eb5a0daa2192-changeset-description | 1365 | +++ b/eb5a0daa2192-changeset-description |
1340 | @@ -1,1 +1,1 @@ | 1366 | @@ -1,1 +1,1 @@ |
1341 | -A0 | 1367 | -A0 |
1342 | +C0 | 1368 | +C0 |
1347 | @@ -0,0 +1,1 @@ | 1373 | @@ -0,0 +1,1 @@ |
1348 | +B0 | 1374 | +B0 |
1349 | | 1375 | |
1350 | | 1376 | |
1351 x b7ea6d14e664 (3) B1 | 1377 x b7ea6d14e664 (3) B1 |
1352 | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) | 1378 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1353 | (No patch available yet, changesets rebased) | 1379 | (No patch available yet, changesets rebased) |
1354 | | 1380 | |
1355 x 0dec01379d3b (2) B0 | 1381 x 0dec01379d3b (2) B0 |
1356 rewritten(description) by test (*) as b7ea6d14e664 (glob) | 1382 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1357 --- a/0dec01379d3b-changeset-description | 1383 --- a/0dec01379d3b-changeset-description |
1358 +++ b/b7ea6d14e664-changeset-description | 1384 +++ b/b7ea6d14e664-changeset-description |
1359 @@ -1,1 +1,1 @@ | 1385 @@ -1,1 +1,1 @@ |
1360 -B0 | 1386 -B0 |
1361 +B1 | 1387 +B1 |
1364 Check that obslog on ROOT with all option show everything | 1390 Check that obslog on ROOT with all option show everything |
1365 $ hg obslog 1 --hidden --all --patch | 1391 $ hg obslog 1 --hidden --all --patch |
1366 @ eb5a0daa2192 (4) C0 | 1392 @ eb5a0daa2192 (4) C0 |
1367 |\ | 1393 |\ |
1368 x | 471f378eab4c (1) A0 | 1394 x | 471f378eab4c (1) A0 |
1369 / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) | 1395 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1370 | --- a/471f378eab4c-changeset-description | 1396 | --- a/471f378eab4c-changeset-description |
1371 | +++ b/eb5a0daa2192-changeset-description | 1397 | +++ b/eb5a0daa2192-changeset-description |
1372 | @@ -1,1 +1,1 @@ | 1398 | @@ -1,1 +1,1 @@ |
1373 | -A0 | 1399 | -A0 |
1374 | +C0 | 1400 | +C0 |
1379 | @@ -0,0 +1,1 @@ | 1405 | @@ -0,0 +1,1 @@ |
1380 | +B0 | 1406 | +B0 |
1381 | | 1407 | |
1382 | | 1408 | |
1383 x b7ea6d14e664 (3) B1 | 1409 x b7ea6d14e664 (3) B1 |
1384 | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) | 1410 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1385 | (No patch available yet, changesets rebased) | 1411 | (No patch available yet, changesets rebased) |
1386 | | 1412 | |
1387 x 0dec01379d3b (2) B0 | 1413 x 0dec01379d3b (2) B0 |
1388 rewritten(description) by test (*) as b7ea6d14e664 (glob) | 1414 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1389 --- a/0dec01379d3b-changeset-description | 1415 --- a/0dec01379d3b-changeset-description |
1390 +++ b/b7ea6d14e664-changeset-description | 1416 +++ b/b7ea6d14e664-changeset-description |
1391 @@ -1,1 +1,1 @@ | 1417 @@ -1,1 +1,1 @@ |
1392 -B0 | 1418 -B0 |
1393 +B1 | 1419 +B1 |
1394 | 1420 |
1395 | 1421 |
1396 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool | 1422 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
1397 [ | 1423 [ |
1398 { | 1424 { |
1399 "debugobshistory.markers": [], | 1425 "markers": [], |
1400 "debugobshistory.node": "eb5a0daa2192", | 1426 "node": "eb5a0daa2192", |
1401 "debugobshistory.rev": 4, | 1427 "rev": 4, |
1402 "debugobshistory.shortdescription": "C0" | 1428 "shortdescription": "C0" |
1403 }, | 1429 }, |
1404 { | 1430 { |
1405 "debugobshistory.markers": [ | 1431 "markers": [ |
1406 { | 1432 { |
1407 "debugobshistory.effect": [ | 1433 "date": [ |
1434 *, (glob) | |
1435 0 (glob) | |
1436 ], | |
1437 "effect": [ | |
1408 *, (glob) | 1438 *, (glob) |
1409 *, (glob) | 1439 *, (glob) |
1410 "content" | 1440 "content" |
1411 ], | 1441 ], |
1412 "debugobshistory.marker_date": [ | 1442 "succnodes": [ |
1413 *, (glob) | |
1414 0 (glob) | |
1415 ], | |
1416 "debugobshistory.marker_user": "test", | |
1417 "debugobshistory.succnodes": [ | |
1418 "eb5a0daa2192" | 1443 "eb5a0daa2192" |
1419 ], | 1444 ], |
1420 "debugobshistory.verb": "rewritten" | 1445 "user": "test", |
1446 "verb": "rewritten" | |
1421 } | 1447 } |
1422 ], | 1448 ], |
1423 "debugobshistory.node": "b7ea6d14e664", | 1449 "node": "b7ea6d14e664", |
1424 "debugobshistory.rev": 3, | 1450 "rev": 3, |
1425 "debugobshistory.shortdescription": "B1" | 1451 "shortdescription": "B1" |
1426 }, | 1452 }, |
1427 { | 1453 { |
1428 "debugobshistory.markers": [ | 1454 "markers": [ |
1429 { | 1455 { |
1430 "debugobshistory.effect": [ | 1456 "date": [ |
1457 *, (glob) | |
1458 0 (glob) | |
1459 ], | |
1460 "effect": [ | |
1431 "description" | 1461 "description" |
1432 ], | 1462 ], |
1433 "debugobshistory.marker_date": [ | 1463 "succnodes": [ |
1434 *, (glob) | |
1435 0 (glob) | |
1436 ], | |
1437 "debugobshistory.marker_user": "test", | |
1438 "debugobshistory.succnodes": [ | |
1439 "b7ea6d14e664" | 1464 "b7ea6d14e664" |
1440 ], | 1465 ], |
1441 "debugobshistory.verb": "rewritten" | 1466 "user": "test", |
1467 "verb": "rewritten" | |
1442 } | 1468 } |
1443 ], | 1469 ], |
1444 "debugobshistory.node": "0dec01379d3b", | 1470 "node": "0dec01379d3b", |
1445 "debugobshistory.rev": 2, | 1471 "rev": 2, |
1446 "debugobshistory.shortdescription": "B0" | 1472 "shortdescription": "B0" |
1447 }, | 1473 }, |
1448 { | 1474 { |
1449 "debugobshistory.markers": [ | 1475 "markers": [ |
1450 { | 1476 { |
1451 "debugobshistory.effect": [ | 1477 "date": [ |
1478 *, (glob) | |
1479 0 (glob) | |
1480 ], | |
1481 "effect": [ | |
1452 "description", | 1482 "description", |
1453 "content" | 1483 "content" |
1454 ], | 1484 ], |
1455 "debugobshistory.marker_date": [ | 1485 "succnodes": [ |
1456 *, (glob) | |
1457 0 (glob) | |
1458 ], | |
1459 "debugobshistory.marker_user": "test", | |
1460 "debugobshistory.succnodes": [ | |
1461 "eb5a0daa2192" | 1486 "eb5a0daa2192" |
1462 ], | 1487 ], |
1463 "debugobshistory.verb": "rewritten" | 1488 "user": "test", |
1489 "verb": "rewritten" | |
1464 } | 1490 } |
1465 ], | 1491 ], |
1466 "debugobshistory.node": "471f378eab4c", | 1492 "node": "471f378eab4c", |
1467 "debugobshistory.rev": 1, | 1493 "rev": 1, |
1468 "debugobshistory.shortdescription": "A0" | 1494 "shortdescription": "A0" |
1469 } | 1495 } |
1470 ] | 1496 ] |
1471 $ hg update 471f378eab4c | 1497 $ hg update 471f378eab4c |
1472 abort: hidden revision '471f378eab4c'! | 1498 abort: hidden revision '471f378eab4c'! |
1473 (use --hidden to access hidden revisions; successor: eb5a0daa2192) | 1499 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1559 | 1585 |
1560 $ hg obslog 7a230b46bf61 --patch | 1586 $ hg obslog 7a230b46bf61 --patch |
1561 @ 7a230b46bf61 (3) A2 | 1587 @ 7a230b46bf61 (3) A2 |
1562 | | 1588 | |
1563 x fdf9bde5129a (2) A1 | 1589 x fdf9bde5129a (2) A1 |
1564 | rewritten(description) by test (*) as 7a230b46bf61 (glob) | 1590 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
1565 | --- a/fdf9bde5129a-changeset-description | 1591 | --- a/fdf9bde5129a-changeset-description |
1566 | +++ b/7a230b46bf61-changeset-description | 1592 | +++ b/7a230b46bf61-changeset-description |
1567 | @@ -1,1 +1,1 @@ | 1593 | @@ -1,1 +1,1 @@ |
1568 | -A1 | 1594 | -A1 |
1569 | +A2 | 1595 | +A2 |
1570 | | 1596 | |
1571 | | 1597 | |
1572 x 471f378eab4c (1) A0 | 1598 x 471f378eab4c (1) A0 |
1573 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1599 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1574 --- a/471f378eab4c-changeset-description | 1600 --- a/471f378eab4c-changeset-description |
1575 +++ b/fdf9bde5129a-changeset-description | 1601 +++ b/fdf9bde5129a-changeset-description |
1576 @@ -1,1 +1,1 @@ | 1602 @@ -1,1 +1,1 @@ |
1577 -A0 | 1603 -A0 |
1578 +A1 | 1604 +A1 |
1594 changectx | 1620 changectx |
1595 $ hg obslog 7a230b46bf61 --patch | 1621 $ hg obslog 7a230b46bf61 --patch |
1596 o 7a230b46bf61 (2) A2 | 1622 o 7a230b46bf61 (2) A2 |
1597 | | 1623 | |
1598 x fdf9bde5129a | 1624 x fdf9bde5129a |
1599 | rewritten(description) by test (*) as 7a230b46bf61 (glob) | 1625 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
1600 | (No patch available yet, context is not local) | 1626 | (No patch available yet, context is not local) |
1601 | | 1627 | |
1602 @ 471f378eab4c (1) A0 | 1628 @ 471f378eab4c (1) A0 |
1603 rewritten(description) by test (*) as fdf9bde5129a (glob) | 1629 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1604 (No patch available yet, succ is unknown locally) | 1630 (No patch available yet, succ is unknown locally) |
1605 | 1631 |
1606 $ hg obslog 7a230b46bf61 --color=debug --patch | 1632 $ hg obslog 7a230b46bf61 --color=debug --patch |
1607 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] | 1633 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
1608 | | 1634 | |
1609 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] | 1635 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
1610 | [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) | 1636 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob) |
1611 | (No patch available yet, context is not local) | 1637 | (No patch available yet, context is not local) |
1612 | | 1638 | |
1613 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] | 1639 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
1614 [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) | 1640 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob) |
1615 (No patch available yet, succ is unknown locally) | 1641 (No patch available yet, succ is unknown locally) |
1616 | 1642 |