From patchwork Sat Jan 16 00:26:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D9800: discovery: move some debug output closer to were it belong From: phabricator X-Patchwork-Id: 48109 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Sat, 16 Jan 2021 00:26:35 +0000 marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I assume these debug output, increment and comment drifted over time. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9800 AFFECTED FILES mercurial/setdiscovery.py CHANGE DETAILS To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py --- a/mercurial/setdiscovery.py +++ b/mercurial/setdiscovery.py @@ -314,9 +314,6 @@ else: ownheads = [rev for rev in cl.headrevs() if rev != nullrev] - # early exit if we know all the specified remote heads already - ui.debug(b"query 1; heads\n") - roundtrips += 1 # We also ask remote about all the local heads. That set can be arbitrarily # large, so we used to limit it size to `initialsamplesize`. We no longer # do as it proved counter productive. The skipped heads could lead to a @@ -375,6 +372,8 @@ else: sample = ownheads + ui.debug(b"query 1; heads\n") + roundtrips += 1 with remote.commandexecutor() as e: fheads = e.callcommand(b'heads', {}) fknown = e.callcommand( @@ -409,6 +408,7 @@ except error.LookupError: continue + # early exit if we know all the specified remote heads already if len(knownsrvheads) == len(srvheadhashes): ui.debug(b"all remote heads known locally\n") return srvheadhashes, False, srvheadhashes