Mercurial > public > mercurial-scm > hg-stable

diff mercurial/exchange.py @ 25182:ee665d3bf6dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: catch down to BaseException when handling bundle2 We can now catch more things.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 18 May 2015 15:33:21 -0500
parents 3f0744eeaeaf
children 472a685a4961
line wrap: on
line diff
--- 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()