Mercurial > public > mercurial-scm > hg-stable

diff mercurial/templater.py @ 24949:890845af1ac2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: strictly parse leading backslashes of '{' (issue4569) (BC) Because double backslashes are processed as a string escape sequence, '\\{' should start the template syntax. On the other hand, r'' disables any sort of \-escapes, so r'\{' can go either way, never start the template syntax or always start it. I simply chose the latter, which means r'\{' is the same as '\\{'.
author Yuya Nishihara <yuya@tcha.org>
date Mon, 04 May 2015 10:17:34 +0900
parents db7463aa080f
children 554d6fcc3c84 7298da81f5a9
line wrap: on
line diff
--- a/mercurial/templater.py	Mon May 04 09:54:01 2015 +0900
+++ b/mercurial/templater.py	Mon May 04 10:17:34 2015 +0900
@@ -87,8 +87,9 @@
         if n < 0:
             parsed.append((strtoken, tmpl[pos:]))
             break
-        if n > 0 and tmpl[n - 1] == '\\':
-            # escaped
+        bs = (n - pos) - len(tmpl[pos:n].rstrip('\\'))
+        if strtoken == 'string' and bs % 2 == 1:
+            # escaped (e.g. '\{', '\\\{', but not '\\{' nor r'\{')
             parsed.append((strtoken, (tmpl[pos:n - 1] + "{")))
             pos = n + 1
             continue