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

annotate mercurial/hgweb/hgweb_mod.py @ 11582:26c7d4fc31bf

protocol: use new wireproto infrastructure in ssh - add protocol helper - insert wireproto into dispatcher - drop duplicate functions from hgweb implementation

author	Matt Mackall <mpm@selenic.com>
date	Wed, 14 Jul 2010 15:25:15 -0500
parents	db3f6f0e4e7d
children	1af96b090116

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
11582 26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	10 from mercurial import ui, hg, hook, error, encoding, templater, wireproto
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',
11370 db3f6f0e4e7d pushkey: add http support Matt Mackall <mpm@selenic.com> parents: 10995 diff changeset	19 'stream_out': 'pull',
db3f6f0e4e7d pushkey: add http support Matt Mackall <mpm@selenic.com> parents: 10995 diff changeset	20 'listkeys': 'pull',
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	21 'unbundle': 'push',
11370 db3f6f0e4e7d pushkey: add http support Matt Mackall <mpm@selenic.com> parents: 10995 diff changeset	22 'pushkey': 'push',
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	23 }
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	24
11582 26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	25 class webproto(object):
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	26 def __init__(self, req):
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	27 self.req = req
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	28 self.response = ''
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	29 def getargs(self, args):
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	30 data = {}
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	31 keys = args.split()
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	32 for k in keys:
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	33 if k == '*':
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	34 star = {}
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	35 for key in self.req.form.keys():
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	36 if key not in keys:
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	37 star[key] = self.req.form[key][0]
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	38 data['*'] = star
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	39 else:
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	40 data[k] = self.req.form[k][0]
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	41 return [data[k] for k in keys]
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	42 def respond(self, s):
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	43 HGTYPE = 'application/mercurial-0.1'
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	44 self.req.respond(HTTP_OK, HGTYPE, length=len(s))
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	45 self.response = s
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	46
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	47 def callproto(repo, req, cmd):
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	48 p = webproto(req)
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	49 r = wireproto.dispatch(repo, p, cmd)
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	50 yield p.response
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	51
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1554 diff changeset	52 class hgweb(object):
10994 c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	53 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	54 if isinstance(repo, str):
10994 c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	55 if baseui:
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	56 u = baseui.copy()
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	57 else:
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	58 u = ui.ui()
8191 35604226d712 hgweb: kill parentui references Matt Mackall <mpm@selenic.com> parents: 8136 diff changeset	59 self.repo = hg.repository(u, repo)
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	60 else:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	61 self.repo = repo
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	62
10995 5efbfa662b3c hgweb: always clear report_untrusted and interactive Matt Mackall <mpm@selenic.com> parents: 10994 diff changeset	63 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	64 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	65 hook.redirect(True)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	66 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	67 self.reponame = name
1078 33f40d0c6124 Various cleanups for tarball support mpm@selenic.com parents: 1077 diff changeset	68 self.archives = 'zip', 'gz', 'bz2'
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	69 self.stripecount = 1
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	70 # 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	71 # 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	72 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	73
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	74 # 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	75 # 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	76 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	77 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	78 untrusted=untrusted)
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	79
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	80 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	81 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	82 untrusted=untrusted)
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	83
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	84 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	85 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	86 untrusted=untrusted)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	87
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9842 diff changeset	88 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	89 if request:
9888 510122bb3c7f hgweb: fix error in 38170eeed18c and introduce test for change Henrik Stuart <hg@hstuart.dk> parents: 9887 diff changeset	90 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	91 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	92 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	93 self.mtime = mtime
1213 db9639b8594c Clean up hgweb imports mpm@selenic.com parents: 1210 diff changeset	94 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	95 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	96 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	97 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	98 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	99 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	100 encoding.encoding = self.config("web", "encoding",
580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	101 encoding.encoding)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	102
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	103 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	104 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	105 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	106 "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	107 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	108 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	109
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	110 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	111 req = wsgirequest(env, respond)
6784 18c429ea3a0e hgweb: all protocol functions have become generators Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6781 diff changeset	112 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	113
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	114 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	115
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9842 diff changeset	116 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	117
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	118 # 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	119 # 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	120
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	121 req.url = req.env['SCRIPT_NAME']
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	122 if not req.url.endswith('/'):
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	123 req.url += '/'
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5890 diff changeset	124 if 'REPO_NAME' in req.env:
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	125 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	126
6459 8189e03adb44 hgweb: make hgwebdir work in the absence of PATH_INFO Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6379 diff changeset	127 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	128 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	129 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	130 if parts[:len(repo_parts)] == repo_parts:
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	131 parts = parts[len(repo_parts):]
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	132 query = '/'.join(parts)
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	133 else:
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	134 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	135 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	136
8860 36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	137 # 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	138 # 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	139 # 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	140
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	141 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	142 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	143 if query:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	144 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	145 try:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	146 if cmd in perms:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	147 try:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	148 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	149 except ErrorResponse, inst:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	150 if cmd == 'unbundle':
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	151 req.drain()
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	152 raise
11582 26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	153 if cmd in wireproto.commands:
26c7d4fc31bf protocol: use new wireproto infrastructure in ssh Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	154 return callproto(self.repo, req, cmd)
8860 36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	155 method = getattr(protocol, cmd)
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	156 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	157 except ErrorResponse, inst:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	158 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	159 if not inst.message:
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	160 return []
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	161 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	162
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	163 # 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	164
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	165 args = query.split('/', 2)
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	166 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	167
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	168 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	169 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	170 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	171 req.form['style'] = [cmd[:style]]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	172 cmd = cmd[style + 1:]
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	173
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	174 # 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	175 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	176 req.form['cmd'] = [cmd]
6777 44c5157474e7 hgweb: protocol requests are processed immediately Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6776 diff changeset	177 else:
44c5157474e7 hgweb: protocol requests are processed immediately Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6776 diff changeset	178 cmd = ''
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	179
7287 6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	180 if cmd == 'static':
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	181 req.form['file'] = ['/'.join(args)]
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	182 else:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	183 if args and args[0]:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	184 node = args.pop(0)
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	185 req.form['node'] = [node]
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	186 if args:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	187 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	188
9731 0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8860 diff changeset	189 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	190 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	191 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	192
7287 6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	193 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	194 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	195 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	196 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	197 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	198 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	199 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	200
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	201 # process the web interface request
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	202
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	203 try:
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	204 tmpl = self.templater(req)
8859 580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	205 ctype = tmpl('mimetype', encoding=encoding.encoding)
6391 a1007f7b9b7b Backed out changeset d2bb66a8a435 (temporary template compatibility) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6379 diff changeset	206 ctype = templater.stringify(ctype)
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	207
7562 b663b5563de7 hgweb: allow static content when deny_read denies access Mark Edgington <edgimar@gmail.com> parents: 7396 diff changeset	208 # 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	209 if cmd != 'static':
b663b5563de7 hgweb: allow static content when deny_read denies access Mark Edgington <edgimar@gmail.com> parents: 7396 diff changeset	210 self.check_perm(req, None)
7336 2dc868712dcc hgweb: support for deny_read/allow_read options Mark Edgington <edgimar@gmail.com> parents: 7311 diff changeset	211
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	212 if cmd == '':
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	213 req.form['cmd'] = [tmpl.cache['default']]
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	214 cmd = req.form['cmd'][0]
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5889 diff changeset	215
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	216 if cmd not in webcommands.__all__:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6249 diff changeset	217 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	218 raise ErrorResponse(HTTP_BAD_REQUEST, msg)
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	219 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	220 self.ctype = ctype
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	221 content = webcommands.rawfile(self, req, tmpl)
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	222 else:
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	223 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	224 req.respond(HTTP_OK, ctype)
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5889 diff changeset	225
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	226 return content
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	227
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7575 diff changeset	228 except error.LookupError, err:
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	229 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	230 msg = str(err)
31a01e3d99cc hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486 Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6368 diff changeset	231 if 'manifest' not in msg:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6249 diff changeset	232 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	233 return tmpl('error', error=msg)
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	234 except (error.RepoError, error.RevlogError), inst:
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	235 req.respond(HTTP_SERVER_ERROR, ctype)
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	236 return tmpl('error', error=str(inst))
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	237 except ErrorResponse, inst:
7740 176d3d681702 hgweb: pass ErrorResponses directly into req.respond() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	238 req.respond(inst, ctype)
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	239 return tmpl('error', error=inst.message)
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	240
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	241 def templater(self, req):
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	242
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	243 # determine scheme, port and server name
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	244 # 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	245
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	246 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	247 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	248 proto = 'https'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	249 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	250 else:
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	251 proto = 'http'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	252 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	253
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	254 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	255 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	256 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	257 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	258 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	259 staticurl += '/'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	260
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	261 # some functions for the templater
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	262
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	263 def header(**map):
8859 580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	264 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	265
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	266 def footer(**map):
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	267 yield tmpl("footer", **map)
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	268
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	269 def motd(**map):
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	270 yield self.config("web", "motd", "")
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	271
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	272 # figure out which style to use
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	273
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	274 vars = {}
9842 d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	275 styles = (
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	276 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	277 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	278 'paper',
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	279 )
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	280 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	281 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	282 vars['style'] = style
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	283
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	284 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	285 sessionvars = webutil.sessionvars(vars, start)
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	286
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	287 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	288 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	289 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	290 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	291
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	292 # create the templater
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	293
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8225 diff changeset	294 tmpl = templater.templater(mapfile,
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	295 defaults={"url": req.url,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	296 "staticurl": staticurl,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	297 "urlbase": urlbase,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	298 "repo": self.reponame,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	299 "header": header,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	300 "footer": footer,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	301 "motd": motd,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	302 "sessionvars": sessionvars
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	303 })
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	304 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	305
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	306 def archivelist(self, nodeid):
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	307 allowed = self.configlist("web", "allow_archive")
3260 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3231 diff changeset	308 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	309 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	310 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	311
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	312 archive_specs = {
2361 d3adb454c5a9 Fix automatic decompression of tarballs with Firefox. Thomas Arendsen Hein <thomas@intevation.de> parents: 2359 diff changeset	313 '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	314 '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	315 'zip': ('application/zip', 'zip', '.zip', None),
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	316 }
1076 01db658cc78a tarball support v0.3 Wojciech Milkowski <wmilkowski@interia.pl> parents: 1073 diff changeset	317
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	318 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	319 for hook in permhooks:
6f92997dbdca hgweb: add support for extension-provided permission hooks Sune Foldager <cryo@cyanite.org> parents: 9888 diff changeset	320 hook(self, req, op)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb/hgweb_mod.py @ 11582:26c7d4fc31bf