Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3003:ddf28837f5af mercurial-4.0

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