Show More
@@ -1558,25 +1558,18 b' class localrepository(repo.repository):' | |||||
1558 |
|
1558 | |||
1559 | if remote_heads != [nullid]: |
|
1559 | if remote_heads != [nullid]: | |
1560 | if remote.capable('branchmap'): |
|
1560 | if remote.capable('branchmap'): | |
1561 |
|
|
1561 | remotebrheads = remote.branchmap() | |
|
1562 | ||||
1562 | if not revs: |
|
1563 | if not revs: | |
1563 | localhds = self.branchmap() |
|
1564 | localbrheads = self.branchmap() | |
1564 | else: |
|
1565 | else: | |
|
1566 | localbrheads = {} | |||
1565 | for n in heads: |
|
1567 | for n in heads: | |
1566 | branch = self[n].branch() |
|
1568 | branch = self[n].branch() | |
1567 |
|
|
1569 | localbrheads.setdefault(branch, []).append(n) | |
1568 | localhds[branch].append(n) |
|
|||
1569 | else: |
|
|||
1570 | localhds[branch] = [n] |
|
|||
1571 |
|
||||
1572 | remotehds = remote.branchmap() |
|
|||
1573 |
|
1570 | |||
1574 | for lh in localhds: |
|
1571 | for branch, lheads in localbrheads.iteritems(): | |
1575 |
|
|
1572 | rheads = remotebrheads.get(branch, []) | |
1576 | rheads = remotehds[lh] |
|
|||
1577 | else: |
|
|||
1578 | rheads = [] |
|
|||
1579 | lheads = localhds[lh] |
|
|||
1580 | if not checkbranch(lheads, rheads, update): |
|
1573 | if not checkbranch(lheads, rheads, update): | |
1581 | return None, 0 |
|
1574 | return None, 0 | |
1582 | else: |
|
1575 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now