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

annotate mercurial/hgweb/hgweb_mod.py @ 11109:a2bc2f2d77a9

subrepo: normalize path part of URLs so that pulling subrepos from webdir works For a "all projects at root" repo layout eg: /main /sub Where subrepos are used such that a clone of main has this layout: ./main/ ./main/.hgsub ./main/sub/ And the .hgsub content is: sub = ../sub This allows a pull from a hgweb where main and sub are exposed at the root (or same directory level) The current code doesn't normalize the path component of a pull url. this results in trying to pull from http://server.com/hg/main/../sub Current hgweb implementation doesn't reduce the path component so this results in a 404 error though everything is setup logically. This patch adresses this 404 error on the puller side normalizing the URLs used for pulling sub repos. For this example, the URL would be reduced to http://server.com/hg/sub Fix + test

author	Edouard Gomez <ed.gomez@free.fr>
date	Sat, 01 May 2010 23:05:19 +0200
parents	5efbfa662b3c
children	db3f6f0e4e7d

rev	line source
2391 d351a3be3371 Fixing up comment headers for split up code. Eric Hopper <hopper@omnifarious.org> parents: 2361 diff changeset	1 # hgweb/hgweb_mod.py - Web interface for a repository.
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	2 #
238 3b92f8fe47ae hgweb.py: kill #! line, clean up copyright notice mpm@selenic.com parents: 222 diff changeset	3 # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4539 diff changeset	4 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	5 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8191 diff changeset	6 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9842 diff changeset	7 # GNU General Public License version 2 or any later version.
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	8
7873 4a4c7f6a5912 cleanup: drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7831 diff changeset	9 import os
8390 beae42f3d93b drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 8360 diff changeset	10 from mercurial import ui, hg, hook, error, encoding, templater
9910 6f92997dbdca hgweb: add support for extension-provided permission hooks Sune Foldager <cryo@cyanite.org> parents: 9888 diff changeset	11 from common import get_mtime, ErrorResponse, permhooks
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	12 from common import HTTP_OK, HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
5566 d74fc8dec2b4 Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI. Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5565 diff changeset	13 from request import wsgirequest
6392 2540521dc7c1 hgweb: separate out utility functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6391 diff changeset	14 import webcommands, protocol, webutil
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	15
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	16 perms = {
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	17 'changegroup': 'pull',
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	18 'changegroupsubset': 'pull',
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	19 'unbundle': 'push',
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	20 'stream_out': 'pull',
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	21 }
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	22
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1554 diff changeset	23 class hgweb(object):
10994 c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	24 def __init__(self, repo, name=None, baseui=None):
4874 d9e385a7a806 Use isinstance instead of type == type Christian Ebert <blacktrash@gmx.net> parents: 4872 diff changeset	25 if isinstance(repo, str):
10994 c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	26 if baseui:
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	27 u = baseui.copy()
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	28 else:
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	29 u = ui.ui()
8191 35604226d712 hgweb: kill parentui references Matt Mackall <mpm@selenic.com> parents: 8136 diff changeset	30 self.repo = hg.repository(u, repo)
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	31 else:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	32 self.repo = repo
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	33
10995 5efbfa662b3c hgweb: always clear report_untrusted and interactive Matt Mackall <mpm@selenic.com> parents: 10994 diff changeset	34 self.repo.ui.setconfig('ui', 'report_untrusted', 'off')
5efbfa662b3c hgweb: always clear report_untrusted and interactive Matt Mackall <mpm@selenic.com> parents: 10994 diff changeset	35 self.repo.ui.setconfig('ui', 'interactive', 'off')
5833 323b9c55b328 hook: redirect stdout to stderr for ssh and http servers Matt Mackall <mpm@selenic.com> parents: 5779 diff changeset	36 hook.redirect(True)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	37 self.mtime = -1
1172 3f30a5e7e15b Use path relative to document root as reponame if published via a web server. Thomas Arendsen Hein <thomas@intevation.de> parents: 1170 diff changeset	38 self.reponame = name
1078 33f40d0c6124 Various cleanups for tarball support mpm@selenic.com parents: 1077 diff changeset	39 self.archives = 'zip', 'gz', 'bz2'
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	40 self.stripecount = 1
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	41 # a repo owner may set web.templates in .hg/hgrc to get any file
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	42 # readable by the user running the CGI script
7966 aa983c3d94a9 templater: move stylemap function from hgweb to templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7948 diff changeset	43 self.templatepath = self.config('web', 'templates')
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	44
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	45 # The CGI scripts are often run by a user different from the repo owner.
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	46 # Trust the settings from the .hg/hgrc files by default.
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	47 def config(self, section, name, default=None, untrusted=True):
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	48 return self.repo.ui.config(section, name, default,
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	49 untrusted=untrusted)
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	50
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	51 def configbool(self, section, name, default=False, untrusted=True):
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	52 return self.repo.ui.configbool(section, name, default,
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	53 untrusted=untrusted)
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	54
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	55 def configlist(self, section, name, default=None, untrusted=True):
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	56 return self.repo.ui.configlist(section, name, default,
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	57 untrusted=untrusted)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	58
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9842 diff changeset	59 def refresh(self, request=None):
38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9842 diff changeset	60 if request:
9888 510122bb3c7f hgweb: fix error in 38170eeed18c and introduce test for change Henrik Stuart <hg@hstuart.dk> parents: 9887 diff changeset	61 self.repo.ui.environ = request.env
10078 97c75ad3b1a0 hgweb: Make get_mtime use repository to find store path. Brendan Cully <brendan@kublai.com> parents: 9910 diff changeset	62 mtime = get_mtime(self.repo.spath)
1418 68f81ba07b2a Make hgweb work when the repository is empty (no 00changelog.i) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1416 diff changeset	63 if mtime != self.mtime:
68f81ba07b2a Make hgweb work when the repository is empty (no 00changelog.i) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1416 diff changeset	64 self.mtime = mtime
1213 db9639b8594c Clean up hgweb imports mpm@selenic.com parents: 1210 diff changeset	65 self.repo = hg.repository(self.repo.ui, self.repo.root)
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	66 self.maxchanges = int(self.config("web", "maxchanges", 10))
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	67 self.stripecount = int(self.config("web", "stripes", 1))
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	68 self.maxshortchanges = int(self.config("web", "maxshortchanges", 60))
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	69 self.maxfiles = int(self.config("web", "maxfiles", 10))
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	70 self.allowpull = self.configbool("web", "allowpull", True)
8859 580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	71 encoding.encoding = self.config("web", "encoding",
580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	72 encoding.encoding)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	73
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	74 def run(self):
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	75 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
8663 45f626a39def wrap string literals in error messages Martin Geisler <mg@lazybytes.net> parents: 8390 diff changeset	76 raise RuntimeError("This function is only intended to be "
45f626a39def wrap string literals in error messages Martin Geisler <mg@lazybytes.net> parents: 8390 diff changeset	77 "called while running as a CGI script.")
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	78 import mercurial.hgweb.wsgicgi as wsgicgi
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	79 wsgicgi.launch(self)
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	80
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	81 def __call__(self, env, respond):
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	82 req = wsgirequest(env, respond)
6784 18c429ea3a0e hgweb: all protocol functions have become generators Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6781 diff changeset	83 return self.run_wsgi(req)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	84
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	85 def run_wsgi(self, req):
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	86
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9842 diff changeset	87 self.refresh(req)
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	88
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	89 # work with CGI variables to create coherent structure
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	90 # use SCRIPT_NAME, PATH_INFO and QUERY_STRING as well as our REPO_NAME
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	91
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	92 req.url = req.env['SCRIPT_NAME']
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	93 if not req.url.endswith('/'):
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	94 req.url += '/'
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5890 diff changeset	95 if 'REPO_NAME' in req.env:
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	96 req.url += req.env['REPO_NAME'] + '/'
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	97
6459 8189e03adb44 hgweb: make hgwebdir work in the absence of PATH_INFO Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6379 diff changeset	98 if 'PATH_INFO' in req.env:
8189e03adb44 hgweb: make hgwebdir work in the absence of PATH_INFO Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6379 diff changeset	99 parts = req.env['PATH_INFO'].strip('/').split('/')
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	100 repo_parts = req.env.get('REPO_NAME', '').split('/')
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	101 if parts[:len(repo_parts)] == repo_parts:
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	102 parts = parts[len(repo_parts):]
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	103 query = '/'.join(parts)
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	104 else:
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	105 query = req.env['QUERY_STRING'].split('&', 1)[0]
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	106 query = query.split(';', 1)[0]
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	107
8860 36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	108 # process this if it's a protocol request
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	109 # protocol bits don't need to create any URLs
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	110 # and the clients always use the old URL structure
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	111
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	112 cmd = req.form.get('cmd', [''])[0]
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	113 if cmd and cmd in protocol.__all__:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	114 if query:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	115 raise ErrorResponse(HTTP_NOT_FOUND)
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	116 try:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	117 if cmd in perms:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	118 try:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	119 self.check_perm(req, perms[cmd])
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	120 except ErrorResponse, inst:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	121 if cmd == 'unbundle':
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	122 req.drain()
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	123 raise
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	124 method = getattr(protocol, cmd)
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	125 return method(self.repo, req)
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	126 except ErrorResponse, inst:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	127 req.respond(inst, protocol.HGTYPE)
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	128 if not inst.message:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	129 return []
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	130 return '0\n%s\n' % inst.message,
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	131
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	132 # translate user-visible url structure to internal structure
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	133
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	134 args = query.split('/', 2)
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	135 if 'cmd' not in req.form and args and args[0]:
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	136
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	137 cmd = args.pop(0)
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	138 style = cmd.rfind('-')
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	139 if style != -1:
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	140 req.form['style'] = [cmd[:style]]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	141 cmd = cmd[style + 1:]
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	142
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	143 # avoid accepting e.g. style parameter as command
6777 44c5157474e7 hgweb: protocol requests are processed immediately Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6776 diff changeset	144 if hasattr(webcommands, cmd):
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	145 req.form['cmd'] = [cmd]
6777 44c5157474e7 hgweb: protocol requests are processed immediately Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6776 diff changeset	146 else:
44c5157474e7 hgweb: protocol requests are processed immediately Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6776 diff changeset	147 cmd = ''
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	148
7287 6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	149 if cmd == 'static':
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	150 req.form['file'] = ['/'.join(args)]
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	151 else:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	152 if args and args[0]:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	153 node = args.pop(0)
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	154 req.form['node'] = [node]
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	155 if args:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	156 req.form['file'] = args
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	157
9731 0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8860 diff changeset	158 ua = req.env.get('HTTP_USER_AGENT', '')
0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8860 diff changeset	159 if cmd == 'rev' and 'mercurial' in ua:
0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8860 diff changeset	160 req.form['style'] = ['raw']
0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8860 diff changeset	161
7287 6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	162 if cmd == 'archive':
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	163 fn = req.form['node'][0]
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	164 for type_, spec in self.archive_specs.iteritems():
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	165 ext = spec[2]
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	166 if fn.endswith(ext):
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	167 req.form['node'] = [fn[:-len(ext)]]
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	168 req.form['type'] = [type_]
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	169
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	170 # process the web interface request
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	171
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	172 try:
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	173 tmpl = self.templater(req)
8859 580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	174 ctype = tmpl('mimetype', encoding=encoding.encoding)
6391 a1007f7b9b7b Backed out changeset d2bb66a8a435 (temporary template compatibility) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6379 diff changeset	175 ctype = templater.stringify(ctype)
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	176
7562 b663b5563de7 hgweb: allow static content when deny_read denies access Mark Edgington <edgimar@gmail.com> parents: 7396 diff changeset	177 # check read permissions non-static content
b663b5563de7 hgweb: allow static content when deny_read denies access Mark Edgington <edgimar@gmail.com> parents: 7396 diff changeset	178 if cmd != 'static':
b663b5563de7 hgweb: allow static content when deny_read denies access Mark Edgington <edgimar@gmail.com> parents: 7396 diff changeset	179 self.check_perm(req, None)
7336 2dc868712dcc hgweb: support for deny_read/allow_read options Mark Edgington <edgimar@gmail.com> parents: 7311 diff changeset	180
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	181 if cmd == '':
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	182 req.form['cmd'] = [tmpl.cache['default']]
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	183 cmd = req.form['cmd'][0]
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5889 diff changeset	184
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	185 if cmd not in webcommands.__all__:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6249 diff changeset	186 msg = 'no such method: %s' % cmd
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	187 raise ErrorResponse(HTTP_BAD_REQUEST, msg)
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	188 elif cmd == 'file' and 'raw' in req.form.get('style', []):
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	189 self.ctype = ctype
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	190 content = webcommands.rawfile(self, req, tmpl)
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	191 else:
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	192 content = getattr(webcommands, cmd)(self, req, tmpl)
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	193 req.respond(HTTP_OK, ctype)
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5889 diff changeset	194
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	195 return content
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	196
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7575 diff changeset	197 except error.LookupError, err:
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	198 req.respond(HTTP_NOT_FOUND, ctype)
6374 31a01e3d99cc hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486 Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	199 msg = str(err)
31a01e3d99cc hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486 Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	200 if 'manifest' not in msg:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6249 diff changeset	201 msg = 'revision not found: %s' % err.name
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	202 return tmpl('error', error=msg)
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	203 except (error.RepoError, error.RevlogError), inst:
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	204 req.respond(HTTP_SERVER_ERROR, ctype)
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	205 return tmpl('error', error=str(inst))
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	206 except ErrorResponse, inst:
7740 176d3d681702 hgweb: pass ErrorResponses directly into req.respond() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	207 req.respond(inst, ctype)
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	208 return tmpl('error', error=inst.message)
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	209
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	210 def templater(self, req):
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	211
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	212 # determine scheme, port and server name
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	213 # this is needed to create absolute urls
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	214
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	215 proto = req.env.get('wsgi.url_scheme')
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	216 if proto == 'https':
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	217 proto = 'https'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	218 default_port = "443"
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	219 else:
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	220 proto = 'http'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	221 default_port = "80"
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	222
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	223 port = req.env["SERVER_PORT"]
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	224 port = port != default_port and (":" + port) or ""
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	225 urlbase = '%s://%s%s' % (proto, req.env['SERVER_NAME'], port)
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	226 staticurl = self.config("web", "staticurl") or req.url + 'static/'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	227 if not staticurl.endswith('/'):
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	228 staticurl += '/'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	229
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	230 # some functions for the templater
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	231
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	232 def header(**map):
8859 580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	233 yield tmpl('header', encoding=encoding.encoding, **map)
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	234
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	235 def footer(**map):
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	236 yield tmpl("footer", **map)
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	237
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	238 def motd(**map):
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	239 yield self.config("web", "motd", "")
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	240
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	241 # figure out which style to use
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	242
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	243 vars = {}
9842 d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	244 styles = (
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	245 req.form.get('style', [None])[0],
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	246 self.config('web', 'style'),
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	247 'paper',
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	248 )
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	249 style, mapfile = templater.stylemap(styles, self.templatepath)
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	250 if style == styles[0]:
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	251 vars['style'] = style
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	252
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	253 start = req.url[-1] == '?' and '&' or '?'
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	254 sessionvars = webutil.sessionvars(vars, start)
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	255
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	256 if not self.reponame:
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	257 self.reponame = (self.config("web", "name")
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	258 or req.env.get('REPO_NAME')
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	259 or req.url.strip('/') or self.repo.root)
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	260
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	261 # create the templater
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	262
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8225 diff changeset	263 tmpl = templater.templater(mapfile,
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	264 defaults={"url": req.url,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	265 "staticurl": staticurl,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	266 "urlbase": urlbase,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	267 "repo": self.reponame,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	268 "header": header,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	269 "footer": footer,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	270 "motd": motd,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	271 "sessionvars": sessionvars
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	272 })
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	273 return tmpl
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	274
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	275 def archivelist(self, nodeid):
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	276 allowed = self.configlist("web", "allow_archive")
3260 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3231 diff changeset	277 for i, spec in self.archive_specs.iteritems():
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	278 if i in allowed or self.configbool("web", "allow" + i):
3260 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3231 diff changeset	279 yield {"type" : i, "extension" : spec[2], "node" : nodeid}
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	280
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	281 archive_specs = {
2361 d3adb454c5a9 Fix automatic decompression of tarballs with Firefox. Thomas Arendsen Hein <thomas@intevation.de> parents: 2359 diff changeset	282 'bz2': ('application/x-tar', 'tbz2', '.tar.bz2', None),
d3adb454c5a9 Fix automatic decompression of tarballs with Firefox. Thomas Arendsen Hein <thomas@intevation.de> parents: 2359 diff changeset	283 'gz': ('application/x-tar', 'tgz', '.tar.gz', None),
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	284 'zip': ('application/zip', 'zip', '.zip', None),
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	285 }
1076 01db658cc78a tarball support v0.3 Wojciech Milkowski <wmilkowski@interia.pl> parents: 1073 diff changeset	286
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	287 def check_perm(self, req, op):
9910 6f92997dbdca hgweb: add support for extension-provided permission hooks Sune Foldager <cryo@cyanite.org> parents: 9888 diff changeset	288 for hook in permhooks:
6f92997dbdca hgweb: add support for extension-provided permission hooks Sune Foldager <cryo@cyanite.org> parents: 9888 diff changeset	289 hook(self, req, op)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb/hgweb_mod.py @ 11109:a2bc2f2d77a9