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 (issue4280)

Browse Source
This commit is contained in:
Matt Mackall 2014-06-16 13:30:46 -05:00
parent 2ec4f75e9f
commit 0257c423ac
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/hgweb/hgweb_mod.py
View File

@ -109,8 +109,6 @@ class hgweb(object):
# compare changelog size in addition to mtime to catch
# rollbacks made less than a second ago
if st.st_mtime != self.mtime or st.st_size != self.size:
self.mtime = st.st_mtime
self.size = st.st_size
r = hg.repository(self.repo.baseui, self.repo.root)
self.repo = self._getview(r)
self.maxchanges = int(self.config("web", "maxchanges", 10))
@ -121,6 +119,9 @@ class hgweb(object):
self.allowpull = self.configbool("web", "allowpull", True)
encoding.encoding = self.config("web", "encoding",
encoding.encoding)
# update these last to avoid threads seeing empty settings
self.mtime = st.st_mtime
self.size = st.st_size
if request:
self.repo.ui.environ = request.env