Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: zlib.error sent to the user (issue3424)
authorBrad Hall <bhall@fb.com>
Mon, 04 Jun 2012 14:46:42 -0700
changeset 16883 5e3a1b96dbb0
parent 16843 61f3ca8e4d39
child 16885 d628bcb3a567
revlog: zlib.error sent to the user (issue3424) Give the user the zlib error message instead of a backtrace when decompression fails.
mercurial/revlog.py file | annotate | diff | comparison | revisions 
--- a/mercurial/revlog.py	Sun Jun 03 19:35:45 2012 +0200
+++ b/mercurial/revlog.py	Mon Jun 04 14:46:42 2012 -0700
@@ -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)
mercurial