Show More
@@ -314,9 +314,6 b' def findcommonheads(' | |||||
314 | else: |
|
314 | else: | |
315 | ownheads = [rev for rev in cl.headrevs() if rev != nullrev] |
|
315 | ownheads = [rev for rev in cl.headrevs() if rev != nullrev] | |
316 |
|
316 | |||
317 | # early exit if we know all the specified remote heads already |
|
|||
318 | ui.debug(b"query 1; heads\n") |
|
|||
319 | roundtrips += 1 |
|
|||
320 | # We also ask remote about all the local heads. That set can be arbitrarily |
|
317 | # We also ask remote about all the local heads. That set can be arbitrarily | |
321 | # large, so we used to limit it size to `initialsamplesize`. We no longer |
|
318 | # large, so we used to limit it size to `initialsamplesize`. We no longer | |
322 | # do as it proved counter productive. The skipped heads could lead to a |
|
319 | # do as it proved counter productive. The skipped heads could lead to a | |
@@ -375,6 +372,8 b' def findcommonheads(' | |||||
375 | else: |
|
372 | else: | |
376 | sample = ownheads |
|
373 | sample = ownheads | |
377 |
|
374 | |||
|
375 | ui.debug(b"query 1; heads\n") | |||
|
376 | roundtrips += 1 | |||
378 | with remote.commandexecutor() as e: |
|
377 | with remote.commandexecutor() as e: | |
379 | fheads = e.callcommand(b'heads', {}) |
|
378 | fheads = e.callcommand(b'heads', {}) | |
380 | fknown = e.callcommand( |
|
379 | fknown = e.callcommand( | |
@@ -409,6 +408,7 b' def findcommonheads(' | |||||
409 | except error.LookupError: |
|
408 | except error.LookupError: | |
410 | continue |
|
409 | continue | |
411 |
|
410 | |||
|
411 | # early exit if we know all the specified remote heads already | |||
412 | if len(knownsrvheads) == len(srvheadhashes): |
|
412 | if len(knownsrvheads) == len(srvheadhashes): | |
413 | ui.debug(b"all remote heads known locally\n") |
|
413 | ui.debug(b"all remote heads known locally\n") | |
414 | return srvheadhashes, False, srvheadhashes |
|
414 | return srvheadhashes, False, srvheadhashes |
General Comments 0
You need to be logged in to leave comments.
Login now