mercurial-crew-with-dirclash: mercurial/templater.py annotate

annotate mercurial/templater.py @ 3635:231393b7316f

templater: use str.decode in parse_string

author	Matt Mackall <mpm@selenic.com>
date	Mon, 13 Nov 2006 13:26:57 -0600
parents	fab28100ea88
children	bf3dec184c78

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
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	8 from demandload import demandload
1901 c64bef3d7043 use safer string parser for template engine. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1900 diff changeset	9 from i18n import gettext as _
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	10 from node import *
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	11 demandload(globals(), "cStringIO cgi re sys os time urllib util textwrap")
1901 c64bef3d7043 use safer string parser for template engine. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1900 diff changeset	12
1902 1cc5f25653a3 make parsestring work with strings that do not have quotes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1901 diff changeset	13 def parsestring(s, quoted=True):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	14 '''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	15 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	16 if quoted:
1cc5f25653a3 make parsestring work with strings that do not have quotes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1901 diff changeset	17 first = s[0]
1cc5f25653a3 make parsestring work with strings that do not have quotes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1901 diff changeset	18 if len(s) < 2: raise SyntaxError(_('string too short'))
1cc5f25653a3 make parsestring work with strings that do not have quotes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1901 diff changeset	19 if first not in "'\"": raise SyntaxError(_('invalid quote'))
1cc5f25653a3 make parsestring work with strings that do not have quotes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1901 diff changeset	20 if s[-1] != first: raise SyntaxError(_('unmatched quotes'))
3635 231393b7316f templater: use str.decode in parse_string Matt Mackall <mpm@selenic.com> parents: 3457 diff changeset	21 s = s[1:-1].decode('string_escape')
231393b7316f templater: use str.decode in parse_string Matt Mackall <mpm@selenic.com> parents: 3457 diff changeset	22 if first in s: raise SyntaxError(_('string ends early'))
231393b7316f templater: use str.decode in parse_string Matt Mackall <mpm@selenic.com> parents: 3457 diff changeset	23 return s
231393b7316f templater: use str.decode in parse_string Matt Mackall <mpm@selenic.com> parents: 3457 diff changeset	24
231393b7316f templater: use str.decode in parse_string Matt Mackall <mpm@selenic.com> parents: 3457 diff changeset	25 return s.decode('string_escape')
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	26
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	27 class templater(object):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	28 '''template expansion engine.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	29
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	30 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	31 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	32 is treated as name of template file.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	33
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	34 templater is asked to expand a key in map. it looks up key, and
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	35 looks for atrings like this: {foo}. it expands {foo} by looking up
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	36 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	37 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	38
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	39 expansion also allows formatting and filtering.
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 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	42 {key%format}.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	43
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	44 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	45 {key\|filter1\|filter2\|...}.'''
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	46
1964 778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1955 diff changeset	47 def __init__(self, mapfile, filters={}, defaults={}, cache={}):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	48 '''set up template engine.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	49 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	50 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	51 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	52 self.mapfile = mapfile or 'template'
1975 6e1a8ea5d717 Duplicate cache when creating templater. Shun-ichi Goto <shunichi.goto@gmail.com> parents: 1964 diff changeset	53 self.cache = cache.copy()
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	54 self.map = {}
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	55 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	56 self.filters = filters
1964 778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1955 diff changeset	57 self.defaults = defaults
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	58
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	59 if not mapfile:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	60 return
1901 c64bef3d7043 use safer string parser for template engine. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1900 diff changeset	61 i = 0
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	62 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	63 l = l.strip()
1901 c64bef3d7043 use safer string parser for template engine. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1900 diff changeset	64 i += 1
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	65 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	66 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	67 if m:
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	68 key, val = m.groups()
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	69 if val[0] in "'\"":
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	70 try:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	71 self.cache[key] = parsestring(val)
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	72 except SyntaxError, inst:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	73 raise SyntaxError('%s:%s: %s' %
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	74 (mapfile, i, inst.args[0]))
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	75 else:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	76 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	77 else:
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	78 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	79
1899 888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	80 def __contains__(self, key):
888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	81 return key in self.cache
888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	82
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	83 def __call__(self, t, **map):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	84 '''perform expansion.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	85 t is name of map element to expand.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	86 map is added elements to use during expansion.'''
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	87 m = self.defaults.copy()
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	88 m.update(map)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	89 try:
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	90 tmpl = self.cache[t]
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	91 except KeyError:
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	92 try:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	93 tmpl = self.cache[t] = file(self.map[t]).read()
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	94 except IOError, inst:
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	95 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	96 (self.map[t], inst.args[1]))
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	97 return self.template(tmpl, self.filters, **m)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	98
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	99 template_re = re.compile(r"[#{]([a-zA-Z_][a-zA-Z0-9_]*)"
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	100 r"((%[a-zA-Z_][a-zA-Z0-9_]))"
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	101 r"((\\|[a-zA-Z_][a-zA-Z0-9_]))[#}]")
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	102
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	103 def template(self, tmpl, filters={}, **map):
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	104 lm = map.copy()
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	105 while tmpl:
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	106 m = self.template_re.search(tmpl)
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	107 if m:
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	108 start, end = m.span(0)
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	109 s, e = tmpl[start], tmpl[end - 1]
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	110 key = m.group(1)
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	111 if ((s == '#' and e != '#') or (s == '{' and e != '}')):
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	112 raise SyntaxError(_("'%s'/'%s' mismatch expanding '%s'") %
0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	113 (s, e, key))
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	114 if start:
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	115 yield tmpl[:start]
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	116 v = map.get(key, "")
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	117 v = callable(v) and v(**map) or v
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	118
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	119 format = m.group(2)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	120 fl = m.group(4)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	121
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	122 if format:
3361 bc5985d53386 templater: Better exception for errors in foo%bar formatting. Thomas Arendsen Hein <thomas@intevation.de> parents: 3194 diff changeset	123 try:
bc5985d53386 templater: Better exception for errors in foo%bar formatting. Thomas Arendsen Hein <thomas@intevation.de> parents: 3194 diff changeset	124 q = v.__iter__
bc5985d53386 templater: Better exception for errors in foo%bar formatting. Thomas Arendsen Hein <thomas@intevation.de> parents: 3194 diff changeset	125 except AttributeError:
bc5985d53386 templater: Better exception for errors in foo%bar formatting. Thomas Arendsen Hein <thomas@intevation.de> parents: 3194 diff changeset	126 raise SyntaxError(_("Error expanding '%s%s'")
bc5985d53386 templater: Better exception for errors in foo%bar formatting. Thomas Arendsen Hein <thomas@intevation.de> parents: 3194 diff changeset	127 % (key, format))
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	128 for i in q():
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	129 lm.update(i)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	130 yield self(format[1:], **lm)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	131
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	132 v = ""
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	133
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	134 elif fl:
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	135 for f in fl.split("\|")[1:]:
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	136 v = filters[f](v)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	137
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	138 yield v
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	139 tmpl = tmpl[end:]
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	140 else:
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	141 yield tmpl
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	142 break
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	143
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	144 agescales = [("second", 1),
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	145 ("minute", 60),
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	146 ("hour", 3600),
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	147 ("day", 3600 * 24),
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	148 ("week", 3600 * 24 * 7),
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	149 ("month", 3600 * 24 * 30),
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	150 ("year", 3600 * 24 * 365)]
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	151
f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	152 agescales.reverse()
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	153
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	154 def age(date):
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	155 '''turn a (timestamp, tzoff) tuple into an age string.'''
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	156
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	157 def plural(t, c):
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	158 if c == 1:
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	159 return t
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	160 return t + "s"
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	161 def fmt(t, c):
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	162 return "%d %s" % (c, plural(t, c))
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	163
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	164 now = time.time()
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	165 then = date[0]
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	166 delta = max(1, int(now - then))
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	167
1900 f2815605186e move repeated work out of inner loops. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1899 diff changeset	168 for t, s in agescales:
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	169 n = delta / s
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	170 if n >= 2 or s == 1:
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	171 return fmt(t, n)
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	172
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	173 def stringify(thing):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	174 '''turn nested template iterator into string.'''
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	175 cs = cStringIO.StringIO()
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	176 def walk(things):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	177 for t in things:
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	178 if hasattr(t, '__iter__'):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	179 walk(t)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	180 else:
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	181 cs.write(t)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	182 walk(thing)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	183 return cs.getvalue()
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	184
2470 fe1689273f84 use demandload more. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2202 diff changeset	185 para_re = None
fe1689273f84 use demandload more. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2202 diff changeset	186 space_re = None
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	187
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	188 def fill(text, width):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	189 '''fill many paragraphs.'''
2470 fe1689273f84 use demandload more. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2202 diff changeset	190 global para_re, space_re
fe1689273f84 use demandload more. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2202 diff changeset	191 if para_re is None:
fe1689273f84 use demandload more. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2202 diff changeset	192 para_re = re.compile('(\n\n\|\n\\s[-]\\s*)', re.M)
fe1689273f84 use demandload more. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2202 diff changeset	193 space_re = re.compile(r' +')
2535 b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2470 diff changeset	194
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	195 def findparas():
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	196 start = 0
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	197 while True:
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	198 m = para_re.search(text, start)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	199 if not m:
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	200 w = len(text)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	201 while w > start and text[w-1].isspace(): w -= 1
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	202 yield text[start:w], text[w:]
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	203 break
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	204 yield text[start:m.start(0)], m.group(1)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	205 start = m.end(1)
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	206
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	207 fp = cStringIO.StringIO()
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	208 for para, rest in findparas():
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	209 fp.write(space_re.sub(' ', textwrap.fill(para, width)))
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	210 fp.write(rest)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	211 return fp.getvalue()
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	212
2559 bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	213 def firstline(text):
bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	214 '''return the first line of text'''
bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	215 try:
bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	216 return text.splitlines(1)[0].rstrip('\r\n')
bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	217 except IndexError:
bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	218 return ''
bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	219
1906 9dec2479622d add iso date template filter. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1905 diff changeset	220 def isodate(date):
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	221 '''turn a (timestamp, tzoff) tuple into an iso 8631 date and time.'''
1906 9dec2479622d add iso date template filter. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1905 diff changeset	222 return util.datestr(date, format='%Y-%m-%d %H:%M')
9dec2479622d add iso date template filter. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1905 diff changeset	223
2519 deb466fa6957 add a new template function 'hgdate' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2470 diff changeset	224 def hgdate(date):
deb466fa6957 add a new template function 'hgdate' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2470 diff changeset	225 '''turn a (timestamp, tzoff) tuple into an hg cset timestamp.'''
deb466fa6957 add a new template function 'hgdate' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2470 diff changeset	226 return "%d %d" % date
deb466fa6957 add a new template function 'hgdate' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2470 diff changeset	227
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	228 def nl2br(text):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	229 '''replace raw newlines with xhtml line breaks.'''
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	230 return text.replace('\n', '<br/>\n')
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	231
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	232 def obfuscate(text):
2643 3b53fa20dda8 Preserve multibyte UTF-8 characters when obfuscating. Brendan Cully <brendan@kublai.com> parents: 2559 diff changeset	233 text = unicode(text, 'utf-8', 'replace')
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	234 return ''.join(['&#%d;' % ord(c) for c in text])
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	235
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	236 def domain(author):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	237 '''get domain of author, or empty string if none.'''
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	238 f = author.find('@')
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	239 if f == -1: return ''
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	240 author = author[f+1:]
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	241 f = author.find('>')
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	242 if f >= 0: author = author[:f]
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	243 return author
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	244
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	245 def email(author):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	246 '''get email of author.'''
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	247 r = author.find('>')
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	248 if r == -1: r = None
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	249 return author[author.find('<')+1:r]
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	250
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	251 def person(author):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	252 '''get name of author, or else username.'''
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	253 f = author.find('<')
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	254 if f == -1: return util.shortuser(author)
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	255 return author[:f].rstrip()
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	256
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	257 def shortdate(date):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	258 '''turn (timestamp, tzoff) tuple into iso 8631 date.'''
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	259 return util.datestr(date, format='%Y-%m-%d', timezone=False)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	260
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	261 def indent(text, prefix):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	262 '''indent each non-empty line of text after first with prefix.'''
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	263 fp = cStringIO.StringIO()
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	264 lines = text.splitlines()
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	265 num_lines = len(lines)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	266 for i in xrange(num_lines):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	267 l = lines[i]
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	268 if i and l.strip(): fp.write(prefix)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	269 fp.write(l)
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	270 if i < num_lines - 1 or text.endswith('\n'):
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	271 fp.write('\n')
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	272 return fp.getvalue()
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	273
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	274 common_filters = {
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	275 "addbreaks": nl2br,
2191 c2e43535d4d1 make templater bit more flexible and efficient for external users. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	276 "basename": os.path.basename,
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	277 "age": age,
f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	278 "date": lambda x: util.datestr(x),
1905 0c760737b996 improve template errors when something is wrong. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1904 diff changeset	279 "domain": domain,
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	280 "email": email,
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	281 "escape": lambda x: cgi.escape(x, True),
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	282 "fill68": lambda x: fill(x, width=68),
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	283 "fill76": lambda x: fill(x, width=76),
2559 bf67d0f6531c templater.firstline should handle empty strings Brendan Cully <brendan@kublai.com> parents: 2539 diff changeset	284 "firstline": firstline,
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	285 "tabindent": lambda x: indent(x, '\t'),
2519 deb466fa6957 add a new template function 'hgdate' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2470 diff changeset	286 "hgdate": hgdate,
1906 9dec2479622d add iso date template filter. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1905 diff changeset	287 "isodate": isodate,
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	288 "obfuscate": obfuscate,
1912 b288b4bb8448 hide some functions behind lambdas, so demandload is useful. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	289 "permissions": lambda x: x and "-rwxr-xr-x" or "-rw-r--r--",
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	290 "person": person,
a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	291 "rfc822date": lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S"),
1912 b288b4bb8448 hide some functions behind lambdas, so demandload is useful. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	292 "short": lambda x: x[:12],
1987 04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	293 "shortdate": shortdate,
04c17fc39c84 add changelog style to command line template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1975 diff changeset	294 "stringify": stringify,
1904 a7e416bf3c1d improve templating. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1902 diff changeset	295 "strip": lambda x: x.strip(),
1912 b288b4bb8448 hide some functions behind lambdas, so demandload is useful. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	296 "urlescape": lambda x: urllib.quote(x),
b288b4bb8448 hide some functions behind lambdas, so demandload is useful. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	297 "user": lambda x: util.shortuser(x),
3457 fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	298 "stringescape": lambda x: x.encode('string_escape'),
1896 f8f818a04f5b move hgweb template code out to templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	299 }
1897 58b6784cf9f1 move hgweb.templatepath into templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1896 diff changeset	300
1899 888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	301 def templatepath(name=None):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1906 diff changeset	302 '''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	303 returns None if not found.'''
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	304
2001 a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	305 # 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	306 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	307 module = sys.executable
a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	308 else:
a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	309 module = __file__
1899 888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	310 for f in 'templates', '../templates':
888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	311 fl = f.split('/')
888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	312 if name: fl.append(name)
2001 a439b7b51530 Windows py2exe version didn't handle names given to templatepath() correctly Lee Cantey <lcantey@gmail.com> parents: 1987 diff changeset	313 p = os.path.join(os.path.dirname(module), *fl)
1899 888d298ddb91 many small changes to templater. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1897 diff changeset	314 if (name and os.path.exists(p)) or os.path.isdir(p):
1897 58b6784cf9f1 move hgweb.templatepath into templater Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1896 diff changeset	315 return os.path.normpath(p)
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	316
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	317 class changeset_templater(object):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	318 '''format changeset information.'''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	319
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	320 def __init__(self, ui, repo, mapfile, dest=None):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	321 self.t = templater(mapfile, common_filters,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	322 cache={'parent': '{rev}:{node\|short} ',
3190 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	323 'manifest': '{rev}:{node\|short}',
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	324 'filecopy': '{name} ({source})'})
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	325 self.ui = ui
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	326 self.dest = dest
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	327 self.repo = repo
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	328
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	329 def use_template(self, t):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	330 '''set template string to use'''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	331 self.t.cache['changeset'] = t
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	332
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	333 def write(self, thing, header=False):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	334 '''write expanded template.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	335 uses in-order recursive traverse of iterators.'''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	336 dest = self.dest or self.ui
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	337 for t in thing:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	338 if hasattr(t, '__iter__'):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	339 self.write(t, header=header)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	340 elif header:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	341 dest.write_header(t)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	342 else:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	343 dest.write(t)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	344
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	345 def write_header(self, thing):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	346 self.write(thing, header=True)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	347
2191 c2e43535d4d1 make templater bit more flexible and efficient for external users. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	348 def show(self, rev=0, changenode=None, brinfo=None, changes=None,
3194 1749987b29e3 Templater expects an iterable copies variable (fixes notify). Brendan Cully <brendan@kublai.com> parents: 3190 diff changeset	349 copies=[], **props):
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	350 '''show a single changeset or file revision'''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	351 log = self.repo.changelog
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	352 if changenode is None:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	353 changenode = log.node(rev)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	354 elif not rev:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	355 rev = log.rev(changenode)
2191 c2e43535d4d1 make templater bit more flexible and efficient for external users. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	356 if changes is None:
c2e43535d4d1 make templater bit more flexible and efficient for external users. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	357 changes = log.read(changenode)
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	358
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	359 def showlist(name, values, plural=None, **args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	360 '''expand set of values.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	361 name is name of key in template map.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	362 values is list of strings or dicts.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	363 plural is plural of name, if not simply name + 's'.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	364
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	365 expansion works like this, given name 'foo'.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	366
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	367 if values is empty, expand 'no_foos'.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	368
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	369 if 'foo' not in template map, return values as a string,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	370 joined by space.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	371
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	372 expand 'start_foos'.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	373
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	374 for each value, expand 'foo'. if 'last_foo' in template
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	375 map, expand it instead of 'foo' for last key.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	376
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	377 expand 'end_foos'.
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	378 '''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	379 if plural: names = plural
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	380 else: names = name + 's'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	381 if not values:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	382 noname = 'no_' + names
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	383 if noname in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	384 yield self.t(noname, **args)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	385 return
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	386 if name not in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	387 if isinstance(values[0], str):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	388 yield ' '.join(values)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	389 else:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	390 for v in values:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	391 yield dict(v, **args)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	392 return
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	393 startname = 'start_' + names
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	394 if startname in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	395 yield self.t(startname, **args)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	396 vargs = args.copy()
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	397 def one(v, tag=name):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	398 try:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	399 vargs.update(v)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	400 except (AttributeError, ValueError):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	401 try:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	402 for a, b in v:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	403 vargs[a] = b
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	404 except ValueError:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	405 vargs[name] = v
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	406 return self.t(tag, **vargs)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	407 lastname = 'last_' + name
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	408 if lastname in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	409 last = values.pop()
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	410 else:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	411 last = None
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	412 for v in values:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	413 yield one(v)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	414 if last is not None:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	415 yield one(last, tag=lastname)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	416 endname = 'end_' + names
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	417 if endname in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	418 yield self.t(endname, **args)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	419
3456 451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	420 def showbranches(**args):
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	421 branch = changes[5].get("branch")
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	422 if branch:
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	423 yield showlist('branch', [branch], plural='branches', **args)
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	424 # add old style branches if requested
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	425 if brinfo and changenode in brinfo:
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	426 for x in showlist('branch', brinfo[changenode],
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	427 plural='branches', **args):
451ec905625b Add new branch info to templater and use it in map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3361 diff changeset	428 yield x
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	429
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	430 if self.ui.debugflag:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	431 def showmanifest(**args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	432 args = args.copy()
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	433 args.update(dict(rev=self.repo.manifest.rev(changes[0]),
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	434 node=hex(changes[0])))
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	435 yield self.t('manifest', **args)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	436 else:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	437 showmanifest = ''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	438
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	439 def showparents(**args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	440 parents = [[('rev', log.rev(p)), ('node', hex(p))]
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	441 for p in log.parents(changenode)
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	442 if self.ui.debugflag or p != nullid]
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	443 if (not self.ui.debugflag and len(parents) == 1 and
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	444 parents[0][0][1] == rev - 1):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	445 return
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	446 for x in showlist('parent', parents, **args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	447 yield x
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	448
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	449 def showtags(**args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	450 for x in showlist('tag', self.repo.nodetags(changenode), **args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	451 yield x
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	452
3457 fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	453 def showextras(**args):
fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	454 extras = changes[5].items()
fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	455 extras.sort()
fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	456 for key, value in extras:
fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	457 args = args.copy()
fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	458 args.update(dict(key=key, value=value))
fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	459 yield self.t('extra', **args)
fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	460
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	461 if self.ui.debugflag:
2874 3d6efcbbd1c9 remove localrepository.changes. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2643 diff changeset	462 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	463 def showfiles(**args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	464 for x in showlist('file', files[0], **args): yield x
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	465 def showadds(**args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	466 for x in showlist('file_add', files[1], **args): yield x
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	467 def showdels(**args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	468 for x in showlist('file_del', files[2], **args): yield x
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	469 else:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	470 def showfiles(**args):
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	471 for x in showlist('file', changes[3], **args): yield x
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	472 showadds = ''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	473 showdels = ''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	474
3190 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	475 copies = [{'name': x[0], 'source': x[1]}
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	476 for x in copies]
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	477 def showcopies(**args):
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	478 for x in showlist('file_copy', copies, plural='file_copies',
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	479 **args):
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	480 yield x
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	481
2191 c2e43535d4d1 make templater bit more flexible and efficient for external users. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	482 defprops = {
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	483 'author': changes[1],
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	484 'branches': showbranches,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	485 'date': changes[2],
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	486 'desc': changes[4],
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	487 'file_adds': showadds,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	488 'file_dels': showdels,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	489 'files': showfiles,
3190 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	490 'file_copies': showcopies,
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	491 'manifest': showmanifest,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	492 'node': hex(changenode),
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	493 'parents': showparents,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	494 'rev': rev,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	495 'tags': showtags,
3457 fab28100ea88 Added extra changeset info to templater and map-cmdline.default. Thomas Arendsen Hein <thomas@intevation.de> parents: 3456 diff changeset	496 'extras': showextras,
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	497 }
2191 c2e43535d4d1 make templater bit more flexible and efficient for external users. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	498 props = props.copy()
c2e43535d4d1 make templater bit more flexible and efficient for external users. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	499 props.update(defprops)
2189 e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	500
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	501 try:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	502 if self.ui.debugflag and 'header_debug' in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	503 key = 'header_debug'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	504 elif self.ui.quiet and 'header_quiet' in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	505 key = 'header_quiet'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	506 elif self.ui.verbose and 'header_verbose' in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	507 key = 'header_verbose'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	508 elif 'header' in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	509 key = 'header'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	510 else:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	511 key = ''
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	512 if key:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	513 self.write_header(self.t(key, **props))
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	514 if self.ui.debugflag and 'changeset_debug' in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	515 key = 'changeset_debug'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	516 elif self.ui.quiet and 'changeset_quiet' in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	517 key = 'changeset_quiet'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	518 elif self.ui.verbose and 'changeset_verbose' in self.t:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	519 key = 'changeset_verbose'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	520 else:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	521 key = 'changeset'
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	522 self.write(self.t(key, **props))
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	523 except KeyError, inst:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	524 raise util.Abort(_("%s: no key named '%s'") % (self.t.mapfile,
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	525 inst.args[0]))
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	526 except SyntaxError, inst:
e3eba577a0ae move changeset_templater into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2001 diff changeset	527 raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
2199 f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	528
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	529 class stringio(object):
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	530 '''wrap cStringIO for use by changeset_templater.'''
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	531 def __init__(self):
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	532 self.fp = cStringIO.StringIO()
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	533
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	534 def write(self, *args):
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	535 for a in args:
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	536 self.fp.write(a)
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	537
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	538 write_header = write
f1986a61ccff move stringio class from bugzilla extension into templater module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2191 diff changeset	539
2202 bc35cd725c37 make templater.stringio a tiny bit more use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2201 diff changeset	540 def __getattr__(self, key):
bc35cd725c37 make templater.stringio a tiny bit more use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2201 diff changeset	541 return getattr(self.fp, key)

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/templater.py @ 3635:231393b7316f