Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
25181:d26703eb3dc5 25182:ee665d3bf6dd
1313 if captureoutput and r is not None: 1313 if captureoutput and r is not None:
1314 repo.ui.pushbuffer(error=True, subproc=True) 1314 repo.ui.pushbuffer(error=True, subproc=True)
1315 def recordout(output): 1315 def recordout(output):
1316 r.newpart('output', data=output, mandatory=False) 1316 r.newpart('output', data=output, mandatory=False)
1317 tr.close() 1317 tr.close()
1318 except Exception, exc: 1318 except BaseException, exc:
1319 exc.duringunbundle2 = True 1319 exc.duringunbundle2 = True
1320 if captureoutput and r is not None: 1320 if captureoutput and r is not None:
1321 parts = exc._bundle2salvagedoutput = r.salvageoutput() 1321 parts = exc._bundle2salvagedoutput = r.salvageoutput()
1322 def recordout(output): 1322 def recordout(output):
1323 part = bundle2.bundlepart('output', data=output, 1323 part = bundle2.bundlepart('output', data=output,