Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: drop redundant type conversion when evaluating integer argument
authorYuya Nishihara <yuya@tcha.org>
Sun, 14 Feb 2016 12:48:14 +0900
changeset 28344 ac371d4c007f
parent 28343 a6c2310b3827
child 28345 d81437c91a26
templater: drop redundant type conversion when evaluating integer argument A function argument may be an integer. In this case, it isn't necessary to convert a value to string and back to integer. Because an argument may be an arbitrary object (e.g. date tuple), TypeError should be caught as well.
mercurial/templater.py file | annotate | diff | comparison | revisions
tests/test-command-template.t file | annotate | diff | comparison | revisions 
--- a/mercurial/templater.py	Sun Feb 14 12:42:25 2016 +0900
+++ b/mercurial/templater.py	Sun Feb 14 12:48:14 2016 +0900
@@ -221,9 +221,10 @@
     return thing
 
 def evalinteger(context, mapping, arg, err):
+    v = evalfuncarg(context, mapping, arg)
     try:
-        return int(stringify(arg[0](context, mapping, arg[1])))
-    except ValueError:
+        return int(v)
+    except (TypeError, ValueError):
         raise error.ParseError(err)
 
 def runinteger(context, mapping, data):
--- a/tests/test-command-template.t	Sun Feb 14 12:42:25 2016 +0900
+++ b/tests/test-command-template.t	Sun Feb 14 12:48:14 2016 +0900
@@ -3148,6 +3148,9 @@
   text.1:be wrapped
   text.1:desc to be
   text.1:wrapped (no-eol)
+  $ hg log -l1 -T '{fill(desc, date, "", "")}\n'
+  hg: parse error: fill expects an integer width
+  [255]
 
   $ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}'
   {node|short} (no-eol)
mercurial