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 |
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) |
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 |
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 |
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) |
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 |
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 |
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) |
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 |