76 @@ -1,1 +1,2 @@ |
76 @@ -1,1 +1,2 @@ |
77 A0 |
77 A0 |
78 +42 |
78 +42 |
79 |
79 |
80 |
80 |
|
81 |
|
82 $ hg obslog --no-graph --patch 4ae3a4151de9 |
|
83 4ae3a4151de9 (3) A1 |
|
84 471f378eab4c (1) A0 |
|
85 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
|
86 --- a/471f378eab4c-changeset-description |
|
87 +++ b/4ae3a4151de9-changeset-description |
|
88 @@ -1,1 +1,3 @@ |
|
89 -A0 |
|
90 +A1 |
|
91 + |
|
92 +Better commit message |
|
93 |
|
94 diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
|
95 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
|
96 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
|
97 @@ -1,1 +1,2 @@ |
|
98 A0 |
|
99 +42 |
|
100 |
|
101 |
|
102 $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' |
|
103 @ A1 |
|
104 | |
|
105 x A0 at 0 0 by test |
|
106 |
81 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
107 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
82 [ |
108 [ |
83 { |
109 { |
84 "debugobshistory.markers": [], |
110 "markers": [], |
85 "debugobshistory.node": "4ae3a4151de9", |
111 "node": "4ae3a4151de9", |
86 "debugobshistory.rev": 3, |
112 "rev": 3, |
87 "debugobshistory.shortdescription": "A1" |
113 "shortdescription": "A1" |
88 }, |
114 }, |
89 { |
115 { |
90 "debugobshistory.markers": [ |
116 "markers": [ |
91 { |
117 { |
92 "debugobshistory.effect": [ |
118 "date": [ |
|
119 *, (glob) |
|
120 0 (glob) |
|
121 ], |
|
122 "effect": [ |
93 "description", |
123 "description", |
94 "content" |
124 "content" |
95 ], |
125 ], |
96 "debugobshistory.marker_date": [ |
126 "succnodes": [ |
97 *, (glob) |
|
98 0 (glob) |
|
99 ], |
|
100 "debugobshistory.marker_user": "test", |
|
101 "debugobshistory.succnodes": [ |
|
102 "4ae3a4151de9" |
127 "4ae3a4151de9" |
103 ], |
128 ], |
104 "debugobshistory.verb": "rewritten" |
129 "user": "test", |
|
130 "verb": "rewritten" |
105 } |
131 } |
106 ], |
132 ], |
107 "debugobshistory.node": "471f378eab4c", |
133 "node": "471f378eab4c", |
108 "debugobshistory.rev": 1, |
134 "rev": 1, |
109 "debugobshistory.shortdescription": "A0" |
135 "shortdescription": "A0" |
110 } |
136 } |
111 ] |
137 ] |
112 $ hg obslog --hidden --patch 471f378eab4c |
138 $ hg obslog --hidden --patch 471f378eab4c |
113 x 471f378eab4c (1) A0 |
139 x 471f378eab4c (1) A0 |
114 rewritten(description, content) by test (*) as 4ae3a4151de9 (glob) |
140 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
115 --- a/471f378eab4c-changeset-description |
141 --- a/471f378eab4c-changeset-description |
116 +++ b/4ae3a4151de9-changeset-description |
142 +++ b/4ae3a4151de9-changeset-description |
117 @@ -1,1 +1,3 @@ |
143 @@ -1,1 +1,3 @@ |
118 -A0 |
144 -A0 |
119 +A1 |
145 +A1 |
222 (No patch available yet, no successors) |
248 (No patch available yet, no successors) |
223 |
249 |
224 $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool |
250 $ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool |
225 [ |
251 [ |
226 { |
252 { |
227 "debugobshistory.markers": [ |
253 "markers": [ |
228 { |
254 { |
229 "debugobshistory.marker_date": [ |
255 "date": [ |
230 *, (glob) |
256 *, (glob) |
231 0 (glob) |
257 0 (glob) |
232 ], |
258 ], |
233 "debugobshistory.marker_user": "test", |
259 "user": "test", |
234 "debugobshistory.verb": "pruned" |
260 "verb": "pruned" |
235 } |
261 } |
236 ], |
262 ], |
237 "debugobshistory.node": "0dec01379d3b", |
263 "node": "0dec01379d3b", |
238 "debugobshistory.rev": 2, |
264 "rev": 2, |
239 "debugobshistory.shortdescription": "B0" |
265 "shortdescription": "B0" |
240 } |
266 } |
241 ] |
267 ] |
242 $ hg obslog 'desc(A0)' --patch |
268 $ hg obslog 'desc(A0)' --patch |
243 @ 471f378eab4c (1) A0 |
269 @ 471f378eab4c (1) A0 |
244 |
270 |
245 $ hg obslog 'desc(A0)' --no-graph -Tjson | python -m json.tool |
271 $ hg obslog 'desc(A0)' --no-graph -Tjson | python -m json.tool |
246 [ |
272 [ |
247 { |
273 { |
248 "debugobshistory.markers": [], |
274 "markers": [], |
249 "debugobshistory.node": "471f378eab4c", |
275 "node": "471f378eab4c", |
250 "debugobshistory.rev": 1, |
276 "rev": 1, |
251 "debugobshistory.shortdescription": "A0" |
277 "shortdescription": "A0" |
252 } |
278 } |
253 ] |
279 ] |
254 $ hg up 1 |
280 $ hg up 1 |
255 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
256 $ hg up 0dec01379d3b |
282 $ hg up 0dec01379d3b |
351 ----------- |
377 ----------- |
352 |
378 |
353 Check that debugobshistory on splitted commit show both targets |
379 Check that debugobshistory on splitted commit show both targets |
354 $ hg obslog 471597cad322 --hidden --patch |
380 $ hg obslog 471597cad322 --hidden --patch |
355 x 471597cad322 (1) A0 |
381 x 471597cad322 (1) A0 |
356 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
382 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
357 (No patch available yet, too many successors (2)) |
383 (No patch available yet, too many successors (2)) |
358 |
384 |
359 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
385 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
360 [ |
386 [ |
361 { |
387 { |
362 "debugobshistory.markers": [ |
388 "markers": [ |
363 { |
389 { |
364 "debugobshistory.effect": [ |
390 "date": [ |
|
391 *, (glob) |
|
392 0 (glob) |
|
393 ], |
|
394 "effect": [ |
365 "parent", |
395 "parent", |
366 "content" |
396 "content" |
367 ], |
397 ], |
368 "debugobshistory.marker_date": [ |
398 "succnodes": [ |
369 *, (glob) |
|
370 0 (glob) |
|
371 ], |
|
372 "debugobshistory.marker_user": "test", |
|
373 "debugobshistory.succnodes": [ |
|
374 "337fec4d2edc", |
399 "337fec4d2edc", |
375 "f257fde29c7a" |
400 "f257fde29c7a" |
376 ], |
401 ], |
377 "debugobshistory.verb": "rewritten" |
402 "user": "test", |
|
403 "verb": "rewritten" |
378 } |
404 } |
379 ], |
405 ], |
380 "debugobshistory.node": "471597cad322", |
406 "node": "471597cad322", |
381 "debugobshistory.rev": 1, |
407 "rev": 1, |
382 "debugobshistory.shortdescription": "A0" |
408 "shortdescription": "A0" |
383 } |
409 } |
384 ] |
410 ] |
385 Check that debugobshistory on the first successor after split show |
411 Check that debugobshistory on the first successor after split show |
386 the revision plus the splitted one |
412 the revision plus the splitted one |
387 $ hg obslog 337fec4d2edc --patch |
413 $ hg obslog 337fec4d2edc --patch |
388 o 337fec4d2edc (2) A0 |
414 o 337fec4d2edc (2) A0 |
389 | |
415 | |
390 x 471597cad322 (1) A0 |
416 x 471597cad322 (1) A0 |
391 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
417 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
392 (No patch available yet, too many successors (2)) |
418 (No patch available yet, too many successors (2)) |
393 |
419 |
394 With the all option, it should show the three changesets |
420 With the all option, it should show the three changesets |
395 $ hg obslog --all 337fec4d2edc --patch |
421 $ hg obslog --all 337fec4d2edc --patch |
396 o 337fec4d2edc (2) A0 |
422 o 337fec4d2edc (2) A0 |
397 | |
423 | |
398 | @ f257fde29c7a (3) A0 |
424 | @ f257fde29c7a (3) A0 |
399 |/ |
425 |/ |
400 x 471597cad322 (1) A0 |
426 x 471597cad322 (1) A0 |
401 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
427 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
402 (No patch available yet, too many successors (2)) |
428 (No patch available yet, too many successors (2)) |
403 |
429 |
404 Check that debugobshistory on the second successor after split show |
430 Check that debugobshistory on the second successor after split show |
405 the revision plus the splitted one |
431 the revision plus the splitted one |
406 $ hg obslog f257fde29c7a --patch |
432 $ hg obslog f257fde29c7a --patch |
407 @ f257fde29c7a (3) A0 |
433 @ f257fde29c7a (3) A0 |
408 | |
434 | |
409 x 471597cad322 (1) A0 |
435 x 471597cad322 (1) A0 |
410 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
436 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
411 (No patch available yet, too many successors (2)) |
437 (No patch available yet, too many successors (2)) |
412 |
438 |
413 With the all option, it should show the three changesets |
439 With the all option, it should show the three changesets |
414 $ hg obslog f257fde29c7a --all --patch |
440 $ hg obslog f257fde29c7a --all --patch |
415 o 337fec4d2edc (2) A0 |
441 o 337fec4d2edc (2) A0 |
416 | |
442 | |
417 | @ f257fde29c7a (3) A0 |
443 | @ f257fde29c7a (3) A0 |
418 |/ |
444 |/ |
419 x 471597cad322 (1) A0 |
445 x 471597cad322 (1) A0 |
420 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
446 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
421 (No patch available yet, too many successors (2)) |
447 (No patch available yet, too many successors (2)) |
422 |
448 |
423 Obslog with all option all should also works on the splitted commit |
449 Obslog with all option all should also works on the splitted commit |
424 $ hg obslog -a 471597cad322 --hidden --patch |
450 $ hg obslog -a 471597cad322 --hidden --patch |
425 o 337fec4d2edc (2) A0 |
451 o 337fec4d2edc (2) A0 |
426 | |
452 | |
427 | @ f257fde29c7a (3) A0 |
453 | @ f257fde29c7a (3) A0 |
428 |/ |
454 |/ |
429 x 471597cad322 (1) A0 |
455 x 471597cad322 (1) A0 |
430 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
456 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
431 (No patch available yet, too many successors (2)) |
457 (No patch available yet, too many successors (2)) |
432 |
458 |
433 Check that debugobshistory on both successors after split show |
459 Check that debugobshistory on both successors after split show |
434 a coherent graph |
460 a coherent graph |
435 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
461 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
436 o 337fec4d2edc (2) A0 |
462 o 337fec4d2edc (2) A0 |
437 | |
463 | |
438 | @ f257fde29c7a (3) A0 |
464 | @ f257fde29c7a (3) A0 |
439 |/ |
465 |/ |
440 x 471597cad322 (1) A0 |
466 x 471597cad322 (1) A0 |
441 rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
467 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
442 (No patch available yet, too many successors (2)) |
468 (No patch available yet, too many successors (2)) |
443 |
469 |
444 $ hg update 471597cad322 |
470 $ hg update 471597cad322 |
445 abort: hidden revision '471597cad322'! |
471 abort: hidden revision '471597cad322'! |
446 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
472 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
617 | @ c7f044602e9b (5) A0 |
643 | @ c7f044602e9b (5) A0 |
618 |/ |
644 |/ |
619 | o f257fde29c7a (3) A0 |
645 | o f257fde29c7a (3) A0 |
620 |/ |
646 |/ |
621 x de7290d8b885 (1) A0 |
647 x de7290d8b885 (1) A0 |
622 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
648 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
623 (No patch available yet, too many successors (4)) |
649 (No patch available yet, too many successors (4)) |
624 |
650 |
625 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
651 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
626 [ |
652 [ |
627 { |
653 { |
628 "debugobshistory.markers": [ |
654 "markers": [ |
629 { |
655 { |
630 "debugobshistory.effect": [ |
656 "date": [ |
|
657 *, (glob) |
|
658 0 (glob) |
|
659 ], |
|
660 "effect": [ |
631 "parent", |
661 "parent", |
632 "content" |
662 "content" |
633 ], |
663 ], |
634 "debugobshistory.marker_date": [ |
664 "succnodes": [ |
635 *, (glob) |
|
636 0 (glob) |
|
637 ], |
|
638 "debugobshistory.marker_user": "test", |
|
639 "debugobshistory.succnodes": [ |
|
640 "1ae8bc733a14", |
665 "1ae8bc733a14", |
641 "337fec4d2edc", |
666 "337fec4d2edc", |
642 "c7f044602e9b", |
667 "c7f044602e9b", |
643 "f257fde29c7a" |
668 "f257fde29c7a" |
644 ], |
669 ], |
645 "debugobshistory.verb": "rewritten" |
670 "user": "test", |
|
671 "verb": "rewritten" |
646 } |
672 } |
647 ], |
673 ], |
648 "debugobshistory.node": "de7290d8b885", |
674 "node": "de7290d8b885", |
649 "debugobshistory.rev": 1, |
675 "rev": 1, |
650 "debugobshistory.shortdescription": "A0" |
676 "shortdescription": "A0" |
651 } |
677 } |
652 ] |
678 ] |
653 $ hg obslog c7f044602e9b --patch |
679 $ hg obslog c7f044602e9b --patch |
654 @ c7f044602e9b (5) A0 |
680 @ c7f044602e9b (5) A0 |
655 | |
681 | |
656 x de7290d8b885 (1) A0 |
682 x de7290d8b885 (1) A0 |
657 rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
683 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000) |
658 (No patch available yet, too many successors (4)) |
684 (No patch available yet, too many successors (4)) |
659 |
685 |
660 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
686 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool |
661 [ |
687 [ |
662 { |
688 { |
663 "debugobshistory.markers": [], |
689 "markers": [], |
664 "debugobshistory.node": "c7f044602e9b", |
690 "node": "c7f044602e9b", |
665 "debugobshistory.rev": 5, |
691 "rev": 5, |
666 "debugobshistory.shortdescription": "A0" |
692 "shortdescription": "A0" |
667 }, |
693 }, |
668 { |
694 { |
669 "debugobshistory.markers": [ |
695 "markers": [ |
670 { |
696 { |
671 "debugobshistory.effect": [ |
697 "date": [ |
|
698 *, (glob) |
|
699 0 (glob) |
|
700 ], |
|
701 "effect": [ |
672 "parent", |
702 "parent", |
673 "content" |
703 "content" |
674 ], |
704 ], |
675 "debugobshistory.marker_date": [ |
705 "succnodes": [ |
676 *, (glob) |
|
677 0 (glob) |
|
678 ], |
|
679 "debugobshistory.marker_user": "test", |
|
680 "debugobshistory.succnodes": [ |
|
681 "1ae8bc733a14", |
706 "1ae8bc733a14", |
682 "337fec4d2edc", |
707 "337fec4d2edc", |
683 "c7f044602e9b", |
708 "c7f044602e9b", |
684 "f257fde29c7a" |
709 "f257fde29c7a" |
685 ], |
710 ], |
686 "debugobshistory.verb": "rewritten" |
711 "user": "test", |
|
712 "verb": "rewritten" |
687 } |
713 } |
688 ], |
714 ], |
689 "debugobshistory.node": "de7290d8b885", |
715 "node": "de7290d8b885", |
690 "debugobshistory.rev": 1, |
716 "rev": 1, |
691 "debugobshistory.shortdescription": "A0" |
717 "shortdescription": "A0" |
692 } |
718 } |
693 ] |
719 ] |
694 Check that debugobshistory on all heads show a coherent graph |
720 Check that debugobshistory on all heads show a coherent graph |
695 $ hg obslog 2::5 --patch |
721 $ hg obslog 2::5 --patch |
696 o 1ae8bc733a14 (4) A0 |
722 o 1ae8bc733a14 (4) A0 |
829 |
855 |
830 Check that debugobshistory on the second folded revision show only |
856 Check that debugobshistory on the second folded revision show only |
831 the revision with the target |
857 the revision with the target |
832 $ hg obslog --hidden 0dec01379d3b --patch |
858 $ hg obslog --hidden 0dec01379d3b --patch |
833 x 0dec01379d3b (2) B0 |
859 x 0dec01379d3b (2) B0 |
834 rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) |
860 rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
835 (No patch available yet, changesets rebased) |
861 (No patch available yet, changesets rebased) |
836 |
862 |
837 Check that with all option, all changesets are shown |
863 Check that with all option, all changesets are shown |
838 $ hg obslog --hidden --all 0dec01379d3b --patch |
864 $ hg obslog --hidden --all 0dec01379d3b --patch |
839 @ eb5a0daa2192 (3) C0 |
865 @ eb5a0daa2192 (3) C0 |
840 |\ |
866 |\ |
841 x | 0dec01379d3b (2) B0 |
867 x | 0dec01379d3b (2) B0 |
842 / rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) |
868 / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
843 | (No patch available yet, changesets rebased) |
869 | (No patch available yet, changesets rebased) |
844 | |
870 | |
845 x 471f378eab4c (1) A0 |
871 x 471f378eab4c (1) A0 |
846 rewritten(description, content) by test (*) as eb5a0daa2192 (glob) |
872 rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
847 --- a/471f378eab4c-changeset-description |
873 --- a/471f378eab4c-changeset-description |
848 +++ b/eb5a0daa2192-changeset-description |
874 +++ b/eb5a0daa2192-changeset-description |
849 @@ -1,1 +1,1 @@ |
875 @@ -1,1 +1,1 @@ |
850 -A0 |
876 -A0 |
851 +C0 |
877 +C0 |
882 |
908 |
883 |
909 |
884 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
910 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
885 [ |
911 [ |
886 { |
912 { |
887 "debugobshistory.markers": [], |
913 "markers": [], |
888 "debugobshistory.node": "eb5a0daa2192", |
914 "node": "eb5a0daa2192", |
889 "debugobshistory.rev": 3, |
915 "rev": 3, |
890 "debugobshistory.shortdescription": "C0" |
916 "shortdescription": "C0" |
891 }, |
917 }, |
892 { |
918 { |
893 "debugobshistory.markers": [ |
919 "markers": [ |
894 { |
920 { |
895 "debugobshistory.effect": [ |
921 "date": [ |
896 "description", |
922 *, (glob) |
|
923 0 (glob) |
|
924 ], |
|
925 "effect": [ |
|
926 *, (glob) |
897 "content" |
927 "content" |
898 ], |
928 ], |
899 "debugobshistory.marker_date": [ |
929 "succnodes": [ |
900 *, (glob) |
|
901 0 (glob) |
|
902 ], |
|
903 "debugobshistory.marker_user": "test", |
|
904 "debugobshistory.succnodes": [ |
|
905 "eb5a0daa2192" |
930 "eb5a0daa2192" |
906 ], |
931 ], |
907 "debugobshistory.verb": "rewritten" |
932 "user": "test", |
|
933 "verb": "rewritten" |
908 } |
934 } |
909 ], |
935 ], |
910 "debugobshistory.node": "471f378eab4c", |
936 "node": "471f378eab4c", |
911 "debugobshistory.rev": 1, |
937 "rev": 1, |
912 "debugobshistory.shortdescription": "A0" |
938 "shortdescription": "A0" |
913 }, |
939 }, |
914 { |
940 { |
915 "debugobshistory.markers": [ |
941 "markers": [ |
916 { |
942 { |
917 "debugobshistory.effect": [ |
943 "date": [ |
|
944 0.0, |
|
945 0 (glob) |
|
946 ], |
|
947 "effect": [ |
918 "description", |
948 "description", |
919 "parent", |
949 "parent", |
920 "content" |
950 "content" |
921 ], |
951 ], |
922 "debugobshistory.marker_date": [ |
952 "succnodes": [ |
923 *, (glob) |
|
924 0 (glob) |
|
925 ], |
|
926 "debugobshistory.marker_user": "test", |
|
927 "debugobshistory.succnodes": [ |
|
928 "eb5a0daa2192" |
953 "eb5a0daa2192" |
929 ], |
954 ], |
930 "debugobshistory.verb": "rewritten" |
955 "user": "test", |
|
956 "verb": "rewritten" |
931 } |
957 } |
932 ], |
958 ], |
933 "debugobshistory.node": "0dec01379d3b", |
959 "node": "0dec01379d3b", |
934 "debugobshistory.rev": 2, |
960 "rev": 2, |
935 "debugobshistory.shortdescription": "B0" |
961 "shortdescription": "B0" |
936 } |
962 } |
937 ] |
963 ] |
938 $ hg update 471f378eab4c |
964 $ hg update 471f378eab4c |
939 abort: hidden revision '471f378eab4c'! |
965 abort: hidden revision '471f378eab4c'! |
940 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
966 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1045 @ 65b757b745b9 (3) A2 |
1071 @ 65b757b745b9 (3) A2 |
1046 | |
1072 | |
1047 | o fdf9bde5129a (2) A1 |
1073 | o fdf9bde5129a (2) A1 |
1048 |/ |
1074 |/ |
1049 x 471f378eab4c (1) A0 |
1075 x 471f378eab4c (1) A0 |
1050 rewritten(description) by test (*) as 65b757b745b9 (glob) |
1076 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1051 --- a/471f378eab4c-changeset-description |
1077 --- a/471f378eab4c-changeset-description |
1052 +++ b/65b757b745b9-changeset-description |
1078 +++ b/65b757b745b9-changeset-description |
1053 @@ -1,1 +1,1 @@ |
1079 @@ -1,1 +1,1 @@ |
1054 -A0 |
1080 -A0 |
1055 +A2 |
1081 +A2 |
1056 |
1082 |
1057 rewritten(description) by test (*) as fdf9bde5129a (glob) |
1083 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1058 --- a/471f378eab4c-changeset-description |
1084 --- a/471f378eab4c-changeset-description |
1059 +++ b/fdf9bde5129a-changeset-description |
1085 +++ b/fdf9bde5129a-changeset-description |
1060 @@ -1,1 +1,1 @@ |
1086 @@ -1,1 +1,1 @@ |
1061 -A0 |
1087 -A0 |
1062 +A1 |
1088 +A1 |
1063 |
1089 |
1064 |
1090 |
1065 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
1091 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
1066 [ |
1092 [ |
1067 { |
1093 { |
1068 "debugobshistory.markers": [ |
1094 "markers": [ |
1069 { |
1095 { |
1070 "debugobshistory.effect": [ |
1096 "date": [ |
|
1097 *, (glob) |
|
1098 0 (glob) |
|
1099 ], |
|
1100 "effect": [ |
1071 "description" |
1101 "description" |
1072 ], |
1102 ], |
1073 "debugobshistory.marker_date": [ |
1103 "succnodes": [ |
1074 *, (glob) |
|
1075 0 (glob) |
|
1076 ], |
|
1077 "debugobshistory.marker_user": "test", |
|
1078 "debugobshistory.succnodes": [ |
|
1079 "65b757b745b9" |
1104 "65b757b745b9" |
1080 ], |
1105 ], |
1081 "debugobshistory.verb": "rewritten" |
1106 "user": "test", |
|
1107 "verb": "rewritten" |
1082 }, |
1108 }, |
1083 { |
1109 { |
1084 "debugobshistory.effect": [ |
1110 "date": [ |
|
1111 *, (glob) |
|
1112 0 (glob) |
|
1113 ], |
|
1114 "effect": [ |
1085 "description" |
1115 "description" |
1086 ], |
1116 ], |
1087 "debugobshistory.marker_date": [ |
1117 "succnodes": [ |
1088 *, (glob) |
|
1089 0 (glob) |
|
1090 ], |
|
1091 "debugobshistory.marker_user": "test", |
|
1092 "debugobshistory.succnodes": [ |
|
1093 "fdf9bde5129a" |
1118 "fdf9bde5129a" |
1094 ], |
1119 ], |
1095 "debugobshistory.verb": "rewritten" |
1120 "user": "test", |
|
1121 "verb": "rewritten" |
1096 } |
1122 } |
1097 ], |
1123 ], |
1098 "debugobshistory.node": "471f378eab4c", |
1124 "node": "471f378eab4c", |
1099 "debugobshistory.rev": 1, |
1125 "rev": 1, |
1100 "debugobshistory.shortdescription": "A0" |
1126 "shortdescription": "A0" |
1101 } |
1127 } |
1102 ] |
1128 ] |
1103 Check that debugobshistory on the first diverged revision show the revision |
1129 Check that debugobshistory on the first diverged revision show the revision |
1104 and the diverent one |
1130 and the diverent one |
1105 $ hg obslog fdf9bde5129a --patch |
1131 $ hg obslog fdf9bde5129a --patch |
1106 o fdf9bde5129a (2) A1 |
1132 o fdf9bde5129a (2) A1 |
1107 | |
1133 | |
1108 x 471f378eab4c (1) A0 |
1134 x 471f378eab4c (1) A0 |
1109 rewritten(description) by test (*) as 65b757b745b9 (glob) |
1135 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1110 --- a/471f378eab4c-changeset-description |
1136 --- a/471f378eab4c-changeset-description |
1111 +++ b/65b757b745b9-changeset-description |
1137 +++ b/65b757b745b9-changeset-description |
1112 @@ -1,1 +1,1 @@ |
1138 @@ -1,1 +1,1 @@ |
1113 -A0 |
1139 -A0 |
1114 +A2 |
1140 +A2 |
1115 |
1141 |
1116 rewritten(description) by test (*) as fdf9bde5129a (glob) |
1142 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1117 --- a/471f378eab4c-changeset-description |
1143 --- a/471f378eab4c-changeset-description |
1118 +++ b/fdf9bde5129a-changeset-description |
1144 +++ b/fdf9bde5129a-changeset-description |
1119 @@ -1,1 +1,1 @@ |
1145 @@ -1,1 +1,1 @@ |
1120 -A0 |
1146 -A0 |
1121 +A1 |
1147 +A1 |
1193 @ 65b757b745b9 (3) A2 |
1219 @ 65b757b745b9 (3) A2 |
1194 | |
1220 | |
1195 | o fdf9bde5129a (2) A1 |
1221 | o fdf9bde5129a (2) A1 |
1196 |/ |
1222 |/ |
1197 x 471f378eab4c (1) A0 |
1223 x 471f378eab4c (1) A0 |
1198 rewritten(description) by test (*) as 65b757b745b9 (glob) |
1224 rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000) |
1199 --- a/471f378eab4c-changeset-description |
1225 --- a/471f378eab4c-changeset-description |
1200 +++ b/65b757b745b9-changeset-description |
1226 +++ b/65b757b745b9-changeset-description |
1201 @@ -1,1 +1,1 @@ |
1227 @@ -1,1 +1,1 @@ |
1202 -A0 |
1228 -A0 |
1203 +A2 |
1229 +A2 |
1204 |
1230 |
1205 rewritten(description) by test (*) as fdf9bde5129a (glob) |
1231 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1206 --- a/471f378eab4c-changeset-description |
1232 --- a/471f378eab4c-changeset-description |
1207 +++ b/fdf9bde5129a-changeset-description |
1233 +++ b/fdf9bde5129a-changeset-description |
1208 @@ -1,1 +1,1 @@ |
1234 @@ -1,1 +1,1 @@ |
1209 -A0 |
1235 -A0 |
1210 +A1 |
1236 +A1 |
1211 |
1237 |
1212 |
1238 |
1213 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool |
1239 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool |
1214 [ |
1240 [ |
1215 { |
1241 { |
1216 "debugobshistory.markers": [], |
1242 "markers": [], |
1217 "debugobshistory.node": "65b757b745b9", |
1243 "node": "65b757b745b9", |
1218 "debugobshistory.rev": 3, |
1244 "rev": 3, |
1219 "debugobshistory.shortdescription": "A2" |
1245 "shortdescription": "A2" |
1220 }, |
1246 }, |
1221 { |
1247 { |
1222 "debugobshistory.markers": [ |
1248 "markers": [ |
1223 { |
1249 { |
1224 "debugobshistory.effect": [ |
1250 "date": [ |
|
1251 *, (glob) |
|
1252 0 (glob) |
|
1253 ], |
|
1254 "effect": [ |
1225 "description" |
1255 "description" |
1226 ], |
1256 ], |
1227 "debugobshistory.marker_date": [ |
1257 "succnodes": [ |
1228 *, (glob) |
|
1229 0 (glob) |
|
1230 ], |
|
1231 "debugobshistory.marker_user": "test", |
|
1232 "debugobshistory.succnodes": [ |
|
1233 "65b757b745b9" |
1258 "65b757b745b9" |
1234 ], |
1259 ], |
1235 "debugobshistory.verb": "rewritten" |
1260 "user": "test", |
|
1261 "verb": "rewritten" |
1236 }, |
1262 }, |
1237 { |
1263 { |
1238 "debugobshistory.effect": [ |
1264 "date": [ |
|
1265 *, (glob) |
|
1266 0 (glob) |
|
1267 ], |
|
1268 "effect": [ |
1239 "description" |
1269 "description" |
1240 ], |
1270 ], |
1241 "debugobshistory.marker_date": [ |
1271 "succnodes": [ |
1242 *, (glob) |
|
1243 0 (glob) |
|
1244 ], |
|
1245 "debugobshistory.marker_user": "test", |
|
1246 "debugobshistory.succnodes": [ |
|
1247 "fdf9bde5129a" |
1272 "fdf9bde5129a" |
1248 ], |
1273 ], |
1249 "debugobshistory.verb": "rewritten" |
1274 "user": "test", |
|
1275 "verb": "rewritten" |
1250 } |
1276 } |
1251 ], |
1277 ], |
1252 "debugobshistory.node": "471f378eab4c", |
1278 "node": "471f378eab4c", |
1253 "debugobshistory.rev": 1, |
1279 "rev": 1, |
1254 "debugobshistory.shortdescription": "A0" |
1280 "shortdescription": "A0" |
1255 }, |
1281 }, |
1256 { |
1282 { |
1257 "debugobshistory.markers": [], |
1283 "markers": [], |
1258 "debugobshistory.node": "fdf9bde5129a", |
1284 "node": "fdf9bde5129a", |
1259 "debugobshistory.rev": 2, |
1285 "rev": 2, |
1260 "debugobshistory.shortdescription": "A1" |
1286 "shortdescription": "A1" |
1261 } |
1287 } |
1262 ] |
1288 ] |
1263 $ hg update 471f378eab4c |
1289 $ hg update 471f378eab4c |
1264 abort: hidden revision '471f378eab4c'! |
1290 abort: hidden revision '471f378eab4c'! |
1265 (use --hidden to access hidden revisions; diverged) |
1291 (use --hidden to access hidden revisions; diverged) |
1266 [255] |
1292 [255] |
1267 $ hg update --hidden 'desc(A0)' |
1293 $ hg update --hidden 'desc(A0)' |
1268 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1294 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1269 working directory parent is obsolete! (471f378eab4c) |
1295 working directory parent is obsolete! (471f378eab4c) |
1270 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue) |
1296 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) |
1271 |
1297 |
1272 Test output with amended + folded commit |
1298 Test output with amended + folded commit |
1273 ======================================== |
1299 ======================================== |
1274 |
1300 |
1275 Test setup |
1301 Test setup |
1393 | @@ -0,0 +1,1 @@ |
1419 | @@ -0,0 +1,1 @@ |
1394 | +B0 |
1420 | +B0 |
1395 | |
1421 | |
1396 | |
1422 | |
1397 x b7ea6d14e664 (3) B1 |
1423 x b7ea6d14e664 (3) B1 |
1398 | rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob) |
1424 | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000) |
1399 | (No patch available yet, changesets rebased) |
1425 | (No patch available yet, changesets rebased) |
1400 | |
1426 | |
1401 x 0dec01379d3b (2) B0 |
1427 x 0dec01379d3b (2) B0 |
1402 rewritten(description) by test (*) as b7ea6d14e664 (glob) |
1428 rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000) |
1403 --- a/0dec01379d3b-changeset-description |
1429 --- a/0dec01379d3b-changeset-description |
1404 +++ b/b7ea6d14e664-changeset-description |
1430 +++ b/b7ea6d14e664-changeset-description |
1405 @@ -1,1 +1,1 @@ |
1431 @@ -1,1 +1,1 @@ |
1406 -B0 |
1432 -B0 |
1407 +B1 |
1433 +B1 |
1408 |
1434 |
1409 |
1435 |
1410 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
1436 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
1411 [ |
1437 [ |
1412 { |
1438 { |
1413 "debugobshistory.markers": [], |
1439 "markers": [], |
1414 "debugobshistory.node": "eb5a0daa2192", |
1440 "node": "eb5a0daa2192", |
1415 "debugobshistory.rev": 4, |
1441 "rev": 4, |
1416 "debugobshistory.shortdescription": "C0" |
1442 "shortdescription": "C0" |
1417 }, |
1443 }, |
1418 { |
1444 { |
1419 "debugobshistory.markers": [ |
1445 "markers": [ |
1420 { |
1446 { |
1421 "debugobshistory.effect": [ |
1447 "date": [ |
|
1448 *, (glob) |
|
1449 0 (glob) |
|
1450 ], |
|
1451 "effect": [ |
1422 *, (glob) |
1452 *, (glob) |
1423 *, (glob) |
1453 *, (glob) |
1424 "content" |
1454 "content" |
1425 ], |
1455 ], |
1426 "debugobshistory.marker_date": [ |
1456 "succnodes": [ |
1427 *, (glob) |
|
1428 0 (glob) |
|
1429 ], |
|
1430 "debugobshistory.marker_user": "test", |
|
1431 "debugobshistory.succnodes": [ |
|
1432 "eb5a0daa2192" |
1457 "eb5a0daa2192" |
1433 ], |
1458 ], |
1434 "debugobshistory.verb": "rewritten" |
1459 "user": "test", |
|
1460 "verb": "rewritten" |
1435 } |
1461 } |
1436 ], |
1462 ], |
1437 "debugobshistory.node": "b7ea6d14e664", |
1463 "node": "b7ea6d14e664", |
1438 "debugobshistory.rev": 3, |
1464 "rev": 3, |
1439 "debugobshistory.shortdescription": "B1" |
1465 "shortdescription": "B1" |
1440 }, |
1466 }, |
1441 { |
1467 { |
1442 "debugobshistory.markers": [ |
1468 "markers": [ |
1443 { |
1469 { |
1444 "debugobshistory.effect": [ |
1470 "date": [ |
|
1471 *, (glob) |
|
1472 0 (glob) |
|
1473 ], |
|
1474 "effect": [ |
1445 "description" |
1475 "description" |
1446 ], |
1476 ], |
1447 "debugobshistory.marker_date": [ |
1477 "succnodes": [ |
1448 *, (glob) |
|
1449 0 (glob) |
|
1450 ], |
|
1451 "debugobshistory.marker_user": "test", |
|
1452 "debugobshistory.succnodes": [ |
|
1453 "b7ea6d14e664" |
1478 "b7ea6d14e664" |
1454 ], |
1479 ], |
1455 "debugobshistory.verb": "rewritten" |
1480 "user": "test", |
|
1481 "verb": "rewritten" |
1456 } |
1482 } |
1457 ], |
1483 ], |
1458 "debugobshistory.node": "0dec01379d3b", |
1484 "node": "0dec01379d3b", |
1459 "debugobshistory.rev": 2, |
1485 "rev": 2, |
1460 "debugobshistory.shortdescription": "B0" |
1486 "shortdescription": "B0" |
1461 }, |
1487 }, |
1462 { |
1488 { |
1463 "debugobshistory.markers": [ |
1489 "markers": [ |
1464 { |
1490 { |
1465 "debugobshistory.effect": [ |
1491 "date": [ |
|
1492 *, (glob) |
|
1493 0 (glob) |
|
1494 ], |
|
1495 "effect": [ |
1466 "description", |
1496 "description", |
1467 "content" |
1497 "content" |
1468 ], |
1498 ], |
1469 "debugobshistory.marker_date": [ |
1499 "succnodes": [ |
1470 *, (glob) |
|
1471 0 (glob) |
|
1472 ], |
|
1473 "debugobshistory.marker_user": "test", |
|
1474 "debugobshistory.succnodes": [ |
|
1475 "eb5a0daa2192" |
1500 "eb5a0daa2192" |
1476 ], |
1501 ], |
1477 "debugobshistory.verb": "rewritten" |
1502 "user": "test", |
|
1503 "verb": "rewritten" |
1478 } |
1504 } |
1479 ], |
1505 ], |
1480 "debugobshistory.node": "471f378eab4c", |
1506 "node": "471f378eab4c", |
1481 "debugobshistory.rev": 1, |
1507 "rev": 1, |
1482 "debugobshistory.shortdescription": "A0" |
1508 "shortdescription": "A0" |
1483 } |
1509 } |
1484 ] |
1510 ] |
1485 $ hg update 471f378eab4c |
1511 $ hg update 471f378eab4c |
1486 abort: hidden revision '471f378eab4c'! |
1512 abort: hidden revision '471f378eab4c'! |
1487 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1513 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1611 changectx |
1637 changectx |
1612 $ hg obslog 7a230b46bf61 --patch |
1638 $ hg obslog 7a230b46bf61 --patch |
1613 o 7a230b46bf61 (2) A2 |
1639 o 7a230b46bf61 (2) A2 |
1614 | |
1640 | |
1615 x fdf9bde5129a |
1641 x fdf9bde5129a |
1616 | rewritten(description) by test (*) as 7a230b46bf61 (glob) |
1642 | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000) |
1617 | (No patch available yet, context is not local) |
1643 | (No patch available yet, context is not local) |
1618 | |
1644 | |
1619 @ 471f378eab4c (1) A0 |
1645 @ 471f378eab4c (1) A0 |
1620 rewritten(description) by test (*) as fdf9bde5129a (glob) |
1646 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
1621 (No patch available yet, succ is unknown locally) |
1647 (No patch available yet, succ is unknown locally) |
1622 |
1648 |
1623 $ hg obslog 7a230b46bf61 --color=debug --patch |
1649 $ hg obslog 7a230b46bf61 --color=debug --patch |
1624 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
1650 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
1625 | |
1651 | |
1626 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
1652 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
1627 | [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) |
1653 | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] |
1628 | (No patch available yet, context is not local) |
1654 | (No patch available yet, context is not local) |
1629 | |
1655 | |
1630 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
1656 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
1631 [evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) |
1657 [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] |
1632 (No patch available yet, succ is unknown locally) |
1658 (No patch available yet, succ is unknown locally) |
1633 |
1659 |