##// END OF EJS Templates
merge with -stable
Benoit Boissinot -
r7837:db39b6c3 merge default
parent child Browse files
Show More
@@ -284,7 +284,7 b' class hgweb(object):'
284
284
285 allow_read = self.configlist('web', 'allow_read')
285 allow_read = self.configlist('web', 'allow_read')
286 result = (not allow_read) or (allow_read == ['*'])
286 result = (not allow_read) or (allow_read == ['*'])
287 if not result or user in allow_read:
287 if not (result or user in allow_read):
288 raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized')
288 raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized')
289
289
290 if op == 'pull' and not self.allowpull:
290 if op == 'pull' and not self.allowpull:
@@ -7,7 +7,7 b''
7
7
8 from node import nullid, short
8 from node import nullid, short
9 from i18n import _
9 from i18n import _
10 import revlog, util
10 import revlog, util, error
11
11
12 def verify(repo):
12 def verify(repo):
13 lock = repo.lock()
13 lock = repo.lock()
@@ -172,13 +172,18 b' def _verify(repo):'
172
172
173 files = util.sort(util.unique(filenodes.keys() + filelinkrevs.keys()))
173 files = util.sort(util.unique(filenodes.keys() + filelinkrevs.keys()))
174 for f in files:
174 for f in files:
175 lr = filelinkrevs[f][0]
176 try:
175 fl = repo.file(f)
177 fl = repo.file(f)
178 except error.RevlogError, e:
179 err(lr, _("broken revlog! (%s)") % e, f)
180 continue
176
181
177 for ff in fl.files():
182 for ff in fl.files():
178 try:
183 try:
179 del storefiles[ff]
184 del storefiles[ff]
180 except KeyError:
185 except KeyError:
181 err(0, _("missing revlog!"), ff)
186 err(lr, _("missing revlog!"), ff)
182
187
183 checklog(fl, f)
188 checklog(fl, f)
184 seen = {}
189 seen = {}
@@ -36,8 +36,8 b' checking manifests'
36 crosschecking files in changesets and manifests
36 crosschecking files in changesets and manifests
37 checking files
37 checking files
38 data/a.i@0: missing revlog!
38 data/a.i@0: missing revlog!
39 data/a.i.hg.hg/c.i@0: missing revlog!
39 data/a.i.hg.hg/c.i@2: missing revlog!
40 data/a.i.hg/b.i@0: missing revlog!
40 data/a.i.hg/b.i@1: missing revlog!
41 3 files, 3 changesets, 3 total revisions
41 3 files, 3 changesets, 3 total revisions
42 3 integrity errors encountered!
42 3 integrity errors encountered!
43 (first damaged changeset appears to be 0)
43 (first damaged changeset appears to be 0)
General Comments 0
You need to be logged in to leave comments. Login now