Mercurial > evolve

comparison tests/test-evolve-obshistory.t @ 3002:00e4d31b8cdb mercurial-4.1

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.1 compat branch (mergeing through 4.2 compat branch)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 01:12:47 +0200
parents 1627153804dc 67b59d1657cf
children ddf28837f5af 3024ae293732
comparison
equal deleted inserted replaced
2809:f25c79365f5d 3002:00e4d31b8cdb
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)
1013 ----------- 1039 -----------
1014 1040
1015 Check that debugobshistory on the divergent revision show both destinations 1041 Check that debugobshistory on the divergent revision show both destinations
1016 $ hg obslog --hidden 471f378eab4c --patch 1042 $ hg obslog --hidden 471f378eab4c --patch
1017 x 471f378eab4c (1) A0 1043 x 471f378eab4c (1) A0
1018 rewritten(description) by test (*) as 65b757b745b9 (glob) 1044 rewritten(description) as 65b757b745b9 by test (*) (glob)
1019 --- a/471f378eab4c-changeset-description 1045 --- a/471f378eab4c-changeset-description
1020 +++ b/65b757b745b9-changeset-description 1046 +++ b/65b757b745b9-changeset-description
1021 @@ -1,1 +1,1 @@ 1047 @@ -1,1 +1,1 @@
1022 -A0 1048 -A0
1023 +A2 1049 +A2
1024 1050
1025 rewritten(description) by test (*) as fdf9bde5129a (glob) 1051 rewritten(description) as fdf9bde5129a by test (*) (glob)
1026 --- a/471f378eab4c-changeset-description 1052 --- a/471f378eab4c-changeset-description
1027 +++ b/fdf9bde5129a-changeset-description 1053 +++ b/fdf9bde5129a-changeset-description
1028 @@ -1,1 +1,1 @@ 1054 @@ -1,1 +1,1 @@
1029 -A0 1055 -A0
1030 +A1 1056 +A1
1036 @ 65b757b745b9 (3) A2 1062 @ 65b757b745b9 (3) A2
1037 | 1063 |
1038 | o fdf9bde5129a (2) A1 1064 | o fdf9bde5129a (2) A1
1039 |/ 1065 |/
1040 x 471f378eab4c (1) A0 1066 x 471f378eab4c (1) A0
1041 rewritten(description) by test (*) as 65b757b745b9 (glob) 1067 rewritten(description) as 65b757b745b9 by test (*) (glob)
1042 --- a/471f378eab4c-changeset-description 1068 --- a/471f378eab4c-changeset-description
1043 +++ b/65b757b745b9-changeset-description 1069 +++ b/65b757b745b9-changeset-description
1044 @@ -1,1 +1,1 @@ 1070 @@ -1,1 +1,1 @@
1045 -A0 1071 -A0
1046 +A2 1072 +A2
1047 1073
1048 rewritten(description) by test (*) as fdf9bde5129a (glob) 1074 rewritten(description) as fdf9bde5129a by test (*) (glob)
1049 --- a/471f378eab4c-changeset-description 1075 --- a/471f378eab4c-changeset-description
1050 +++ b/fdf9bde5129a-changeset-description 1076 +++ b/fdf9bde5129a-changeset-description
1051 @@ -1,1 +1,1 @@ 1077 @@ -1,1 +1,1 @@
1052 -A0 1078 -A0
1053 +A1 1079 +A1
1054 1080
1055 1081
1056 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool 1082 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
1057 [ 1083 [
1058 { 1084 {
1059 "debugobshistory.markers": [ 1085 "markers": [
1060 { 1086 {
1061 "debugobshistory.effect": [ 1087 "date": [
1088 *, (glob)
1089 0 (glob)
1090 ],
1091 "effect": [
1062 "description" 1092 "description"
1063 ], 1093 ],
1064 "debugobshistory.marker_date": [ 1094 "succnodes": [
1065 *, (glob)
1066 0 (glob)
1067 ],
1068 "debugobshistory.marker_user": "test",
1069 "debugobshistory.succnodes": [
1070 "65b757b745b9" 1095 "65b757b745b9"
1071 ], 1096 ],
1072 "debugobshistory.verb": "rewritten" 1097 "user": "test",
1098 "verb": "rewritten"
1073 }, 1099 },
1074 { 1100 {
1075 "debugobshistory.effect": [ 1101 "date": [
1102 *, (glob)
1103 0 (glob)
1104 ],
1105 "effect": [
1076 "description" 1106 "description"
1077 ], 1107 ],
1078 "debugobshistory.marker_date": [ 1108 "succnodes": [
1079 *, (glob)
1080 0 (glob)
1081 ],
1082 "debugobshistory.marker_user": "test",
1083 "debugobshistory.succnodes": [
1084 "fdf9bde5129a" 1109 "fdf9bde5129a"
1085 ], 1110 ],
1086 "debugobshistory.verb": "rewritten" 1111 "user": "test",
1112 "verb": "rewritten"
1087 } 1113 }
1088 ], 1114 ],
1089 "debugobshistory.node": "471f378eab4c", 1115 "node": "471f378eab4c",
1090 "debugobshistory.rev": 1, 1116 "rev": 1,
1091 "debugobshistory.shortdescription": "A0" 1117 "shortdescription": "A0"
1092 } 1118 }
1093 ] 1119 ]
1094 Check that debugobshistory on the first diverged revision show the revision 1120 Check that debugobshistory on the first diverged revision show the revision
1095 and the diverent one 1121 and the diverent one
1096 $ hg obslog fdf9bde5129a --patch 1122 $ hg obslog fdf9bde5129a --patch
1097 o fdf9bde5129a (2) A1 1123 o fdf9bde5129a (2) A1
1098 | 1124 |
1099 x 471f378eab4c (1) A0 1125 x 471f378eab4c (1) A0
1100 rewritten(description) by test (*) as 65b757b745b9 (glob) 1126 rewritten(description) as 65b757b745b9 by test (*) (glob)
1101 --- a/471f378eab4c-changeset-description 1127 --- a/471f378eab4c-changeset-description
1102 +++ b/65b757b745b9-changeset-description 1128 +++ b/65b757b745b9-changeset-description
1103 @@ -1,1 +1,1 @@ 1129 @@ -1,1 +1,1 @@
1104 -A0 1130 -A0
1105 +A2 1131 +A2
1106 1132
1107 rewritten(description) by test (*) as fdf9bde5129a (glob) 1133 rewritten(description) as fdf9bde5129a by test (*) (glob)
1108 --- a/471f378eab4c-changeset-description 1134 --- a/471f378eab4c-changeset-description
1109 +++ b/fdf9bde5129a-changeset-description 1135 +++ b/fdf9bde5129a-changeset-description
1110 @@ -1,1 +1,1 @@ 1136 @@ -1,1 +1,1 @@
1111 -A0 1137 -A0
1112 +A1 1138 +A1
1118 @ 65b757b745b9 (3) A2 1144 @ 65b757b745b9 (3) A2
1119 | 1145 |
1120 | o fdf9bde5129a (2) A1 1146 | o fdf9bde5129a (2) A1
1121 |/ 1147 |/
1122 x 471f378eab4c (1) A0 1148 x 471f378eab4c (1) A0
1123 rewritten(description) by test (*) as 65b757b745b9 (glob) 1149 rewritten(description) as 65b757b745b9 by test (*) (glob)
1124 --- a/471f378eab4c-changeset-description 1150 --- a/471f378eab4c-changeset-description
1125 +++ b/65b757b745b9-changeset-description 1151 +++ b/65b757b745b9-changeset-description
1126 @@ -1,1 +1,1 @@ 1152 @@ -1,1 +1,1 @@
1127 -A0 1153 -A0
1128 +A2 1154 +A2
1129 1155
1130 rewritten(description) by test (*) as fdf9bde5129a (glob) 1156 rewritten(description) as fdf9bde5129a by test (*) (glob)
1131 --- a/471f378eab4c-changeset-description 1157 --- a/471f378eab4c-changeset-description
1132 +++ b/fdf9bde5129a-changeset-description 1158 +++ b/fdf9bde5129a-changeset-description
1133 @@ -1,1 +1,1 @@ 1159 @@ -1,1 +1,1 @@
1134 -A0 1160 -A0
1135 +A1 1161 +A1
1139 and the diverent one 1165 and the diverent one
1140 $ hg obslog 65b757b745b9 --patch 1166 $ hg obslog 65b757b745b9 --patch
1141 @ 65b757b745b9 (3) A2 1167 @ 65b757b745b9 (3) A2
1142 | 1168 |
1143 x 471f378eab4c (1) A0 1169 x 471f378eab4c (1) A0
1144 rewritten(description) by test (*) as 65b757b745b9 (glob) 1170 rewritten(description) as 65b757b745b9 by test (*) (glob)
1145 --- a/471f378eab4c-changeset-description 1171 --- a/471f378eab4c-changeset-description
1146 +++ b/65b757b745b9-changeset-description 1172 +++ b/65b757b745b9-changeset-description
1147 @@ -1,1 +1,1 @@ 1173 @@ -1,1 +1,1 @@
1148 -A0 1174 -A0
1149 +A2 1175 +A2
1150 1176
1151 rewritten(description) by test (*) as fdf9bde5129a (glob) 1177 rewritten(description) as fdf9bde5129a by test (*) (glob)
1152 --- a/471f378eab4c-changeset-description 1178 --- a/471f378eab4c-changeset-description
1153 +++ b/fdf9bde5129a-changeset-description 1179 +++ b/fdf9bde5129a-changeset-description
1154 @@ -1,1 +1,1 @@ 1180 @@ -1,1 +1,1 @@
1155 -A0 1181 -A0
1156 +A1 1182 +A1
1161 @ 65b757b745b9 (3) A2 1187 @ 65b757b745b9 (3) A2
1162 | 1188 |
1163 | o fdf9bde5129a (2) A1 1189 | o fdf9bde5129a (2) A1
1164 |/ 1190 |/
1165 x 471f378eab4c (1) A0 1191 x 471f378eab4c (1) A0
1166 rewritten(description) by test (*) as 65b757b745b9 (glob) 1192 rewritten(description) as 65b757b745b9 by test (*) (glob)
1167 --- a/471f378eab4c-changeset-description 1193 --- a/471f378eab4c-changeset-description
1168 +++ b/65b757b745b9-changeset-description 1194 +++ b/65b757b745b9-changeset-description
1169 @@ -1,1 +1,1 @@ 1195 @@ -1,1 +1,1 @@
1170 -A0 1196 -A0
1171 +A2 1197 +A2
1172 1198
1173 rewritten(description) by test (*) as fdf9bde5129a (glob) 1199 rewritten(description) as fdf9bde5129a by test (*) (glob)
1174 --- a/471f378eab4c-changeset-description 1200 --- a/471f378eab4c-changeset-description
1175 +++ b/fdf9bde5129a-changeset-description 1201 +++ b/fdf9bde5129a-changeset-description
1176 @@ -1,1 +1,1 @@ 1202 @@ -1,1 +1,1 @@
1177 -A0 1203 -A0
1178 +A1 1204 +A1
1184 @ 65b757b745b9 (3) A2 1210 @ 65b757b745b9 (3) A2
1185 | 1211 |
1186 | o fdf9bde5129a (2) A1 1212 | o fdf9bde5129a (2) A1
1187 |/ 1213 |/
1188 x 471f378eab4c (1) A0 1214 x 471f378eab4c (1) A0
1189 rewritten(description) by test (*) as 65b757b745b9 (glob) 1215 rewritten(description) as 65b757b745b9 by test (*) (glob)
1190 --- a/471f378eab4c-changeset-description 1216 --- a/471f378eab4c-changeset-description
1191 +++ b/65b757b745b9-changeset-description 1217 +++ b/65b757b745b9-changeset-description
1192 @@ -1,1 +1,1 @@ 1218 @@ -1,1 +1,1 @@
1193 -A0 1219 -A0
1194 +A2 1220 +A2
1195 1221
1196 rewritten(description) by test (*) as fdf9bde5129a (glob) 1222 rewritten(description) as fdf9bde5129a by test (*) (glob)
1197 --- a/471f378eab4c-changeset-description 1223 --- a/471f378eab4c-changeset-description
1198 +++ b/fdf9bde5129a-changeset-description 1224 +++ b/fdf9bde5129a-changeset-description
1199 @@ -1,1 +1,1 @@ 1225 @@ -1,1 +1,1 @@
1200 -A0 1226 -A0
1201 +A1 1227 +A1
1202 1228
1203 1229
1204 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool 1230 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool
1205 [ 1231 [
1206 { 1232 {
1207 "debugobshistory.markers": [], 1233 "markers": [],
1208 "debugobshistory.node": "65b757b745b9", 1234 "node": "65b757b745b9",
1209 "debugobshistory.rev": 3, 1235 "rev": 3,
1210 "debugobshistory.shortdescription": "A2" 1236 "shortdescription": "A2"
1211 }, 1237 },
1212 { 1238 {
1213 "debugobshistory.markers": [ 1239 "markers": [
1214 { 1240 {
1215 "debugobshistory.effect": [ 1241 "date": [
1242 *, (glob)
1243 0 (glob)
1244 ],
1245 "effect": [
1216 "description" 1246 "description"
1217 ], 1247 ],
1218 "debugobshistory.marker_date": [ 1248 "succnodes": [
1219 *, (glob)
1220 0 (glob)
1221 ],
1222 "debugobshistory.marker_user": "test",
1223 "debugobshistory.succnodes": [
1224 "65b757b745b9" 1249 "65b757b745b9"
1225 ], 1250 ],
1226 "debugobshistory.verb": "rewritten" 1251 "user": "test",
1252 "verb": "rewritten"
1227 }, 1253 },
1228 { 1254 {
1229 "debugobshistory.effect": [ 1255 "date": [
1256 *, (glob)
1257 0 (glob)
1258 ],
1259 "effect": [
1230 "description" 1260 "description"
1231 ], 1261 ],
1232 "debugobshistory.marker_date": [ 1262 "succnodes": [
1233 *, (glob)
1234 0 (glob)
1235 ],
1236 "debugobshistory.marker_user": "test",
1237 "debugobshistory.succnodes": [
1238 "fdf9bde5129a" 1263 "fdf9bde5129a"
1239 ], 1264 ],
1240 "debugobshistory.verb": "rewritten" 1265 "user": "test",
1266 "verb": "rewritten"
1241 } 1267 }
1242 ], 1268 ],
1243 "debugobshistory.node": "471f378eab4c", 1269 "node": "471f378eab4c",
1244 "debugobshistory.rev": 1, 1270 "rev": 1,
1245 "debugobshistory.shortdescription": "A0" 1271 "shortdescription": "A0"
1246 }, 1272 },
1247 { 1273 {
1248 "debugobshistory.markers": [], 1274 "markers": [],
1249 "debugobshistory.node": "fdf9bde5129a", 1275 "node": "fdf9bde5129a",
1250 "debugobshistory.rev": 2, 1276 "rev": 2,
1251 "debugobshistory.shortdescription": "A1" 1277 "shortdescription": "A1"
1252 } 1278 }
1253 ] 1279 ]
1254 $ hg update 471f378eab4c 1280 $ hg update 471f378eab4c
1255 abort: hidden revision '471f378eab4c'! 1281 abort: hidden revision '471f378eab4c'!
1256 (use --hidden to access hidden revisions) 1282 (use --hidden to access hidden revisions)
1257 [255] 1283 [255]
1258 $ hg update --hidden 'desc(A0)' 1284 $ hg update --hidden 'desc(A0)'
1259 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1285 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1260 working directory parent is obsolete! (471f378eab4c) 1286 working directory parent is obsolete! (471f378eab4c)
1261 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) 1287 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
1262 1288
1263 Test output with amended + folded commit 1289 Test output with amended + folded commit
1264 ======================================== 1290 ========================================
1265 1291
1266 Test setup 1292 Test setup
1333 Check that debugobshistory on head show a coherent graph 1359 Check that debugobshistory on head show a coherent graph
1334 $ hg obslog eb5a0daa2192 --patch 1360 $ hg obslog eb5a0daa2192 --patch
1335 @ eb5a0daa2192 (4) C0 1361 @ eb5a0daa2192 (4) C0
1336 |\ 1362 |\
1337 x | 471f378eab4c (1) A0 1363 x | 471f378eab4c (1) A0
1338 / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) 1364 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
1339 | --- a/471f378eab4c-changeset-description 1365 | --- a/471f378eab4c-changeset-description
1340 | +++ b/eb5a0daa2192-changeset-description 1366 | +++ b/eb5a0daa2192-changeset-description
1341 | @@ -1,1 +1,1 @@ 1367 | @@ -1,1 +1,1 @@
1342 | -A0 1368 | -A0
1343 | +C0 1369 | +C0
1348 | @@ -0,0 +1,1 @@ 1374 | @@ -0,0 +1,1 @@
1349 | +B0 1375 | +B0
1350 | 1376 |
1351 | 1377 |
1352 x b7ea6d14e664 (3) B1 1378 x b7ea6d14e664 (3) B1
1353 | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) 1379 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
1354 | (No patch available yet, changesets rebased) 1380 | (No patch available yet, changesets rebased)
1355 | 1381 |
1356 x 0dec01379d3b (2) B0 1382 x 0dec01379d3b (2) B0
1357 rewritten(description) by test (*) as b7ea6d14e664 (glob) 1383 rewritten(description) as b7ea6d14e664 by test (*) (glob)
1358 --- a/0dec01379d3b-changeset-description 1384 --- a/0dec01379d3b-changeset-description
1359 +++ b/b7ea6d14e664-changeset-description 1385 +++ b/b7ea6d14e664-changeset-description
1360 @@ -1,1 +1,1 @@ 1386 @@ -1,1 +1,1 @@
1361 -B0 1387 -B0
1362 +B1 1388 +B1
1365 Check that obslog on ROOT with all option show everything 1391 Check that obslog on ROOT with all option show everything
1366 $ hg obslog 1 --hidden --all --patch 1392 $ hg obslog 1 --hidden --all --patch
1367 @ eb5a0daa2192 (4) C0 1393 @ eb5a0daa2192 (4) C0
1368 |\ 1394 |\
1369 x | 471f378eab4c (1) A0 1395 x | 471f378eab4c (1) A0
1370 / rewritten(description, content) by test (*) as eb5a0daa2192 (glob) 1396 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob)
1371 | --- a/471f378eab4c-changeset-description 1397 | --- a/471f378eab4c-changeset-description
1372 | +++ b/eb5a0daa2192-changeset-description 1398 | +++ b/eb5a0daa2192-changeset-description
1373 | @@ -1,1 +1,1 @@ 1399 | @@ -1,1 +1,1 @@
1374 | -A0 1400 | -A0
1375 | +C0 1401 | +C0
1380 | @@ -0,0 +1,1 @@ 1406 | @@ -0,0 +1,1 @@
1381 | +B0 1407 | +B0
1382 | 1408 |
1383 | 1409 |
1384 x b7ea6d14e664 (3) B1 1410 x b7ea6d14e664 (3) B1
1385 | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) 1411 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob)
1386 | (No patch available yet, changesets rebased) 1412 | (No patch available yet, changesets rebased)
1387 | 1413 |
1388 x 0dec01379d3b (2) B0 1414 x 0dec01379d3b (2) B0
1389 rewritten(description) by test (*) as b7ea6d14e664 (glob) 1415 rewritten(description) as b7ea6d14e664 by test (*) (glob)
1390 --- a/0dec01379d3b-changeset-description 1416 --- a/0dec01379d3b-changeset-description
1391 +++ b/b7ea6d14e664-changeset-description 1417 +++ b/b7ea6d14e664-changeset-description
1392 @@ -1,1 +1,1 @@ 1418 @@ -1,1 +1,1 @@
1393 -B0 1419 -B0
1394 +B1 1420 +B1
1395 1421
1396 1422
1397 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool 1423 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
1398 [ 1424 [
1399 { 1425 {
1400 "debugobshistory.markers": [], 1426 "markers": [],
1401 "debugobshistory.node": "eb5a0daa2192", 1427 "node": "eb5a0daa2192",
1402 "debugobshistory.rev": 4, 1428 "rev": 4,
1403 "debugobshistory.shortdescription": "C0" 1429 "shortdescription": "C0"
1404 }, 1430 },
1405 { 1431 {
1406 "debugobshistory.markers": [ 1432 "markers": [
1407 { 1433 {
1408 "debugobshistory.effect": [ 1434 "date": [
1435 *, (glob)
1436 0 (glob)
1437 ],
1438 "effect": [
1409 *, (glob) 1439 *, (glob)
1410 *, (glob) 1440 *, (glob)
1411 "content" 1441 "content"
1412 ], 1442 ],
1413 "debugobshistory.marker_date": [ 1443 "succnodes": [
1414 *, (glob)
1415 0 (glob)
1416 ],
1417 "debugobshistory.marker_user": "test",
1418 "debugobshistory.succnodes": [
1419 "eb5a0daa2192" 1444 "eb5a0daa2192"
1420 ], 1445 ],
1421 "debugobshistory.verb": "rewritten" 1446 "user": "test",
1447 "verb": "rewritten"
1422 } 1448 }
1423 ], 1449 ],
1424 "debugobshistory.node": "b7ea6d14e664", 1450 "node": "b7ea6d14e664",
1425 "debugobshistory.rev": 3, 1451 "rev": 3,
1426 "debugobshistory.shortdescription": "B1" 1452 "shortdescription": "B1"
1427 }, 1453 },
1428 { 1454 {
1429 "debugobshistory.markers": [ 1455 "markers": [
1430 { 1456 {
1431 "debugobshistory.effect": [ 1457 "date": [
1458 *, (glob)
1459 0 (glob)
1460 ],
1461 "effect": [
1432 "description" 1462 "description"
1433 ], 1463 ],
1434 "debugobshistory.marker_date": [ 1464 "succnodes": [
1435 *, (glob)
1436 0 (glob)
1437 ],
1438 "debugobshistory.marker_user": "test",
1439 "debugobshistory.succnodes": [
1440 "b7ea6d14e664" 1465 "b7ea6d14e664"
1441 ], 1466 ],
1442 "debugobshistory.verb": "rewritten" 1467 "user": "test",
1468 "verb": "rewritten"
1443 } 1469 }
1444 ], 1470 ],
1445 "debugobshistory.node": "0dec01379d3b", 1471 "node": "0dec01379d3b",
1446 "debugobshistory.rev": 2, 1472 "rev": 2,
1447 "debugobshistory.shortdescription": "B0" 1473 "shortdescription": "B0"
1448 }, 1474 },
1449 { 1475 {
1450 "debugobshistory.markers": [ 1476 "markers": [
1451 { 1477 {
1452 "debugobshistory.effect": [ 1478 "date": [
1479 *, (glob)
1480 0 (glob)
1481 ],
1482 "effect": [
1453 "description", 1483 "description",
1454 "content" 1484 "content"
1455 ], 1485 ],
1456 "debugobshistory.marker_date": [ 1486 "succnodes": [
1457 *, (glob)
1458 0 (glob)
1459 ],
1460 "debugobshistory.marker_user": "test",
1461 "debugobshistory.succnodes": [
1462 "eb5a0daa2192" 1487 "eb5a0daa2192"
1463 ], 1488 ],
1464 "debugobshistory.verb": "rewritten" 1489 "user": "test",
1490 "verb": "rewritten"
1465 } 1491 }
1466 ], 1492 ],
1467 "debugobshistory.node": "471f378eab4c", 1493 "node": "471f378eab4c",
1468 "debugobshistory.rev": 1, 1494 "rev": 1,
1469 "debugobshistory.shortdescription": "A0" 1495 "shortdescription": "A0"
1470 } 1496 }
1471 ] 1497 ]
1472 $ hg update 471f378eab4c 1498 $ hg update 471f378eab4c
1473 abort: hidden revision '471f378eab4c'! 1499 abort: hidden revision '471f378eab4c'!
1474 (use --hidden to access hidden revisions) 1500 (use --hidden to access hidden revisions)
1560 1586
1561 $ hg obslog 7a230b46bf61 --patch 1587 $ hg obslog 7a230b46bf61 --patch
1562 @ 7a230b46bf61 (3) A2 1588 @ 7a230b46bf61 (3) A2
1563 | 1589 |
1564 x fdf9bde5129a (2) A1 1590 x fdf9bde5129a (2) A1
1565 | rewritten(description) by test (*) as 7a230b46bf61 (glob) 1591 | rewritten(description) as 7a230b46bf61 by test (*) (glob)
1566 | --- a/fdf9bde5129a-changeset-description 1592 | --- a/fdf9bde5129a-changeset-description
1567 | +++ b/7a230b46bf61-changeset-description 1593 | +++ b/7a230b46bf61-changeset-description
1568 | @@ -1,1 +1,1 @@ 1594 | @@ -1,1 +1,1 @@
1569 | -A1 1595 | -A1
1570 | +A2 1596 | +A2
1571 | 1597 |
1572 | 1598 |
1573 x 471f378eab4c (1) A0 1599 x 471f378eab4c (1) A0
1574 rewritten(description) by test (*) as fdf9bde5129a (glob) 1600 rewritten(description) as fdf9bde5129a by test (*) (glob)
1575 --- a/471f378eab4c-changeset-description 1601 --- a/471f378eab4c-changeset-description
1576 +++ b/fdf9bde5129a-changeset-description 1602 +++ b/fdf9bde5129a-changeset-description
1577 @@ -1,1 +1,1 @@ 1603 @@ -1,1 +1,1 @@
1578 -A0 1604 -A0
1579 +A1 1605 +A1
1595 changectx 1621 changectx
1596 $ hg obslog 7a230b46bf61 --patch 1622 $ hg obslog 7a230b46bf61 --patch
1597 o 7a230b46bf61 (2) A2 1623 o 7a230b46bf61 (2) A2
1598 | 1624 |
1599 x fdf9bde5129a 1625 x fdf9bde5129a
1600 | rewritten(description) by test (*) as 7a230b46bf61 (glob) 1626 | rewritten(description) as 7a230b46bf61 by test (*) (glob)
1601 | (No patch available yet, context is not local) 1627 | (No patch available yet, context is not local)
1602 | 1628 |
1603 @ 471f378eab4c (1) A0 1629 @ 471f378eab4c (1) A0
1604 rewritten(description) by test (*) as fdf9bde5129a (glob) 1630 rewritten(description) as fdf9bde5129a by test (*) (glob)
1605 (No patch available yet, succ is unknown locally) 1631 (No patch available yet, succ is unknown locally)
1606 1632
1607 $ hg obslog 7a230b46bf61 --color=debug --patch 1633 $ hg obslog 7a230b46bf61 --color=debug --patch
1608 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] 1634 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
1609 | 1635 |
1610 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] 1636 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
1611 | [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) 1637 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob)
1612 | (No patch available yet, context is not local) 1638 | (No patch available yet, context is not local)
1613 | 1639 |
1614 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] 1640 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
1615 [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) 1641 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob)
1616 (No patch available yet, succ is unknown locally) 1642 (No patch available yet, succ is unknown locally)
1617 1643