##// END OF EJS Templates
Fix revlog-ng interaction with old-http....
Fix revlog-ng interaction with old-http. revlog.py wasn't trying to detect the version of a revlog file that doesn't exist on the filesystem (as is the case with old-http). Additionally, there was an off-by-one error in httprangereader.read (ranges in HTTP Range headers are inclusive), making it get more data than what was asked for. This made a struct.unpack complain that "unpack str size does not match format". Finally, with the two fixes above, test-static-http fails, since BaseHTTPServer doesn't understand ranges and returns too much data. Work around that by reading only the specified amount.

File last commit:

r2001:a439b7b5 default
r2138:f5046cab default
Show More
templater.py
305 lines | 9.5 KiB | text/x-python | PythonLexer
Vadim Gelfer
add doc comments to template code.
r1909 # templater.py - template expansion for output
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Vadim Gelfer
move repeated work out of inner loops.
r1900 import re
Vadim Gelfer
move hgweb template code out to templater
r1896 from demandload import demandload
Vadim Gelfer
use safer string parser for template engine.
r1901 from i18n import gettext as _
Vadim Gelfer
add changelog style to command line template....
r1987 demandload(globals(), "cStringIO cgi re sys os time urllib util textwrap")
Vadim Gelfer
use safer string parser for template engine.
r1901
esctable = {
'\\': '\\',
'r': '\r',
't': '\t',
'n': '\n',
'v': '\v',
}
Vadim Gelfer
make parsestring work with strings that do not have quotes.
r1902 def parsestring(s, quoted=True):
Vadim Gelfer
add doc comments to template code.
r1909 '''parse a string using simple c-like syntax.
string must be in quotes if quoted is True.'''
Vadim Gelfer
use safer string parser for template engine.
r1901 fp = cStringIO.StringIO()
Vadim Gelfer
make parsestring work with strings that do not have quotes.
r1902 if quoted:
first = s[0]
if len(s) < 2: raise SyntaxError(_('string too short'))
if first not in "'\"": raise SyntaxError(_('invalid quote'))
if s[-1] != first: raise SyntaxError(_('unmatched quotes'))
s = s[1:-1]
Vadim Gelfer
use safer string parser for template engine.
r1901 escape = False
Vadim Gelfer
make parsestring work with strings that do not have quotes.
r1902 for c in s:
Vadim Gelfer
use safer string parser for template engine.
r1901 if escape:
fp.write(esctable.get(c, c))
escape = False
elif c == '\\': escape = True
Vadim Gelfer
make parsestring work with strings that do not have quotes.
r1902 elif quoted and c == first: raise SyntaxError(_('string ends early'))
Vadim Gelfer
use safer string parser for template engine.
r1901 else: fp.write(c)
if escape: raise SyntaxError(_('unterminated escape'))
return fp.getvalue()
Vadim Gelfer
move hgweb template code out to templater
r1896
class templater(object):
Vadim Gelfer
add doc comments to template code.
r1909 '''template expansion engine.
template expansion works like this. a map file contains key=value
pairs. if value is quoted, it is treated as string. otherwise, it
is treated as name of template file.
templater is asked to expand a key in map. it looks up key, and
looks for atrings like this: {foo}. it expands {foo} by looking up
foo in map, and substituting it. expansion is recursive: it stops
when there is no more {foo} to replace.
expansion also allows formatting and filtering.
format uses key to expand each item in list. syntax is
{key%format}.
filter uses function to transform value. syntax is
{key|filter1|filter2|...}.'''
Vadim Gelfer
fix template bug that made hgweb break....
r1964 def __init__(self, mapfile, filters={}, defaults={}, cache={}):
Vadim Gelfer
add doc comments to template code.
r1909 '''set up template engine.
mapfile is name of file to read map definitions from.
filters is dict of functions. each transforms a value into another.
defaults is dict of default map definitions.'''
Vadim Gelfer
improve template errors when something is wrong.
r1905 self.mapfile = mapfile or 'template'
Shun-ichi Goto
Duplicate cache when creating templater.
r1975 self.cache = cache.copy()
Vadim Gelfer
move hgweb template code out to templater
r1896 self.map = {}
Vadim Gelfer
improve template errors when something is wrong.
r1905 self.base = (mapfile and os.path.dirname(mapfile)) or ''
Vadim Gelfer
move hgweb template code out to templater
r1896 self.filters = filters
Vadim Gelfer
fix template bug that made hgweb break....
r1964 self.defaults = defaults
Vadim Gelfer
move hgweb template code out to templater
r1896
Vadim Gelfer
improve template errors when something is wrong.
r1905 if not mapfile:
return
Vadim Gelfer
use safer string parser for template engine.
r1901 i = 0
Vadim Gelfer
move hgweb template code out to templater
r1896 for l in file(mapfile):
Vadim Gelfer
make --style=compact look for map-cmdline.compact....
r1914 l = l.strip()
Vadim Gelfer
use safer string parser for template engine.
r1901 i += 1
Vadim Gelfer
make --style=compact look for map-cmdline.compact....
r1914 if not l or l[0] in '#;': continue
Vadim Gelfer
improve template errors when something is wrong.
r1905 m = re.match(r'([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.+)$', l)
Vadim Gelfer
move hgweb template code out to templater
r1896 if m:
Vadim Gelfer
improve template errors when something is wrong.
r1905 key, val = m.groups()
if val[0] in "'\"":
try:
self.cache[key] = parsestring(val)
except SyntaxError, inst:
raise SyntaxError('%s:%s: %s' %
(mapfile, i, inst.args[0]))
else:
self.map[key] = os.path.join(self.base, val)
Vadim Gelfer
move hgweb template code out to templater
r1896 else:
Vadim Gelfer
improve template errors when something is wrong.
r1905 raise SyntaxError(_("%s:%s: parse error") % (mapfile, i))
Vadim Gelfer
move hgweb template code out to templater
r1896
Vadim Gelfer
many small changes to templater....
r1899 def __contains__(self, key):
return key in self.cache
Vadim Gelfer
move hgweb template code out to templater
r1896 def __call__(self, t, **map):
Vadim Gelfer
add doc comments to template code.
r1909 '''perform expansion.
t is name of map element to expand.
map is added elements to use during expansion.'''
Vadim Gelfer
move hgweb template code out to templater
r1896 m = self.defaults.copy()
m.update(map)
try:
tmpl = self.cache[t]
except KeyError:
Vadim Gelfer
improve template errors when something is wrong.
r1905 try:
tmpl = self.cache[t] = file(self.map[t]).read()
except IOError, inst:
raise IOError(inst.args[0], _('template file %s: %s') %
(self.map[t], inst.args[1]))
Vadim Gelfer
move hgweb template code out to templater
r1896 return self.template(tmpl, self.filters, **m)
Vadim Gelfer
improve templating....
r1904 template_re = re.compile(r"[#{]([a-zA-Z_][a-zA-Z0-9_]*)"
Vadim Gelfer
move repeated work out of inner loops.
r1900 r"((%[a-zA-Z_][a-zA-Z0-9_]*)*)"
Vadim Gelfer
improve templating....
r1904 r"((\|[a-zA-Z_][a-zA-Z0-9_]*)*)[#}]")
Vadim Gelfer
move repeated work out of inner loops.
r1900
Vadim Gelfer
move hgweb template code out to templater
r1896 def template(self, tmpl, filters={}, **map):
Vadim Gelfer
move repeated work out of inner loops.
r1900 lm = map.copy()
Vadim Gelfer
move hgweb template code out to templater
r1896 while tmpl:
Vadim Gelfer
move repeated work out of inner loops.
r1900 m = self.template_re.search(tmpl)
Vadim Gelfer
move hgweb template code out to templater
r1896 if m:
Vadim Gelfer
improve template errors when something is wrong.
r1905 start, end = m.span(0)
s, e = tmpl[start], tmpl[end - 1]
key = m.group(1)
if ((s == '#' and e != '#') or (s == '{' and e != '}')):
raise SyntaxError(_("'%s'/'%s' mismatch expanding '%s'") %
(s, e, key))
Vadim Gelfer
move repeated work out of inner loops.
r1900 if start:
yield tmpl[:start]
Vadim Gelfer
improve template errors when something is wrong.
r1905 v = map.get(key, "")
Vadim Gelfer
move hgweb template code out to templater
r1896 v = callable(v) and v(**map) or v
format = m.group(2)
fl = m.group(4)
if format:
q = v.__iter__
for i in q():
lm.update(i)
yield self(format[1:], **lm)
v = ""
elif fl:
for f in fl.split("|")[1:]:
v = filters[f](v)
yield v
Vadim Gelfer
improve template errors when something is wrong.
r1905 tmpl = tmpl[end:]
Vadim Gelfer
move hgweb template code out to templater
r1896 else:
yield tmpl
Vadim Gelfer
move repeated work out of inner loops.
r1900 break
agescales = [("second", 1),
("minute", 60),
("hour", 3600),
("day", 3600 * 24),
("week", 3600 * 24 * 7),
("month", 3600 * 24 * 30),
("year", 3600 * 24 * 365)]
agescales.reverse()
Vadim Gelfer
move hgweb template code out to templater
r1896
Vadim Gelfer
add doc comments to template code.
r1909 def age(date):
'''turn a (timestamp, tzoff) tuple into an age string.'''
Vadim Gelfer
move hgweb template code out to templater
r1896 def plural(t, c):
if c == 1:
return t
return t + "s"
def fmt(t, c):
return "%d %s" % (c, plural(t, c))
now = time.time()
Vadim Gelfer
add doc comments to template code.
r1909 then = date[0]
Vadim Gelfer
move hgweb template code out to templater
r1896 delta = max(1, int(now - then))
Vadim Gelfer
move repeated work out of inner loops.
r1900 for t, s in agescales:
Vadim Gelfer
move hgweb template code out to templater
r1896 n = delta / s
if n >= 2 or s == 1:
return fmt(t, n)
Vadim Gelfer
add changelog style to command line template....
r1987 def stringify(thing):
'''turn nested template iterator into string.'''
cs = cStringIO.StringIO()
def walk(things):
for t in things:
if hasattr(t, '__iter__'):
walk(t)
else:
cs.write(t)
walk(thing)
return cs.getvalue()
para_re = re.compile('(\n\n|\n\\s*[-*]\\s*)', re.M)
space_re = re.compile(r' +')
def fill(text, width):
'''fill many paragraphs.'''
def findparas():
start = 0
while True:
m = para_re.search(text, start)
if not m:
w = len(text)
while w > start and text[w-1].isspace(): w -= 1
yield text[start:w], text[w:]
break
yield text[start:m.start(0)], m.group(1)
start = m.end(1)
fp = cStringIO.StringIO()
for para, rest in findparas():
fp.write(space_re.sub(' ', textwrap.fill(para, width)))
fp.write(rest)
return fp.getvalue()
Vadim Gelfer
add iso date template filter.
r1906 def isodate(date):
Vadim Gelfer
add changelog style to command line template....
r1987 '''turn a (timestamp, tzoff) tuple into an iso 8631 date and time.'''
Vadim Gelfer
add iso date template filter.
r1906 return util.datestr(date, format='%Y-%m-%d %H:%M')
Vadim Gelfer
move hgweb template code out to templater
r1896 def nl2br(text):
Vadim Gelfer
add doc comments to template code.
r1909 '''replace raw newlines with xhtml line breaks.'''
Vadim Gelfer
move hgweb template code out to templater
r1896 return text.replace('\n', '<br/>\n')
def obfuscate(text):
return ''.join(['&#%d;' % ord(c) for c in text])
Vadim Gelfer
improve templating....
r1904 def domain(author):
Vadim Gelfer
add doc comments to template code.
r1909 '''get domain of author, or empty string if none.'''
Vadim Gelfer
improve templating....
r1904 f = author.find('@')
if f == -1: return ''
author = author[f+1:]
f = author.find('>')
if f >= 0: author = author[:f]
return author
Vadim Gelfer
add changelog style to command line template....
r1987 def email(author):
'''get email of author.'''
r = author.find('>')
if r == -1: r = None
return author[author.find('<')+1:r]
Vadim Gelfer
improve templating....
r1904 def person(author):
Vadim Gelfer
add doc comments to template code.
r1909 '''get name of author, or else username.'''
Vadim Gelfer
improve templating....
r1904 f = author.find('<')
if f == -1: return util.shortuser(author)
return author[:f].rstrip()
Vadim Gelfer
add changelog style to command line template....
r1987 def shortdate(date):
'''turn (timestamp, tzoff) tuple into iso 8631 date.'''
return util.datestr(date, format='%Y-%m-%d', timezone=False)
def indent(text, prefix):
'''indent each non-empty line of text after first with prefix.'''
fp = cStringIO.StringIO()
lines = text.splitlines()
num_lines = len(lines)
for i in xrange(num_lines):
l = lines[i]
if i and l.strip(): fp.write(prefix)
fp.write(l)
if i < num_lines - 1 or text.endswith('\n'):
fp.write('\n')
return fp.getvalue()
Vadim Gelfer
move hgweb template code out to templater
r1896 common_filters = {
Vadim Gelfer
improve templating....
r1904 "addbreaks": nl2br,
Vadim Gelfer
move hgweb template code out to templater
r1896 "age": age,
"date": lambda x: util.datestr(x),
Vadim Gelfer
improve template errors when something is wrong.
r1905 "domain": domain,
Vadim Gelfer
add changelog style to command line template....
r1987 "email": email,
Vadim Gelfer
improve templating....
r1904 "escape": lambda x: cgi.escape(x, True),
Vadim Gelfer
add changelog style to command line template....
r1987 "fill68": lambda x: fill(x, width=68),
"fill76": lambda x: fill(x, width=76),
Vadim Gelfer
hide some functions behind lambdas, so demandload is useful.
r1912 "firstline": lambda x: x.splitlines(1)[0].rstrip('\r\n'),
Vadim Gelfer
add changelog style to command line template....
r1987 "tabindent": lambda x: indent(x, '\t'),
Vadim Gelfer
add iso date template filter.
r1906 "isodate": isodate,
Vadim Gelfer
move hgweb template code out to templater
r1896 "obfuscate": obfuscate,
Vadim Gelfer
hide some functions behind lambdas, so demandload is useful.
r1912 "permissions": lambda x: x and "-rwxr-xr-x" or "-rw-r--r--",
Vadim Gelfer
improve templating....
r1904 "person": person,
"rfc822date": lambda x: util.datestr(x, "%a, %d %b %Y %H:%M:%S"),
Vadim Gelfer
hide some functions behind lambdas, so demandload is useful.
r1912 "short": lambda x: x[:12],
Vadim Gelfer
add changelog style to command line template....
r1987 "shortdate": shortdate,
"stringify": stringify,
Vadim Gelfer
improve templating....
r1904 "strip": lambda x: x.strip(),
Vadim Gelfer
hide some functions behind lambdas, so demandload is useful.
r1912 "urlescape": lambda x: urllib.quote(x),
"user": lambda x: util.shortuser(x),
Vadim Gelfer
move hgweb template code out to templater
r1896 }
Vadim Gelfer
move hgweb.templatepath into templater
r1897
Vadim Gelfer
many small changes to templater....
r1899 def templatepath(name=None):
Vadim Gelfer
add doc comments to template code.
r1909 '''return location of template file or directory (if no name).
returns None if not found.'''
Lee Cantey
Windows py2exe version didn't handle names given to templatepath() correctly
r2001 # executable version (py2exe) doesn't support __file__
if hasattr(sys, 'frozen'):
module = sys.executable
else:
module = __file__
Vadim Gelfer
many small changes to templater....
r1899 for f in 'templates', '../templates':
fl = f.split('/')
if name: fl.append(name)
Lee Cantey
Windows py2exe version didn't handle names given to templatepath() correctly
r2001 p = os.path.join(os.path.dirname(module), *fl)
Vadim Gelfer
many small changes to templater....
r1899 if (name and os.path.exists(p)) or os.path.isdir(p):
Vadim Gelfer
move hgweb.templatepath into templater
r1897 return os.path.normpath(p)