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

equal deleted inserted replaced

-:a51991ebf229
+:4f81068ed8cd
 if hasattr(thing, "__iter__"):
 for part in thing:
 write(part)
 else:
 sys.stdout.write(str(thing))
-def template(tmpl, filters = {}, **map):
-while 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), "")
-v = callable(v) and v(**map) 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, filters = {}, defaults = {}):
 self.cache = {}
 self.map = {}
 m.update(map)
 try:
 tmpl = self.cache[t]
 except KeyError:
 tmpl = self.cache[t] = file(self.map[t]).read()
-return template(tmpl, self.filters, **m)
+return self.template(tmpl, self.filters, **m)
+def template(self, tmpl, filters = {}, **map):
+while tmpl:
+m = re.search(r"#([a-zA-Z0-9]+)((%[a-zA-Z0-9]+)*)((\|[a-zA-Z0-9]+)*)#", tmpl)
+if m:
+yield tmpl[:m.start(0)]
+v = map.get(m.group(1), "")
+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 = map.copy()
+lm.update(i)
+yield self(format[1:], **lm)
+v = ""
+elif fl:
+for f in fl.split("|")[1:]:
+v = filters[f](v)
+yield v
+tmpl = tmpl[m.end(0):]
+else:
+yield tmpl
+return
 def rfc822date(x):
 return time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime(x))
 common_filters = {
 if f > count: break
 r = "%d" % f
 if pos + f < count: l.append(("+" + r, pos + f))
 if pos - f >= 0: l.insert(0, ("-" + r, pos - f))
-yield self.t("naventry", rev = 0, label="(0)")
+yield {"rev": 0, "label": "(0)"}
 for label, rev in l:
-yield self.t("naventry", label = label, rev = rev)
+yield {"label": label, "rev": rev}
-yield self.t("naventry", label="tip")
+yield {"label": "tip", "rev": ""}
 def changelist(**map):
 parity = (start - end) & 1
 cl = self.repo.changelog
 l = [] # build a list in forward order for efficiency
 n = cl.node(i)
 changes = cl.read(n)
 hn = hex(n)
 t = float(changes[2].split(' ')[0])
-l.insert(0, self.t(
+l.insert(0, {
-'changelogentry',
+"parity": parity,
-parity = parity,
+"author": changes[1],
-author = changes[1],
+"parent": self.parents("changelogparent",
-parent = self.parents("changelogparent",
 cl.parents(n), cl.rev),
-changelogtag = self.showtag("changelogtag",n),
+"changelogtag": self.showtag("changelogtag",n),
-manifest = hex(changes[0]),
+"manifest": hex(changes[0]),
-desc = changes[4],
+"desc": changes[4],
-date = t,
+"date": t,
-files = self.listfilediffs(changes[3], n),
+"files": self.listfilediffs(changes[3], n),
-rev = i,
+"rev": i,
-node = hn))
+"node": hn})
 parity = 1 - parity
-yield l
+for e in l: yield e
 cl = self.repo.changelog
 mf = cl.read(cl.tip())[0]
 count = cl.count()
 start = max(0, pos - self.maxchanges + 1)
 lr = fl.linkrev(n)
 cn = cl.node(lr)
 cs = cl.read(cl.node(lr))
 t = float(cs[2].split(' ')[0])
-l.insert(0, self.t("filelogentry",
+l.insert(0, {"parity": parity,
-parity = parity,
+"filenode": hex(n),
-filenode = hex(n),
+"filerev": i,
-filerev = i,
+"file": f,
-file = f,
+"node": hex(cn),
-node = hex(cn),
+"author": cs[1],
-author = cs[1],
+"date": t,
-date = t,
+"parent": self.parents("filelogparent",
-parent = self.parents("filelogparent",
 fl.parents(n), fl.rev, file=f),
-desc = cs[4]))
+"desc": cs[4]})
 parity = 1 - parity
-yield l
+for e in l: yield e
 yield self.t("filelog",
 file = f,
 filenode = filenode,
 entries = entries)
 t = float(cs[2].split(' ')[0])
 mfn = cs[0]
 def lines():
 for l, t in enumerate(text.splitlines(1)):
-yield self.t("fileline", line = t,
+yield {"line": t,
-linenumber = "% 6d" % (l + 1),
+"linenumber": "% 6d" % (l + 1),
-parity = l & 1)
+"parity": l & 1}
 yield self.t("filerevision", file = f,
 filenode = node,
 path = up(f),
 text = lines(),
 if last != cnode:
 parity = 1 - parity
 last = cnode
-yield self.t("annotateline",
+yield {"parity": parity,
-parity = parity,
+"node": hex(cnode),
-node = hex(cnode),
+"rev": r,
-rev = r,
+"author": name,
-author = name,
+"file": f,
-file = f,
+"line": l}
-line = l)
 yield self.t("fileannotate",
 file = f,
 filenode = node,
 annotate = annotate,
 parity = 0
 fl = files.keys()
 fl.sort()
 for f in fl:
 full, fnode = files[f]
+if not fnode:
+continue
+yield {"file": full,
+"manifest": mnode,
+"filenode": hex(fnode),
+"parity": parity,
+"basename": f,
+"permissions": mff[full]}
+parity = 1 - parity
+def dirlist(**map):
+parity = 0
+fl = files.keys()
+fl.sort()
+for f in fl:
+full, fnode = files[f]
 if fnode:
-yield self.t("manifestfileentry",
+continue
-file = full,
-manifest = mnode,
+yield {"parity": parity,
-filenode = hex(fnode),
+"path": os.path.join(path, f),
-parity = parity,
+"manifest": mnode,
-basename = f,
+"basename": f[:-1]}
-permissions = mff[full])
-else:
-yield self.t("manifestdirentry",
-parity = parity,
-path = os.path.join(path, f),
-manifest = mnode, basename = f[:-1])
 parity = 1 - parity
 yield self.t("manifest",
 manifest = mnode,
 rev = rev,
 node = hex(node),
 path = path,
 up = up(path),
-entries = filelist)
+fentries = filelist,
+dentries = dirlist)
 def tags(self):
 cl = self.repo.changelog
 mf = cl.read(cl.tip())[0]
 i.reverse()
 def entries(**map):
 parity = 0
 for k,n in i:
-yield self.t("tagentry",
+yield {"parity": parity,
-parity = parity,
+"tag": k,
-tag = k,
+"node": hex(n)}
-node = hex(n))
 parity = 1 - parity
 yield self.t("tags",
 manifest = hex(mf),
 entries = entries)

changeset 981	4f81068ed8cd
parent 964	3f37720e7dc7
parent 980	5197fb9d65d5
child 982	8d2e24bae760