evolve: comparison tests/test-evolve-obshistory.t

equal deleted inserted replaced

-:d3d686f05458
+:54ac473663ff
 > [phases]
 > publish=False
 > [extensions]
 > evolve =
 > color =
+> [experimental]
+> evolution.effect-flags = yes
 > EOF
 Test output on amended commit
 =============================
 -----------
 $ hg obslog 4ae3a4151de9
 @  4ae3a4151de9 (3) A1
 |
 x  471f378eab4c (1) A0
-rewritten by test (*) as 4ae3a4151de9 (glob)
+rewritten(description, content) by test (*) as 4ae3a4151de9 (glob)
 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [],
 "debugobshistory.shortdescription": "A1"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"description",
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 "debugobshistory.shortdescription": "A0"
 }
 ]
 $ hg obslog --hidden 471f378eab4c
 x  471f378eab4c (1) A0
-rewritten by test (*) as 4ae3a4151de9 (glob)
+rewritten(description, content) by test (*) as 4ae3a4151de9 (glob)
 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+*, (glob)
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 -----------
 Check that debugobshistory on splitted commit show both targets
 $ hg obslog 471597cad322 --hidden
 x  471597cad322 (1) A0
-rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"parent",
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 the revision plus the splitted one
 $ hg obslog 337fec4d2edc
 o  337fec4d2edc (2) A0
 |
 x  471597cad322 (1) A0
-rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
 With the all option, it should show the three changesets
 $ hg obslog --all 337fec4d2edc
 o  337fec4d2edc (2) A0
 |
 | @  f257fde29c7a (3) A0
 |/
 x  471597cad322 (1) A0
-rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
 Check that debugobshistory on the second successor after split show
 the revision plus the splitted one
 $ hg obslog f257fde29c7a
 @  f257fde29c7a (3) A0
 |
 x  471597cad322 (1) A0
-rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
 With the all option, it should show the three changesets
 $ hg obslog f257fde29c7a --all
 o  337fec4d2edc (2) A0
 |
 | @  f257fde29c7a (3) A0
 |/
 x  471597cad322 (1) A0
-rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
 Obslog with all option all should also works on the splitted commit
 $ hg obslog -a 471597cad322 --hidden
 o  337fec4d2edc (2) A0
 |
 | @  f257fde29c7a (3) A0
 |/
 x  471597cad322 (1) A0
-rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
 Check that debugobshistory on both successors after split show
 a coherent graph
 $ hg obslog 'f257fde29c7a+337fec4d2edc'
 o  337fec4d2edc (2) A0
 |
 | @  f257fde29c7a (3) A0
 |/
 x  471597cad322 (1) A0
-rewritten by test (*) as 337fec4d2edc, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 337fec4d2edc, f257fde29c7a (glob)
 $ hg update 471597cad322
 abort: hidden revision '471597cad322'!
 (use --hidden to access hidden revisions)
 [255]
 Actual test
 -----------
 $ hg obslog de7290d8b885 --hidden
 x  de7290d8b885 (1) A0
-rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
 $ hg obslog de7290d8b885 --hidden --all
 o  1ae8bc733a14 (4) A0
 |
 | o  337fec4d2edc (2) A0
 | @  c7f044602e9b (5) A0
 |/
 | o  f257fde29c7a (3) A0
 |/
 x  de7290d8b885 (1) A0
-rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"parent",
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 ]
 $ hg obslog c7f044602e9b
 @  c7f044602e9b (5) A0
 |
 x  de7290d8b885 (1) A0
-rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [],
 "debugobshistory.shortdescription": "A0"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"parent",
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 | @  c7f044602e9b (5) A0
 |/
 | o  f257fde29c7a (3) A0
 |/
 x  de7290d8b885 (1) A0
-rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
 $ hg obslog 5 --all
 o  1ae8bc733a14 (4) A0
 |
 | o  337fec4d2edc (2) A0
 | @  c7f044602e9b (5) A0
 |/
 | o  f257fde29c7a (3) A0
 |/
 x  de7290d8b885 (1) A0
-rewritten by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
+rewritten(parent, content) by test (*) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a (glob)
 $ hg update de7290d8b885
 abort: hidden revision 'de7290d8b885'!
 (use --hidden to access hidden revisions)
 [255]
 Check that debugobshistory on the first folded revision show only
 the revision with the target
 $ hg obslog --hidden 471f378eab4c
 x  471f378eab4c (1) A0
-rewritten by test (*) as eb5a0daa2192 (glob)
+rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
 Check that with all option, all changesets are shown
 $ hg obslog --hidden --all 471f378eab4c
 @    eb5a0daa2192 (3) C0
 |\
 x |  0dec01379d3b (2) B0
-/     rewritten by test (*) as eb5a0daa2192 (glob)
+/     rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
 |
 x  471f378eab4c (1) A0
-rewritten by test (*) as eb5a0daa2192 (glob)
+rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
 Check that debugobshistory on the second folded revision show only
 the revision with the target
 $ hg obslog --hidden 0dec01379d3b
 x  0dec01379d3b (2) B0
-rewritten by test (*) as eb5a0daa2192 (glob)
+rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
 Check that with all option, all changesets are shown
 $ hg obslog --hidden --all 0dec01379d3b
 @    eb5a0daa2192 (3) C0
 |\
 x |  0dec01379d3b (2) B0
-/     rewritten by test (*) as eb5a0daa2192 (glob)
+/     rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
 |
 x  471f378eab4c (1) A0
-rewritten by test (*) as eb5a0daa2192 (glob)
+rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
 Check that debugobshistory on the successor revision show a coherent
 graph
 $ hg obslog eb5a0daa2192
 @    eb5a0daa2192 (3) C0
 |\
 x |  0dec01379d3b (2) B0
-/     rewritten by test (*) as eb5a0daa2192 (glob)
+/     rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
 |
 x  471f378eab4c (1) A0
-rewritten by test (*) as eb5a0daa2192 (glob)
+rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [],
 "debugobshistory.shortdescription": "C0"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"description",
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 "debugobshistory.shortdescription": "A0"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"description",
+"parent",
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 -----------
 Check that debugobshistory on the divergent revision show both destinations
 $ hg obslog --hidden 471f378eab4c
 x  471f378eab4c (1) A0
-rewritten by test (*) as 65b757b745b9 (glob)
+rewritten(description) by test (*) as 65b757b745b9 (glob)
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 Check that with all option, every changeset is shown
 $ hg obslog --hidden --all 471f378eab4c
 @  65b757b745b9 (3) A2
 |
 | o  fdf9bde5129a (2) A1
 |/
 x  471f378eab4c (1) A0
-rewritten by test (*) as 65b757b745b9 (glob)
+rewritten(description) by test (*) as 65b757b745b9 (glob)
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"description"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 "65b757b745b9"
 ],
 "debugobshistory.verb": "rewritten"
 },
 {
+"debugobshistory.effect": [
+"description"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 and the diverent one
 $ hg obslog fdf9bde5129a
 o  fdf9bde5129a (2) A1
 |
 x  471f378eab4c (1) A0
-rewritten by test (*) as 65b757b745b9 (glob)
+rewritten(description) by test (*) as 65b757b745b9 (glob)
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 Check that all option show all of them
 $ hg obslog fdf9bde5129a -a
 @  65b757b745b9 (3) A2
 |
 | o  fdf9bde5129a (2) A1
 |/
 x  471f378eab4c (1) A0
-rewritten by test (*) as 65b757b745b9 (glob)
+rewritten(description) by test (*) as 65b757b745b9 (glob)
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 Check that debugobshistory on the second diverged revision show the revision
 and the diverent one
 $ hg obslog 65b757b745b9
 @  65b757b745b9 (3) A2
 |
 x  471f378eab4c (1) A0
-rewritten by test (*) as 65b757b745b9 (glob)
+rewritten(description) by test (*) as 65b757b745b9 (glob)
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 Check that all option show all of them
 $ hg obslog 65b757b745b9 -a
 @  65b757b745b9 (3) A2
 |
 | o  fdf9bde5129a (2) A1
 |/
 x  471f378eab4c (1) A0
-rewritten by test (*) as 65b757b745b9 (glob)
+rewritten(description) by test (*) as 65b757b745b9 (glob)
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 Check that debugobshistory on the both diverged revision show a coherent
 graph
 $ hg obslog '65b757b745b9+fdf9bde5129a'
 @  65b757b745b9 (3) A2
 |
 | o  fdf9bde5129a (2) A1
 |/
 x  471f378eab4c (1) A0
-rewritten by test (*) as 65b757b745b9 (glob)
+rewritten(description) by test (*) as 65b757b745b9 (glob)
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [],
 "debugobshistory.shortdescription": "A2"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"description"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 "65b757b745b9"
 ],
 "debugobshistory.verb": "rewritten"
 },
 {
+"debugobshistory.effect": [
+"description"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 (use --hidden to access hidden revisions)
 [255]
 $ hg update --hidden 'desc(A0)'
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 working directory parent is obsolete! (471f378eab4c)
-(471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
+(471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
 Test output with amended + folded commit
 ========================================
 Test setup
 Check that debugobshistory on head show a coherent graph
 $ hg obslog eb5a0daa2192
 @    eb5a0daa2192 (4) C0
 |\
 x |  471f378eab4c (1) A0
-/     rewritten by test (*) as eb5a0daa2192 (glob)
+/     rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
 |
 x  b7ea6d14e664 (3) B1
-|    rewritten by test (*) as eb5a0daa2192 (glob)
+|    rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
 |
 x  0dec01379d3b (2) B0
-rewritten by test (*) as b7ea6d14e664 (glob)
+rewritten(description) by test (*) as b7ea6d14e664 (glob)
 Check that obslog on ROOT with all option show everything
 $ hg obslog 1 --hidden --all
 @    eb5a0daa2192 (4) C0
 |\
 x |  471f378eab4c (1) A0
-/     rewritten by test (*) as eb5a0daa2192 (glob)
+/     rewritten(description, content) by test (*) as eb5a0daa2192 (glob)
 |
 x  b7ea6d14e664 (3) B1
-|    rewritten by test (*) as eb5a0daa2192 (glob)
+|    rewritten(description, parent, content) by test (*) as eb5a0daa2192 (glob)
 |
 x  0dec01379d3b (2) B0
-rewritten by test (*) as b7ea6d14e664 (glob)
+rewritten(description) by test (*) as b7ea6d14e664 (glob)
 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool
 [
 {
 "debugobshistory.markers": [],
 "debugobshistory.shortdescription": "C0"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+*, (glob)
+*, (glob)
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 "debugobshistory.shortdescription": "B1"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"description"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 "debugobshistory.shortdescription": "B0"
 },
 {
 "debugobshistory.markers": [
 {
+"debugobshistory.effect": [
+"description",
+"content"
+],
 "debugobshistory.marker_date": [
 *, (glob)
 0 (glob)
 ],
 "debugobshistory.marker_user": "test",
 $ hg obslog 7a230b46bf61
 @  7a230b46bf61 (3) A2
 |
 x  fdf9bde5129a (2) A1
-|    rewritten by test (*) as 7a230b46bf61 (glob)
+|    rewritten(description) by test (*) as 7a230b46bf61 (glob)
 |
 x  471f378eab4c (1) A0
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 $ cd $TESTTMP/local-remote-markers-2
 $ hg pull
 pulling from $TESTTMP/local-remote-markers-1
 searching for changes
 changectx
 $ hg obslog 7a230b46bf61
 o  7a230b46bf61 (2) A2
 |
 x  fdf9bde5129a
-|    rewritten by test (*) as 7a230b46bf61 (glob)
+|    rewritten(description) by test (*) as 7a230b46bf61 (glob)
 |
 @  471f378eab4c (1) A0
-rewritten by test (*) as fdf9bde5129a (glob)
+rewritten(description) by test (*) as fdf9bde5129a (glob)
 $ hg obslog 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|(*)] as [evolve.node|7a230b46bf61] (glob)
+|    [evolve.verb|rewritten](description) 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|(*)] as [evolve.node|fdf9bde5129a] (glob)
+[evolve.verb|rewritten](description) by [evolve.user|test] [evolve.date|(*)] as [evolve.node|fdf9bde5129a] (glob)

branch	mercurial-4.1
changeset 2595	54ac473663ff
parent 2531	d3d686f05458
parent 2585	b5e3fe610beb
child 2596	44dd9d76afb2
child 2700	52d5c5ce27e4