Mercurial > hg
comparison mercurial/hgweb/hgweb_mod.py @ 18858:f02045645d12
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 02 Apr 2013 01:15:31 -0500 |
parents | 35fb2ef52a39 50c922c1b514 |
children | 60e060f4faa9 |
comparison
equal
deleted
inserted
replaced
18853:78d760aa3607 | 18858:f02045645d12 |
---|---|
248 return content | 248 return content |
249 | 249 |
250 except (error.LookupError, error.RepoLookupError), err: | 250 except (error.LookupError, error.RepoLookupError), err: |
251 req.respond(HTTP_NOT_FOUND, ctype) | 251 req.respond(HTTP_NOT_FOUND, ctype) |
252 msg = str(err) | 252 msg = str(err) |
253 if util.safehasattr(err, 'name') and 'manifest' not in msg: | 253 if (util.safehasattr(err, 'name') and |
254 not isinstance(err, error.ManifestLookupError)): | |
254 msg = 'revision not found: %s' % err.name | 255 msg = 'revision not found: %s' % err.name |
255 return tmpl('error', error=msg) | 256 return tmpl('error', error=msg) |
256 except (error.RepoError, error.RevlogError), inst: | 257 except (error.RepoError, error.RevlogError), inst: |
257 req.respond(HTTP_SERVER_ERROR, ctype) | 258 req.respond(HTTP_SERVER_ERROR, ctype) |
258 return tmpl('error', error=str(inst)) | 259 return tmpl('error', error=str(inst)) |