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

equal deleted inserted replaced

-:f47ed78ab17b
+:67b59d1657cf
 Precursors template should show current revision as it is the working copy
 $ hg olog tip
 o  d004c8f274b9 (4) A2
 |
 x  a468dc9b3633 (3) A1
-|    rewritten(description) by test2 (*) as d004c8f274b9 (glob)
+|    rewritten(description) as d004c8f274b9 by test2 (*) (glob)
 |
 @  471f378eab4c (1) A0
-rewritten(description, content) by test1 (*) as a468dc9b3633 (glob)
+rewritten(description, content) as a468dc9b3633 by test1 (*) (glob)
 $ hg tlog
 o  d004c8f274b9
 |    Precursors: 471f378eab4c
 |    semi-colon: 471f378eab4c
 | @  471f378eab4c
 |/     Successors: [d004c8f274b9]
 |      semi-colon: [d004c8f274b9]
-|      Fate: rewritten by test1, test2 as d004c8f274b9
+|      Fate: rewritten as d004c8f274b9 by test1, test2
 |
 o  ea207398892e
 $ hg fatelog -q
 o  d004c8f274b9
 $ hg fatelog
 o  d004c8f274b9
 |
 | @  471f378eab4c
-|/     Obsfate: rewritten by test1, test2 as d004c8f274b9
+|/     Obsfate: rewritten as d004c8f274b9 by test1, test2
 |
 o  ea207398892e
 $ hg fatelog -v
 o  d004c8f274b9
 |
 | @  471f378eab4c
-|/     Obsfate: rewritten by test1, test2 as d004c8f274b9 (between * and *) (glob)
+|/     Obsfate: rewritten as d004c8f274b9 by test1, test2 (*) (glob)
 |
 o  ea207398892e
 (check json)
 |    Precursors: a468dc9b3633
 |    semi-colon: a468dc9b3633
 | @  a468dc9b3633
 |/     Successors: [d004c8f274b9]
 |      semi-colon: [d004c8f274b9]
-|      Fate: rewritten by test2 as d004c8f274b9
+|      Fate: reworded as d004c8f274b9 by test2
 |
 o  ea207398892e
 Precursors template should show the precursor as we force its display with
 --hidden
 | @  a468dc9b3633
 |/     Precursors: 471f378eab4c
 |      semi-colon: 471f378eab4c
 |      Successors: [d004c8f274b9]
 |      semi-colon: [d004c8f274b9]
-|      Fate: rewritten by test2 as d004c8f274b9
+|      Fate: reworded as d004c8f274b9 by test2
 |
 | x  f137d23bb3e1
 | |    Fate: pruned by test1
 | |
 | x  471f378eab4c
 |/     Successors: [a468dc9b3633]
 |      semi-colon: [a468dc9b3633]
-|      Fate: rewritten by test1 as a468dc9b3633
+|      Fate: rewritten as a468dc9b3633 by test1
 |
 o  ea207398892e
 $ hg fatelog -v
 o  d004c8f274b9
 |
 | @  a468dc9b3633
-|/     Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob)
+|/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
 |
 o  ea207398892e
 $ hg up 'desc(A2)'
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 | x  a468dc9b3633
 |/     Precursors: 471f378eab4c
 |      semi-colon: 471f378eab4c
 |      Successors: [d004c8f274b9]
 |      semi-colon: [d004c8f274b9]
-|      Fate: rewritten by test2 as d004c8f274b9
+|      Fate: reworded as d004c8f274b9 by test2
 |
 | x  f137d23bb3e1
 | |    Fate: pruned by test1
 | |
 | x  471f378eab4c
 |/     Successors: [a468dc9b3633]
 |      semi-colon: [a468dc9b3633]
-|      Fate: rewritten by test1 as a468dc9b3633
+|      Fate: rewritten as a468dc9b3633 by test1
 |
 o  ea207398892e
 $ hg fatelog -v
 @  d004c8f274b9
 $ hg fatelog -v --hidden
 @  d004c8f274b9
 |
 | x  a468dc9b3633
-|/     Obsfate: rewritten by test2 as d004c8f274b9 (at *) (glob)
+|/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
 |
 | x  f137d23bb3e1
 | |    Obsfate: pruned by test1 (at *) (glob)
 | |
 | x  471f378eab4c
-|/     Obsfate: rewritten by test1 as a468dc9b3633 (at *) (glob)
+|/     Obsfate: rewritten as a468dc9b3633 by test1 (*) (glob)
 |
 o  ea207398892e
 $ hg fatelogjson --hidden
 @  d004c8f274b9 ""
 |
-| x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "rewritten"}] (glob)
+| x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob)
 |/
 | x  f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] (glob)
 | |
 | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] (glob)
 |/
 ---------------
 $ hg up 'desc(A0)' --hidden
 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 --contentdivergent' to resolve the issue)
 Precursors template should show current revision as it is the working copy
 $ hg tlog
 o  019fadeab383
 |    Precursors: 471f378eab4c
 |/     Precursors: 471f378eab4c
 |      semi-colon: 471f378eab4c
 | @  471f378eab4c
 |/     Successors: [fdf9bde5129a], [019fadeab383]
 |      semi-colon: [fdf9bde5129a]; [019fadeab383]
-|      Fate: rewritten as fdf9bde5129a
+|      Fate: reworded as fdf9bde5129a
-|      Fate: rewritten as 019fadeab383
+|      Fate: reworded as 019fadeab383
 |
 o  ea207398892e
 $ hg fatelog
 o  019fadeab383
 |
 | o  fdf9bde5129a
 |/
 | @  471f378eab4c
-|/     Obsfate: rewritten as fdf9bde5129a; rewritten as 019fadeab383
+|/     Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
 |
 o  ea207398892e
 $ hg up 'desc(A1)'
 | x  65b757b745b9
 |/     Precursors: 471f378eab4c
 |      semi-colon: 471f378eab4c
 |      Successors: [019fadeab383]
 |      semi-colon: [019fadeab383]
-|      Fate: rewritten as 019fadeab383
+|      Fate: reworded as 019fadeab383
 |
 | @  fdf9bde5129a
 |/     Precursors: 471f378eab4c
 |      semi-colon: 471f378eab4c
 | x  471f378eab4c
 |/     Successors: [fdf9bde5129a], [65b757b745b9]
 |      semi-colon: [fdf9bde5129a]; [65b757b745b9]
-|      Fate: rewritten as fdf9bde5129a
+|      Fate: reworded as fdf9bde5129a
-|      Fate: rewritten as 65b757b745b9
+|      Fate: reworded as 65b757b745b9
 |
 o  ea207398892e
 $ hg fatelog --hidden
 o  019fadeab383
 |
 | x  65b757b745b9
-|/     Obsfate: rewritten as 019fadeab383
+|/     Obsfate: reworded as 019fadeab383
 |
 | @  fdf9bde5129a
 |/
 | x  471f378eab4c
-|/     Obsfate: rewritten as fdf9bde5129a; rewritten as 65b757b745b9
+|/     Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
 |
 o  ea207398892e
 $ hg fatelogjson --hidden
 o  019fadeab383 ""
 |
-| x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "rewritten"}] (glob)
+| x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob)
 |/
 | @  fdf9bde5129a ""
 |/
-| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "rewritten"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "rewritten"}] (glob)
+| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob)
 |/
 o  ea207398892e ""
 Test templates with amended + folded commit
 | |    Fate: rewritten as eb5a0daa2192
 | |
 | | x  0dec01379d3b
 | |/     Successors: [b7ea6d14e664]
 | |      semi-colon: [b7ea6d14e664]
-| |      Fate: rewritten as b7ea6d14e664
+| |      Fate: reworded as b7ea6d14e664
 | |
 | x  471f378eab4c
 |/     Successors: [eb5a0daa2192]
 |      semi-colon: [eb5a0daa2192]
 |      Fate: rewritten as eb5a0daa2192
 |
 | x  b7ea6d14e664
 | |    Obsfate: rewritten as eb5a0daa2192
 | |
 | | x  0dec01379d3b
-| |/     Obsfate: rewritten as b7ea6d14e664
+| |/     Obsfate: reworded as b7ea6d14e664
 | |
 | x  471f378eab4c
 |/     Obsfate: rewritten as eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelogjson --hidden
 @  eb5a0daa2192 ""
 |
 | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
 | |
-| | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "rewritten"}] (glob)
+| | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob)
 | |/
 | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
 |/
 o  ea207398892e ""
 |    Precursors: 471f378eab4c
 |    semi-colon: 471f378eab4c
 | @  471f378eab4c
 |/     Successors: [7a230b46bf61]
 |      semi-colon: [7a230b46bf61]
-|      Fate: rewritten as 7a230b46bf61
+|      Fate: reworded as 7a230b46bf61
 |
 o  ea207398892e
 $ hg fatelog --hidden -v
 o  7a230b46bf61
 |
 | @  471f378eab4c
-|/     Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob)
+|/     Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
 |
 o  ea207398892e
 $ hg up 'desc(A2)'
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 |    Precursors: 471f378eab4c
 |    semi-colon: 471f378eab4c
 | x  471f378eab4c
 |/     Successors: [7a230b46bf61]
 |      semi-colon: [7a230b46bf61]
-|      Fate: rewritten as 7a230b46bf61
+|      Fate: reworded as 7a230b46bf61
 |
 o  ea207398892e
 $ hg fatelog --hidden -v
 @  7a230b46bf61
 |
 | x  471f378eab4c
-|/     Obsfate: rewritten by test as 7a230b46bf61 (between * and *) (glob)
+|/     Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
 |
 o  ea207398892e
 $ hg fatelogjson --hidden
 @  7a230b46bf61 ""
 |
-| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "rewritten"}] (glob)
+| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob)
 |/
 o  ea207398892e ""
 Test templates with pruned commits

branch	mercurial-4.2
changeset 3001	67b59d1657cf
parent 2798	2280461343e5
parent 3000	bd7e8be29542
child 3002	00e4d31b8cdb
child 3108	9c9c8c1eeb93