Mercurial > hg-stable
changeset 7837:db39b6c3da48
merge with -stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sat, 07 Mar 2009 20:30:20 +0100 |
| parents | bc0a87123ab8 (current diff) 794def2fe232 (diff) |
| children | c2e962bdcc37 |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Fri Mar 06 12:35:48 2009 -0800 +++ b/mercurial/hgweb/hgweb_mod.py Sat Mar 07 20:30:20 2009 +0100 @@ -284,7 +284,7 @@ allow_read = self.configlist('web', 'allow_read') result = (not allow_read) or (allow_read == ['*']) - if not result or user in allow_read: + if not (result or user in allow_read): raise ErrorResponse(HTTP_UNAUTHORIZED, 'read not authorized') if op == 'pull' and not self.allowpull:
--- a/mercurial/verify.py Fri Mar 06 12:35:48 2009 -0800 +++ b/mercurial/verify.py Sat Mar 07 20:30:20 2009 +0100 @@ -7,7 +7,7 @@ from node import nullid, short from i18n import _ -import revlog, util +import revlog, util, error def verify(repo): lock = repo.lock() @@ -172,13 +172,18 @@ files = util.sort(util.unique(filenodes.keys() + filelinkrevs.keys())) for f in files: - fl = repo.file(f) + lr = filelinkrevs[f][0] + try: + fl = repo.file(f) + except error.RevlogError, e: + err(lr, _("broken revlog! (%s)") % e, f) + continue for ff in fl.files(): try: del storefiles[ff] except KeyError: - err(0, _("missing revlog!"), ff) + err(lr, _("missing revlog!"), ff) checklog(fl, f) seen = {}
--- a/tests/test-fncache.out Fri Mar 06 12:35:48 2009 -0800 +++ b/tests/test-fncache.out Sat Mar 07 20:30:20 2009 +0100 @@ -36,8 +36,8 @@ crosschecking files in changesets and manifests checking files data/a.i@0: missing revlog! - data/a.i.hg.hg/c.i@0: missing revlog! - data/a.i.hg/b.i@0: missing revlog! + data/a.i.hg.hg/c.i@2: missing revlog! + data/a.i.hg/b.i@1: missing revlog! 3 files, 3 changesets, 3 total revisions 3 integrity errors encountered! (first damaged changeset appears to be 0)