# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1365631506 25200
# Node ID 4085c9fafb8e6f1b68c8f9d4d549304d948e6e5a
# Parent  ed676ed67a5c94d20c33175823df48cd5d7c1d65# Parent  74ea61318ea8196e8eb0c1210120a513f10d3c81
merge

diff -r ed676ed67a5c -r 4085c9fafb8e mercurial/templater.py
--- a/mercurial/templater.py	Wed Apr 10 12:34:42 2013 -0700
+++ b/mercurial/templater.py	Wed Apr 10 15:05:06 2013 -0700
@@ -66,10 +66,7 @@
                     break
                 pos += 1
             sym = program[s:pos]
-            try:
-                yield ('string', str(int(sym)), s)
-            except ValueError:
-                yield ('symbol', sym, s)
+            yield ('symbol', sym, s)
             pos -= 1
         elif c == '}':
             pos += 1
diff -r ed676ed67a5c -r 4085c9fafb8e tests/test-command-template.t
--- a/tests/test-command-template.t	Wed Apr 10 12:34:42 2013 -0700
+++ b/tests/test-command-template.t	Wed Apr 10 15:05:06 2013 -0700
@@ -1360,12 +1360,6 @@
   $ hg log -l1 --template '{date|age}\n'
   7 years from now
 
-Filter with int function argument:
-
-  $ hg log --template '{fill(author, 20)}\n' -r 0
-  User Name
-  <user@hostname>
-
 Error on syntax:
 
   $ echo 'x = "f' >> t