# HG changeset patch # User Pierre-Yves David # Date 1495642621 -7200 # Node ID 5bbc756adda41779706abf62b0ff69b8bcbb8768 # Parent 50113c1ea068bec4f5a7f60decc2d13f0d8ad9ae test: improve the globing for obsmarker date If we force the date of obsmarkers, they will no longer include "20". diff -r 50113c1ea068 -r 5bbc756adda4 tests/test-evolve-obshistory.t --- a/tests/test-evolve-obshistory.t Tue May 23 10:50:56 2017 +0200 +++ b/tests/test-evolve-obshistory.t Wed May 24 18:17:01 2017 +0200 @@ -57,7 +57,7 @@ @ 4ae3a4151de9 (3) A1 | x 471f378eab4c (1) A0 - rewritten by test (*20*) as 4ae3a4151de9 (glob) + rewritten by test (*) as 4ae3a4151de9 (glob) $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool [ @@ -88,7 +88,7 @@ ] $ hg obslog --hidden 471f378eab4c x 471f378eab4c (1) A0 - rewritten by test (*20*) as 4ae3a4151de9 (glob) + rewritten by test (*) as 4ae3a4151de9 (glob) $ hg olog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool [ @@ -175,7 +175,7 @@ $ hg olog 'desc(B0)' --hidden x 0dec01379d3b (2) B0 - pruned by test (*20*) (glob) + pruned by test (*) (glob) $ hg olog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool [ @@ -308,7 +308,7 @@ Check that debugobshistory on splitted commit show both targets $ hg olog 471597cad322 --hidden x 471597cad322 (1) A0 - rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) $ hg olog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool [ @@ -338,7 +338,7 @@ o 337fec4d2edc (2) A0 | x 471597cad322 (1) A0 - rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) Check that debugobshistory on the second successor after split show the revision plus the splitted one @@ -346,7 +346,7 @@ @ f257fde29c7a (3) A0 | x 471597cad322 (1) A0 - rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) Check that debugobshistory on both successors after split show a coherent graph @@ -356,7 +356,7 @@ | @ f257fde29c7a (3) A0 |/ x 471597cad322 (1) A0 - rewritten by test (*20*) as 337fec4d2edc, f257fde29c7a (glob) + rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob) $ hg update 471597cad322 abort: hidden revision '471597cad322'! @@ -522,7 +522,7 @@ $ hg olog de7290d8b885 --hidden x de7290d8b885 (1) A0 - rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) $ hg olog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool [ @@ -552,7 +552,7 @@ @ c7f044602e9b (5) A0 | x de7290d8b885 (1) A0 - rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) $ hg olog c7f044602e9b --no-graph -Tjson | python -m json.tool [ @@ -595,7 +595,7 @@ | o f257fde29c7a (3) A0 |/ x de7290d8b885 (1) A0 - rewritten by test (*20*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) + rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob) $ hg update de7290d8b885 abort: hidden revision 'de7290d8b885'! @@ -667,13 +667,13 @@ the revision with the target $ hg olog --hidden 471f378eab4c x 471f378eab4c (1) A0 - rewritten by test (*20*) as eb5a0daa2192 (glob) + rewritten by test (*) as eb5a0daa2192 (glob) Check that debugobshistory on the second folded revision show only the revision with the target $ hg olog --hidden 0dec01379d3b x 0dec01379d3b (2) B0 - rewritten by test (*20*) as eb5a0daa2192 (glob) + rewritten by test (*) as eb5a0daa2192 (glob) Check that debugobshistory on the successor revision show a coherent graph @@ -681,10 +681,10 @@ @ eb5a0daa2192 (3) C0 |\ x | 0dec01379d3b (2) B0 - / rewritten by test (*20*) as eb5a0daa2192 (glob) + / rewritten by test (*) as eb5a0daa2192 (glob) | x 471f378eab4c (1) A0 - rewritten by test (*20*) as eb5a0daa2192 (glob) + rewritten by test (*) as eb5a0daa2192 (glob) $ hg olog eb5a0daa2192 --no-graph -Tjson | python -m json.tool [ @@ -817,8 +817,8 @@ Check that debugobshistory on the divergent revision show both destinations $ hg olog --hidden 471f378eab4c x 471f378eab4c (1) A0 - rewritten by test (*20*) as 65b757b745b9 (glob) - rewritten by test (*20*) as fdf9bde5129a (glob) + rewritten by test (*) as 65b757b745b9 (glob) + rewritten by test (*) as fdf9bde5129a (glob) $ hg olog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool [ @@ -858,8 +858,8 @@ o fdf9bde5129a (2) A1 | x 471f378eab4c (1) A0 - rewritten by test (*20*) as 65b757b745b9 (glob) - rewritten by test (*20*) as fdf9bde5129a (glob) + rewritten by test (*) as 65b757b745b9 (glob) + rewritten by test (*) as fdf9bde5129a (glob) Check that debugobshistory on the second diverged revision show the revision and the diverent one @@ -867,8 +867,8 @@ @ 65b757b745b9 (3) A2 | x 471f378eab4c (1) A0 - rewritten by test (*20*) as 65b757b745b9 (glob) - rewritten by test (*20*) as fdf9bde5129a (glob) + rewritten by test (*) as 65b757b745b9 (glob) + rewritten by test (*) as fdf9bde5129a (glob) Check that debugobshistory on the both diverged revision show a coherent graph @@ -878,8 +878,8 @@ | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 - rewritten by test (*20*) as 65b757b745b9 (glob) - rewritten by test (*20*) as fdf9bde5129a (glob) + rewritten by test (*) as 65b757b745b9 (glob) + rewritten by test (*) as fdf9bde5129a (glob) $ hg olog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool [ @@ -1009,13 +1009,13 @@ @ eb5a0daa2192 (4) C0 |\ x | 471f378eab4c (1) A0 - / rewritten by test (*20*) as eb5a0daa2192 (glob) + / rewritten by test (*) as eb5a0daa2192 (glob) | x b7ea6d14e664 (3) B1 - | rewritten by test (*20*) as eb5a0daa2192 (glob) + | rewritten by test (*) as eb5a0daa2192 (glob) | x 0dec01379d3b (2) B0 - rewritten by test (*20*) as b7ea6d14e664 (glob) + rewritten by test (*) as b7ea6d14e664 (glob) $ hg olog eb5a0daa2192 --no-graph -Tjson | python -m json.tool [ @@ -1173,10 +1173,10 @@ @ 7a230b46bf61 (3) A2 | x fdf9bde5129a (2) A1 - | rewritten by test (*20*) as 7a230b46bf61 (glob) + | rewritten by test (*) as 7a230b46bf61 (glob) | x 471f378eab4c (1) A0 - rewritten by test (*20*) as fdf9bde5129a (glob) + rewritten by test (*) as fdf9bde5129a (glob) $ cd $TESTTMP/local-remote-markers-2 $ hg pull @@ -1196,19 +1196,19 @@ o 7a230b46bf61 (2) A2 | x fdf9bde5129a - | rewritten by test (*20*) as 7a230b46bf61 (glob) + | rewritten by test (*) as 7a230b46bf61 (glob) | @ 471f378eab4c (1) A0 - rewritten by test (*20*) as fdf9bde5129a (glob) + rewritten by test (*) as fdf9bde5129a (glob) $ hg olog 7a230b46bf61 --color=debug o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] | x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] - | [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.node|7a230b46bf61] (glob) + | [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*)] as [evolve.node|7a230b46bf61] (glob) | @ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] - [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.node|fdf9bde5129a] (glob) + [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob) Test with cycle @@ -1284,35 +1284,35 @@ $ hg olog "desc(A)" --hidden @ 2a34000d3544 (1) A - | rewritten by test (*20*) as c473644ee0e9 (glob) + | rewritten by test (*) as c473644ee0e9 (glob) | x a8df460dbbfe (3) C - | rewritten by test (*20*) as 2a34000d3544 (glob) + | rewritten by test (*) as 2a34000d3544 (glob) | x c473644ee0e9 (2) B - | rewritten by test (*20*) as a8df460dbbfe (glob) + | rewritten by test (*) as a8df460dbbfe (glob) | $ hg olog "desc(B)" --hidden @ 2a34000d3544 (1) A - | rewritten by test (*20*) as c473644ee0e9 (glob) + | rewritten by test (*) as c473644ee0e9 (glob) | x a8df460dbbfe (3) C - | rewritten by test (*20*) as 2a34000d3544 (glob) + | rewritten by test (*) as 2a34000d3544 (glob) | x c473644ee0e9 (2) B - | rewritten by test (*20*) as a8df460dbbfe (glob) + | rewritten by test (*) as a8df460dbbfe (glob) | $ hg olog "desc(C)" --hidden @ 2a34000d3544 (1) A - | rewritten by test (*20*) as c473644ee0e9 (glob) + | rewritten by test (*) as c473644ee0e9 (glob) | x a8df460dbbfe (3) C - | rewritten by test (*20*) as 2a34000d3544 (glob) + | rewritten by test (*) as 2a34000d3544 (glob) | x c473644ee0e9 (2) B - | rewritten by test (*20*) as a8df460dbbfe (glob) + | rewritten by test (*) as a8df460dbbfe (glob) | Test with multiple cyles @@ -1428,22 +1428,22 @@ $ hg olog "desc(D)" --hidden x 0da815c333f6 (5) E - | rewritten by test (*20*) as d9f908fde1a1 (glob) + | rewritten by test (*) as d9f908fde1a1 (glob) | @ 868d2e0eb19c (4) D - |\ rewritten by test (*20*) as 0da815c333f6 (glob) + |\ rewritten by test (*) as 0da815c333f6 (glob) | | | x d9f908fde1a1 (6) F - | | rewritten by test (*20*) as 868d2e0eb19c (glob) + | | rewritten by test (*) as 868d2e0eb19c (glob) | | +---x 2a34000d3544 (1) A - | | rewritten by test (*20*) as c473644ee0e9 (glob) + | | rewritten by test (*) as c473644ee0e9 (glob) | | x | a8df460dbbfe (3) C - | | rewritten by test (*20*) as 2a34000d3544, 868d2e0eb19c (glob) + | | rewritten by test (*) as 2a34000d3544, 868d2e0eb19c (glob) | | x | c473644ee0e9 (2) B - | | rewritten by test (*20*) as a8df460dbbfe (glob) + | | rewritten by test (*) as a8df460dbbfe (glob) | | Check the json output is valid in this case