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