Mercurial > hg-stable
changeset 18896:4085c9fafb8e
merge
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Wed, 10 Apr 2013 15:05:06 -0700 |
parents | ed676ed67a5c (current diff) 74ea61318ea8 (diff) |
children | 38982de2b4eb |
files | |
diffstat | 2 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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