Mercurial > hg
diff mercurial/templater.py @ 25662:ff5172c83002
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 24 Jun 2015 13:41:27 -0500 |
parents | 328739ea70c3 6047b60cdd09 |
children | ce3d4b858420 |
line wrap: on
line diff
--- a/mercurial/templater.py Tue Jun 23 22:20:01 2015 -0700 +++ b/mercurial/templater.py Wed Jun 24 13:41:27 2015 -0500 @@ -47,7 +47,7 @@ s = pos while pos < end: # find closing quote d = program[pos] - if decode and d == '\\': # skip over escaped characters + if d == '\\': # skip over escaped characters pos += 2 continue if d == c: @@ -450,7 +450,7 @@ # i18n: "revset" is a keyword raise error.ParseError(_("revset expects one or more arguments")) - raw = args[0][1] + raw = stringify(args[0][0](context, mapping, args[0][1])) ctx = mapping['ctx'] repo = ctx.repo()