# HG changeset patch # User Pierre-Yves David # Date 1431981201 18000 # Node ID ee665d3bf6dd057d6d1fb6be684b2be5e7becd4c # Parent d26703eb3dc5782af51fb99b1bb5837765317bd2 exchange: catch down to BaseException when handling bundle2 We can now catch more things. diff -r d26703eb3dc5 -r ee665d3bf6dd mercurial/exchange.py --- a/mercurial/exchange.py Mon May 18 13:23:14 2015 -0500 +++ b/mercurial/exchange.py Mon May 18 15:33:21 2015 -0500 @@ -1315,7 +1315,7 @@ 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()