Show More
@@ -28,6 +28,7 b' class hgwebdir(object):' | |||||
28 | self.style = None |
|
28 | self.style = None | |
29 | self.stripecount = None |
|
29 | self.stripecount = None | |
30 | self.repos_sorted = ('name', False) |
|
30 | self.repos_sorted = ('name', False) | |
|
31 | self._baseurl = None | |||
31 | if isinstance(config, (list, tuple)): |
|
32 | if isinstance(config, (list, tuple)): | |
32 | self.repos = cleannames(config) |
|
33 | self.repos = cleannames(config) | |
33 | self.repos_sorted = ('', False) |
|
34 | self.repos_sorted = ('', False) | |
@@ -48,6 +49,8 b' class hgwebdir(object):' | |||||
48 | self.style = cp.get('web', 'style') |
|
49 | self.style = cp.get('web', 'style') | |
49 | if cp.has_option('web', 'stripes'): |
|
50 | if cp.has_option('web', 'stripes'): | |
50 | self.stripecount = int(cp.get('web', 'stripes')) |
|
51 | self.stripecount = int(cp.get('web', 'stripes')) | |
|
52 | if cp.has_option('web', 'baseurl'): | |||
|
53 | self._baseurl = cp.get('web', 'baseurl') | |||
51 | if cp.has_section('paths'): |
|
54 | if cp.has_section('paths'): | |
52 | self.repos.extend(cleannames(cp.items('paths'))) |
|
55 | self.repos.extend(cleannames(cp.items('paths'))) | |
53 | if cp.has_section('collections'): |
|
56 | if cp.has_section('collections'): | |
@@ -233,6 +236,9 b' class hgwebdir(object):' | |||||
233 | and "-" or "", column)) |
|
236 | and "-" or "", column)) | |
234 | for column in sortable] |
|
237 | for column in sortable] | |
235 |
|
238 | |||
|
239 | if self._baseurl is not None: | |||
|
240 | req.env['SCRIPT_NAME'] = self._baseurl | |||
|
241 | ||||
236 | return tmpl("index", entries=entries, subdir=subdir, |
|
242 | return tmpl("index", entries=entries, subdir=subdir, | |
237 | sortcolumn=sortcolumn, descending=descending, |
|
243 | sortcolumn=sortcolumn, descending=descending, | |
238 | **dict(sort)) |
|
244 | **dict(sort)) | |
@@ -254,6 +260,9 b' class hgwebdir(object):' | |||||
254 | def config(section, name, default=None, untrusted=True): |
|
260 | def config(section, name, default=None, untrusted=True): | |
255 | return self.parentui.config(section, name, default, untrusted) |
|
261 | return self.parentui.config(section, name, default, untrusted) | |
256 |
|
262 | |||
|
263 | if self._baseurl is not None: | |||
|
264 | req.env['SCRIPT_NAME'] = self._baseurl | |||
|
265 | ||||
257 | url = req.env.get('SCRIPT_NAME', '') |
|
266 | url = req.env.get('SCRIPT_NAME', '') | |
258 | if not url.endswith('/'): |
|
267 | if not url.endswith('/'): | |
259 | url += '/' |
|
268 | url += '/' |
General Comments 0
You need to be logged in to leave comments.
Login now