Show More
@@ -318,6 +318,10 b' def processbundle(repo, unbundler, trans' | |||
|
318 | 318 | # type of bundle. We should probably clean up or drop this return code |
|
319 | 319 | # craziness in a future version. |
|
320 | 320 | exc.duringunbundle2 = True |
|
321 | salvaged = [] | |
|
322 | if op.reply is not None: | |
|
323 | salvaged = op.reply.salvageoutput() | |
|
324 | exc._bundle2salvagedoutput = salvaged | |
|
321 | 325 | raise |
|
322 | 326 | return op |
|
323 | 327 |
@@ -1288,6 +1288,7 b' def unbundle(repo, cg, heads, source, ur' | |||
|
1288 | 1288 | check_heads(repo, heads, 'uploading changes') |
|
1289 | 1289 | # push can proceed |
|
1290 | 1290 | if util.safehasattr(cg, 'params'): |
|
1291 | r = None | |
|
1291 | 1292 | try: |
|
1292 | 1293 | wlock = repo.wlock() |
|
1293 | 1294 | lock = repo.lock() |
@@ -1299,6 +1300,8 b' def unbundle(repo, cg, heads, source, ur' | |||
|
1299 | 1300 | tr.close() |
|
1300 | 1301 | except Exception, exc: |
|
1301 | 1302 | exc.duringunbundle2 = True |
|
1303 | if r is not None: | |
|
1304 | exc._bundle2salvagedoutput = r.salvageoutput() | |
|
1302 | 1305 | raise |
|
1303 | 1306 | else: |
|
1304 | 1307 | lock = repo.lock() |
General Comments 0
You need to be logged in to leave comments.
Login now