Show More
@@ -325,10 +325,8 b' def processbundle(repo, unbundler, trans' | |||||
325 | if output is not None: |
|
325 | if output is not None: | |
326 | output = op.ui.popbuffer() |
|
326 | output = op.ui.popbuffer() | |
327 | if output: |
|
327 | if output: | |
328 | op.reply.newpart('b2x:output', |
|
328 | outpart = op.reply.newpart('b2x:output', data=output) | |
329 | advisoryparams=[('in-reply-to', |
|
329 | outpart.addparam('in-reply-to', str(part.id), mandatory=False) | |
330 | str(part.id))], |
|
|||
331 | data=output) |
|
|||
332 | part.read() |
|
330 | part.read() | |
333 | except Exception, exc: |
|
331 | except Exception, exc: | |
334 | if part is not None: |
|
332 | if part is not None: | |
@@ -769,9 +767,9 b' def handlechangegroup(op, inpart):' | |||||
769 | if op.reply is not None: |
|
767 | if op.reply is not None: | |
770 | # This is definitly not the final form of this |
|
768 | # This is definitly not the final form of this | |
771 | # return. But one need to start somewhere. |
|
769 | # return. But one need to start somewhere. | |
772 |
op.reply.newpart('b2x:reply:changegroup' |
|
770 | part = op.reply.newpart('b2x:reply:changegroup') | |
773 |
|
|
771 | part.addparam('in-reply-to', str(inpart.id), mandatory=False) | |
774 | ('return', '%i' % ret)]) |
|
772 | part.addparam('return', '%i' % ret, mandatory=False) | |
775 | assert not inpart.read() |
|
773 | assert not inpart.read() | |
776 |
|
774 | |||
777 | @parthandler('b2x:reply:changegroup') |
|
775 | @parthandler('b2x:reply:changegroup') |
General Comments 0
You need to be logged in to leave comments.
Login now