Mercurial > hg-stable
changeset 16885:d628bcb3a567
merge heads
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 07 Jun 2012 15:55:12 +0200 |
| parents | 4fd1f1d7569b (current diff) 5e3a1b96dbb0 (diff) |
| children | 8c1cf3e3fe42 |
| files | mercurial/revlog.py |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/revlog.py Thu Jun 07 15:54:40 2012 +0200 +++ b/mercurial/revlog.py Thu Jun 07 15:55:12 2012 +0200 @@ -112,7 +112,10 @@ if t == '\0': return bin if t == 'x': - return _decompress(bin) + try: + return _decompress(bin) + except zlib.error, e: + raise RevlogError(_("revlog decompress error: %s") % str(e)) if t == 'u': return bin[1:] raise RevlogError(_("unknown compression type %r") % t)