Mercurial > evolve

changeset 3650:35ffd7a4b339

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templatekw: remove obsfatedata templatekw Individuals fields are available in core as single template functions.
author Boris Feld <boris.feld@octobus.net>
date Fri, 06 Apr 2018 17:53:41 +0200
parents 4fcf815916f5
children fa15068a9945
files CHANGELOG hgext3rd/evolve/templatekw.py tests/test-evolve-templates.t
diffstat 3 files changed, 9 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Thu Mar 29 13:01:05 2018 -0700
+++ b/CHANGELOG	Fri Apr 06 17:53:41 2018 +0200
@@ -10,6 +10,10 @@
 
   * fixed some memory leak issue
 
+  * templatekw: remove `obsfatedata` templatekw. Individuals fields are
+    available in core as single template functions.
+
+>>>>>>> source: 35349a1debab stable - boris: templatekw: remove obsfatedata t...
 7.3.0 -- 2018-03-21
 ---------------------
 
--- a/hgext3rd/evolve/templatekw.py	Thu Mar 29 13:01:05 2018 -0700
+++ b/hgext3rd/evolve/templatekw.py	Fri Apr 06 17:53:41 2018 +0200
@@ -255,8 +255,10 @@
 
     return "\n".join(lines)
 
-
-if util.safehasattr(templatekw, 'compatlist'):
+if util.safehasattr(templatekw, 'obsfateverb'):
+    # Individuals fragments are available in core
+    pass
+elif util.safehasattr(templatekw, 'compatlist'):
     @eh.templatekw('obsfatedata', requires=set(['ctx', 'templ']))
     def showobsfatedata(context, mapping):
         ctx = context.resource(mapping, 'ctx')
@@ -267,7 +269,7 @@
             return templatekw.compatlist(context, mapping, "obsfatedata", [])
         args = mapping.copy()
         args.pop('ctx')
-        args['templ'] = context.resource(mapping, 'templ')
+        args['templ'] = context
         return _showobsfatedata(repo, ctx, values, **args)
 else:
     # pre hg-4.6
--- a/tests/test-evolve-templates.t	Thu Mar 29 13:01:05 2018 -0700
+++ b/tests/test-evolve-templates.t	Fri Apr 06 17:53:41 2018 +0200
@@ -19,7 +19,6 @@
   >     {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} {obsfatedata|json}\n'
   > EOF
 
 Test templates on amended commit
@@ -246,16 +245,6 @@
   o  ea207398892e
   
 
-  $ hg fatelogjson --hidden
-  @  d004c8f274b9 []
-  |
-  | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
-  |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
-  |/
-  o  ea207398892e []
-  
-
 Test templates with splitted commit
 ===================================
 
@@ -414,16 +403,6 @@
   o  ea207398892e
   
 
-  $ hg fatelogjson --hidden
-  @  f257fde29c7a []
-  |
-  o  337fec4d2edc []
-  |
-  | x  471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["operation", "split"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}]
-  |/
-  o  ea207398892e []
-  
-
 Test templates with folded commit
 ==============================
 
@@ -587,16 +566,6 @@
   o  ea207398892e
   
 
-  $ hg fatelogjson --hidden
-  @  eb5a0daa2192 []
-  |
-  | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
-  | |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
-  |/
-  o  ea207398892e []
-  
-
 Test templates with divergence
 ==============================
 
@@ -758,18 +727,6 @@
   o  ea207398892e
   
 
-  $ hg fatelogjson --hidden
-  *  019fadeab383 []
-  |
-  | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
-  |/
-  | @  fdf9bde5129a []
-  |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
-  |/
-  o  ea207398892e []
-  
-
 Test templates with amended + folded commit
 ===========================================
 
@@ -981,17 +938,6 @@
   |
   o  ea207398892e
   
-  $ hg fatelogjson --hidden
-  @  eb5a0daa2192 []
-  |
-  | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
-  | |
-  | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
-  | |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
-  |/
-  o  ea207398892e []
-  
 
 Test template with pushed and pulled obs markers
 ==============================================
@@ -1134,14 +1080,6 @@
   |
   o  ea207398892e
   
-
-  $ hg fatelogjson --hidden
-  @  7a230b46bf61 []
-  |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
-  |/
-  o  ea207398892e []
-  
  
 Test template with obsmarkers cycle
 ===================================