Show More
@@ -147,12 +147,11 b' def findcommonheads(ui, local, remote,' | |||||
147 | sample = _limitsample(ownheads, initialsamplesize) |
|
147 | sample = _limitsample(ownheads, initialsamplesize) | |
148 | # indices between sample and externalized version must match |
|
148 | # indices between sample and externalized version must match | |
149 | sample = list(sample) |
|
149 | sample = list(sample) | |
150 | batch = remote.batch() |
|
150 | batch = remote.iterbatch() | |
151 |
|
|
151 | batch.heads() | |
152 |
|
|
152 | batch.known(dag.externalizeall(sample)) | |
153 | batch.submit() |
|
153 | batch.submit() | |
154 | srvheadhashes = srvheadhashesref.value |
|
154 | srvheadhashes, yesno = batch.results() | |
155 | yesno = yesnoref.value |
|
|||
156 |
|
155 | |||
157 | if cl.tip() == nullid: |
|
156 | if cl.tip() == nullid: | |
158 | if srvheadhashes != [nullid]: |
|
157 | if srvheadhashes != [nullid]: |
General Comments 0
You need to be logged in to leave comments.
Login now