--- a/mercurial/bundle2.py	Mon May 18 13:20:19 2015 -0500
+++ b/mercurial/bundle2.py	Mon May 18 13:23:14 2015 -0500
@@ -315,7 +315,7 @@
     try:
         for part in iterparts:
             _processpart(op, part)
-    except Exception, exc:
+    except BaseException, exc:
         for part in iterparts:
             # consume the bundle content
             part.seek(0, 2)
@@ -762,7 +762,7 @@
             for chunk in self._payloadchunks():
                 yield _pack(_fpayloadsize, len(chunk))
                 yield chunk
-        except Exception, exc:
+        except BaseException, exc:
             # backup exception data for later
             exc_info = sys.exc_info()
             msg = 'unexpected error: %s' % exc