# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1339077312 -7200
# Node ID d628bcb3a567a4018fc9855876f5c020b0493648
# Parent  4fd1f1d7569bceef4cbb98603f4968bb36ccb289# Parent  5e3a1b96dbb0fc502f5c4fb6c3baf81da710e1f0
merge heads

diff -r 4fd1f1d7569b -r d628bcb3a567 mercurial/revlog.py
--- 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)