Show More
@@ -540,17 +540,26 b' def getremotechanges(ui, repo, peer, onl' | |||
|
540 | 540 | and peer.capable('getbundle') |
|
541 | 541 | and peer.capable('bundle2')) |
|
542 | 542 | if canbundle2: |
|
543 | kwargs = {} | |
|
544 | kwargs[r'common'] = common | |
|
545 | kwargs[r'heads'] = rheads | |
|
546 | kwargs[r'bundlecaps'] = exchange.caps20to10(repo, role='client') | |
|
547 | kwargs[r'cg'] = True | |
|
548 | b2 = peer.getbundle('incoming', **kwargs) | |
|
549 | fname = bundle = changegroup.writechunks(ui, b2._forwardchunks(), | |
|
550 | bundlename) | |
|
543 | with peer.commandexecutor() as e: | |
|
544 | b2 = e.callcommand('getbundle', { | |
|
545 | 'source': 'incoming', | |
|
546 | 'common': common, | |
|
547 | 'heads': rheads, | |
|
548 | 'bundlecaps': exchange.caps20to10(repo, role='client'), | |
|
549 | 'cg': True, | |
|
550 | }).result() | |
|
551 | ||
|
552 | fname = bundle = changegroup.writechunks(ui, | |
|
553 | b2._forwardchunks(), | |
|
554 | bundlename) | |
|
551 | 555 | else: |
|
552 | 556 | if peer.capable('getbundle'): |
|
553 | cg = peer.getbundle('incoming', common=common, heads=rheads) | |
|
557 | with peer.commandexecutor() as e: | |
|
558 | cg = e.callcommand('getbundle', { | |
|
559 | 'source': 'incoming', | |
|
560 | 'common': common, | |
|
561 | 'heads': rheads, | |
|
562 | }).result() | |
|
554 | 563 | elif onlyheads is None and not peer.capable('changegroupsubset'): |
|
555 | 564 | # compat with older servers when pulling all remote heads |
|
556 | 565 | |
@@ -594,7 +603,11 b' def getremotechanges(ui, repo, peer, onl' | |||
|
594 | 603 | |
|
595 | 604 | if bundlerepo: |
|
596 | 605 | reponodes = [ctx.node() for ctx in bundlerepo[bundlerepo.firstnewrev:]] |
|
597 | remotephases = peer.listkeys('phases') | |
|
606 | ||
|
607 | with peer.commandexecutor() as e: | |
|
608 | remotephases = e.callcommand('listkeys', { | |
|
609 | 'namespace': 'phases', | |
|
610 | }).result() | |
|
598 | 611 | |
|
599 | 612 | pullop = exchange.pulloperation(bundlerepo, peer, heads=reponodes) |
|
600 | 613 | pullop.trmanager = bundletransactionmanager() |
General Comments 0
You need to be logged in to leave comments.
Login now