mercurial-scm/hg-stable: mercurial/templater.py annotate

annotate mercurial/templater.py @ 7396:526c40a74bd0

templater: return data in increasing chunk sizes Currently hgweb is not streaming its output -- it accumulates the entire response before sending it. This patch restores streaming behaviour. To avoid having to synchronously write many tiny fragments, this patch also adds buffering to the template generator. Local testing of a fetch of a 100,000 line file with wget produces a slight slowdown overall (up from 6.5 seconds to 7.2 seconds), but instead of waiting 6 seconds for headers to arrive, output begins immediately.

author	Brendan Cully <brendan@kublai.com>
date	Fri, 21 Nov 2008 15:51:40 -0800
parents	125c8fedcbe0
children	cf7741aa1e96

rev	line source
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	1 # templater.py - template expansion for output
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	2 #
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	4 #
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	5 # This software may be used and distributed according to the terms
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	7
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	8 from i18n import _
5976 9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5975 diff changeset	9 import re, sys, os
6337 d2713d902524 give better error message on non-existent mapfile (issue813) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	10 from mercurial import util
1901 c64bef3d7043 use safer string parser for template engine. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1900 diff changeset	11
7107 125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	12 path = ['templates', '../templates']
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	13
1902 1cc5f25653a3 make parsestring work with strings that do not have quotes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1901 diff changeset	14 def parsestring(s, quoted=True):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	15 '''parse a string using simple c-like syntax.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	16 string must be in quotes if quoted is True.'''
1902 1cc5f25653a3 make parsestring work with strings that do not have quotes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1901 diff changeset	17 if quoted:
3639 5c9a36210662 templater: simplify parsestring Matt Mackall <mpm@selenic.com> parents: 3638 diff changeset	18 if len(s) < 2 or s[0] != s[-1]:
5c9a36210662 templater: simplify parsestring Matt Mackall <mpm@selenic.com> parents: 3638 diff changeset	19 raise SyntaxError(_('unmatched quotes'))
5c9a36210662 templater: simplify parsestring Matt Mackall <mpm@selenic.com> parents: 3638 diff changeset	20 return s[1:-1].decode('string_escape')
3632 231393b7316f templater: use str.decode in parse_string Matt Mackall <mpm@selenic.com> parents: 3462 diff changeset	21
231393b7316f templater: use str.decode in parse_string Matt Mackall <mpm@selenic.com> parents: 3462 diff changeset	22 return s.decode('string_escape')
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	23
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	24 class templater(object):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	25 '''template expansion engine.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	26
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	27 template expansion works like this. a map file contains key=value
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	28 pairs. if value is quoted, it is treated as string. otherwise, it
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	29 is treated as name of template file.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	30
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	31 templater is asked to expand a key in map. it looks up key, and
4334 66a3fe30f9fc minor typo fix in templater's docstring TK Soh <teekaysoh@yahoo.com> parents: 3904 diff changeset	32 looks for strings like this: {foo}. it expands {foo} by looking up
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	33 foo in map, and substituting it. expansion is recursive: it stops
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	34 when there is no more {foo} to replace.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	35
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	36 expansion also allows formatting and filtering.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	37
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	38 format uses key to expand each item in list. syntax is
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	39 {key%format}.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	40
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	41 filter uses function to transform value. syntax is
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	42 {key\|filter1\|filter2\|...}.'''
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	43
3638 7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	44 template_re = re.compile(r"(?:(?:#(?=[\w\\|%]+#))\|(?:{(?=[\w\\|%]+})))"
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	45 r"(\w+)(?:(?:%(\w+))\|((?:\\|\w+)*))[#}]")
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	46
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	47 def __init__(self, mapfile, filters={}, defaults={}, cache={},
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	48 minchunk=1024, maxchunk=65536):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	49 '''set up template engine.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	50 mapfile is name of file to read map definitions from.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	51 filters is dict of functions. each transforms a value into another.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	52 defaults is dict of default map definitions.'''
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	53 self.mapfile = mapfile or 'template'
1975 6e1a8ea5d717 Duplicate cache when creating templater. Shun-ichi Goto <shunichi.goto@gmail.com> parents: 1964 diff changeset	54 self.cache = cache.copy()
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	55 self.map = {}
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	56 self.base = (mapfile and os.path.dirname(mapfile)) or ''
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	57 self.filters = filters
1964 778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1955 diff changeset	58 self.defaults = defaults
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	59 self.minchunk, self.maxchunk = minchunk, maxchunk
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	60
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	61 if not mapfile:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	62 return
6337 d2713d902524 give better error message on non-existent mapfile (issue813) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	63 if not os.path.exists(mapfile):
d2713d902524 give better error message on non-existent mapfile (issue813) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	64 raise util.Abort(_('style not found: %s') % mapfile)
d2713d902524 give better error message on non-existent mapfile (issue813) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	65
1901 c64bef3d7043 use safer string parser for template engine. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1900 diff changeset	66 i = 0
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	67 for l in file(mapfile):
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	68 l = l.strip()
1901 c64bef3d7043 use safer string parser for template engine. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1900 diff changeset	69 i += 1
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	70 if not l or l[0] in '#;': continue
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	71 m = re.match(r'([a-zA-Z_][a-zA-Z0-9_])\s=\s*(.+)$', l)
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	72 if m:
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	73 key, val = m.groups()
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	74 if val[0] in "'\"":
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	75 try:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	76 self.cache[key] = parsestring(val)
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	77 except SyntaxError, inst:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	78 raise SyntaxError('%s:%s: %s' %
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	79 (mapfile, i, inst.args[0]))
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	80 else:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	81 self.map[key] = os.path.join(self.base, val)
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	82 else:
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	83 raise SyntaxError(_("%s:%s: parse error") % (mapfile, i))
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	84
1899 888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	85 def __contains__(self, key):
3637 e7639888bb2f templater: simplify cache and remove filter argument in __call__ Matt Mackall <mpm@selenic.com> parents: 3636 diff changeset	86 return key in self.cache or key in self.map
1899 888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	87
6783 6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	88 def _template(self, t):
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	89 '''Get the template for the given template name. Use a local cache.'''
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5269 diff changeset	90 if not t in self.cache:
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	91 try:
3637 e7639888bb2f templater: simplify cache and remove filter argument in __call__ Matt Mackall <mpm@selenic.com> parents: 3636 diff changeset	92 self.cache[t] = file(self.map[t]).read()
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	93 except IOError, inst:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	94 raise IOError(inst.args[0], _('template file %s: %s') %
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	95 (self.map[t], inst.args[1]))
6783 6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	96 return self.cache[t]
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	97
6783 6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	98 def _process(self, tmpl, map):
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	99 '''Render a template. Returns a generator.'''
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	100 while tmpl:
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	101 m = self.template_re.search(tmpl)
3638 7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	102 if not m:
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	103 yield tmpl
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	104 break
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	105
3638 7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	106 start, end = m.span(0)
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	107 key, format, fl = m.groups()
3636 dfbbb33f3fa3 templater: simplify template function Matt Mackall <mpm@selenic.com> parents: 3635 diff changeset	108
3638 7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	109 if start:
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	110 yield tmpl[:start]
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	111 tmpl = tmpl[end:]
3636 dfbbb33f3fa3 templater: simplify template function Matt Mackall <mpm@selenic.com> parents: 3635 diff changeset	112
3638 7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	113 if key in map:
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	114 v = map[key]
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	115 else:
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	116 v = self.defaults.get(key, "")
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	117 if callable(v):
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	118 v = v(**map)
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	119 if format:
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	120 if not hasattr(v, '__iter__'):
6434 62e0bb41e682 hgweb: minor improvements for new web style Matt Mackall <mpm@selenic.com> parents: 6337 diff changeset	121 raise SyntaxError(_("Error expanding '%s%%%s'")
3638 7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	122 % (key, format))
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	123 lm = map.copy()
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	124 for i in v:
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	125 lm.update(i)
6783 6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	126 t = self._template(format)
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	127 yield self._process(t, lm)
3638 7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	128 else:
7b064d8bac5e template: fold template() into __call__, minor optimizations Matt Mackall <mpm@selenic.com> parents: 3637 diff changeset	129 if fl:
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	130 for f in fl.split("\|")[1:]:
3637 e7639888bb2f templater: simplify cache and remove filter argument in __call__ Matt Mackall <mpm@selenic.com> parents: 3636 diff changeset	131 v = self.filters[f](v)
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	132 yield v
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	133
6783 6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	134 def __call__(self, t, **map):
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	135 stream = self.expand(t, **map)
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	136 if self.minchunk:
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	137 stream = util.increasingchunks(stream, min=self.minchunk,
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	138 max=self.maxchunk)
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	139 return stream
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	140
526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7107 diff changeset	141 def expand(self, t, **map):
6783 6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	142 '''Perform expansion. t is name of map element to expand. map contains
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	143 added elements for use during expansion. Is a generator.'''
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	144 tmpl = self._template(t)
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	145 iters = [self._process(tmpl, map)]
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	146 while iters:
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	147 try:
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	148 item = iters[0].next()
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	149 except StopIteration:
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	150 iters.pop(0)
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	151 continue
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	152 if isinstance(item, str):
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	153 yield item
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	154 elif item is None:
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	155 yield ''
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	156 elif hasattr(item, '__iter__'):
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	157 iters.insert(0, iter(item))
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	158 else:
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	159 yield str(item)
6d824dc86907 templater: make a template a string-only iterator Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6434 diff changeset	160
1899 888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	161 def templatepath(name=None):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	162 '''return location of template file or directory (if no name).
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	163 returns None if not found.'''
7107 125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	164 normpaths = []
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	165
2001 a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	166 # executable version (py2exe) doesn't support __file__
a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	167 if hasattr(sys, 'frozen'):
a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	168 module = sys.executable
a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	169 else:
a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	170 module = __file__
7107 125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	171 for f in path:
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	172 if f.startswith('/'):
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	173 p = f
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	174 else:
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	175 fl = f.split('/')
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	176 p = os.path.join(os.path.dirname(module), *fl)
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	177 if name:
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	178 p = os.path.join(p, name)
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	179 if name and os.path.exists(p):
1897 58b6784cf9f1 move hgweb.templatepath into templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1896 diff changeset	180 return os.path.normpath(p)
7107 125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	181 elif os.path.isdir(p):
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	182 normpaths.append(os.path.normpath(p))
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	183
125c8fedcbe0 Allow hgweb to search for templates in more than one path. Brendan Cully <brendan@kublai.com> parents: 6783 diff changeset	184 return normpaths
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	185
5976 9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5975 diff changeset	186 def stringify(thing):
9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5975 diff changeset	187 '''turn nested template iterator into string.'''
9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5975 diff changeset	188 if hasattr(thing, '__iter__'):
9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5975 diff changeset	189 return "".join([stringify(t) for t in thing if t is not None])
9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5975 diff changeset	190 return str(thing)
9f1e6ab76069 templates: move filters to their own module Matt Mackall <mpm@selenic.com> parents: 5975 diff changeset	191

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/templater.py @ 7396:526c40a74bd0