##// END OF EJS Templates
templater: fix little problem from stylemap() changes
templater: fix little problem from stylemap() changes

File last commit:

r8216:25266fe9 default
r8223:02145b70 default
Show More
hgwebdir_mod.py
318 lines | 12.6 KiB | text/x-python | PythonLexer
Eric Hopper
Fixing up comment headers for split up code.
r2391 # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories.
Eric Hopper
Final stage of the hgweb split up....
r2356 #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
Vadim Gelfer
update copyrights.
r2859 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
Eric Hopper
Final stage of the hgweb split up....
r2356 #
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Dirkjan Ochtman
Backed out changeset d2bb66a8a435 (temporary template compatibility)
r6391 import os
Martin Geisler
i18n: import _ instead of gettext
r7225 from mercurial.i18n import _
Matt Mackall
hgweb: use config.config
r8180 from mercurial import ui, hg, util, templater, templatefilters
from mercurial import config, error, encoding
Dirkjan Ochtman
templater: move stylemap function from hgweb to templater
r7966 from common import ErrorResponse, get_mtime, staticfile, paritygen,\
Dirkjan Ochtman
hgweb: explicit response status
r5993 get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
Matt Mackall
Replace demandload with new demandimport
r3877 from hgweb_mod import hgweb
Dirkjan Ochtman
Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI.
r5566 from request import wsgirequest
Dirkjan Ochtman
hgweb: use new sessionvars code in hgwebdir, too
r8216 import webutil
Eric Hopper
Final stage of the hgweb split up....
r2356
Dirkjan Ochtman
hgweb: some cleanups in hgwebdir, remove double defaults...
r8215 def cleannames(items):
return [(util.pconvert(name).strip('/'), path) for name, path in items]
Eric Hopper
Final stage of the hgweb split up....
r2356 class hgwebdir(object):
Dirkjan Ochtman
hgweb: some cleanups in hgwebdir, remove double defaults...
r8215
Matt Mackall
hgweb: kill parentui references
r8191 def __init__(self, conf, baseui=None):
Eric Hopper
Final stage of the hgweb split up....
r2356
Matt Mackall
hgweb: kill parentui references
r8191 if baseui:
Dirkjan Ochtman
hgweb: some cleanups in hgwebdir, remove double defaults...
r8215 self.ui = baseui.copy()
Matt Mackall
ui: refactor option setting...
r8136 else:
Matt Mackall
hgweb: kill parentui references
r8191 self.ui = ui.ui()
self.ui.setconfig('ui', 'report_untrusted', 'off')
self.ui.setconfig('ui', 'interactive', 'off')
Matt Mackall
ui: refactor option setting...
r8136
Alexis S. L. Carvalho
hgwebdir: try to get web.style and web.motd from the ui.config system...
r4080 self.motd = None
Matt Mackall
hgweb: Change default style to paper
r7337 self.style = 'paper'
Dirkjan Ochtman
hgweb: some cleanups in hgwebdir, remove double defaults...
r8215 self.stripecount = 1
Eric Hopper
Final stage of the hgweb split up....
r2356 self.repos_sorted = ('name', False)
Brendan Cully
Support web.baseurl in hgwebdir, overriding SCRIPT_NAME
r6221 self._baseurl = None
Dirkjan Ochtman
hgweb: some cleanups in hgwebdir, remove double defaults...
r8215
Matt Mackall
hgweb: use config.config
r8180 if isinstance(conf, (list, tuple)):
self.repos = cleannames(conf)
Eric Hopper
Final stage of the hgweb split up....
r2356 self.repos_sorted = ('', False)
Matt Mackall
hgweb: use config.config
r8180 elif isinstance(conf, dict):
Matt Mackall
replace util.sort with sorted built-in...
r8209 self.repos = sorted(cleannames(conf.items()))
Eric Hopper
Final stage of the hgweb split up....
r2356 else:
Matt Mackall
hgweb: use config.config
r8180 if isinstance(conf, config.config):
cp = conf
Michael Gebetsroither
hgwebdir: class hgwebdir should also accept a configparser instance
r4051 else:
Matt Mackall
hgweb: use config.config
r8180 cp = config.config()
cp.read(conf)
Eric Hopper
Final stage of the hgweb split up....
r2356 self.repos = []
Matt Mackall
hgweb: use config.config
r8180 self.motd = cp.get('web', 'motd')
self.style = cp.get('web', 'style', 'paper')
Dirkjan Ochtman
hgweb: some cleanups in hgwebdir, remove double defaults...
r8215 self.stripecount = cp.get('web', 'stripes', 1)
Matt Mackall
hgweb: use config.config
r8180 self._baseurl = cp.get('web', 'baseurl')
if 'paths' in cp:
Patrick Mezard
hgweb: extend [paths] syntax to match repositories recursively (issue852)...
r7450 paths = cleannames(cp.items('paths'))
for prefix, root in paths:
roothead, roottail = os.path.split(root)
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523 # "foo = /bar/*" makes every subrepo of /bar/ to be
# mounted as foo/subrepo
# and "foo = /bar/**" does even recurse inside the
# subdirectories, remember to use it without working dir.
try:
recurse = {'*': False, '**': True}[roottail]
except KeyError:
Patrick Mezard
hgweb: extend [paths] syntax to match repositories recursively (issue852)...
r7450 self.repos.append((prefix, root))
continue
roothead = os.path.normpath(roothead)
Benoit Allard
hgweb: recurse down collections only if ** in [paths]...
r7523 for path in util.walkrepos(roothead, followsym=True,
recurse=recurse):
Patrick Mezard
hgweb: extend [paths] syntax to match repositories recursively (issue852)...
r7450 path = os.path.normpath(path)
name = util.pconvert(path[len(roothead):]).strip('/')
if prefix:
name = prefix + '/' + name
self.repos.append((name, path))
Matt Mackall
hgweb: use config.config
r8180 for prefix, root in cp.items('collections'):
for path in util.walkrepos(root, followsym=True):
repo = os.path.normpath(path)
name = repo
if name.startswith(prefix):
name = name[len(prefix):]
self.repos.append((name.lstrip(os.sep), repo))
Eric Hopper
Final stage of the hgweb split up....
r2356 self.repos.sort()
Eric Hopper
Arrange for old copies of CGI scripts to still work.
r2535 def run(self):
Eric Hopper
Cleanup hgweb and hgwebdir's run method a bit.
r2538 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
Eric Hopper
Arrange for old copies of CGI scripts to still work.
r2535 raise RuntimeError("This function is only intended to be called while running as a CGI script.")
import mercurial.hgweb.wsgicgi as wsgicgi
Dirkjan Ochtman
Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI.
r5566 wsgicgi.launch(self)
def __call__(self, env, respond):
req = wsgirequest(env, respond)
Dirkjan Ochtman
merge another backout
r6797 return self.run_wsgi(req)
Eric Hopper
Arrange for old copies of CGI scripts to still work.
r2535
Mark Edgington
hgweb: support for deny_read/allow_read options...
r7336 def read_allowed(self, ui, req):
"""Check allow_read and deny_read config options of a repo's ui object
to determine user permissions. By default, with neither option set (or
both empty), allow all users to read the repo. There are two ways a
user can be denied read access: (1) deny_read is not empty, and the
user is unauthenticated or deny_read contains user (or *), and (2)
allow_read is not empty and the user is not in allow_read. Return True
if user is allowed to read the repo, else return False."""
user = req.env.get('REMOTE_USER')
Dirkjan Ochtman
hgweb: fix long line lengths introduced in 2dc868712dcc
r7575 deny_read = ui.configlist('web', 'deny_read', untrusted=True)
Mark Edgington
hgweb: support for deny_read/allow_read options...
r7336 if deny_read and (not user or deny_read == ['*'] or user in deny_read):
return False
Dirkjan Ochtman
hgweb: fix long line lengths introduced in 2dc868712dcc
r7575 allow_read = ui.configlist('web', 'allow_read', untrusted=True)
Mark Edgington
hgweb: support for deny_read/allow_read options...
r7336 # by default, allow reading if no allow_read option has been set
if (not allow_read) or (allow_read == ['*']) or (user in allow_read):
return True
return False
Eric Hopper
Arrange for old copies of CGI scripts to still work.
r2535 def run_wsgi(self, req):
Eric Hopper
Final stage of the hgweb split up....
r2356
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 try:
try:
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 virtual = req.env.get("PATH_INFO", "").strip('/')
Dirkjan Ochtman
hgweb: explicit response status
r5993 tmpl = self.templater(req)
Matt Mackall
move encoding bits from util to encoding...
r7948 ctype = tmpl('mimetype', encoding=encoding.encoding)
Dirkjan Ochtman
Backed out changeset d2bb66a8a435 (temporary template compatibility)
r6391 ctype = templater.stringify(ctype)
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603 # a static file
if virtual.startswith('static/') or 'static' in req.form:
if virtual.startswith('static/'):
fname = virtual[7:]
else:
fname = req.form['static'][0]
Brendan Cully
Allow hgweb to search for templates in more than one path....
r7107 static = templater.templatepath('static')
Patrick Mezard
hgwebdir_mod: fix a performance issue with static files
r7560 return (staticfile(static, fname, req),)
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603
# top-level index
elif not virtual:
Dirkjan Ochtman
hgweb: explicit response status
r5993 req.respond(HTTP_OK, ctype)
Brendan Cully
templater: return data in increasing chunk sizes...
r7396 return self.makeindex(req, tmpl)
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603 # nested indexes and hgwebs
Thomas Arendsen Hein
Removed trailing spaces from everything except test output
r6210
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603 repos = dict(self.repos)
while virtual:
real = repos.get(virtual)
if real:
req.env['REPO_NAME'] = virtual
try:
Matt Mackall
hgweb: kill parentui references
r8191 repo = hg.repository(self.ui, real)
Dirkjan Ochtman
merge another backout
r6797 return hgweb(repo).run_wsgi(req)
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603 except IOError, inst:
Dirkjan Ochtman
hgweb: explicit response status
r5993 msg = inst.strerror
raise ErrorResponse(HTTP_SERVER_ERROR, msg)
Matt Mackall
error: move repo errors...
r7637 except error.RepoError, inst:
Dirkjan Ochtman
hgweb: explicit response status
r5993 raise ErrorResponse(HTTP_SERVER_ERROR, str(inst))
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603 # browse subdirectories
subdir = virtual + '/'
if [r for r in repos if r.startswith(subdir)]:
Dirkjan Ochtman
hgweb: explicit response status
r5993 req.respond(HTTP_OK, ctype)
Brendan Cully
templater: return data in increasing chunk sizes...
r7396 return self.makeindex(req, tmpl, subdir)
Dirkjan Ochtman
hgwebdir: refactor inner loop
r5603
up = virtual.rfind('/')
if up < 0:
break
virtual = virtual[:up]
# prefixes not found
Dirkjan Ochtman
hgweb: explicit response status
r5993 req.respond(HTTP_NOT_FOUND, ctype)
Brendan Cully
templater: return data in increasing chunk sizes...
r7396 return tmpl("notfound", repo=virtual)
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 except ErrorResponse, err:
Dirkjan Ochtman
hgweb: pass ErrorResponses directly into req.respond()
r7740 req.respond(err, ctype)
Brendan Cully
templater: return data in increasing chunk sizes...
r7396 return tmpl('error', error=err.message or '')
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 finally:
tmpl = None
def makeindex(self, req, tmpl, subdir=""):
Eric Hopper
Final stage of the hgweb split up....
r2356 def archivelist(ui, nodeid, url):
Alexis S. L. Carvalho
use untrusted settings in hgwebdir
r3556 allowed = ui.configlist("web", "allow_archive", untrusted=True)
Brendan Cully
Teach hgwebdir about new interface
r3262 for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
Alexis S. L. Carvalho
use untrusted settings in hgwebdir
r3556 if i[0] in allowed or ui.configbool("web", "allow" + i[0],
untrusted=True):
Brendan Cully
Teach hgwebdir about new interface
r3262 yield {"type" : i[0], "extension": i[1],
"node": nodeid, "url": url}
Eric Hopper
Final stage of the hgweb split up....
r2356
Brendan Cully
hgweb: let hgwebdir browse subdirectories
r4841 def entries(sortcolumn="", descending=False, subdir="", **map):
Eric Hopper
Final stage of the hgweb split up....
r2356 rows = []
Thomas Arendsen Hein
hgweb: use generator to count parity of horizontal stripes for easier reading....
r4462 parity = paritygen(self.stripecount)
Eric Hopper
Final stage of the hgweb split up....
r2356 for name, path in self.repos:
Brendan Cully
hgweb: let hgwebdir browse subdirectories
r4841 if not name.startswith(subdir):
continue
Brendan Cully
hgwebdir: show only trailing part of path when browsing subdirectories
r4843 name = name[len(subdir):]
Brendan Cully
hgweb: let hgwebdir browse subdirectories
r4841
Matt Mackall
hgweb: kill parentui references
r8191 u = self.ui.copy()
Eric Hopper
Final stage of the hgweb split up....
r2356 try:
u.readconfig(os.path.join(path, '.hg', 'hgrc'))
Alexis S. L. Carvalho
hgwebdir: ignore hgrc parse errors while building the index page...
r5332 except Exception, e:
Martin Geisler
move % out of translatable strings...
r6913 u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e))
Alexis S. L. Carvalho
hgwebdir: ignore hgrc parse errors while building the index page...
r5332 continue
Alexis S. L. Carvalho
use untrusted settings in hgwebdir
r3556 def get(section, name, default=None):
return u.config(section, name, default, untrusted=True)
Eric Hopper
Final stage of the hgweb split up....
r2356
Markus F.X.J. Oberhumer
Add option "hidden" to hgwebdir....
r4709 if u.configbool("web", "hidden", untrusted=True):
continue
Mark Edgington
hgweb: support for deny_read/allow_read options...
r7336 if not self.read_allowed(u, req):
continue
Dirkjan Ochtman
hgweb: make hgwebdir work in the absence of PATH_INFO...
r6459 parts = [name]
if 'PATH_INFO' in req.env:
parts.insert(0, req.env['PATH_INFO'].rstrip('/'))
Dirkjan Ochtman
Use SCRIPT_NAME and PATH_INFO instead of REQUEST_URI. This is required by WSGI (fixes issue846).
r5579 if req.env['SCRIPT_NAME']:
Thomas Arendsen Hein
Removed tabs and trailing whitespace in python files
r5760 parts.insert(0, req.env['SCRIPT_NAME'])
Dirkjan Ochtman
Use SCRIPT_NAME and PATH_INFO instead of REQUEST_URI. This is required by WSGI (fixes issue846).
r5579 url = ('/'.join(parts).replace("//", "/")) + '/'
Eric Hopper
Final stage of the hgweb split up....
r2356
# update time with local timezone
try:
d = (get_mtime(path), util.makedate()[1])
except OSError:
continue
Thomas Arendsen Hein
Don't let ui.username override web.contact (issue900)...
r5779 contact = get_contact(get)
Eric Hopper
Final stage of the hgweb split up....
r2356 description = get("web", "description", "")
name = get("web", "name", name)
row = dict(contact=contact or "unknown",
contact_sort=contact.upper() or "unknown",
name=name,
name_sort=name,
url=url,
description=description or "unknown",
description_sort=description.upper() or "unknown",
lastchange=d,
lastchange_sort=d[1]-d[0],
archives=archivelist(u, "tip", url))
if (not sortcolumn
or (sortcolumn, descending) == self.repos_sorted):
# fast path for unsorted output
Thomas Arendsen Hein
hgweb: use generator to count parity of horizontal stripes for easier reading....
r4462 row['parity'] = parity.next()
Eric Hopper
Final stage of the hgweb split up....
r2356 yield row
else:
rows.append((row["%s_sort" % sortcolumn], row))
if rows:
rows.sort()
if descending:
rows.reverse()
for key, row in rows:
Thomas Arendsen Hein
hgweb: use generator to count parity of horizontal stripes for easier reading....
r4462 row['parity'] = parity.next()
Eric Hopper
Final stage of the hgweb split up....
r2356 yield row
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 sortable = ["name", "description", "contact", "lastchange"]
sortcolumn, descending = self.repos_sorted
Christian Ebert
Prefer i in d over d.has_key(i)
r5915 if 'sort' in req.form:
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 sortcolumn = req.form['sort'][0]
descending = sortcolumn.startswith('-')
if descending:
sortcolumn = sortcolumn[1:]
if sortcolumn not in sortable:
sortcolumn = ""
Brendan Cully
hgweb: let hgwebdir browse subdirectories
r4841
Dirkjan Ochtman
hgwebdir: split out makeindex function, facilitate test failure diagnosis
r5601 sort = [("sort_%s" % column,
"%s%s" % ((not descending and column == sortcolumn)
and "-" or "", column))
for column in sortable]
Dirkjan Ochtman
hgweb: move HTTP content types out of header templates...
r5928
Brendan Cully
Support web.baseurl in hgwebdir, overriding SCRIPT_NAME
r6221 if self._baseurl is not None:
req.env['SCRIPT_NAME'] = self._baseurl
Dirkjan Ochtman
hgweb: forgot to centralize the req.write() calls in hgwebdir
r5965 return tmpl("index", entries=entries, subdir=subdir,
sortcolumn=sortcolumn, descending=descending,
**dict(sort))
Dirkjan Ochtman
hgwebdir: split out templater creation
r5602
def templater(self, req):
def header(**map):
Matt Mackall
move encoding bits from util to encoding...
r7948 yield tmpl('header', encoding=encoding.encoding, **map)
Dirkjan Ochtman
hgwebdir: split out templater creation
r5602
def footer(**map):
yield tmpl("footer", **map)
def motd(**map):
if self.motd is not None:
yield self.motd
else:
yield config('web', 'motd', '')
def config(section, name, default=None, untrusted=True):
Matt Mackall
hgweb: kill parentui references
r8191 return self.ui.config(section, name, default, untrusted)
Dirkjan Ochtman
hgwebdir: split out templater creation
r5602
Brendan Cully
Support web.baseurl in hgwebdir, overriding SCRIPT_NAME
r6221 if self._baseurl is not None:
req.env['SCRIPT_NAME'] = self._baseurl
Dirkjan Ochtman
hgwebdir: split out templater creation
r5602 url = req.env.get('SCRIPT_NAME', '')
if not url.endswith('/'):
url += '/'
Dirkjan Ochtman
hgweb: use new sessionvars code in hgwebdir, too
r8216 vars = {}
style = self.style
if 'style' in req.form:
vars['style'] = style = req.form['style'][0]
start = url[-1] == '?' and '&' or '?'
sessionvars = webutil.sessionvars(vars, start)
Dirkjan Ochtman
hgwebdir: split out templater creation
r5602 staticurl = config('web', 'staticurl') or url + 'static/'
if not staticurl.endswith('/'):
staticurl += '/'
Dirkjan Ochtman
hgweb: some cleanups in hgwebdir, remove double defaults...
r8215 style = 'style' in req.form and req.form['style'][0] or self.style
Dirkjan Ochtman
templater: move stylemap function from hgweb to templater
r7966 mapfile = templater.stylemap(style)
Matt Mackall
templates: move filters to their own module...
r5976 tmpl = templater.templater(mapfile, templatefilters.filters,
Dirkjan Ochtman
hgwebdir: split out templater creation
r5602 defaults={"header": header,
"footer": footer,
"motd": motd,
"url": url,
Dirkjan Ochtman
hgweb: use new sessionvars code in hgwebdir, too
r8216 "staticurl": staticurl,
"sessionvars": sessionvars})
Dirkjan Ochtman
hgwebdir: split out templater creation
r5602 return tmpl