Show More
@@ -359,23 +359,43 b' def _processpart(op, part):' | |||
|
359 | 359 | |
|
360 | 360 | The part is guaranteed to have been fully consumed when the function exits |
|
361 | 361 | (even if an exception is raised).""" |
|
362 | status = 'unknown' # used by debug output | |
|
362 | 363 | try: |
|
363 | 364 | try: |
|
364 | 365 | handler = parthandlermapping.get(part.type) |
|
365 | 366 | if handler is None: |
|
367 | status = 'unsupported-type' | |
|
366 | 368 | raise error.UnsupportedPartError(parttype=part.type) |
|
367 | 369 | indebug(op.ui, 'found a handler for part %r' % part.type) |
|
368 | 370 | unknownparams = part.mandatorykeys - handler.params |
|
369 | 371 | if unknownparams: |
|
370 | 372 | unknownparams = list(unknownparams) |
|
371 | 373 | unknownparams.sort() |
|
374 | status = 'unsupported-params (%s)' % unknownparams | |
|
372 | 375 | raise error.UnsupportedPartError(parttype=part.type, |
|
373 | 376 | params=unknownparams) |
|
377 | status = 'supported' | |
|
374 | 378 | except error.UnsupportedPartError, exc: |
|
375 | 379 | if part.mandatory: # mandatory parts |
|
376 | 380 | raise |
|
377 | 381 | indebug(op.ui, 'ignoring unsupported advisory part %s' % exc) |
|
378 | 382 | return # skip to part processing |
|
383 | finally: | |
|
384 | if op.ui.debugflag: | |
|
385 | msg = ['bundle2-input-part: "%s"' % part.type] | |
|
386 | if not part.mandatory: | |
|
387 | msg.append(' (advisory)') | |
|
388 | nbmp = len(part.mandatorykeys) | |
|
389 | nbap = len(part.params) - nbmp | |
|
390 | if nbmp or nbap: | |
|
391 | msg.append(' (params:') | |
|
392 | if nbmp: | |
|
393 | msg.append(' %i mandatory' % nbmp) | |
|
394 | if nbap: | |
|
395 | msg.append(' %i advisory' % nbmp) | |
|
396 | msg.append(')') | |
|
397 | msg.append(' %s\n' % status) | |
|
398 | op.ui.debug(''.join(msg)) | |
|
379 | 399 | |
|
380 | 400 | # handler is called outside the above try block so that we don't |
|
381 | 401 | # risk catching KeyErrors from anything other than the |
@@ -557,18 +557,21 b' Process the bundle' | |||
|
557 | 557 | bundle2-input: part id: "0" |
|
558 | 558 | bundle2-input: part parameters: 0 |
|
559 | 559 | bundle2-input: ignoring unsupported advisory part test:empty |
|
560 | bundle2-input-part: "test:empty" (advisory) unsupported-type | |
|
560 | 561 | bundle2-input: payload chunk size: 0 |
|
561 | 562 | bundle2-input: part header size: 17 |
|
562 | 563 | bundle2-input: part type: "test:empty" |
|
563 | 564 | bundle2-input: part id: "1" |
|
564 | 565 | bundle2-input: part parameters: 0 |
|
565 | 566 | bundle2-input: ignoring unsupported advisory part test:empty |
|
567 | bundle2-input-part: "test:empty" (advisory) unsupported-type | |
|
566 | 568 | bundle2-input: payload chunk size: 0 |
|
567 | 569 | bundle2-input: part header size: 16 |
|
568 | 570 | bundle2-input: part type: "test:song" |
|
569 | 571 | bundle2-input: part id: "2" |
|
570 | 572 | bundle2-input: part parameters: 0 |
|
571 | 573 | bundle2-input: found a handler for part 'test:song' |
|
574 | bundle2-input-part: "test:song" (advisory) supported | |
|
572 | 575 | The choir starts singing: |
|
573 | 576 | bundle2-input: payload chunk size: 178 |
|
574 | 577 | bundle2-input: payload chunk size: 0 |
@@ -580,6 +583,7 b' Process the bundle' | |||
|
580 | 583 | bundle2-input: part id: "3" |
|
581 | 584 | bundle2-input: part parameters: 0 |
|
582 | 585 | bundle2-input: found a handler for part 'test:debugreply' |
|
586 | bundle2-input-part: "test:debugreply" (advisory) supported | |
|
583 | 587 | debugreply: no reply |
|
584 | 588 | bundle2-input: payload chunk size: 0 |
|
585 | 589 | bundle2-input: part header size: 43 |
@@ -587,6 +591,7 b' Process the bundle' | |||
|
587 | 591 | bundle2-input: part id: "4" |
|
588 | 592 | bundle2-input: part parameters: 3 |
|
589 | 593 | bundle2-input: ignoring unsupported advisory part test:math |
|
594 | bundle2-input-part: "test:math" (advisory) (params: 2 mandatory 2 advisory) unsupported-type | |
|
590 | 595 | bundle2-input: payload chunk size: 2 |
|
591 | 596 | bundle2-input: payload chunk size: 0 |
|
592 | 597 | bundle2-input: part header size: 29 |
@@ -595,12 +600,14 b' Process the bundle' | |||
|
595 | 600 | bundle2-input: part parameters: 1 |
|
596 | 601 | bundle2-input: found a handler for part 'test:song' |
|
597 | 602 | bundle2-input: ignoring unsupported advisory part test:song - randomparam |
|
603 | bundle2-input-part: "test:song" (advisory) (params: 1 mandatory) unsupported-params (['randomparam']) | |
|
598 | 604 | bundle2-input: payload chunk size: 0 |
|
599 | 605 | bundle2-input: part header size: 16 |
|
600 | 606 | bundle2-input: part type: "test:ping" |
|
601 | 607 | bundle2-input: part id: "6" |
|
602 | 608 | bundle2-input: part parameters: 0 |
|
603 | 609 | bundle2-input: found a handler for part 'test:ping' |
|
610 | bundle2-input-part: "test:ping" (advisory) supported | |
|
604 | 611 | received ping request (id 6) |
|
605 | 612 | bundle2-input: payload chunk size: 0 |
|
606 | 613 | bundle2-input: part header size: 0 |
General Comments 0
You need to be logged in to leave comments.
Login now