facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

hgweb: avoid initialization race (issue3953)

Browse Source
This commit is contained in:
Matt Mackall 2013-12-04 13:42:28 -06:00
parent c4f5764d33
commit 03adb7cbe4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mercurial/hgweb/hgweb_mod.py
View File

@ -59,15 +59,16 @@ class hgweb(object):
u = baseui.copy()
else:
u = ui.ui()
self.repo = hg.repository(u, repo)
r = hg.repository(u, repo)
else:
self.repo = repo
r = repo
self.repo = self._getview(self.repo)
self.repo.ui.setconfig('ui', 'report_untrusted', 'off')
self.repo.baseui.setconfig('ui', 'report_untrusted', 'off')
self.repo.ui.setconfig('ui', 'nontty', 'true')
self.repo.baseui.setconfig('ui', 'nontty', 'true')
r = self._getview(r)
r.ui.setconfig('ui', 'report_untrusted', 'off')
r.baseui.setconfig('ui', 'report_untrusted', 'off')
r.ui.setconfig('ui', 'nontty', 'true')
r.baseui.setconfig('ui', 'nontty', 'true')
self.repo = r
hook.redirect(True)
self.mtime = -1
self.size = -1
@ -94,7 +95,8 @@ class hgweb(object):
untrusted=untrusted)
def _getview(self, repo):
viewconfig = self.config('web', 'view', 'served')
viewconfig = repo.ui.config('web', 'view', 'served',
untrusted=True)
if viewconfig == 'all':
return repo.unfiltered()
elif viewconfig in repoview.filtertable: