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

comparison mercurial/hgweb.py @ 871:c2e77581bc84

Merge with mpm.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Tue, 09 Aug 2005 17:24:38 -0800
parents	9c918287d10b c333dfa8fa1a
children	d4cb383e7de7 781266a78fe1 bc9ca4d51d23 63ca8a68d59e

comparison

equal deleted inserted replaced

-:a82eae840447
+:c2e77581bc84
 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() or v
+v = callable(v) and v(**map) or v
 fl = m.group(2)
 if fl:
 for f in fl.split("|")[1:]:
 v = filters[f](v)
 for f in d:
 to = r.file(f).read(mmap1[f])
 tn = None
 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn)
-def header(self):
-yield self.t("header")
-def footer(self):
-yield self.t("footer")
 def changelog(self, pos):
-def changenav():
+def changenav(**map):
 def seq(factor = 1):
 yield 1 * factor
 yield 3 * factor
 #yield 5 * factor
 for f in seq(factor * 10):
 for label, rev in l:
 yield self.t("naventry", label = label, rev = rev)
 yield self.t("naventry", label="tip")
-def changelist():
+def changelist(**map):
 parity = (start - end) & 1
 cl = self.repo.changelog
 l = [] # build a list in forward order for efficiency
 for i in range(start, end):
 n = cl.node(i)
 manifest = hex(mf),
 rev = pos, changesets = count, entries = changelist)
 def search(self, query):
-def changelist():
+def changelist(**map):
 cl = self.repo.changelog
 count = 0
 qw = query.lower().split()
 def revgen():
 mf = self.repo.manifest.read(changes[0])
 for f in changes[3]:
 files.append(self.t("filenodelink",
 filenode = hex(mf.get(f, nullid)), file = f))
-def diff():
+def diff(**map):
 yield self.diff(p1, n, None)
 yield self.t('changeset',
 diff = diff,
 rev = cl.rev(n),
 def filelog(self, f, filenode):
 cl = self.repo.changelog
 fl = self.repo.file(f)
 count = fl.count()
-def entries():
+def entries(**map):
 l = []
 parity = (count - 1) & 1
 for i in range(count):
 cn = cl.node(changerev)
 cs = cl.read(cn)
 t = float(cs[2].split(' ')[0])
 mfn = cs[0]
-def annotate():
+def annotate(**map):
 parity = 1
 last = None
 for r, l in fl.annotate(n):
 try:
 cnode = ncache[r]
 files[short] = (f, None)
 else:
 short = os.path.basename(remain)
 files[short] = (f, n)
-def filelist():
+def filelist(**map):
 parity = 0
 fl = files.keys()
 fl.sort()
 for f in fl:
 full, fnode = files[f]
 mf = cl.read(cl.tip())[0]
 i = self.repo.tagslist()
 i.reverse()
-def entries():
+def entries(**map):
 parity = 0
 for k,n in i:
 yield self.t("tagentry",
 parity = parity,
 tag = k,
 cl = self.repo.changelog
 p1 = cl.parents(n)[0]
 cs = cl.read(n)
 mf = self.repo.manifest.read(cs[0])
-def diff():
+def diff(**map):
 yield self.diff(p1, n, file)
 yield self.t("filediff",
 file = file,
 filenode = hex(mf.get(file, nullid)),
 # add tags to things
 # tags -> list of changesets corresponding to tags
 # find tag, changeset, file
 def run(self):
+def header(**map):
+yield self.t("header", **map)
+def footer(**map):
+yield self.t("footer", **map)
 self.refresh()
 args = cgi.parse()
 m = os.path.join(self.templates, "map")
 if args.has_key('style'):
 url = "http://%s%s%s" % (os.environ["SERVER_NAME"], port, uri)
 self.t = templater(m, self.filters,
 {"url":url,
 "repo":self.reponame,
-"header":self.header(),
+"header":header,
-"footer":self.footer(),
+"footer":footer,
 })
-if not args.has_key('cmd') or args['cmd'][0] == 'changelog':
+if not args.has_key('cmd'):
+args['cmd'] = [self.t.cache['default'],]
+if args['cmd'][0] == 'changelog':
 c = self.repo.changelog.count() - 1
 hi = c
 if args.has_key('rev'):
 hi = args['rev'][0]
 try:

Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hgweb.py @ 871:c2e77581bc84