Show More
@@ -272,18 +272,18 b' def findcommonheads(ui, local, remote,' | |||
|
272 | 272 | # compatibility reasons) |
|
273 | 273 | ui.status(_("searching for changes\n")) |
|
274 | 274 | |
|
275 | srvheads = [] | |
|
275 | knownsrvheads = [] # revnos of remote heads that are known locally | |
|
276 | 276 | for node in srvheadhashes: |
|
277 | 277 | if node == nullid: |
|
278 | 278 | continue |
|
279 | 279 | |
|
280 | 280 | try: |
|
281 | srvheads.append(clrev(node)) | |
|
281 | knownsrvheads.append(clrev(node)) | |
|
282 | 282 | # Catches unknown and filtered nodes. |
|
283 | 283 | except error.LookupError: |
|
284 | 284 | continue |
|
285 | 285 | |
|
286 | if len(srvheads) == len(srvheadhashes): | |
|
286 | if len(knownsrvheads) == len(srvheadhashes): | |
|
287 | 287 | ui.debug("all remote heads known locally\n") |
|
288 | 288 | return srvheadhashes, False, srvheadhashes |
|
289 | 289 | |
@@ -297,7 +297,7 b' def findcommonheads(ui, local, remote,' | |||
|
297 | 297 | disco = partialdiscovery(local, ownheads) |
|
298 | 298 | # treat remote heads (and maybe own heads) as a first implicit sample |
|
299 | 299 | # response |
|
300 | disco.addcommons(srvheads) | |
|
300 | disco.addcommons(knownsrvheads) | |
|
301 | 301 | disco.addinfo(zip(sample, yesno)) |
|
302 | 302 | |
|
303 | 303 | full = False |
@@ -340,7 +340,7 b' def findcommonheads(ui, local, remote,' | |||
|
340 | 340 | ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed)) |
|
341 | 341 | msg = ('found %d common and %d unknown server heads,' |
|
342 | 342 | ' %d roundtrips in %.4fs\n') |
|
343 | missing = set(result) - set(srvheads) | |
|
343 | missing = set(result) - set(knownsrvheads) | |
|
344 | 344 | ui.log('discovery', msg, len(result), len(missing), roundtrips, |
|
345 | 345 | elapsed) |
|
346 | 346 |
General Comments 0
You need to be logged in to leave comments.
Login now