Mercurial > hg

diff mercurial/templater.py @ 13665:e798e430c5e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: report a parse error if a revset is not parsed completely (issue2654)
author Bernhard Leiner <bleiner@gmail.com>
date Wed, 16 Mar 2011 23:09:14 +0100
parents e3b87fb34d00
children 135e244776f0
line wrap: on
line diff
--- a/mercurial/templater.py	Wed Mar 16 18:48:59 2011 +0100
+++ b/mercurial/templater.py	Wed Mar 16 23:09:14 2011 +0100
@@ -69,7 +69,6 @@
         else:
             raise error.ParseError(_("syntax error"), pos)
         pos += 1
-    data[2] = pos
     yield ('end', None, pos)
 
 def compiletemplate(tmpl, context):
@@ -91,8 +90,8 @@
             parsed.append(("string", tmpl[pos:n]))
 
         pd = [tmpl, n + 1, stop]
-        parsed.append(p.parse(pd))
-        pos = pd[2]
+        parseres, pos = p.parse(pd)
+        parsed.append(parseres)
 
     return [compileexp(e, context) for e in parsed]