hgwebdir: use web.prefix when creating url breadcrumbs (issue3790)
The web.prefix setting was being ignored when creating the index URL
breadcrumbs.
We only need to fix hgwebdir and not hgweb because hgweb gets the complete URL
request, including the prefix, while hgwebdir gets a "subdir" which does not
include the prefix.
This fix is slightly different of what was suggested on the bug tracker. In
there it was suggested to hide the prefix itself from the breadcrumb. I think
that would be a better solution, but it would require changing all the index
templates and passing the prefix to the template engine, which may be too big
a change for stable during the freeze. For now this fixes the problem, and the
fix could be improved during the next cycle.
--- a/mercurial/hgweb/hgweb_mod.py Wed Jan 30 16:08:32 2013 -0800
+++ b/mercurial/hgweb/hgweb_mod.py Thu Jan 31 22:36:22 2013 +0100
@@ -24,7 +24,7 @@
'pushkey': 'push',
}
-def makebreadcrumb(url):
+def makebreadcrumb(url, prefix=''):
'''Return a 'URL breadcrumb' list
A 'URL breadcrumb' is a list of URL-name pairs,
@@ -33,6 +33,8 @@
'''
if url.endswith('/'):
url = url[:-1]
+ if prefix:
+ url = '/' + prefix + url
relpath = url
if relpath.startswith('/'):
relpath = relpath[1:]
--- a/mercurial/hgweb/hgwebdir_mod.py Wed Jan 30 16:08:32 2013 -0800
+++ b/mercurial/hgweb/hgwebdir_mod.py Thu Jan 31 22:36:22 2013 +0100
@@ -133,6 +133,12 @@
if self.stripecount:
self.stripecount = int(self.stripecount)
self._baseurl = self.ui.config('web', 'baseurl')
+ prefix = self.ui.config('web', 'prefix', '')
+ if prefix.startswith('/'):
+ prefix = prefix[1:]
+ if prefix.endswith('/'):
+ prefix = prefix[:-1]
+ self.prefix = prefix
self.lastrefresh = time.time()
def run(self):
@@ -395,7 +401,7 @@
self.updatereqenv(req.env)
return tmpl("index", entries=entries, subdir=subdir,
- pathdef=makebreadcrumb('/' + subdir),
+ pathdef=makebreadcrumb('/' + subdir, self.prefix),
sortcolumn=sortcolumn, descending=descending,
**dict(sort))