86 "debugobshistory.shortdescription": "A0" |
86 "debugobshistory.shortdescription": "A0" |
87 } |
87 } |
88 ] |
88 ] |
89 $ hg obslog --hidden 471f378eab4c |
89 $ hg obslog --hidden 471f378eab4c |
90 x 471f378eab4c (1) A0 |
90 x 471f378eab4c (1) A0 |
91 rewritten by test (*20*) as 4ae3a4151de9 (glob) |
91 rewritten by test (*) as 4ae3a4151de9 (glob) |
92 |
92 |
93 $ hg olog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
93 $ hg olog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
94 [ |
94 [ |
95 { |
95 { |
96 "debugobshistory.markers": [ |
96 "debugobshistory.markers": [ |
173 Actual test |
173 Actual test |
174 ----------- |
174 ----------- |
175 |
175 |
176 $ hg olog 'desc(B0)' --hidden |
176 $ hg olog 'desc(B0)' --hidden |
177 x 0dec01379d3b (2) B0 |
177 x 0dec01379d3b (2) B0 |
178 pruned by test (*20*) (glob) |
178 pruned by test (*) (glob) |
179 |
179 |
180 $ hg olog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool |
180 $ hg olog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool |
181 [ |
181 [ |
182 { |
182 { |
183 "debugobshistory.markers": [ |
183 "debugobshistory.markers": [ |
306 ----------- |
306 ----------- |
307 |
307 |
308 Check that debugobshistory on splitted commit show both targets |
308 Check that debugobshistory on splitted commit show both targets |
309 $ hg olog 471597cad322 --hidden |
309 $ hg olog 471597cad322 --hidden |
310 x 471597cad322 (1) A0 |
310 x 471597cad322 (1) A0 |
311 rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) |
311 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
312 |
312 |
313 $ hg olog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
313 $ hg olog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
314 [ |
314 [ |
315 { |
315 { |
316 "debugobshistory.markers": [ |
316 "debugobshistory.markers": [ |
336 the revision plus the splitted one |
336 the revision plus the splitted one |
337 $ hg olog 337fec4d2edc |
337 $ hg olog 337fec4d2edc |
338 o 337fec4d2edc (2) A0 |
338 o 337fec4d2edc (2) A0 |
339 | |
339 | |
340 x 471597cad322 (1) A0 |
340 x 471597cad322 (1) A0 |
341 rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) |
341 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
342 |
342 |
343 Check that debugobshistory on the second successor after split show |
343 Check that debugobshistory on the second successor after split show |
344 the revision plus the splitted one |
344 the revision plus the splitted one |
345 $ hg olog f257fde29c7a |
345 $ hg olog f257fde29c7a |
346 @ f257fde29c7a (3) A0 |
346 @ f257fde29c7a (3) A0 |
347 | |
347 | |
348 x 471597cad322 (1) A0 |
348 x 471597cad322 (1) A0 |
349 rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) |
349 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
350 |
350 |
351 Check that debugobshistory on both successors after split show |
351 Check that debugobshistory on both successors after split show |
352 a coherent graph |
352 a coherent graph |
353 $ hg olog 'f257fde29c7a+337fec4d2edc' |
353 $ hg olog 'f257fde29c7a+337fec4d2edc' |
354 o 337fec4d2edc (2) A0 |
354 o 337fec4d2edc (2) A0 |
355 | |
355 | |
356 | @ f257fde29c7a (3) A0 |
356 | @ f257fde29c7a (3) A0 |
357 |/ |
357 |/ |
358 x 471597cad322 (1) A0 |
358 x 471597cad322 (1) A0 |
359 rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) |
359 rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) |
360 |
360 |
361 $ hg update 471597cad322 |
361 $ hg update 471597cad322 |
362 abort: hidden revision '471597cad322'! |
362 abort: hidden revision '471597cad322'! |
363 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
363 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
364 [255] |
364 [255] |
520 Actual test |
520 Actual test |
521 ----------- |
521 ----------- |
522 |
522 |
523 $ hg olog de7290d8b885 --hidden |
523 $ hg olog de7290d8b885 --hidden |
524 x de7290d8b885 (1) A0 |
524 x de7290d8b885 (1) A0 |
525 rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
525 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
526 |
526 |
527 $ hg olog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
527 $ hg olog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool |
528 [ |
528 [ |
529 { |
529 { |
530 "debugobshistory.markers": [ |
530 "debugobshistory.markers": [ |
550 ] |
550 ] |
551 $ hg olog c7f044602e9b |
551 $ hg olog c7f044602e9b |
552 @ c7f044602e9b (5) A0 |
552 @ c7f044602e9b (5) A0 |
553 | |
553 | |
554 x de7290d8b885 (1) A0 |
554 x de7290d8b885 (1) A0 |
555 rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
555 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
556 |
556 |
557 $ hg olog c7f044602e9b --no-graph -Tjson | python -m json.tool |
557 $ hg olog c7f044602e9b --no-graph -Tjson | python -m json.tool |
558 [ |
558 [ |
559 { |
559 { |
560 "debugobshistory.markers": [], |
560 "debugobshistory.markers": [], |
593 | @ c7f044602e9b (5) A0 |
593 | @ c7f044602e9b (5) A0 |
594 |/ |
594 |/ |
595 | o f257fde29c7a (3) A0 |
595 | o f257fde29c7a (3) A0 |
596 |/ |
596 |/ |
597 x de7290d8b885 (1) A0 |
597 x de7290d8b885 (1) A0 |
598 rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
598 rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) |
599 |
599 |
600 $ hg update de7290d8b885 |
600 $ hg update de7290d8b885 |
601 abort: hidden revision 'de7290d8b885'! |
601 abort: hidden revision 'de7290d8b885'! |
602 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
602 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
603 [255] |
603 [255] |
665 |
665 |
666 Check that debugobshistory on the first folded revision show only |
666 Check that debugobshistory on the first folded revision show only |
667 the revision with the target |
667 the revision with the target |
668 $ hg olog --hidden 471f378eab4c |
668 $ hg olog --hidden 471f378eab4c |
669 x 471f378eab4c (1) A0 |
669 x 471f378eab4c (1) A0 |
670 rewritten by test (*20*) as eb5a0daa2192 (glob) |
670 rewritten by test (*) as eb5a0daa2192 (glob) |
671 |
671 |
672 Check that debugobshistory on the second folded revision show only |
672 Check that debugobshistory on the second folded revision show only |
673 the revision with the target |
673 the revision with the target |
674 $ hg olog --hidden 0dec01379d3b |
674 $ hg olog --hidden 0dec01379d3b |
675 x 0dec01379d3b (2) B0 |
675 x 0dec01379d3b (2) B0 |
676 rewritten by test (*20*) as eb5a0daa2192 (glob) |
676 rewritten by test (*) as eb5a0daa2192 (glob) |
677 |
677 |
678 Check that debugobshistory on the successor revision show a coherent |
678 Check that debugobshistory on the successor revision show a coherent |
679 graph |
679 graph |
680 $ hg olog eb5a0daa2192 |
680 $ hg olog eb5a0daa2192 |
681 @ eb5a0daa2192 (3) C0 |
681 @ eb5a0daa2192 (3) C0 |
682 |\ |
682 |\ |
683 x | 0dec01379d3b (2) B0 |
683 x | 0dec01379d3b (2) B0 |
684 / rewritten by test (*20*) as eb5a0daa2192 (glob) |
684 / rewritten by test (*) as eb5a0daa2192 (glob) |
685 | |
685 | |
686 x 471f378eab4c (1) A0 |
686 x 471f378eab4c (1) A0 |
687 rewritten by test (*20*) as eb5a0daa2192 (glob) |
687 rewritten by test (*) as eb5a0daa2192 (glob) |
688 |
688 |
689 $ hg olog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
689 $ hg olog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
690 [ |
690 [ |
691 { |
691 { |
692 "debugobshistory.markers": [], |
692 "debugobshistory.markers": [], |
815 ----------- |
815 ----------- |
816 |
816 |
817 Check that debugobshistory on the divergent revision show both destinations |
817 Check that debugobshistory on the divergent revision show both destinations |
818 $ hg olog --hidden 471f378eab4c |
818 $ hg olog --hidden 471f378eab4c |
819 x 471f378eab4c (1) A0 |
819 x 471f378eab4c (1) A0 |
820 rewritten by test (*20*) as 65b757b745b9 (glob) |
820 rewritten by test (*) as 65b757b745b9 (glob) |
821 rewritten by test (*20*) as fdf9bde5129a (glob) |
821 rewritten by test (*) as fdf9bde5129a (glob) |
822 |
822 |
823 $ hg olog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
823 $ hg olog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
824 [ |
824 [ |
825 { |
825 { |
826 "debugobshistory.markers": [ |
826 "debugobshistory.markers": [ |
856 and the diverent one |
856 and the diverent one |
857 $ hg olog fdf9bde5129a |
857 $ hg olog fdf9bde5129a |
858 o fdf9bde5129a (2) A1 |
858 o fdf9bde5129a (2) A1 |
859 | |
859 | |
860 x 471f378eab4c (1) A0 |
860 x 471f378eab4c (1) A0 |
861 rewritten by test (*20*) as 65b757b745b9 (glob) |
861 rewritten by test (*) as 65b757b745b9 (glob) |
862 rewritten by test (*20*) as fdf9bde5129a (glob) |
862 rewritten by test (*) as fdf9bde5129a (glob) |
863 |
863 |
864 Check that debugobshistory on the second diverged revision show the revision |
864 Check that debugobshistory on the second diverged revision show the revision |
865 and the diverent one |
865 and the diverent one |
866 $ hg olog 65b757b745b9 |
866 $ hg olog 65b757b745b9 |
867 @ 65b757b745b9 (3) A2 |
867 @ 65b757b745b9 (3) A2 |
868 | |
868 | |
869 x 471f378eab4c (1) A0 |
869 x 471f378eab4c (1) A0 |
870 rewritten by test (*20*) as 65b757b745b9 (glob) |
870 rewritten by test (*) as 65b757b745b9 (glob) |
871 rewritten by test (*20*) as fdf9bde5129a (glob) |
871 rewritten by test (*) as fdf9bde5129a (glob) |
872 |
872 |
873 Check that debugobshistory on the both diverged revision show a coherent |
873 Check that debugobshistory on the both diverged revision show a coherent |
874 graph |
874 graph |
875 $ hg olog '65b757b745b9+fdf9bde5129a' |
875 $ hg olog '65b757b745b9+fdf9bde5129a' |
876 @ 65b757b745b9 (3) A2 |
876 @ 65b757b745b9 (3) A2 |
877 | |
877 | |
878 | o fdf9bde5129a (2) A1 |
878 | o fdf9bde5129a (2) A1 |
879 |/ |
879 |/ |
880 x 471f378eab4c (1) A0 |
880 x 471f378eab4c (1) A0 |
881 rewritten by test (*20*) as 65b757b745b9 (glob) |
881 rewritten by test (*) as 65b757b745b9 (glob) |
882 rewritten by test (*20*) as fdf9bde5129a (glob) |
882 rewritten by test (*) as fdf9bde5129a (glob) |
883 |
883 |
884 $ hg olog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool |
884 $ hg olog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool |
885 [ |
885 [ |
886 { |
886 { |
887 "debugobshistory.markers": [], |
887 "debugobshistory.markers": [], |
1007 Check that debugobshistory on head show a coherent graph |
1007 Check that debugobshistory on head show a coherent graph |
1008 $ hg olog eb5a0daa2192 |
1008 $ hg olog eb5a0daa2192 |
1009 @ eb5a0daa2192 (4) C0 |
1009 @ eb5a0daa2192 (4) C0 |
1010 |\ |
1010 |\ |
1011 x | 471f378eab4c (1) A0 |
1011 x | 471f378eab4c (1) A0 |
1012 / rewritten by test (*20*) as eb5a0daa2192 (glob) |
1012 / rewritten by test (*) as eb5a0daa2192 (glob) |
1013 | |
1013 | |
1014 x b7ea6d14e664 (3) B1 |
1014 x b7ea6d14e664 (3) B1 |
1015 | rewritten by test (*20*) as eb5a0daa2192 (glob) |
1015 | rewritten by test (*) as eb5a0daa2192 (glob) |
1016 | |
1016 | |
1017 x 0dec01379d3b (2) B0 |
1017 x 0dec01379d3b (2) B0 |
1018 rewritten by test (*20*) as b7ea6d14e664 (glob) |
1018 rewritten by test (*) as b7ea6d14e664 (glob) |
1019 |
1019 |
1020 $ hg olog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
1020 $ hg olog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
1021 [ |
1021 [ |
1022 { |
1022 { |
1023 "debugobshistory.markers": [], |
1023 "debugobshistory.markers": [], |
1171 |
1171 |
1172 $ hg olog 7a230b46bf61 |
1172 $ hg olog 7a230b46bf61 |
1173 @ 7a230b46bf61 (3) A2 |
1173 @ 7a230b46bf61 (3) A2 |
1174 | |
1174 | |
1175 x fdf9bde5129a (2) A1 |
1175 x fdf9bde5129a (2) A1 |
1176 | rewritten by test (*20*) as 7a230b46bf61 (glob) |
1176 | rewritten by test (*) as 7a230b46bf61 (glob) |
1177 | |
1177 | |
1178 x 471f378eab4c (1) A0 |
1178 x 471f378eab4c (1) A0 |
1179 rewritten by test (*20*) as fdf9bde5129a (glob) |
1179 rewritten by test (*) as fdf9bde5129a (glob) |
1180 |
1180 |
1181 $ cd $TESTTMP/local-remote-markers-2 |
1181 $ cd $TESTTMP/local-remote-markers-2 |
1182 $ hg pull |
1182 $ hg pull |
1183 pulling from $TESTTMP/local-remote-markers-1 |
1183 pulling from $TESTTMP/local-remote-markers-1 |
1184 searching for changes |
1184 searching for changes |
1194 changectx |
1194 changectx |
1195 $ hg olog 7a230b46bf61 |
1195 $ hg olog 7a230b46bf61 |
1196 o 7a230b46bf61 (2) A2 |
1196 o 7a230b46bf61 (2) A2 |
1197 | |
1197 | |
1198 x fdf9bde5129a |
1198 x fdf9bde5129a |
1199 | rewritten by test (*20*) as 7a230b46bf61 (glob) |
1199 | rewritten by test (*) as 7a230b46bf61 (glob) |
1200 | |
1200 | |
1201 @ 471f378eab4c (1) A0 |
1201 @ 471f378eab4c (1) A0 |
1202 rewritten by test (*20*) as fdf9bde5129a (glob) |
1202 rewritten by test (*) as fdf9bde5129a (glob) |
1203 |
1203 |
1204 $ hg olog 7a230b46bf61 --color=debug |
1204 $ hg olog 7a230b46bf61 --color=debug |
1205 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
1205 o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
1206 | |
1206 | |
1207 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
1207 x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
1208 | [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.node|7a230b46bf61] (glob) |
1208 | [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) |
1209 | |
1209 | |
1210 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
1210 @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
1211 [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.node|fdf9bde5129a] (glob) |
1211 [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) |
1212 |
1212 |
1213 |
1213 |
1214 Test with cycle |
1214 Test with cycle |
1215 =============== |
1215 =============== |
1216 |
1216 |
1282 |
1282 |
1283 Check that debugobshistory never crash on a cycle |
1283 Check that debugobshistory never crash on a cycle |
1284 |
1284 |
1285 $ hg olog "desc(A)" --hidden |
1285 $ hg olog "desc(A)" --hidden |
1286 @ 2a34000d3544 (1) A |
1286 @ 2a34000d3544 (1) A |
1287 | rewritten by test (*20*) as c473644ee0e9 (glob) |
1287 | rewritten by test (*) as c473644ee0e9 (glob) |
1288 | |
1288 | |
1289 x a8df460dbbfe (3) C |
1289 x a8df460dbbfe (3) C |
1290 | rewritten by test (*20*) as 2a34000d3544 (glob) |
1290 | rewritten by test (*) as 2a34000d3544 (glob) |
1291 | |
1291 | |
1292 x c473644ee0e9 (2) B |
1292 x c473644ee0e9 (2) B |
1293 | rewritten by test (*20*) as a8df460dbbfe (glob) |
1293 | rewritten by test (*) as a8df460dbbfe (glob) |
1294 | |
1294 | |
1295 |
1295 |
1296 $ hg olog "desc(B)" --hidden |
1296 $ hg olog "desc(B)" --hidden |
1297 @ 2a34000d3544 (1) A |
1297 @ 2a34000d3544 (1) A |
1298 | rewritten by test (*20*) as c473644ee0e9 (glob) |
1298 | rewritten by test (*) as c473644ee0e9 (glob) |
1299 | |
1299 | |
1300 x a8df460dbbfe (3) C |
1300 x a8df460dbbfe (3) C |
1301 | rewritten by test (*20*) as 2a34000d3544 (glob) |
1301 | rewritten by test (*) as 2a34000d3544 (glob) |
1302 | |
1302 | |
1303 x c473644ee0e9 (2) B |
1303 x c473644ee0e9 (2) B |
1304 | rewritten by test (*20*) as a8df460dbbfe (glob) |
1304 | rewritten by test (*) as a8df460dbbfe (glob) |
1305 | |
1305 | |
1306 |
1306 |
1307 $ hg olog "desc(C)" --hidden |
1307 $ hg olog "desc(C)" --hidden |
1308 @ 2a34000d3544 (1) A |
1308 @ 2a34000d3544 (1) A |
1309 | rewritten by test (*20*) as c473644ee0e9 (glob) |
1309 | rewritten by test (*) as c473644ee0e9 (glob) |
1310 | |
1310 | |
1311 x a8df460dbbfe (3) C |
1311 x a8df460dbbfe (3) C |
1312 | rewritten by test (*20*) as 2a34000d3544 (glob) |
1312 | rewritten by test (*) as 2a34000d3544 (glob) |
1313 | |
1313 | |
1314 x c473644ee0e9 (2) B |
1314 x c473644ee0e9 (2) B |
1315 | rewritten by test (*20*) as a8df460dbbfe (glob) |
1315 | rewritten by test (*) as a8df460dbbfe (glob) |
1316 | |
1316 | |
1317 |
1317 |
1318 Test with multiple cyles |
1318 Test with multiple cyles |
1319 ======================== |
1319 ======================== |
1320 |
1320 |
1426 |
1426 |
1427 Check that debugobshistory never crash on a cycle |
1427 Check that debugobshistory never crash on a cycle |
1428 |
1428 |
1429 $ hg olog "desc(D)" --hidden |
1429 $ hg olog "desc(D)" --hidden |
1430 x 0da815c333f6 (5) E |
1430 x 0da815c333f6 (5) E |
1431 | rewritten by test (*20*) as d9f908fde1a1 (glob) |
1431 | rewritten by test (*) as d9f908fde1a1 (glob) |
1432 | |
1432 | |
1433 @ 868d2e0eb19c (4) D |
1433 @ 868d2e0eb19c (4) D |
1434 |\ rewritten by test (*20*) as 0da815c333f6 (glob) |
1434 |\ rewritten by test (*) as 0da815c333f6 (glob) |
1435 | | |
1435 | | |
1436 | x d9f908fde1a1 (6) F |
1436 | x d9f908fde1a1 (6) F |
1437 | | rewritten by test (*20*) as 868d2e0eb19c (glob) |
1437 | | rewritten by test (*) as 868d2e0eb19c (glob) |
1438 | | |
1438 | | |
1439 +---x 2a34000d3544 (1) A |
1439 +---x 2a34000d3544 (1) A |
1440 | | rewritten by test (*20*) as c473644ee0e9 (glob) |
1440 | | rewritten by test (*) as c473644ee0e9 (glob) |
1441 | | |
1441 | | |
1442 x | a8df460dbbfe (3) C |
1442 x | a8df460dbbfe (3) C |
1443 | | rewritten by test (*20*) as 2a34000d3544, 868d2e0eb19c (glob) |
1443 | | rewritten by test (*) as 2a34000d3544, 868d2e0eb19c (glob) |
1444 | | |
1444 | | |
1445 x | c473644ee0e9 (2) B |
1445 x | c473644ee0e9 (2) B |
1446 | | rewritten by test (*20*) as a8df460dbbfe (glob) |
1446 | | rewritten by test (*) as a8df460dbbfe (glob) |
1447 | | |
1447 | | |
1448 |
1448 |
1449 Check the json output is valid in this case |
1449 Check the json output is valid in this case |
1450 |
1450 |
1451 $ hg olog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool |
1451 $ hg olog "desc(D)" --hidden --no-graph -Tjson | python -m json.tool |