# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 2015-05-18 20:33:21
# Node ID ee665d3bf6dd057d6d1fb6be684b2be5e7becd4c
# Parent  d26703eb3dc5782af51fb99b1bb5837765317bd2

exchange: catch down to BaseException when handling bundle2

We can now catch more things.

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1315,7 +1315,7 @@ def unbundle(repo, cg, heads, source, ur
                         def recordout(output):
                             r.newpart('output', data=output, mandatory=False)
                 tr.close()
-            except Exception, exc:
+            except BaseException, exc:
                 exc.duringunbundle2 = True
                 if captureoutput and r is not None:
                     parts = exc._bundle2salvagedoutput = r.salvageoutput()