Show More
@@ -168,10 +168,7 b' def checkheads(repo, remote, outgoing, r' | |||
|
168 | 168 | branches = set(repo[n].branch() for n in outgoing.missing) |
|
169 | 169 | |
|
170 | 170 | # 2. Check for new branches on the remote. |
|
171 |
|
|
|
172 | remotemap = phases.visiblebranchmap(remote.local()) | |
|
173 | else: | |
|
174 | remotemap = remote.branchmap() | |
|
171 | remotemap = remote.branchmap() | |
|
175 | 172 | newbranches = branches - set(remotemap) |
|
176 | 173 | if newbranches and not newbranch: # new branch requires --new-branch |
|
177 | 174 | branchnames = ', '.join(sorted(newbranches)) |
@@ -56,10 +56,10 b' class localpeer(peer.peerrepository):' | |||
|
56 | 56 | return self._repo.lookup(key) |
|
57 | 57 | |
|
58 | 58 | def branchmap(self): |
|
59 | return self._repo.branchmap() | |
|
59 | return phases.visiblebranchmap(self._repo) | |
|
60 | 60 | |
|
61 | 61 | def heads(self): |
|
62 |
return self._repo |
|
|
62 | return phases.visibleheads(self._repo) | |
|
63 | 63 | |
|
64 | 64 | def known(self, nodes): |
|
65 | 65 | return self._repo.known(nodes) |
@@ -9,7 +9,6 b'' | |||
|
9 | 9 | from node import nullid |
|
10 | 10 | from i18n import _ |
|
11 | 11 | import random, util, dagutil |
|
12 | import phases | |
|
13 | 12 | |
|
14 | 13 | def _updatesample(dag, nodes, sample, always, quicksamplesize=0): |
|
15 | 14 | # if nodes is empty we scan the entire graph |
@@ -100,7 +99,7 b' def findcommonheads(ui, local, remote,' | |||
|
100 | 99 | sample = ownheads |
|
101 | 100 | if remote.local(): |
|
102 | 101 | # stopgap until we have a proper localpeer that supports batch() |
|
103 |
srvheadhashes = |
|
|
102 | srvheadhashes = remote.heads() | |
|
104 | 103 | yesno = remote.known(dag.externalizeall(sample)) |
|
105 | 104 | elif remote.capable('batch'): |
|
106 | 105 | batch = remote.batch() |
General Comments 0
You need to be logged in to leave comments.
Login now