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

annotate mercurial/hgweb/hgwebdir_mod.py @ 4843:496ac05c6a31

hgwebdir: show only trailing part of path when browsing subdirectories

author	Brendan Cully <brendan@kublai.com>
date	Thu, 05 Jul 2007 19:56:16 -0700
parents	9b0ebb5e0f94
children	4f86c58c6c56

rev	line source
2391 d351a3be3371 Fixing up comment headers for split up code. Eric Hopper <hopper@omnifarious.org> parents: 2360 diff changeset	1 # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories.
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>
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2538 diff changeset	4 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
131 c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	5 #
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	6 # This software may be used and distributed according to the terms
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
c9d51742471c moving hgweb to mercurial subdir jake@edge2.net parents: diff changeset	8
3877 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3557 diff changeset	9 from mercurial import demandimport; demandimport.enable()
abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3557 diff changeset	10 import os, mimetools, cStringIO
2311 b832b6eb65ab Moving hgweb.py into it's own module in preparation for breaking it up. Eric Hopper <hopper@omnifarious.org> parents: 2275 diff changeset	11 from mercurial.i18n import gettext as _
3877 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3557 diff changeset	12 from mercurial import ui, hg, util, templater
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	13 from common import get_mtime, staticfile, style_map, paritygen
3877 abaee83ce0a6 Replace demandload with new demandimport Matt Mackall <mpm@selenic.com> parents: 3557 diff changeset	14 from hgweb_mod import hgweb
138 c77a679e9cfa Revamped templated hgweb mpm@selenic.com parents: 137 diff changeset	15
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	16 # This is a stopgap
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1554 diff changeset	17 class hgwebdir(object):
4079 40c9710e8182 Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3882 diff changeset	18 def __init__(self, config, parentui=None):
1181 4f5001f5b4c3 Make sure the repository names don't have slashes at the at or else in some Vincent Wagelaar <vincent@ricardis.tudelft.nl> parents: 1180 diff changeset	19 def cleannames(items):
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	20 return [(name.strip(os.sep), path) for name, path in items]
1181 4f5001f5b4c3 Make sure the repository names don't have slashes at the at or else in some Vincent Wagelaar <vincent@ricardis.tudelft.nl> parents: 1180 diff changeset	21
4079 40c9710e8182 Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3882 diff changeset	22 self.parentui = parentui
4080 ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	23 self.motd = None
ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	24 self.style = None
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	25 self.stripecount = None
2174 3044a3fdae76 If default sorting is name, offer name-descending with one click. Thomas Arendsen Hein <thomas@intevation.de> parents: 2173 diff changeset	26 self.repos_sorted = ('name', False)
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	27 if isinstance(config, (list, tuple)):
1181 4f5001f5b4c3 Make sure the repository names don't have slashes at the at or else in some Vincent Wagelaar <vincent@ricardis.tudelft.nl> parents: 1180 diff changeset	28 self.repos = cleannames(config)
2174 3044a3fdae76 If default sorting is name, offer name-descending with one click. Thomas Arendsen Hein <thomas@intevation.de> parents: 2173 diff changeset	29 self.repos_sorted = ('', False)
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	30 elif isinstance(config, dict):
1181 4f5001f5b4c3 Make sure the repository names don't have slashes at the at or else in some Vincent Wagelaar <vincent@ricardis.tudelft.nl> parents: 1180 diff changeset	31 self.repos = cleannames(config.items())
1143 4fffb3d84b7c Allow list of (virtual, real) or dictionary to be passed to hgwebdir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1142 diff changeset	32 self.repos.sort()
4fffb3d84b7c Allow list of (virtual, real) or dictionary to be passed to hgwebdir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1142 diff changeset	33 else:
4051 022056263354 hgwebdir: class hgwebdir should also accept a configparser instance Michael Gebetsroither <michael.geb@gmx.at> parents: 3887 diff changeset	34 if isinstance(config, util.configparser):
022056263354 hgwebdir: class hgwebdir should also accept a configparser instance Michael Gebetsroither <michael.geb@gmx.at> parents: 3887 diff changeset	35 cp = config
022056263354 hgwebdir: class hgwebdir should also accept a configparser instance Michael Gebetsroither <michael.geb@gmx.at> parents: 3887 diff changeset	36 else:
022056263354 hgwebdir: class hgwebdir should also accept a configparser instance Michael Gebetsroither <michael.geb@gmx.at> parents: 3887 diff changeset	37 cp = util.configparser()
022056263354 hgwebdir: class hgwebdir should also accept a configparser instance Michael Gebetsroither <michael.geb@gmx.at> parents: 3887 diff changeset	38 cp.read(config)
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	39 self.repos = []
3221 d7d53e3d9590 Add style support to hgwebdir Edouard Gomez <ed.gomez@free.fr> parents: 2859 diff changeset	40 if cp.has_section('web'):
d7d53e3d9590 Add style support to hgwebdir Edouard Gomez <ed.gomez@free.fr> parents: 2859 diff changeset	41 if cp.has_option('web', 'motd'):
d7d53e3d9590 Add style support to hgwebdir Edouard Gomez <ed.gomez@free.fr> parents: 2859 diff changeset	42 self.motd = cp.get('web', 'motd')
d7d53e3d9590 Add style support to hgwebdir Edouard Gomez <ed.gomez@free.fr> parents: 2859 diff changeset	43 if cp.has_option('web', 'style'):
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3221 diff changeset	44 self.style = cp.get('web', 'style')
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	45 if cp.has_option('web', 'stripes'):
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	46 self.stripecount = int(cp.get('web', 'stripes'))
1829 b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	47 if cp.has_section('paths'):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	48 self.repos.extend(cleannames(cp.items('paths')))
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	49 if cp.has_section('collections'):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	50 for prefix, root in cp.items('collections'):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	51 for path in util.walkrepos(root):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	52 repo = os.path.normpath(path)
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	53 name = repo
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	54 if name.startswith(prefix):
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	55 name = name[len(prefix):]
b0f6af327fd4 hgwebdir: export collections of repos Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1703 diff changeset	56 self.repos.append((name.lstrip(os.sep), repo))
1143 4fffb3d84b7c Allow list of (virtual, real) or dictionary to be passed to hgwebdir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1142 diff changeset	57 self.repos.sort()
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	58
2535 b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	59 def run(self):
2538 f4b7d71c1c60 Cleanup hgweb and hgwebdir's run method a bit. Eric Hopper <hopper@omnifarious.org> parents: 2537 diff changeset	60 if not os.environ.get('GATEWAY_INTERFACE', '').startswith("CGI/1."):
2535 b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	61 raise RuntimeError("This function is only intended to be called while running as a CGI script.")
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	62 import mercurial.hgweb.wsgicgi as wsgicgi
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	63 from request import wsgiapplication
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	64 def make_web_app():
2538 f4b7d71c1c60 Cleanup hgweb and hgwebdir's run method a bit. Eric Hopper <hopper@omnifarious.org> parents: 2537 diff changeset	65 return self
2535 b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	66 wsgicgi.launch(wsgiapplication(make_web_app))
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	67
b8ccf6386db7 Arrange for old copies of CGI scripts to still work. Eric Hopper <hopper@omnifarious.org> parents: 2514 diff changeset	68 def run_wsgi(self, req):
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	69 def header(**map):
3882 9c8488490724 Set charset encoding for hgwebdir, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3557 diff changeset	70 header_file = cStringIO.StringIO(
9c8488490724 Set charset encoding for hgwebdir, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3557 diff changeset	71 ''.join(tmpl("header", encoding=util._encoding, **map)))
2514 419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	72 msg = mimetools.Message(header_file, 0)
419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	73 req.header(msg.items())
419c42223bee Really fix http headers for web UI and issue 254. Eric Hopper <hopper@omnifarious.org> parents: 2509 diff changeset	74 yield header_file.read()
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	75
4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	76 def footer(**map):
3479 bbfb392b2b1a Fix "templater object got multiple values for keyword argument 'motd'" Thomas Arendsen Hein <thomas@intevation.de> parents: 3478 diff changeset	77 yield tmpl("footer", **map)
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	78
3488 8f02223662c8 hgweb: make #motd# available for all templates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3479 diff changeset	79 def motd(**map):
4080 ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	80 if self.motd is not None:
ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	81 yield self.motd
ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	82 else:
ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	83 yield config('web', 'motd', '')
3488 8f02223662c8 hgweb: make #motd# available for all templates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3479 diff changeset	84
4079 40c9710e8182 Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3882 diff changeset	85 parentui = self.parentui or ui.ui(report_untrusted=False)
40c9710e8182 Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3882 diff changeset	86
4080 ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	87 def config(section, name, default=None, untrusted=True):
ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	88 return parentui.config(section, name, default, untrusted)
ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	89
3328 415905fad4fe Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /) Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	90 url = req.env['REQUEST_URI'].split('?')[0]
415905fad4fe Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /) Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	91 if not url.endswith('/'):
415905fad4fe Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /) Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	92 url += '/'
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	93 pathinfo = req.env.get('PATH_INFO', '').strip('/') + '/'
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	94 base = url[:len(url) - len(pathinfo)]
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	95 if not base.endswith('/'):
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	96 base += '/'
3328 415905fad4fe Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /) Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	97
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	98 staticurl = config('web', 'staticurl') or base + 'static/'
4084 51e52db6b40d hgweb: allow static files to be served directly by the HTTP server Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4081 diff changeset	99 if not staticurl.endswith('/'):
51e52db6b40d hgweb: allow static files to be served directly by the HTTP server Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4081 diff changeset	100 staticurl += '/'
51e52db6b40d hgweb: allow static files to be served directly by the HTTP server Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4081 diff changeset	101
3221 d7d53e3d9590 Add style support to hgwebdir Edouard Gomez <ed.gomez@free.fr> parents: 2859 diff changeset	102 style = self.style
4080 ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	103 if style is None:
ef14fdb675da hgwebdir: try to get web.style and web.motd from the ui.config system Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4079 diff changeset	104 style = config('web', 'style', '')
3221 d7d53e3d9590 Add style support to hgwebdir Edouard Gomez <ed.gomez@free.fr> parents: 2859 diff changeset	105 if req.form.has_key('style'):
d7d53e3d9590 Add style support to hgwebdir Edouard Gomez <ed.gomez@free.fr> parents: 2859 diff changeset	106 style = req.form['style'][0]
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	107 if self.stripecount is None:
12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	108 self.stripecount = int(config('web', 'stripes', 1))
3276 db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3263 diff changeset	109 mapfile = style_map(templater.templatepath(), style)
db9d2a624521 hgweb: Search templates in templatepath/style/map, too, using a common function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3263 diff changeset	110 tmpl = templater.templater(mapfile, templater.common_filters,
1964 778281d46bb2 fix template bug that made hgweb break. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	111 defaults={"header": header,
3328 415905fad4fe Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /) Brendan Cully <brendan@kublai.com> parents: 3276 diff changeset	112 "footer": footer,
3488 8f02223662c8 hgweb: make #motd# available for all templates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3479 diff changeset	113 "motd": motd,
4084 51e52db6b40d hgweb: allow static files to be served directly by the HTTP server Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4081 diff changeset	114 "url": url,
51e52db6b40d hgweb: allow static files to be served directly by the HTTP server Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4081 diff changeset	115 "staticurl": staticurl})
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	116
2171 290534ee163c Add download links to hgwebdir index page for allowed archive types. Thomas Arendsen Hein <thomas@intevation.de> parents: 2170 diff changeset	117 def archivelist(ui, nodeid, url):
3556 c3043ebe40a0 use untrusted settings in hgwebdir Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3488 diff changeset	118 allowed = ui.configlist("web", "allow_archive", untrusted=True)
3262 1e322b44b366 Teach hgwebdir about new interface Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	119 for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
3556 c3043ebe40a0 use untrusted settings in hgwebdir Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3488 diff changeset	120 if i[0] in allowed or ui.configbool("web", "allow" + i[0],
c3043ebe40a0 use untrusted settings in hgwebdir Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3488 diff changeset	121 untrusted=True):
3262 1e322b44b366 Teach hgwebdir about new interface Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	122 yield {"type" : i[0], "extension": i[1],
1e322b44b366 Teach hgwebdir about new interface Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	123 "node": nodeid, "url": url}
2171 290534ee163c Add download links to hgwebdir index page for allowed archive types. Thomas Arendsen Hein <thomas@intevation.de> parents: 2170 diff changeset	124
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	125 def entries(sortcolumn="", descending=False, subdir="", **map):
3365 cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	126 def sessionvars(**map):
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	127 fields = []
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	128 if req.form.has_key('style'):
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	129 style = req.form['style'][0]
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	130 if style != get('web', 'style', ''):
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	131 fields.append(('style', style))
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	132
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	133 separator = url[-1] == '?' and ';' or '?'
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	134 for name, value in fields:
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	135 yield dict(name=name, value=value, separator=separator)
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	136 separator = ';'
cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	137
2173 d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	138 rows = []
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	139 parity = paritygen(self.stripecount)
1141 033c968d7c66 Use ConfigParser only in hgwebdir.__init__() Thomas Arendsen Hein <thomas@intevation.de> parents: 1140 diff changeset	140 for name, path in self.repos:
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	141 if not name.startswith(subdir):
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	142 continue
4843 496ac05c6a31 hgwebdir: show only trailing part of path when browsing subdirectories Brendan Cully <brendan@kublai.com> parents: 4841 diff changeset	143 name = name[len(subdir):]
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	144
4079 40c9710e8182 Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3882 diff changeset	145 u = ui.ui(parentui=parentui)
1170 85555540a4e2 Make .hg/hgrc optional for repositories published by hgwebdir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1165 diff changeset	146 try:
1473 7d66ce9895fa make readconfig take a filename instead of a file pointer as argument Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1445 diff changeset	147 u.readconfig(os.path.join(path, '.hg', 'hgrc'))
1170 85555540a4e2 Make .hg/hgrc optional for repositories published by hgwebdir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1165 diff changeset	148 except IOError:
85555540a4e2 Make .hg/hgrc optional for repositories published by hgwebdir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1165 diff changeset	149 pass
3556 c3043ebe40a0 use untrusted settings in hgwebdir Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3488 diff changeset	150 def get(section, name, default=None):
c3043ebe40a0 use untrusted settings in hgwebdir Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3488 diff changeset	151 return u.config(section, name, default, untrusted=True)
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	152
4709 53eca35c3aeb Add option "hidden" to hgwebdir. Markus F.X.J. Oberhumer <markus@oberhumer.com> parents: 4462 diff changeset	153 if u.configbool("web", "hidden", untrusted=True):
53eca35c3aeb Add option "hidden" to hgwebdir. Markus F.X.J. Oberhumer <markus@oberhumer.com> parents: 4462 diff changeset	154 continue
53eca35c3aeb Add option "hidden" to hgwebdir. Markus F.X.J. Oberhumer <markus@oberhumer.com> parents: 4462 diff changeset	155
4843 496ac05c6a31 hgwebdir: show only trailing part of path when browsing subdirectories Brendan Cully <brendan@kublai.com> parents: 4841 diff changeset	156 url = ('/'.join([req.env["REQUEST_URI"].split('?')[0], name])
3262 1e322b44b366 Teach hgwebdir about new interface Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	157 .replace("//", "/")) + '/'
1022 31dcaf9123ba Minor hgwebdir tweaks mpm@selenic.com parents: 987 diff changeset	158
1348 b8c82bf3da21 hgwebdir: Fix date display mpm@selenic.com parents: 1333 diff changeset	159 # update time with local timezone
1524 0d47bb884330 hgweb: fix traceback by skipping invalid repo paths TK Soh <teekaysoh@yahoo.com> parents: 1511 diff changeset	160 try:
0d47bb884330 hgweb: fix traceback by skipping invalid repo paths TK Soh <teekaysoh@yahoo.com> parents: 1511 diff changeset	161 d = (get_mtime(path), util.makedate()[1])
0d47bb884330 hgweb: fix traceback by skipping invalid repo paths TK Soh <teekaysoh@yahoo.com> parents: 1511 diff changeset	162 except OSError:
0d47bb884330 hgweb: fix traceback by skipping invalid repo paths TK Soh <teekaysoh@yahoo.com> parents: 1511 diff changeset	163 continue
1348 b8c82bf3da21 hgwebdir: Fix date display mpm@selenic.com parents: 1333 diff changeset	164
2173 d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	165 contact = (get("ui", "username") or # preferred
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	166 get("web", "contact") or # deprecated
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	167 get("web", "author", "")) # also
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	168 description = get("web", "description", "")
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	169 name = get("web", "name", name)
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	170 row = dict(contact=contact or "unknown",
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	171 contact_sort=contact.upper() or "unknown",
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	172 name=name,
2174 3044a3fdae76 If default sorting is name, offer name-descending with one click. Thomas Arendsen Hein <thomas@intevation.de> parents: 2173 diff changeset	173 name_sort=name,
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1023 diff changeset	174 url=url,
2173 d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	175 description=description or "unknown",
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	176 description_sort=description.upper() or "unknown",
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	177 lastchange=d,
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	178 lastchange_sort=d[1]-d[0],
3365 cf680c9ab1dd Keep session variables when linking from hgwebdir's index to repositories. Thomas Arendsen Hein <thomas@intevation.de> parents: 3328 diff changeset	179 sessionvars=sessionvars,
2171 290534ee163c Add download links to hgwebdir index page for allowed archive types. Thomas Arendsen Hein <thomas@intevation.de> parents: 2170 diff changeset	180 archives=archivelist(u, "tip", url))
2174 3044a3fdae76 If default sorting is name, offer name-descending with one click. Thomas Arendsen Hein <thomas@intevation.de> parents: 2173 diff changeset	181 if (not sortcolumn
3044a3fdae76 If default sorting is name, offer name-descending with one click. Thomas Arendsen Hein <thomas@intevation.de> parents: 2173 diff changeset	182 or (sortcolumn, descending) == self.repos_sorted):
2173 d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	183 # fast path for unsorted output
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	184 row['parity'] = parity.next()
2173 d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	185 yield row
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	186 else:
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	187 rows.append((row["%s_sort" % sortcolumn], row))
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	188 if rows:
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	189 rows.sort()
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	190 if descending:
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	191 rows.reverse()
d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	192 for key, row in rows:
4462 12e4d9524951 hgweb: use generator to count parity of horizontal stripes for easier reading. Thomas Arendsen Hein <thomas@intevation.de> parents: 4250 diff changeset	193 row['parity'] = parity.next()
2173 d1943df604c4 Make hgwebdir columns sortable. Thomas Arendsen Hein <thomas@intevation.de> parents: 2171 diff changeset	194 yield row
941 4cf418c2a013 Add a multi-repository server mpm@selenic.com parents: 939 diff changeset	195
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	196 def makeindex(req, subdir=""):
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	197 sortable = ["name", "description", "contact", "lastchange"]
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	198 sortcolumn, descending = self.repos_sorted
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	199 if req.form.has_key('sort'):
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	200 sortcolumn = req.form['sort'][0]
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	201 descending = sortcolumn.startswith('-')
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	202 if descending:
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	203 sortcolumn = sortcolumn[1:]
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	204 if sortcolumn not in sortable:
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	205 sortcolumn = ""
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	206
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	207 sort = [("sort_%s" % column,
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	208 "%s%s" % ((not descending and column == sortcolumn)
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	209 and "-" or "", column))
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	210 for column in sortable]
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	211 req.write(tmpl("index", entries=entries, subdir=subdir,
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	212 sortcolumn=sortcolumn, descending=descending,
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	213 **dict(sort)))
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	214
4244 a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	215 try:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	216 virtual = req.env.get("PATH_INFO", "").strip('/')
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	217 if virtual.startswith('static/'):
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	218 static = os.path.join(templater.templatepath(), 'static')
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	219 fname = virtual[7:]
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	220 req.write(staticfile(static, fname, req) or
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	221 tmpl('error', error='%r not found' % fname))
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	222 elif virtual:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	223 while virtual:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	224 real = dict(self.repos).get(virtual)
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	225 if real:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	226 break
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	227 up = virtual.rfind('/')
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	228 if up < 0:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	229 break
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	230 virtual = virtual[:up]
3262 1e322b44b366 Teach hgwebdir about new interface Brendan Cully <brendan@kublai.com> parents: 3223 diff changeset	231 if real:
4244 a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	232 req.env['REPO_NAME'] = virtual
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	233 try:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	234 repo = hg.repository(parentui, real)
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	235 hgweb(repo).run_wsgi(req)
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	236 except IOError, inst:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	237 req.write(tmpl("error", error=inst.strerror))
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	238 except hg.RepoError, inst:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	239 req.write(tmpl("error", error=str(inst)))
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	240 else:
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	241 subdir=req.env.get("PATH_INFO", "").strip('/') + '/'
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	242 if [r for r in self.repos if r[0].startswith(subdir)]:
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	243 makeindex(req, subdir)
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	244 else:
9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	245 req.write(tmpl("notfound", repo=virtual))
1123 457c23af92bd Use a template for the error message. Ollivier Robert <roberto@keltia.freenix.fr> parents: 1122 diff changeset	246 else:
4244 a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	247 if req.form.has_key('static'):
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	248 static = os.path.join(templater.templatepath(), "static")
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	249 fname = req.form['static'][0]
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	250 req.write(staticfile(static, fname, req)
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	251 or tmpl("error", error="%r not found" % fname))
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	252 else:
4841 9b0ebb5e0f94 hgweb: let hgwebdir browse subdirectories Brendan Cully <brendan@kublai.com> parents: 4709 diff changeset	253 makeindex(req)
4244 a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	254 finally:
a80502f47552 hgwebdir: break templater -> templater circular reference Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4080 diff changeset	255 tmpl = None

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/hgweb/hgwebdir_mod.py @ 4843:496ac05c6a31