Mercurial > hg
changeset 28954:f97a0bcfd7a1
templater: separate function to create templater from map file (API)
New frommapfile() function will make it clear when template aliases will be
loaded. They should be applied to command arguments and templates in hgrc,
but not to map files. Otherwise, our stock styles and web templates
(i.e map-file templates) could be modified unintentionally.
Future patches will add "aliases" argument to __init__(), but not to
frommapfile().
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 03 Apr 2016 23:26:48 +0900 |
| parents | 7f6b8ec691e3 |
| children | 78759f78a44e |
| files | mercurial/cmdutil.py mercurial/commands.py mercurial/filemerge.py mercurial/formatter.py mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py mercurial/templater.py |
| diffstat | 7 files changed, 52 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/cmdutil.py Sun Apr 03 23:26:48 2016 +0900 @@ -1478,6 +1478,7 @@ def __init__(self, ui, repo, matchfn, diffopts, tmpl, mapfile, buffered): changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered) formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) + filters = {'formatnode': formatnode} defaulttempl = { 'parent': '{rev}:{node|formatnode} ', 'manifest': '{rev}:{node|formatnode}', @@ -1486,10 +1487,14 @@ } # filecopy is preserved for compatibility reasons defaulttempl['filecopy'] = defaulttempl['file_copy'] - self.t = templater.templater(mapfile, {'formatnode': formatnode}, - cache=defaulttempl) - if tmpl: - self.t.cache['changeset'] = tmpl + assert not (tmpl and mapfile) + if mapfile: + self.t = templater.templater.frommapfile(mapfile, filters=filters, + cache=defaulttempl) + else: + self.t = templater.templater(filters=filters, cache=defaulttempl) + if tmpl: + self.t.cache['changeset'] = tmpl self.cache = {}
--- a/mercurial/commands.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/commands.py Sun Apr 03 23:26:48 2016 +0900 @@ -2770,7 +2770,7 @@ # template found, check if it is working err = None try: - templater.templater(m) + templater.templater.frommapfile(m) except Exception as inst: err = inst p = None @@ -3681,7 +3681,7 @@ mapfile = None if revs is None: k = 'debugtemplate' - t = templater.templater(mapfile) + t = templater.templater() t.cache[k] = tmpl ui.write(templater.stringify(t(k, **props))) else:
--- a/mercurial/filemerge.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/filemerge.py Sun Apr 03 23:26:48 2016 +0900 @@ -526,7 +526,7 @@ ui = repo.ui template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) - tmpl = templater.templater(None, cache={'conflictmarker': template}) + tmpl = templater.templater(cache={'conflictmarker': template}) pad = max(len(l) for l in labels)
--- a/mercurial/formatter.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/formatter.py Sun Apr 03 23:26:48 2016 +0900 @@ -190,7 +190,10 @@ def gettemplater(ui, topic, spec): tmpl, mapfile = lookuptemplate(ui, topic, spec) - t = templater.templater(mapfile, {}) + assert not (tmpl and mapfile) + if mapfile: + return templater.templater.frommapfile(mapfile) + t = templater.templater() if tmpl: t.cache[topic] = tmpl return t
--- a/mercurial/hgweb/hgweb_mod.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/hgweb/hgweb_mod.py Sun Apr 03 23:26:48 2016 +0900 @@ -188,20 +188,22 @@ # create the templater - tmpl = templater.templater(mapfile, - filters={'websub': websubfilter}, - defaults={'url': req.url, - 'logourl': logourl, - 'logoimg': logoimg, - 'staticurl': staticurl, - 'urlbase': urlbase, - 'repo': self.reponame, - 'encoding': encoding.encoding, - 'motd': motd, - 'sessionvars': sessionvars, - 'pathdef': makebreadcrumb(req.url), - 'style': style, - }) + defaults = { + 'url': req.url, + 'logourl': logourl, + 'logoimg': logoimg, + 'staticurl': staticurl, + 'urlbase': urlbase, + 'repo': self.reponame, + 'encoding': encoding.encoding, + 'motd': motd, + 'sessionvars': sessionvars, + 'pathdef': makebreadcrumb(req.url), + 'style': style, + } + tmpl = templater.templater.frommapfile(mapfile, + filters={'websub': websubfilter}, + defaults=defaults) return tmpl
--- a/mercurial/hgweb/hgwebdir_mod.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/hgweb/hgwebdir_mod.py Sun Apr 03 23:26:48 2016 +0900 @@ -491,16 +491,17 @@ if not staticurl.endswith('/'): staticurl += '/' - tmpl = templater.templater(mapfile, - defaults={"encoding": encoding.encoding, - "motd": motd, - "url": url, - "logourl": logourl, - "logoimg": logoimg, - "staticurl": staticurl, - "sessionvars": sessionvars, - "style": style, - }) + defaults = { + "encoding": encoding.encoding, + "motd": motd, + "url": url, + "logourl": logourl, + "logoimg": logoimg, + "staticurl": staticurl, + "sessionvars": sessionvars, + "style": style, + } + tmpl = templater.templater.frommapfile(mapfile, defaults=defaults) return tmpl def updatereqenv(self, env):
--- a/mercurial/templater.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/templater.py Sun Apr 03 23:26:48 2016 +0900 @@ -1016,10 +1016,9 @@ class templater(object): - def __init__(self, mapfile, filters=None, defaults=None, cache=None, + def __init__(self, filters=None, defaults=None, cache=None, minchunk=1024, maxchunk=65536): '''set up template engine. - mapfile is name of file to read map definitions from. filters is dict of functions. each transforms a value into another. defaults is dict of default map definitions.''' if filters is None: @@ -1036,11 +1035,15 @@ self.minchunk, self.maxchunk = minchunk, maxchunk self.ecache = {} - if not mapfile: - return + @classmethod + def frommapfile(cls, mapfile, filters=None, defaults=None, cache=None, + minchunk=1024, maxchunk=65536): + """Create templater from the specified map file""" + t = cls(filters, defaults, cache, minchunk, maxchunk) cache, tmap = _readmapfile(mapfile) - self.cache.update(cache) - self.map = tmap + t.cache.update(cache) + t.map = tmap + return t def __contains__(self, key): return key in self.cache or key in self.map