mercurial-scm/hg-stable: mercurial/hgweb/hgweb

comparison mercurial/hgweb/hgweb_mod.py @ 5600:9d900f7282e6

hgweb: explicitly pass around the templater

author	Dirkjan Ochtman <dirkjan@ochtman.nl>
date	Mon, 03 Dec 2007 13:30:08 +0100
parents	3de66c2a9734
children	652f57de3ccf

comparison

equal deleted inserted replaced

-:3de66c2a9734
+:9d900f7282e6
 req.form['node'] = [fn[:-len(ext)]]
 req.form['type'] = [type_]
 # actually process the request
-self.templater(req)
 try:
-if not req.form.has_key('cmd'):
-req.form['cmd'] = [self.t.cache['default']]
+cmd = req.form.get('cmd', [''])[0]
+if hasattr(protocol, cmd):
-cmd = req.form['cmd'][0]
+method = getattr(protocol, cmd)
-try:
-if hasattr(protocol, cmd):
-method = getattr(protocol, cmd)
-else:
-method = getattr(webcommands, cmd)
 method(self, req)
-except revlog.LookupError, err:
+else:
-req.respond(404, self.t(
+tmpl = self.templater(req)
-'error', error='revision not found: %s' % err.name))
+if cmd == '':
-except (hg.RepoError, revlog.RevlogError), inst:
+req.form['cmd'] = [tmpl.cache['default']]
-req.respond('500 Internal Server Error',
+cmd = req.form['cmd'][0]
-self.t('error', error=str(inst)))
+method = getattr(webcommands, cmd)
-except ErrorResponse, inst:
+method(self, req, tmpl)
-req.respond(inst.code, self.t('error', error=inst.message))
+del tmpl
-except AttributeError:
-req.respond(400,
+except revlog.LookupError, err:
-self.t('error', error='No such method: ' + cmd))
+req.respond(404, tmpl(
-finally:
+'error', error='revision not found: %s' % err.name))
-self.t = None
+except (hg.RepoError, revlog.RevlogError), inst:
+req.respond('500 Internal Server Error',
+tmpl('error', error=str(inst)))
+except ErrorResponse, inst:
+req.respond(inst.code, tmpl('error', error=inst.message))
+except AttributeError:
+req.respond(400, tmpl('error', error='No such method: ' + cmd))
 def templater(self, req):
 # determine scheme, port and server name
 # this is needed to create absolute urls
 # some functions for the templater
 def header(**map):
 header_file = cStringIO.StringIO(
-''.join(self.t("header", encoding=self.encoding, **map)))
+''.join(tmpl("header", encoding=self.encoding, **map)))
 msg = mimetools.Message(header_file, 0)
 req.header(msg.items())
 yield header_file.read()
 def rawfileheader(**map):
 ('Content-disposition', 'filename=%s' % map['file']),
 ('Content-length', str(len(map['raw'])))])
 yield ''
 def footer(**map):
-yield self.t("footer", **map)
+yield tmpl("footer", **map)
 def motd(**map):
 yield self.config("web", "motd", "")
 def sessionvars(**map):
 or req.env.get('REPO_NAME')
 or req.url.strip('/') or self.repo.root)
 # create the templater
-self.t = templater.templater(mapfile, templater.common_filters,
+tmpl = templater.templater(mapfile, templater.common_filters,
 defaults={"url": req.url,
 "staticurl": staticurl,
 "urlbase": urlbase,
 "repo": self.reponame,
 "header": header,
 "footer": footer,
 "motd": motd,
 "rawfileheader": rawfileheader,
 "sessionvars": sessionvars
 })
+return tmpl
 def archivelist(self, nodeid):
 allowed = self.configlist("web", "allow_archive")
 for i, spec in self.archive_specs.iteritems():
 if i in allowed or self.configbool("web", "allow" + i):
 yield {"type" : i, "extension" : spec[2], "node" : nodeid}
-def listfilediffs(self, files, changeset):
+def listfilediffs(self, tmpl, files, changeset):
 for f in files[:self.maxfiles]:
-yield self.t("filedifflink", node=hex(changeset), file=f)
+yield tmpl("filedifflink", node=hex(changeset), file=f)
 if len(files) > self.maxfiles:
-yield self.t("fileellipses")
+yield tmpl("fileellipses")
 def siblings(self, siblings=[], hiderev=None, **args):
 siblings = [s for s in siblings if s.node() != nullid]
 if len(siblings) == 1 and siblings[0].rev() == hiderev:
 return
 # an empty dict. Using dict.get avoids a traceback.
 if self.repo.branchtags().get(branch) == ctx.node():
 branches.append({"name": branch})
 return branches
-def showtag(self, t1, node=nullid, **args):
+def showtag(self, tmpl, t1, node=nullid, **args):
 for t in self.repo.nodetags(node):
-yield self.t(t1, tag=t, **args)
+yield tmpl(t1, tag=t, **args)
-def diff(self, node1, node2, files):
+def diff(self, tmpl, node1, node2, files):
 def filterfiles(filters, files):
 l = [x for x in files if x in filters]
 for t in filters:
 if t and t[-1] != os.sep:
 l += [x for x in files if x.startswith(t)]
 return l
 parity = paritygen(self.stripecount)
 def diffblock(diff, f, fn):
-yield self.t("diffblock",
+yield tmpl("diffblock",
 lines=prettyprintlines(diff),
 parity=parity.next(),
 file=f,
 filenode=hex(fn or nullid))
 def prettyprintlines(diff):
 for l in diff.splitlines(1):
 if l.startswith('+'):
-yield self.t("difflineplus", line=l)
+yield tmpl("difflineplus", line=l)
 elif l.startswith('-'):
-yield self.t("difflineminus", line=l)
+yield tmpl("difflineminus", line=l)
 elif l.startswith('@'):
-yield self.t("difflineat", line=l)
+yield tmpl("difflineat", line=l)
 else:
-yield self.t("diffline", line=l)
+yield tmpl("diffline", line=l)
 r = self.repo
 c1 = r.changectx(node1)
 c2 = r.changectx(node2)
 date1 = util.datestr(c1.date())
 to = c1.filectx(f).data()
 tn = None
 yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, f,
 opts=diffopts), f, tn)
-def changelog(self, ctx, shortlog=False):
+def changelog(self, tmpl, ctx, shortlog=False):
 def changelist(limit=0,**map):
 cl = self.repo.changelog
 l = [] # build a list in forward order for efficiency
 for i in xrange(start, end):
 ctx = self.repo.changectx(i)
 "parent": self.siblings(ctx.parents(), i - 1),
 "child": self.siblings(ctx.children(), i + 1),
 "changelogtag": self.showtag("changelogtag",n),
 "desc": ctx.description(),
 "date": ctx.date(),
-"files": self.listfilediffs(ctx.files(), n),
+"files": self.listfilediffs(tmpl, ctx.files(), n),
 "rev": i,
 "node": hex(n),
 "tags": self.nodetagsdict(n),
 "branches": self.nodebranchdict(ctx)})
 pos = end - 1
 parity = paritygen(self.stripecount, offset=start-end)
 changenav = revnavgen(pos, maxchanges, count, self.repo.changectx)
-yield self.t(shortlog and 'shortlog' or 'changelog',
+yield tmpl(shortlog and 'shortlog' or 'changelog',
 changenav=changenav,
 node=hex(cl.tip()),
 rev=pos, changesets=count,
 entries=lambda **x: changelist(limit=0,**x),
 latestentry=lambda **x: changelist(limit=1,**x),
 archives=self.archivelist("tip"))
-def search(self, query):
+def search(self, tmpl, query):
 def changelist(**map):
 cl = self.repo.changelog
 count = 0
 qw = query.lower().split()
 continue
 count += 1
 n = ctx.node()
-yield self.t('searchentry',
+yield tmpl('searchentry',
 parity=parity.next(),
 author=ctx.user(),
 parent=self.siblings(ctx.parents()),
 child=self.siblings(ctx.children()),
 changelogtag=self.showtag("changelogtag",n),
 desc=ctx.description(),
 date=ctx.date(),
-files=self.listfilediffs(ctx.files(), n),
+files=self.listfilediffs(tmpl, ctx.files(), n),
 rev=ctx.rev(),
 node=hex(n),
 tags=self.nodetagsdict(n),
 branches=self.nodebranchdict(ctx))
 if count >= self.maxchanges:
 break
 cl = self.repo.changelog
 parity = paritygen(self.stripecount)
-yield self.t('search',
+yield tmpl('search',
 query=query,
 node=hex(cl.tip()),
 entries=changelist,
 archives=self.archivelist("tip"))
-def changeset(self, ctx):
+def changeset(self, tmpl, ctx):
 n = ctx.node()
 parents = ctx.parents()
 p1 = parents[0].node()
 files = []
 parity = paritygen(self.stripecount)
 for f in ctx.files():
-files.append(self.t("filenodelink",
+files.append(tmpl("filenodelink",
 node=hex(n), file=f,
 parity=parity.next()))
 def diff(**map):
-yield self.diff(p1, n, None)
+yield self.diff(tmpl, p1, n, None)
-yield self.t('changeset',
+yield tmpl('changeset',
 diff=diff,
 rev=ctx.rev(),
 node=hex(n),
 parent=self.siblings(parents),
 child=self.siblings(ctx.children()),
 changesettag=self.showtag("changesettag",n),
 author=ctx.user(),
 desc=ctx.description(),
 date=ctx.date(),
 files=files,
 archives=self.archivelist(hex(n)),
 tags=self.nodetagsdict(n),
 branches=self.nodebranchdict(ctx))
-def filelog(self, fctx):
+def filelog(self, tmpl, fctx):
 f = fctx.path()
 fl = fctx.filelog()
 count = fl.count()
 pagelen = self.maxshortchanges
 pos = fctx.filerev()
 for e in l:
 yield e
 nodefunc = lambda x: fctx.filectx(fileid=x)
 nav = revnavgen(pos, pagelen, count, nodefunc)
-yield self.t("filelog", file=f, node=hex(fctx.node()), nav=nav,
+yield tmpl("filelog", file=f, node=hex(fctx.node()), nav=nav,
 entries=lambda **x: entries(limit=0, **x),
 latestentry=lambda **x: entries(limit=1, **x))
-def filerevision(self, fctx):
+def filerevision(self, tmpl, fctx):
 f = fctx.path()
 text = fctx.data()
 fl = fctx.filelog()
 n = fctx.filenode()
 parity = paritygen(self.stripecount)
 for l, t in enumerate(text.splitlines(1)):
 yield {"line": t,
 "linenumber": "% 6d" % (l + 1),
 "parity": parity.next()}
-yield self.t("filerevision",
+yield tmpl("filerevision",
 file=f,
 path=_up(f),
 text=lines(),
 raw=rawtext,
 mimetype=mt,
 rev=fctx.rev(),
 node=hex(fctx.node()),
 author=fctx.user(),
 date=fctx.date(),
 desc=fctx.description(),
 parent=self.siblings(fctx.parents()),
 child=self.siblings(fctx.children()),
 rename=self.renamelink(fl, n),
 permissions=fctx.manifest().flags(f))
-def fileannotate(self, fctx):
+def fileannotate(self, tmpl, fctx):
 f = fctx.path()
 n = fctx.filenode()
 fl = fctx.filelog()
 parity = paritygen(self.stripecount)
 "rev": f.rev(),
 "author": name,
 "file": f.path(),
 "line": l}
-yield self.t("fileannotate",
+yield tmpl("fileannotate",
 file=f,
 annotate=annotate,
 path=_up(f),
 rev=fctx.rev(),
 node=hex(fctx.node()),
 author=fctx.user(),
 date=fctx.date(),
 desc=fctx.description(),
 rename=self.renamelink(fl, n),
 parent=self.siblings(fctx.parents()),
 child=self.siblings(fctx.children()),
 permissions=fctx.manifest().flags(f))
-def manifest(self, ctx, path):
+def manifest(self, tmpl, ctx, path):
 mf = ctx.manifest()
 node = ctx.node()
 files = {}
 parity = paritygen(self.stripecount)
 yield {"parity": parity.next(),
 "path": "%s%s" % (abspath, f),
 "basename": f[:-1]}
-yield self.t("manifest",
+yield tmpl("manifest",
 rev=ctx.rev(),
 node=hex(node),
 path=abspath,
 up=_up(abspath),
 upparity=parity.next(),
 fentries=filelist,
 dentries=dirlist,
 archives=self.archivelist(hex(node)),
 tags=self.nodetagsdict(node),
 branches=self.nodebranchdict(ctx))
-def tags(self):
+def tags(self, tmpl):
 i = self.repo.tagslist()
 i.reverse()
 parity = paritygen(self.stripecount)
 def entries(notip=False,limit=0, **map):
 yield {"parity": parity.next(),
 "tag": k,
 "date": self.repo.changectx(n).date(),
 "node": hex(n)}
-yield self.t("tags",
+yield tmpl("tags",
 node=hex(self.repo.changelog.tip()),
 entries=lambda **x: entries(False,0, **x),
 entriesnotip=lambda **x: entries(True,0, **x),
 latestentry=lambda **x: entries(True,1, **x))
-def summary(self):
+def summary(self, tmpl):
 i = self.repo.tagslist()
 i.reverse()
 def tagentries(**map):
 parity = paritygen(self.stripecount)
 count += 1
 if count > 10: # limit to 10 tags
 break;
-yield self.t("tagentry",
+yield tmpl("tagentry",
 parity=parity.next(),
 tag=k,
 node=hex(n),
 date=self.repo.changectx(n).date())
 def branches(**map):
 parity = paritygen(self.stripecount)
 for i in xrange(start, end):
 ctx = self.repo.changectx(i)
 n = ctx.node()
 hn = hex(n)
-l.insert(0, self.t(
+l.insert(0, tmpl(
 'shortlogentry',
 parity=parity.next(),
 author=ctx.user(),
 desc=ctx.description(),
 date=ctx.date(),
 rev=i,
 cl = self.repo.changelog
 count = cl.count()
 start = max(0, count - self.maxchanges)
 end = min(count, start + self.maxchanges)
-yield self.t("summary",
+yield tmpl("summary",
 desc=self.config("web", "description", "unknown"),
 owner=(self.config("ui", "username") or # preferred
 self.config("web", "contact") or # deprecated
 self.config("web", "author", "unknown")), # also
 lastchange=cl.read(cl.tip())[2],
 tags=tagentries,
 branches=branches,
 shortlog=changelist,
 node=hex(cl.tip()),
 archives=self.archivelist("tip"))
-def filediff(self, fctx):
+def filediff(self, tmpl, fctx):
 n = fctx.node()
 path = fctx.path()
 parents = fctx.parents()
 p1 = parents and parents[0].node() or nullid
 def diff(**map):
-yield self.diff(p1, n, [path])
+yield self.diff(tmpl, p1, n, [path])
-yield self.t("filediff",
+yield tmpl("filediff",
 file=path,
 node=hex(n),
 rev=fctx.rev(),
 parent=self.siblings(parents),
 child=self.siblings(fctx.children()),
 diff=diff)
 archive_specs = {
 'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', None),
 'gz': ('application/x-tar', 'tgz', '.tar.gz', None),
 'zip': ('application/zip', 'zip', '.zip', None),
 }
-def archive(self, req, key, type_):
+def archive(self, tmpl, req, key, type_):
 reponame = re.sub(r"\W+", "-", os.path.basename(self.reponame))
 cnode = self.repo.lookup(key)
 arch_version = key
 if cnode == key or key == 'tip':
 arch_version = short(cnode)

Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/hgweb_mod.py @ 5600:9d900f7282e6