Show More
@@ -328,13 +328,14 b' def processbundle(repo, unbundler, trans' | |||
|
328 | 328 | msg.append(' with-transaction') |
|
329 | 329 | msg.append('\n') |
|
330 | 330 | repo.ui.debug(''.join(msg)) |
|
331 | iterparts = unbundler.iterparts() | |
|
331 | iterparts = enumerate(unbundler.iterparts()) | |
|
332 | 332 | part = None |
|
333 | nbpart = 0 | |
|
333 | 334 | try: |
|
334 | for part in iterparts: | |
|
335 | for nbpart, part in iterparts: | |
|
335 | 336 | _processpart(op, part) |
|
336 | 337 | except BaseException, exc: |
|
337 | for part in iterparts: | |
|
338 | for nbpart, part in iterparts: | |
|
338 | 339 | # consume the bundle content |
|
339 | 340 | part.seek(0, 2) |
|
340 | 341 | # Small hack to let caller code distinguish exceptions from bundle2 |
@@ -348,6 +349,9 b' def processbundle(repo, unbundler, trans' | |||
|
348 | 349 | salvaged = op.reply.salvageoutput() |
|
349 | 350 | exc._bundle2salvagedoutput = salvaged |
|
350 | 351 | raise |
|
352 | finally: | |
|
353 | repo.ui.debug('bundle2-input-bundle: %i parts total\n' % nbpart) | |
|
354 | ||
|
351 | 355 | return op |
|
352 | 356 | |
|
353 | 357 | def _processpart(op, part): |
General Comments 0
You need to be logged in to leave comments.
Login now