# HG changeset patch # User Pierre-Yves David # Date 2015-05-18 18:23:14 # Node ID d26703eb3dc5782af51fb99b1bb5837765317bd2 # Parent 3ff2a5dc7c20568f07016abdb8a5156e5b56366d bundle2: use BaseException in bundle2 We can ensure we fail over properly in more cases. diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -315,7 +315,7 @@ def processbundle(repo, unbundler, trans 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 @@ class bundlepart(object): 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