mercurial-crew-with-dirclash: comparison mercurial/hgweb.py

equal deleted inserted replaced

-:8450c18f2a45
+:f918a6fa2572
 import os, cgi, time, re, difflib, sys, zlib
 from mercurial.hg import *
 def templatepath():
-for f in "templates/map", "../templates/map":
+for f in "templates", "../templates":
 p = os.path.join(os.path.dirname(__file__), f)
-if os.path.isfile(p): return p
+if os.path.isdir(p): return p
 def age(t):
 def plural(t, c):
 if c == 1: return t
 return t + "s"
 for t, s in scales:
 n = delta / s
 if n >= 2 or s == 1: return fmt(t, n)
 def nl2br(text):
-return text.replace('\n', '<br/>')
+return text.replace('\n', '<br/>\n')
 def obfuscate(text):
 return ''.join([ '&#%d' % ord(c) for c in text ])
 def up(p):
 for part in thing:
 write(part)
 else:
 sys.stdout.write(str(thing))
-def template(tmpl, **map):
+def template(tmpl, filters = {}, **map):
 while tmpl:
-m = re.search(r"#([a-zA-Z0-9]+)#", tmpl)
+m = re.search(r"#([a-zA-Z0-9]+)((\|[a-zA-Z0-9]+)*)#", tmpl)
 if m:
 yield tmpl[:m.start(0)]
 v = map.get(m.group(1), "")
-yield callable(v) and v() or v
+v = callable(v) and v() or v
+fl = m.group(2)
+if fl:
+for f in fl.split("|")[1:]:
+v = filters[f](v)
+yield v
 tmpl = tmpl[m.end(0):]
 else:
 yield tmpl
 return
 class templater:
-def __init__(self, mapfile):
+def __init__(self, mapfile, filters = {}):
 self.cache = {}
 self.map = {}
 self.base = os.path.dirname(mapfile)
+self.filters = filters
 for l in file(mapfile):
 m = re.match(r'(\S+)\s*=\s*"(.*)"$', l)
 if m:
 self.cache[m.group(1)] = m.group(2)
 def __call__(self, t, **map):
 try:
 tmpl = self.cache[t]
 except KeyError:
 tmpl = self.cache[t] = file(self.map[t]).read()
-return template(tmpl, **map)
+return template(tmpl, self.filters, **map)
 class hgweb:
 maxchanges = 20
 maxfiles = 10
-def __init__(self, path, name, templatemap = ""):
+def __init__(self, path, name, templates = ""):
-templatemap = templatemap or templatepath()
+self.templates = templates or templatepath()
 self.reponame = name
 self.repo = repository(ui(), path)
-self.t = templater(templatemap)
 self.viewonly = 0
+self.filters = {
+"escape": cgi.escape,
+"age": age,
+"date": (lambda x: time.asctime(time.gmtime(x))),
+"addbreaks": nl2br,
+"obfuscate": obfuscate,
+"firstline": (lambda x: x.splitlines(1)[0]),
+}
 def date(self, cs):
 return time.asctime(time.gmtime(float(cs[2].split(' ')[0])))
 def listfiles(self, files, mf):
 filenode = hex(fn))
 parity[0] = 1 - parity[0]
 def prettyprintlines(diff):
 for l in diff.splitlines(1):
-line = cgi.escape(l)
+if l.startswith('+'):
-if line.startswith('+'):
+yield self.t("difflineplus", line = l)
-yield self.t("difflineplus", line = line)
+elif l.startswith('-'):
-elif line.startswith('-'):
+yield self.t("difflineminus", line = l)
-yield self.t("difflineminus", line = line)
+elif l.startswith('@'):
-elif line.startswith('@'):
+yield self.t("difflineat", line = l)
-yield self.t("difflineat", line = line)
 else:
-yield self.t("diffline", line = line)
+yield self.t("diffline", line = l)
 r = self.repo
 cl = r.changelog
 mf = r.manifest
 change1 = cl.read(node1)
 t = float(changes[2].split(' ')[0])
 l.insert(0, self.t(
 'changelogentry',
 parity = parity,
-author = obfuscate(changes[1]),
+author = changes[1],
-shortdesc = cgi.escape(changes[4].splitlines()[0]),
-age = age(t),
 parent1 = self.parent("changelogparent",
 hex(p1), cl.rev(p1)),
 parent2 = self.parent("changelogparent",
 hex(p2), cl.rev(p2)),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = cl.rev(p1), p2rev = cl.rev(p2),
 manifest = hex(changes[0]),
-desc = nl2br(cgi.escape(changes[4])),
+desc = changes[4],
-date = time.asctime(time.gmtime(t)),
+date = t,
 files = self.listfilediffs(changes[3], n),
 rev = i,
 node = hn))
 parity = 1 - parity
 footer = self.footer(),
 repo = self.reponame,
 diff = diff,
 rev = cl.rev(n),
 node = nodeid,
-shortdesc = cgi.escape(changes[4].splitlines()[0]),
 parent1 = self.parent("changesetparent",
 hex(p1), cl.rev(p1)),
 parent2 = self.parent("changesetparent",
 hex(p2), cl.rev(p2)),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = cl.rev(p1), p2rev = cl.rev(p2),
 manifest = hex(changes[0]),
-author = obfuscate(changes[1]),
+author = changes[1],
-desc = nl2br(cgi.escape(changes[4])),
+desc = changes[4],
-date = time.asctime(time.gmtime(t)),
+date = t,
 files = files)
 def filelog(self, f, filenode):
 cl = self.repo.changelog
 fl = self.repo.file(f)
 parity = parity,
 filenode = hex(n),
 filerev = i,
 file = f,
 node = hex(cn),
-author = obfuscate(cs[1]),
+author = cs[1],
-age = age(t),
+date = t,
-date = time.asctime(time.gmtime(t)),
+desc = cs[4],
-shortdesc = cgi.escape(cs[4].splitlines()[0]),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = fl.rev(p1), p2rev = fl.rev(p2)))
 parity = 1 - parity
 yield l
 entries = entries)
 def filerevision(self, f, node):
 fl = self.repo.file(f)
 n = bin(node)
-text = cgi.escape(fl.read(n))
+text = fl.read(n)
 changerev = fl.linkrev(n)
 cl = self.repo.changelog
 cn = cl.node(changerev)
 cs = cl.read(cn)
 p1, p2 = fl.parents(n)
 t = float(cs[2].split(' ')[0])
 mfn = cs[0]
 def lines():
 for l, t in enumerate(text.splitlines(1)):
-yield self.t("fileline",
+yield self.t("fileline", line = t,
-line = t,
 linenumber = "% 6d" % (l + 1),
 parity = l & 1)
 yield self.t("filerevision", file = f,
 header = self.header(),
 path = up(f),
 text = lines(),
 rev = changerev,
 node = hex(cn),
 manifest = hex(mfn),
-author = obfuscate(cs[1]),
+author = cs[1],
-age = age(t),
+date = t,
-date = time.asctime(time.gmtime(t)),
-shortdesc = cgi.escape(cs[4].splitlines()[0]),
 parent1 = self.parent("filerevparent",
 hex(p1), fl.rev(p1), file=f),
 parent2 = self.parent("filerevparent",
 hex(p2), fl.rev(p2), file=f),
 p1 = hex(p1), p2 = hex(p2),
 p1rev = fl.rev(p1), p2rev = fl.rev(p2))
 def fileannotate(self, f, node):
 bcache = {}
 ncache = {}
 fl = self.repo.file(f)
 parity = parity,
 node = hex(cnode),
 rev = r,
 author = name,
 file = f,
-line = cgi.escape(l))
+line = l)
 yield self.t("fileannotate",
 header = self.header(),
 footer = self.footer(),
 repo = self.reponame,
 annotate = annotate,
 path = up(f),
 rev = changerev,
 node = hex(cn),
 manifest = hex(mfn),
-author = obfuscate(cs[1]),
+author = cs[1],
-age = age(t),
+date = t,
-date = time.asctime(time.gmtime(t)),
-shortdesc = cgi.escape(cs[4].splitlines()[0]),
 parent1 = self.parent("fileannotateparent",
 hex(p1), fl.rev(p1), file=f),
 parent2 = self.parent("fileannotateparent",
 hex(p2), fl.rev(p2), file=f),
 p1 = hex(p1), p2 = hex(p2),
 # find tag, changeset, file
 def run(self):
 args = cgi.parse()
+m = os.path.join(self.templates, "map")
+if args.has_key('style'):
+b = os.path.basename("map-" + args['style'][0])
+p = os.path.join(self.templates, b)
+if os.path.isfile(p): m = p
+self.t = templater(m, self.filters)
 if not args.has_key('cmd') or args['cmd'][0] == 'changelog':
 hi = self.repo.changelog.count()
 if args.has_key('rev'):
 hi = args['rev'][0]
 try:

changeset 201	f918a6fa2572
parent 198	c88ef31fb5c0
child 215	9ff5a78d0c45