##// END OF EJS Templates
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol...
Yuya Nishihara -
r27043:ccdc95c6 default
parent child Browse files
Show More
@@ -13,7 +13,7 b' from mercurial import ui as uimod'
13 from mercurial import error, encoding
13 from mercurial import error, encoding
14 from common import ErrorResponse, get_mtime, staticfile, paritygen, ismember, \
14 from common import ErrorResponse, get_mtime, staticfile, paritygen, ismember, \
15 get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
15 get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
16 from hgweb_mod import hgweb, makebreadcrumb
16 import hgweb_mod
17 from request import wsgirequest
17 from request import wsgirequest
18 import webutil
18 import webutil
19
19
@@ -232,7 +232,7 b' class hgwebdir(object):'
232 try:
232 try:
233 # ensure caller gets private copy of ui
233 # ensure caller gets private copy of ui
234 repo = hg.repository(self.ui.copy(), real)
234 repo = hg.repository(self.ui.copy(), real)
235 return hgweb(repo).run_wsgi(req)
235 return hgweb_mod.hgweb(repo).run_wsgi(req)
236 except IOError as inst:
236 except IOError as inst:
237 msg = inst.strerror
237 msg = inst.strerror
238 raise ErrorResponse(HTTP_SERVER_ERROR, msg)
238 raise ErrorResponse(HTTP_SERVER_ERROR, msg)
@@ -427,7 +427,7 b' class hgwebdir(object):'
427 self.updatereqenv(req.env)
427 self.updatereqenv(req.env)
428
428
429 return tmpl("index", entries=entries, subdir=subdir,
429 return tmpl("index", entries=entries, subdir=subdir,
430 pathdef=makebreadcrumb('/' + subdir, self.prefix),
430 pathdef=hgweb_mod.makebreadcrumb('/' + subdir, self.prefix),
431 sortcolumn=sortcolumn, descending=descending,
431 sortcolumn=sortcolumn, descending=descending,
432 **dict(sort))
432 **dict(sort))
433
433
General Comments 0
You need to be logged in to leave comments. Login now