##// END OF EJS Templates
bundle2: include stderr when capturing handlers output...
Pierre-Yves David -
r21133:bef4a2ad default
parent child Browse files
Show More
@@ -309,7 +309,7 b' def processbundle(repo, unbundler, trans'
309 # itself represents a defect of a different variety).
309 # itself represents a defect of a different variety).
310 output = None
310 output = None
311 if op.reply is not None:
311 if op.reply is not None:
312 op.ui.pushbuffer()
312 op.ui.pushbuffer(error=True)
313 output = ''
313 output = ''
314 try:
314 try:
315 handler(op, part)
315 handler(op, part)
@@ -37,6 +37,7 b' Create an extension to test bundle2 API'
37 > def pinghandler(op, part):
37 > def pinghandler(op, part):
38 > op.ui.write('received ping request (id %i)\n' % part.id)
38 > op.ui.write('received ping request (id %i)\n' % part.id)
39 > if op.reply is not None:
39 > if op.reply is not None:
40 > op.ui.write_err('replying to ping request (id %i)\n' % part.id)
40 > rpart = bundle2.bundlepart('test:pong',
41 > rpart = bundle2.bundlepart('test:pong',
41 > [('in-reply-to', str(part.id))])
42 > [('in-reply-to', str(part.id))])
42 > op.reply.addpart(rpart)
43 > op.reply.addpart(rpart)
@@ -509,7 +510,8 b' The reply is a bundle'
509 Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko
510 Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko
510 Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko
511 Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko
511 Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko.
512 Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko.
512 \x00\x00\x00\x00\x00\x1e test:pong\x00\x00\x00\x01\x01\x00\x0b\x01in-reply-to5\x00\x00\x00\x00\x00\x1b\x06output\x00\x00\x00\x02\x00\x01\x0b\x01in-reply-to5\x00\x00\x00\x1dreceived ping request (id 5) (esc)
513 \x00\x00\x00\x00\x00\x1e test:pong\x00\x00\x00\x01\x01\x00\x0b\x01in-reply-to5\x00\x00\x00\x00\x00\x1b\x06output\x00\x00\x00\x02\x00\x01\x0b\x01in-reply-to5\x00\x00\x00=received ping request (id 5) (esc)
514 replying to ping request (id 5)
513 \x00\x00\x00\x00\x00\x00 (no-eol) (esc)
515 \x00\x00\x00\x00\x00\x00 (no-eol) (esc)
514
516
515 The reply is valid
517 The reply is valid
@@ -527,7 +529,7 b' The reply is valid'
527 :output:
529 :output:
528 mandatory: 0
530 mandatory: 0
529 advisory: 1
531 advisory: 1
530 payload: 29 bytes
532 payload: 61 bytes
531 parts count: 3
533 parts count: 3
532
534
533 Unbundle the reply to get the output:
535 Unbundle the reply to get the output:
@@ -538,6 +540,7 b' Unbundle the reply to get the output:'
538 remote: Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko
540 remote: Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko
539 remote: Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko.
541 remote: Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko.
540 remote: received ping request (id 5)
542 remote: received ping request (id 5)
543 remote: replying to ping request (id 5)
541 0 unread bytes
544 0 unread bytes
542
545
543 Support for changegroup
546 Support for changegroup
General Comments 0
You need to be logged in to leave comments. Login now