Show More
@@ -532,12 +532,15 b' def _pullbundle2(pullop):' | |||
|
532 | 532 | """pull data using bundle2 |
|
533 | 533 | |
|
534 | 534 | For now, the only supported data are changegroup.""" |
|
535 | remotecaps = bundle2.bundle2caps(pullop.remote) | |
|
535 | 536 | kwargs = {'bundlecaps': caps20to10(pullop.repo)} |
|
536 | 537 | # pulling changegroup |
|
537 | 538 | pullop.todosteps.remove('changegroup') |
|
538 | 539 | |
|
539 | 540 | kwargs['common'] = pullop.common |
|
540 | 541 | kwargs['heads'] = pullop.heads or pullop.rheads |
|
542 | if 'b2x:listkeys' in remotecaps: | |
|
543 | kwargs['listkeys'] = ['phase'] | |
|
541 | 544 | if not pullop.fetch: |
|
542 | 545 | pullop.repo.ui.status(_("no changes found\n")) |
|
543 | 546 | pullop.cgresult = 0 |
@@ -557,6 +560,11 b' def _pullbundle2(pullop):' | |||
|
557 | 560 | assert len(op.records['changegroup']) == 1 |
|
558 | 561 | pullop.cgresult = op.records['changegroup'][0]['return'] |
|
559 | 562 | |
|
563 | # processing phases change | |
|
564 | for namespace, value in op.records['listkeys']: | |
|
565 | if namespace == 'phases': | |
|
566 | _pullapplyphases(pullop, value) | |
|
567 | ||
|
560 | 568 | def _pullbundle2extraprepare(pullop, kwargs): |
|
561 | 569 | """hook function so that extensions can extend the getbundle call""" |
|
562 | 570 | pass |
General Comments 0
You need to be logged in to leave comments.
Login now