tests/test-evolve-templates.t
branchmercurial-4.1
changeset 3109 3024ae293732
parent 3108 9c9c8c1eeb93
parent 3002 00e4d31b8cdb
child 3110 50be10c63825
child 3118 a1cdc128defd
--- a/tests/test-evolve-templates.t	Fri Oct 20 18:34:22 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 20 18:41:05 2017 +0200
@@ -16,10 +16,7 @@
   >     {if(precursors, "\n  Precursors: {precursors}")}\
   >     {if(precursors, "\n  semi-colon: {join(precursors, "; ")}")}\
   >     {if(successors, "\n  Successors: {successors}")}\
-  >     {if(successors, "\n  semi-colon: {join(successors, "; ")}")}\
-  >     {if(obsfate, "\n  Fate: {join(obsfate, "\n  Fate: ")}\n")}\n'
-  > fatelog = log -G -T '{node|short}\n{if(obsfate, "  Obsfate: {join(obsfate, "; ")}\n\n")}'
-  > fatelogjson = log -G -T '{node|short} {obsfate|json}\n'
+  >     {if(successors, "\n  semi-colon: {join(successors, "; ")}")}\n'
   > EOF
 
 Test templates on amended commit
@@ -88,74 +85,8 @@
   | @  471f378eab4c
   |/     Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten as d004c8f274b9 by test, test2
-  |
-  o  ea207398892e
-  
-
-  $ hg log -G
-  o  changeset:   4:d004c8f274b9
-  |  tag:         tip
-  |  parent:      0:ea207398892e
-  |  user:        test
-  |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  summary:     A2
-  |
-  | @  changeset:   1:471f378eab4c
-  |/   user:        test
-  |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    summary:     A0
-  |
-  o  changeset:   0:ea207398892e
-     user:        test
-     date:        Thu Jan 01 00:00:00 1970 +0000
-     summary:     ROOT
-  
-
-  $ hg fatelog -q
-  o  d004c8f274b9
-  |
-  | @  471f378eab4c
-  |/     Obsfate: rewritten as d004c8f274b9
-  |
   o  ea207398892e
   
-
-  $ hg fatelog
-  o  d004c8f274b9
-  |
-  | @  471f378eab4c
-  |/     Obsfate: rewritten as d004c8f274b9 by test, test2
-  |
-  o  ea207398892e
-  
-  $ hg fatelog -v
-  o  d004c8f274b9
-  |
-  | @  471f378eab4c
-  |/     Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob)
-  |
-  o  ea207398892e
-  
-
-(check json)
-
-  $ hg log -GT '{precursors|json}\n'
-  o  ["471f378eab4c5e25f6c77f785b27c936efb22874"]
-  |
-  | @  []
-  |/
-  o  []
-  
-
-  $ hg log -GT '{successors|json}\n'
-  o  ""
-  |
-  | @  [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
-  |/
-  o  ""
-  
-
   $ hg up 'desc(A1)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (a468dc9b3633)
@@ -169,8 +100,6 @@
   | @  a468dc9b3633
   |/     Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: reworded as d004c8f274b9 by test2
-  |
   o  ea207398892e
   
 Precursors template should show the precursor as we force its display with
@@ -184,24 +113,11 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: reworded as d004c8f274b9 by test2
-  |
   | x  f137d23bb3e1
-  | |    Fate: pruned
   | |
   | x  471f378eab4c
   |/     Successors: [a468dc9b3633]
   |      semi-colon: [a468dc9b3633]
-  |      Fate: rewritten as a468dc9b3633
-  |
-  o  ea207398892e
-  
-  $ hg fatelog -v
-  o  d004c8f274b9
-  |
-  | @  a468dc9b3633
-  |/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
-  |
   o  ea207398892e
   
   $ hg up 'desc(A2)'
@@ -220,50 +136,13 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: reworded as d004c8f274b9 by test2
-  |
   | x  f137d23bb3e1
-  | |    Fate: pruned
   | |
   | x  471f378eab4c
   |/     Successors: [a468dc9b3633]
   |      semi-colon: [a468dc9b3633]
-  |      Fate: rewritten as a468dc9b3633
-  |
   o  ea207398892e
   
-  $ hg fatelog -v
-  @  d004c8f274b9
-  |
-  o  ea207398892e
-  
-
-  $ hg fatelog -v --hidden
-  @  d004c8f274b9
-  |
-  | x  a468dc9b3633
-  |/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
-  |
-  | x  f137d23bb3e1
-  | |    Obsfate: pruned by test (at *) (glob)
-  | |
-  | x  471f378eab4c
-  |/     Obsfate: rewritten as a468dc9b3633 by test (*) (glob)
-  |
-  o  ea207398892e
-  
-
-  $ hg fatelogjson --hidden
-  @  d004c8f274b9 []
-  |
-  | 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", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob)
-  | |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob)
-  |/
-  o  ea207398892e []
-  
 
 Test templates with splitted commit
 ===================================
@@ -366,18 +245,6 @@
   | @  471597cad322
   |/     Successors: [337fec4d2edc, f257fde29c7a]
   |      semi-colon: [337fec4d2edc, f257fde29c7a]
-  |      Fate: split as 337fec4d2edc, f257fde29c7a
-  |
-  o  ea207398892e
-  
-  $ hg fatelog
-  o  f257fde29c7a
-  |
-  o  337fec4d2edc
-  |
-  | @  471597cad322
-  |/     Obsfate: split as 337fec4d2edc, f257fde29c7a
-  |
   o  ea207398892e
   
 
@@ -405,31 +272,8 @@
   | x  471597cad322
   |/     Successors: [337fec4d2edc, f257fde29c7a]
   |      semi-colon: [337fec4d2edc, f257fde29c7a]
-  |      Fate: split as 337fec4d2edc, f257fde29c7a
-  |
   o  ea207398892e
   
-  $ hg fatelog --hidden
-  @  f257fde29c7a
-  |
-  o  337fec4d2edc
-  |
-  | x  471597cad322
-  |/     Obsfate: split as 337fec4d2edc, f257fde29c7a
-  |
-  o  ea207398892e
-  
-
-  $ hg fatelogjson --hidden
-  @  f257fde29c7a []
-  |
-  o  337fec4d2edc []
-  |
-  | x  471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob)
-  |/
-  o  ea207398892e []
-  
-
 Test templates with folded commit
 ==============================
 
@@ -500,16 +344,6 @@
   | @  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
-  |      Fate: rewritten as eb5a0daa2192
-  |
-  o  ea207398892e
-  
-  $ hg fatelog
-  o  eb5a0daa2192
-  |
-  | @  471f378eab4c
-  |/     Obsfate: rewritten as eb5a0daa2192
-  |
   o  ea207398892e
   
   $ hg up 'desc(B0)' --hidden
@@ -526,27 +360,11 @@
   | @  0dec01379d3b
   | |    Successors: [eb5a0daa2192]
   | |    semi-colon: [eb5a0daa2192]
-  | |    Fate: rewritten as eb5a0daa2192
-  | |
   | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
-  |      Fate: rewritten as eb5a0daa2192
-  |
   o  ea207398892e
   
-  $ hg fatelog
-  o  eb5a0daa2192
-  |
-  | @  0dec01379d3b
-  | |    Obsfate: rewritten as eb5a0daa2192
-  | |
-  | x  471f378eab4c
-  |/     Obsfate: rewritten as eb5a0daa2192
-  |
-  o  ea207398892e
-  
-
   $ hg up 'desc(C0)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -566,36 +384,11 @@
   | x  0dec01379d3b
   | |    Successors: [eb5a0daa2192]
   | |    semi-colon: [eb5a0daa2192]
-  | |    Fate: rewritten as eb5a0daa2192
-  | |
   | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
-  |      Fate: rewritten as eb5a0daa2192
-  |
   o  ea207398892e
   
-  $ hg fatelog --hidden
-  @  eb5a0daa2192
-  |
-  | x  0dec01379d3b
-  | |    Obsfate: rewritten as eb5a0daa2192
-  | |
-  | x  471f378eab4c
-  |/     Obsfate: rewritten as eb5a0daa2192
-  |
-  o  ea207398892e
-  
-
-  $ hg fatelogjson --hidden
-  @  eb5a0daa2192 []
-  |
-  | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (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 []
-  
 
 Test templates with divergence
 ==============================
@@ -679,22 +472,8 @@
   | @  471f378eab4c
   |/     Successors: [fdf9bde5129a], [019fadeab383]
   |      semi-colon: [fdf9bde5129a]; [019fadeab383]
-  |      Fate: reworded as fdf9bde5129a
-  |      Fate: reworded as 019fadeab383
-  |
   o  ea207398892e
   
-  $ hg fatelog
-  o  019fadeab383
-  |
-  | o  fdf9bde5129a
-  |/
-  | @  471f378eab4c
-  |/     Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
-  |
-  o  ea207398892e
-  
-
   $ hg up 'desc(A1)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 Precursors template should not show precursors as it's not displayed in the
@@ -707,13 +486,6 @@
   o  ea207398892e
   
 
-  $ hg fatelog
-  o  019fadeab383
-  |
-  | @  fdf9bde5129a
-  |/
-  o  ea207398892e
-  
 Precursors template should a precursor as we force its display with --hidden
   $ hg tlog --hidden
   o  019fadeab383
@@ -724,44 +496,14 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [019fadeab383]
   |      semi-colon: [019fadeab383]
-  |      Fate: reworded as 019fadeab383
-  |
   | @  fdf9bde5129a
   |/     Precursors: 471f378eab4c
   |      semi-colon: 471f378eab4c
   | x  471f378eab4c
   |/     Successors: [fdf9bde5129a], [65b757b745b9]
   |      semi-colon: [fdf9bde5129a]; [65b757b745b9]
-  |      Fate: reworded as fdf9bde5129a
-  |      Fate: reworded as 65b757b745b9
-  |
   o  ea207398892e
   
-  $ hg fatelog --hidden
-  o  019fadeab383
-  |
-  | x  65b757b745b9
-  |/     Obsfate: reworded as 019fadeab383
-  |
-  | @  fdf9bde5129a
-  |/
-  | x  471f378eab4c
-  |/     Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
-  |
-  o  ea207398892e
-  
-
-  $ hg fatelogjson --hidden
-  o  019fadeab383 []
-  |
-  | 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"]], [*, *], 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
 ===========================================
@@ -844,16 +586,6 @@
   | @  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
-  |      Fate: rewritten as eb5a0daa2192
-  |
-  o  ea207398892e
-  
-  $ hg fatelog
-  o  eb5a0daa2192
-  |
-  | @  471f378eab4c
-  |/     Obsfate: rewritten as eb5a0daa2192
-  |
   o  ea207398892e
   
   $ hg up 'desc(B0)' --hidden
@@ -867,24 +599,9 @@
   | @  0dec01379d3b
   | |    Successors: [eb5a0daa2192]
   | |    semi-colon: [eb5a0daa2192]
-  | |    Fate: rewritten as eb5a0daa2192
-  | |
   | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
-  |      Fate: rewritten as eb5a0daa2192
-  |
-  o  ea207398892e
-  
-  $ hg fatelog
-  o  eb5a0daa2192
-  |
-  | @  0dec01379d3b
-  | |    Obsfate: rewritten as eb5a0daa2192
-  | |
-  | x  471f378eab4c
-  |/     Obsfate: rewritten as eb5a0daa2192
-  |
   o  ea207398892e
   
 
@@ -899,24 +616,9 @@
   | @  b7ea6d14e664
   | |    Successors: [eb5a0daa2192]
   | |    semi-colon: [eb5a0daa2192]
-  | |    Fate: rewritten as eb5a0daa2192
-  | |
   | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
-  |      Fate: rewritten as eb5a0daa2192
-  |
-  o  ea207398892e
-  
-  $ hg fatelog
-  o  eb5a0daa2192
-  |
-  | @  b7ea6d14e664
-  | |    Obsfate: rewritten as eb5a0daa2192
-  | |
-  | x  471f378eab4c
-  |/     Obsfate: rewritten as eb5a0daa2192
-  |
   o  ea207398892e
   
 
@@ -936,46 +638,14 @@
   | |    semi-colon: 0dec01379d3b
   | |    Successors: [eb5a0daa2192]
   | |    semi-colon: [eb5a0daa2192]
-  | |    Fate: rewritten as eb5a0daa2192
-  | |
   | | x  0dec01379d3b
   | |/     Successors: [b7ea6d14e664]
   | |      semi-colon: [b7ea6d14e664]
-  | |      Fate: reworded as b7ea6d14e664
-  | |
   | x  471f378eab4c
   |/     Successors: [eb5a0daa2192]
   |      semi-colon: [eb5a0daa2192]
-  |      Fate: rewritten as eb5a0daa2192
-  |
   o  ea207398892e
   
-  $ hg fatelog --hidden
-  @  eb5a0daa2192
-  |
-  | x  b7ea6d14e664
-  | |    Obsfate: rewritten as eb5a0daa2192
-  | |
-  | | x  0dec01379d3b
-  | |/     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"]], [*, *], 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 []
-  
-
 Test template with pushed and pulled obs markers
 ==============================================
 
@@ -1069,58 +739,8 @@
   | @  471f378eab4c
   |/     Successors: [7a230b46bf61]
   |      semi-colon: [7a230b46bf61]
-  |      Fate: reworded as 7a230b46bf61
-  |
-  o  ea207398892e
-  
-  $ hg fatelog --hidden -v
-  o  7a230b46bf61
-  |
-  | @  471f378eab4c
-  |/     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
-  $ hg tlog
-  @  7a230b46bf61
-  |
-  o  ea207398892e
-  
-  $ hg fatelog -v
-  @  7a230b46bf61
-  |
   o  ea207398892e
   
-  $ hg tlog --hidden
-  @  7a230b46bf61
-  |    Precursors: 471f378eab4c
-  |    semi-colon: 471f378eab4c
-  | x  471f378eab4c
-  |/     Successors: [7a230b46bf61]
-  |      semi-colon: [7a230b46bf61]
-  |      Fate: reworded as 7a230b46bf61
-  |
-  o  ea207398892e
-  
-  $ hg fatelog --hidden -v
-  @  7a230b46bf61
-  |
-  | x  471f378eab4c
-  |/     Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
-  |
-  o  ea207398892e
-  
-
-  $ hg fatelogjson --hidden
-  @  7a230b46bf61 []
-  |
-  | 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
 ==================================
 
@@ -1145,13 +765,6 @@
   (use 'hg evolve' to update to its parent successor)
   $ hg tlog
   @  471f378eab4c
-  |    Fate: pruned
   |
   o  ea207398892e
   
-  $ hg fatelog -v
-  @  471f378eab4c
-  |    Obsfate: pruned by test (at *) (glob)
-  |
-  o  ea207398892e
-