Mercurial > hg
comparison mercurial/cmdutil.py @ 20066:64b4f0cd7336 stable
templater: fix escaping in nested string literals (issue4102)
Before the templater got extended for nested expressions, it made
sense to decode string escapes across the whole string. Now we do it
on a piece by piece basis.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 18 Nov 2013 14:02:26 -0500 |
parents | b7f76db06dc0 |
children | 6d4fda48b4e3 |
comparison
equal
deleted
inserted
replaced
20064:99c4b8f79324 | 20066:64b4f0cd7336 |
---|---|
938 if opts.get('patch') or opts.get('stat'): | 938 if opts.get('patch') or opts.get('stat'): |
939 patch = scmutil.matchall(repo) | 939 patch = scmutil.matchall(repo) |
940 | 940 |
941 tmpl = opts.get('template') | 941 tmpl = opts.get('template') |
942 style = None | 942 style = None |
943 if tmpl: | 943 if not tmpl: |
944 tmpl = templater.parsestring(tmpl, quoted=False) | |
945 else: | |
946 style = opts.get('style') | 944 style = opts.get('style') |
947 | 945 |
948 # ui settings | 946 # ui settings |
949 if not (tmpl or style): | 947 if not (tmpl or style): |
950 tmpl = ui.config('ui', 'logtemplate') | 948 tmpl = ui.config('ui', 'logtemplate') |