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

annotate mercurial/templater.py @ 2439:e8c4f3d3df8c

extend network protocol to stop clients from locking servers now all repositories have capabilities slot, tuple with list of names. if 'unbundle' capability present, repo supports push where client does not need to lock server. repository classes that have unbundle capability also have unbundle method. implemented for ssh now, will be base for push over http. unbundle protocol acts this way. server tells client what heads it has during normal negotiate step. client starts unbundle by repeat server's heads back to it. if server has new heads, abort immediately. otherwise, transfer changes to server. once data transferred, server locks and checks heads again. if heads same, changes can be added. else someone else added heads, and server aborts. if client wants to force server to add heads, sends special heads list of 'force'.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Thu, 15 Jun 2006 16:37:23 -0700
parents	bc35cd725c37
children	fe1689273f84

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

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/templater.py @ 2439:e8c4f3d3df8c