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

annotate mercurial/hgweb/hgweb_mod.py @ 18627:4e949b8e0930

hgweb: add websub template filter The purpose of this new filter is to make it possible to partially replace the functionality of the interhg extension. The idea is to be able to define regular expression based substitutions on a new "websub" config section. hgweb will then be able to apply these substitutions wherever the "websub" filter is used on a template. This first revision just adds the code necessary to load the websub expressions and adds the websub filter, but it does not add any calls to the websub filter itself on any of the templates. That will be done on the following revisions.

author	Angel Ezquerra <angel.ezquerra@gmail.com>
date	Fri, 08 Feb 2013 18:05:32 +0100
parents	36549fa712da
children	013fcd112f13

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
18522 36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	10 from mercurial import ui, hg, hook, error, encoding, templater, util, repoview
18627 4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	11 from mercurial.templatefilters import websub
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	12 from mercurial.i18n import _
13958 71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	13 from common import get_stat, ErrorResponse, permhooks, caching
12739 8dcd3203a261 hgweb: don't send a body or illegal headers during 304 response Augie Fackler <durin42@gmail.com> parents: 12696 diff changeset	14 from common import HTTP_OK, HTTP_NOT_MODIFIED, HTTP_BAD_REQUEST
8dcd3203a261 hgweb: don't send a body or illegal headers during 304 response Augie Fackler <durin42@gmail.com> parents: 12696 diff changeset	15 from common import 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	16 from request import wsgirequest
18627 4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	17 import webcommands, protocol, webutil, re
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	18
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	19 perms = {
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	20 'changegroup': 'pull',
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	21 'changegroupsubset': 'pull',
13741 b51bf961b3cb wireproto: add getbundle() function Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13571 diff changeset	22 'getbundle': 'pull',
11370 db3f6f0e4e7d pushkey: add http support Matt Mackall <mpm@selenic.com> parents: 10995 diff changeset	23 'stream_out': 'pull',
db3f6f0e4e7d pushkey: add http support Matt Mackall <mpm@selenic.com> parents: 10995 diff changeset	24 'listkeys': 'pull',
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	25 'unbundle': 'push',
11370 db3f6f0e4e7d pushkey: add http support Matt Mackall <mpm@selenic.com> parents: 10995 diff changeset	26 'pushkey': 'push',
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	27 }
d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	28
18515 bf8bbbf4aa45 hgwebdir: use web.prefix when creating url breadcrumbs (issue3790) Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18429 diff changeset	29 def makebreadcrumb(url, prefix=''):
18258 bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	30 '''Return a 'URL breadcrumb' list
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	31
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	32 A 'URL breadcrumb' is a list of URL-name pairs,
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	33 corresponding to each of the path items on a URL.
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	34 This can be used to create path navigation entries.
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	35 '''
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	36 if url.endswith('/'):
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	37 url = url[:-1]
18515 bf8bbbf4aa45 hgwebdir: use web.prefix when creating url breadcrumbs (issue3790) Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18429 diff changeset	38 if prefix:
bf8bbbf4aa45 hgwebdir: use web.prefix when creating url breadcrumbs (issue3790) Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18429 diff changeset	39 url = '/' + prefix + url
18258 bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	40 relpath = url
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	41 if relpath.startswith('/'):
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	42 relpath = relpath[1:]
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	43
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	44 breadcrumb = []
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	45 urlel = url
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	46 pathitems = [''] + relpath.split('/')
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	47 for pathel in reversed(pathitems):
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	48 if not pathel or not urlel:
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	49 break
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	50 breadcrumb.append({'url': urlel, 'name': pathel})
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	51 urlel = os.path.dirname(urlel)
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	52 return reversed(breadcrumb)
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	53
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	54
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1554 diff changeset	55 class hgweb(object):
10994 c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	56 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	57 if isinstance(repo, str):
10994 c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	58 if baseui:
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	59 u = baseui.copy()
c12a57c1a67e hgweb: add baseui to hgweb entrypoint Matt Mackall <mpm@selenic.com> parents: 10905 diff changeset	60 else:
12696 ef969e58a394 hgweb: another fix for the help termwidth bug Matt Mackall <mpm@selenic.com> parents: 12691 diff changeset	61 u = ui.ui()
8191 35604226d712 hgweb: kill parentui references Matt Mackall <mpm@selenic.com> parents: 8136 diff changeset	62 self.repo = hg.repository(u, repo)
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	63 else:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 986 diff changeset	64 self.repo = repo
133 fb84d3e71042 added template support for some hgweb output, also, template files for jake@edge2.net parents: 132 diff changeset	65
18522 36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	66 self.repo = self._getview(self.repo)
10995 5efbfa662b3c hgweb: always clear report_untrusted and interactive Matt Mackall <mpm@selenic.com> parents: 10994 diff changeset	67 self.repo.ui.setconfig('ui', 'report_untrusted', 'off')
16754 d94c470c3deb hgweb: use ui.nontty to disable all cooked I/O Matt Mackall <mpm@selenic.com> parents: 16683 diff changeset	68 self.repo.ui.setconfig('ui', 'nontty', 'true')
5833 323b9c55b328 hook: redirect stdout to stderr for ssh and http servers Matt Mackall <mpm@selenic.com> parents: 5779 diff changeset	69 hook.redirect(True)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	70 self.mtime = -1
13958 71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	71 self.size = -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	72 self.reponame = name
1078 33f40d0c6124 Various cleanups for tarball support mpm@selenic.com parents: 1077 diff changeset	73 self.archives = 'zip', 'gz', 'bz2'
2666 ebf033bc8eb2 hgweb: Configurable zebra stripes Frank Kingswood <frank@kingswood-consulting.co.uk> parents: 2622 diff changeset	74 self.stripecount = 1
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	75 # 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	76 # 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	77 self.templatepath = self.config('web', 'templates')
18627 4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	78 self.websubtable = self.loadwebsub()
3555 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 # 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	81 # 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	82 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	83 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	84 untrusted=untrusted)
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	85
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	86 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	87 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	88 untrusted=untrusted)
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	89
881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	90 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	91 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	92 untrusted=untrusted)
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	93
18522 36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	94 def _getview(self, repo):
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	95 viewconfig = self.config('web', 'view', 'served')
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	96 if viewconfig == 'all':
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	97 return repo.unfiltered()
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	98 elif viewconfig in repoview.filtertable:
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	99 return repo.filtered(viewconfig)
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	100 else:
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	101 return repo.filtered('served')
36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	102
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9842 diff changeset	103 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	104 if request:
9888 510122bb3c7f hgweb: fix error in 38170eeed18c and introduce test for change Henrik Stuart <hg@hstuart.dk> parents: 9887 diff changeset	105 self.repo.ui.environ = request.env
13958 71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	106 st = get_stat(self.repo.spath)
71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	107 # compare changelog size in addition to mtime to catch
71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	108 # rollbacks made less than a second ago
71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	109 if st.st_mtime != self.mtime or st.st_size != self.size:
71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	110 self.mtime = st.st_mtime
71f51cc71652 hgweb: detect change based on changelog size too Martin Geisler <mg@lazybytes.net> parents: 13445 diff changeset	111 self.size = st.st_size
1213 db9639b8594c Clean up hgweb imports mpm@selenic.com parents: 1210 diff changeset	112 self.repo = hg.repository(self.repo.ui, self.repo.root)
18522 36549fa712da hgweb: add a `web.view` to control filtering Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18521 diff changeset	113 self.repo = self._getview(self.repo)
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	114 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	115 self.stripecount = int(self.config("web", "stripes", 1))
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 14999 diff changeset	116 self.maxshortchanges = int(self.config("web", "maxshortchanges",
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 14999 diff changeset	117 60))
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	118 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	119 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	120 encoding.encoding = self.config("web", "encoding",
580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	121 encoding.encoding)
258 268bcb5a072a hgweb: watch changelog for changes mpm@selenic.com parents: 241 diff changeset	122
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	123 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	124 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	125 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	126 "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	127 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	128 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	129
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	130 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	131 req = wsgirequest(env, respond)
6784 18c429ea3a0e hgweb: all protocol functions have become generators Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6781 diff changeset	132 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	133
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	134 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	135
9887 38170eeed18c ui: add environ property to access os.environ or wsgirequest.environ Sune Foldager <cryo@cyanite.org> parents: 9842 diff changeset	136 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	137
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	138 # 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	139 # 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	140
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	141 req.url = req.env['SCRIPT_NAME']
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	142 if not req.url.endswith('/'):
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	143 req.url += '/'
5915 d0576d065993 Prefer i in d over d.has_key(i) Christian Ebert <blacktrash@gmx.net> parents: 5890 diff changeset	144 if 'REPO_NAME' in req.env:
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	145 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	146
6459 8189e03adb44 hgweb: make hgwebdir work in the absence of PATH_INFO Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6379 diff changeset	147 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	148 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	149 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	150 if parts[:len(repo_parts)] == repo_parts:
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	151 parts = parts[len(repo_parts):]
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	152 query = '/'.join(parts)
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	153 else:
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	154 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	155 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	156
8860 36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	157 # 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	158 # 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	159 # 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	160
36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	161 cmd = req.form.get('cmd', [''])[0]
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	162 if protocol.iscmd(cmd):
13445 61a898576888 hgweb: handle invalid requests with both form data and querystring Mads Kiilerich <mads@kiilerich.com> parents: 12739 diff changeset	163 try:
61a898576888 hgweb: handle invalid requests with both form data and querystring Mads Kiilerich <mads@kiilerich.com> parents: 12739 diff changeset	164 if query:
61a898576888 hgweb: handle invalid requests with both form data and querystring Mads Kiilerich <mads@kiilerich.com> parents: 12739 diff changeset	165 raise ErrorResponse(HTTP_NOT_FOUND)
61a898576888 hgweb: handle invalid requests with both form data and querystring Mads Kiilerich <mads@kiilerich.com> parents: 12739 diff changeset	166 if cmd in perms:
11595 368cd5325348 protocol: move hgweb protocol support back into protocol.py Matt Mackall <mpm@selenic.com> parents: 11593 diff changeset	167 self.check_perm(req, perms[cmd])
13445 61a898576888 hgweb: handle invalid requests with both form data and querystring Mads Kiilerich <mads@kiilerich.com> parents: 12739 diff changeset	168 return protocol.call(self.repo, req, cmd)
61a898576888 hgweb: handle invalid requests with both form data and querystring Mads Kiilerich <mads@kiilerich.com> parents: 12739 diff changeset	169 except ErrorResponse, inst:
13571 84bd3fd63afc hgweb_mod: respond right away if the client specified 100-continue support Augie Fackler <durin42@gmail.com> parents: 13445 diff changeset	170 # A client that sends unbundle without 100-continue will
84bd3fd63afc hgweb_mod: respond right away if the client specified 100-continue support Augie Fackler <durin42@gmail.com> parents: 13445 diff changeset	171 # break if we respond early.
84bd3fd63afc hgweb_mod: respond right away if the client specified 100-continue support Augie Fackler <durin42@gmail.com> parents: 13445 diff changeset	172 if (cmd == 'unbundle' and
14991 4f39610996fa http2: send an extra header to signal a non-broken client Augie Fackler <durin42@gmail.com> parents: 13966 diff changeset	173 (req.env.get('HTTP_EXPECT',
4f39610996fa http2: send an extra header to signal a non-broken client Augie Fackler <durin42@gmail.com> parents: 13966 diff changeset	174 '').lower() != '100-continue') or
4f39610996fa http2: send an extra header to signal a non-broken client Augie Fackler <durin42@gmail.com> parents: 13966 diff changeset	175 req.env.get('X-HgHttp2', '')):
13445 61a898576888 hgweb: handle invalid requests with both form data and querystring Mads Kiilerich <mads@kiilerich.com> parents: 12739 diff changeset	176 req.drain()
18352 e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18258 diff changeset	177 req.respond(inst, protocol.HGTYPE,
e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18258 diff changeset	178 body='0\n%s\n' % inst.message)
e33b9b92a200 hgweb: pass the actual response body to request.response, not just the length Mads Kiilerich <mads@kiilerich.com> parents: 18258 diff changeset	179 return ''
8860 36654238c050 hgweb: deny cloning a subpath of a repo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8859 diff changeset	180
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	181 # 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	182
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	183 args = query.split('/', 2)
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	184 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	185
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	186 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	187 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	188 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	189 req.form['style'] = [cmd[:style]]
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	190 cmd = cmd[style + 1:]
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	191
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	192 # avoid accepting e.g. style parameter as command
14953 6ee6ecf1ee89 hgweb_mod: use safehasattr instead of hasattr Augie Fackler <durin42@gmail.com> parents: 14913 diff changeset	193 if util.safehasattr(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	194 req.form['cmd'] = [cmd]
6777 44c5157474e7 hgweb: protocol requests are processed immediately Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6776 diff changeset	195 else:
44c5157474e7 hgweb: protocol requests are processed immediately Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6776 diff changeset	196 cmd = ''
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	197
7287 6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	198 if cmd == 'static':
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	199 req.form['file'] = ['/'.join(args)]
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	200 else:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	201 if args and args[0]:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	202 node = args.pop(0)
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	203 req.form['node'] = [node]
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	204 if args:
6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	205 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	206
9731 0e080d519d1b hgweb: treat rev as raw-rev if user agent is hg Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8860 diff changeset	207 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	208 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	209 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	210
7287 6e9fe4ff9c54 hgweb: handle subdirectories within static directory Brendan Cully <brendan@kublai.com> parents: 7180 diff changeset	211 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	212 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	213 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	214 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	215 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	216 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	217 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	218
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	219 # process the web interface request
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	220
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	221 try:
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	222 tmpl = self.templater(req)
8859 580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	223 ctype = tmpl('mimetype', encoding=encoding.encoding)
6391 a1007f7b9b7b Backed out changeset d2bb66a8a435 (temporary template compatibility) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6379 diff changeset	224 ctype = templater.stringify(ctype)
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	225
7562 b663b5563de7 hgweb: allow static content when deny_read denies access Mark Edgington <edgimar@gmail.com> parents: 7396 diff changeset	226 # 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	227 if cmd != 'static':
b663b5563de7 hgweb: allow static content when deny_read denies access Mark Edgington <edgimar@gmail.com> parents: 7396 diff changeset	228 self.check_perm(req, None)
7336 2dc868712dcc hgweb: support for deny_read/allow_read options Mark Edgington <edgimar@gmail.com> parents: 7311 diff changeset	229
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	230 if cmd == '':
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	231 req.form['cmd'] = [tmpl.cache['default']]
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	232 cmd = req.form['cmd'][0]
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5889 diff changeset	233
13966 a1c31c64bcd3 hgweb: support disabling page cache Steven Stallion <sstallion@gmail.com> parents: 13964 diff changeset	234 if self.configbool('web', 'cache', True):
a1c31c64bcd3 hgweb: support disabling page cache Steven Stallion <sstallion@gmail.com> parents: 13964 diff changeset	235 caching(self, req) # sets ETag header or raises NOT_MODIFIED
6149 b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	236 if cmd not in webcommands.__all__:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6249 diff changeset	237 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	238 raise ErrorResponse(HTTP_BAD_REQUEST, msg)
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	239 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	240 self.ctype = ctype
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	241 content = webcommands.rawfile(self, req, tmpl)
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	242 else:
b023915aa1bc hgweb: separate protocol calls from interface calls (issue996) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6142 diff changeset	243 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	244 req.respond(HTTP_OK, ctype)
5890 a0e20a5eba3c hgweb: fast path for sending raw files Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5889 diff changeset	245
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	246 return content
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	247
18521 0af2fe7b3274 hgweb: returns 404 for unknow revision instead of 500 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18515 diff changeset	248 except (error.LookupError, error.RepoLookupError), err:
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	249 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	250 msg = str(err)
18521 0af2fe7b3274 hgweb: returns 404 for unknow revision instead of 500 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18515 diff changeset	251 if util.safehasattr(err, 'name') and 'manifest' not in msg:
6368 2c370f08c486 hgweb: better error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6249 diff changeset	252 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	253 return tmpl('error', error=msg)
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	254 except (error.RepoError, error.RevlogError), inst:
5993 948a41e77902 hgweb: explicit response status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5976 diff changeset	255 req.respond(HTTP_SERVER_ERROR, ctype)
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	256 return tmpl('error', error=str(inst))
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	257 except ErrorResponse, inst:
7740 176d3d681702 hgweb: pass ErrorResponses directly into req.respond() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7637 diff changeset	258 req.respond(inst, ctype)
12739 8dcd3203a261 hgweb: don't send a body or illegal headers during 304 response Augie Fackler <durin42@gmail.com> parents: 12696 diff changeset	259 if inst.code == HTTP_NOT_MODIFIED:
8dcd3203a261 hgweb: don't send a body or illegal headers during 304 response Augie Fackler <durin42@gmail.com> parents: 12696 diff changeset	260 # Not allowed to return a body on a 304
8dcd3203a261 hgweb: don't send a body or illegal headers during 304 response Augie Fackler <durin42@gmail.com> parents: 12696 diff changeset	261 return ['']
7396 526c40a74bd0 templater: return data in increasing chunk sizes Brendan Cully <brendan@kublai.com> parents: 7348 diff changeset	262 return tmpl('error', error=inst.message)
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	263
18627 4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	264 def loadwebsub(self):
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	265 websubtable = []
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	266 websubdefs = self.repo.ui.configitems('websub')
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	267 for key, pattern in websubdefs:
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	268 # grab the delimiter from the character after the "s"
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	269 unesc = pattern[1]
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	270 delim = re.escape(unesc)
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	271
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	272 # identify portions of the pattern, taking care to avoid escaped
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	273 # delimiters. the replace format and flags are optional, but
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	274 # delimiters are required.
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	275 match = re.match(
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	276 r'^s%s(.+)(?:(?<=\\\\)\|(?<!\\))%s(.)%s([ilmsux])$'
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	277 % (delim, delim, delim), pattern)
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	278 if not match:
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	279 self.repo.ui.warn(_("websub: invalid pattern for %s: %s\n")
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	280 % (key, pattern))
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	281 continue
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	282
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	283 # we need to unescape the delimiter for regexp and format
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	284 delim_re = re.compile(r'(?<!\\)\\%s' % delim)
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	285 regexp = delim_re.sub(unesc, match.group(1))
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	286 format = delim_re.sub(unesc, match.group(2))
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	287
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	288 # the pattern allows for 6 regexp flags, so set them if necessary
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	289 flagin = match.group(3)
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	290 flags = 0
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	291 if flagin:
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	292 for flag in flagin.upper():
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	293 flags \|= re.__dict__[flag]
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	294
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	295 try:
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	296 regexp = re.compile(regexp, flags)
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	297 websubtable.append((regexp, format))
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	298 except re.error:
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	299 self.repo.ui.warn(_("websub: invalid regexp for %s: %s\n")
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	300 % (key, regexp))
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	301 return websubtable
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	302
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	303 def templater(self, req):
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	304
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	305 # determine scheme, port and server name
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	306 # 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	307
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	308 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	309 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	310 proto = 'https'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	311 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	312 else:
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	313 proto = 'http'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	314 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	315
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	316 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	317 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	318 urlbase = '%s://%s%s' % (proto, req.env['SERVER_NAME'], port)
13964 616ad3f6fd33 hgweb: support alternate logo url Steven Stallion <sstallion@gmail.com> parents: 13959 diff changeset	319 logourl = self.config("web", "logourl", "http://mercurial.selenic.com/")
14913 44382887d012 hgweb: add a "web/logoimg" setting to customize the web logo image Angel Ezquerra <angel.ezquerra@gmail.com> parents: 13966 diff changeset	320 logoimg = self.config("web", "logoimg", "hglogo.png")
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	321 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	322 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	323 staticurl += '/'
08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	324
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	325 # some functions for the templater
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	326
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	327 def header(**map):
8859 580a79dde2a3 hgweb: web.encoding should override encoding.encoding (issue1183) Matt Mackall <mpm@selenic.com> parents: 8663 diff changeset	328 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	329
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	330 def footer(**map):
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	331 yield tmpl("footer", **map)
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	332
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	333 def motd(**map):
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	334 yield self.config("web", "motd", "")
20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	335
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	336 # figure out which style to use
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	337
7345 55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	338 vars = {}
9842 d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	339 styles = (
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	340 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	341 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	342 'paper',
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	343 )
d3dbdca92458 hgweb: don't choke when an inexistent style is requested (issue1901) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9731 diff changeset	344 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	345 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	346 vars['style'] = style
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	347
55651328dfcc hgweb: fix up the less/more links on the graph page Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7336 diff changeset	348 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	349 sessionvars = webutil.sessionvars(vars, start)
5596 20b07b68a865 hgweb: get rid of some nested functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5595 diff changeset	350
5591 08887121a652 split out hgweb commands into a separate file, move some code around Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5579 diff changeset	351 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	352 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	353 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	354 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	355
18627 4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	356 def websubfilter(text):
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	357 return websub(text, self.websubtable)
4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	358
5599 3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	359 # create the templater
3de66c2a9734 hgweb: split out templater definition Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5598 diff changeset	360
8360 acc202b71619 templater: provide the standard template filters by default Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8225 diff changeset	361 tmpl = templater.templater(mapfile,
18627 4e949b8e0930 hgweb: add websub template filter Angel Ezquerra <angel.ezquerra@gmail.com> parents: 18522 diff changeset	362 filters={"websub": websubfilter},
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	363 defaults={"url": req.url,
13964 616ad3f6fd33 hgweb: support alternate logo url Steven Stallion <sstallion@gmail.com> parents: 13959 diff changeset	364 "logourl": logourl,
14913 44382887d012 hgweb: add a "web/logoimg" setting to customize the web logo image Angel Ezquerra <angel.ezquerra@gmail.com> parents: 13966 diff changeset	365 "logoimg": logoimg,
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	366 "staticurl": staticurl,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	367 "urlbase": urlbase,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	368 "repo": self.reponame,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	369 "header": header,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	370 "footer": footer,
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	371 "motd": motd,
18258 bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	372 "sessionvars": sessionvars,
bebb05a7e249 hgweb: add a "URL breadcrumb" to the index and repository pages Angel Ezquerra <angel.ezquerra at gmail.com> parents: 16754 diff changeset	373 "pathdef": makebreadcrumb(req.url),
5600 9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	374 })
9d900f7282e6 hgweb: explicitly pass around the templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 5599 diff changeset	375 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	376
1498 78590fb4a82b hgweb: Added archive download buttons to manifest page. Thomas Arendsen Hein <thomas@intevation.de> parents: 1473 diff changeset	377 def archivelist(self, nodeid):
3555 881064004fd0 use untrusted settings in hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3499 diff changeset	378 allowed = self.configlist("web", "allow_archive")
3260 1f1af9b273e8 hgweb: accept NewWebInterface URLs Brendan Cully <brendan@kublai.com> parents: 3231 diff changeset	379 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	380 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	381 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	382
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	383 archive_specs = {
12570 a72c5ff1260c Correct Content-Type header values for archive downloads. Ry4an Brase <ry4an-hg@ry4an.org> parents: 11370 diff changeset	384 'bz2': ('application/x-bzip2', 'tbz2', '.tar.bz2', None),
a72c5ff1260c Correct Content-Type header values for archive downloads. Ry4an Brase <ry4an-hg@ry4an.org> parents: 11370 diff changeset	385 'gz': ('application/x-gzip', 'tgz', '.tar.gz', None),
2113 633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	386 'zip': ('application/zip', 'zip', '.zip', None),
633d733e7b11 make hgweb use new archival module. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2103 diff changeset	387 }
1076 01db658cc78a tarball support v0.3 Wojciech Milkowski <wmilkowski@interia.pl> parents: 1073 diff changeset	388
6779 d3147b4e3e8a hgweb: centralize permission checks for protocol commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6777 diff changeset	389 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	390 for hook in permhooks:
6f92997dbdca hgweb: add support for extension-provided permission hooks Sune Foldager <cryo@cyanite.org> parents: 9888 diff changeset	391 hook(self, req, op)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb/hgweb_mod.py @ 18627:4e949b8e0930