Show More
@@ -455,19 +455,21 b' def getremotechanges(ui, repo, other, on' | |||||
455 | if bundlename or not localrepo: |
|
455 | if bundlename or not localrepo: | |
456 | # create a bundle (uncompressed if other repo is not local) |
|
456 | # create a bundle (uncompressed if other repo is not local) | |
457 |
|
457 | |||
458 | if other.capable('getbundle'): |
|
458 | if True: | |
459 | cg = other.getbundle('incoming', common=common, heads=rheads) |
|
459 | if other.capable('getbundle'): | |
460 | elif onlyheads is None and not other.capable('changegroupsubset'): |
|
460 | cg = other.getbundle('incoming', common=common, heads=rheads) | |
461 | # compat with older servers when pulling all remote heads |
|
461 | elif onlyheads is None and not other.capable('changegroupsubset'): | |
462 | cg = other.changegroup(incoming, "incoming") |
|
462 | # compat with older servers when pulling all remote heads | |
463 | rheads = None |
|
463 | cg = other.changegroup(incoming, "incoming") | |
464 | else: |
|
464 | rheads = None | |
465 | cg = other.changegroupsubset(incoming, rheads, 'incoming') |
|
465 | else: | |
466 | if localrepo: |
|
466 | cg = other.changegroupsubset(incoming, rheads, 'incoming') | |
467 | bundletype = "HG10BZ" |
|
467 | if localrepo: | |
468 | else: |
|
468 | bundletype = "HG10BZ" | |
469 | bundletype = "HG10UN" |
|
469 | else: | |
470 | fname = bundle = changegroup.writebundle(ui, cg, bundlename, bundletype) |
|
470 | bundletype = "HG10UN" | |
|
471 | fname = bundle = changegroup.writebundle(ui, cg, bundlename, | |||
|
472 | bundletype) | |||
471 | # keep written bundle? |
|
473 | # keep written bundle? | |
472 | if bundlename: |
|
474 | if bundlename: | |
473 | bundle = None |
|
475 | bundle = None |
General Comments 0
You need to be logged in to leave comments.
Login now