equal
deleted
inserted
replaced
539 canbundle2 = (not forcebundle1 |
539 canbundle2 = (not forcebundle1 |
540 and other.capable('getbundle') |
540 and other.capable('getbundle') |
541 and other.capable('bundle2')) |
541 and other.capable('bundle2')) |
542 if canbundle2: |
542 if canbundle2: |
543 kwargs = {} |
543 kwargs = {} |
544 kwargs['common'] = common |
544 kwargs[r'common'] = common |
545 kwargs['heads'] = rheads |
545 kwargs[r'heads'] = rheads |
546 kwargs['bundlecaps'] = exchange.caps20to10(repo) |
546 kwargs[r'bundlecaps'] = exchange.caps20to10(repo) |
547 kwargs['cg'] = True |
547 kwargs[r'cg'] = True |
548 b2 = other.getbundle('incoming', **kwargs) |
548 b2 = other.getbundle('incoming', **kwargs) |
549 fname = bundle = changegroup.writechunks(ui, b2._forwardchunks(), |
549 fname = bundle = changegroup.writechunks(ui, b2._forwardchunks(), |
550 bundlename) |
550 bundlename) |
551 else: |
551 else: |
552 if other.capable('getbundle'): |
552 if other.capable('getbundle'): |