This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2644

setdiscovery: remove initialsamplesize from a condition
ClosedPublic

Authored by martinvonz on Mar 4 2018, 11:58 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGbf485b70d0ae: setdiscovery: remove initialsamplesize from a condition
Summary

It seems more direct to compare the actual sample size. That way we
can change the sample taken earlier in the code without breaking the
condition.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 4 2018, 11:58 AM
indygreg accepted this revision.Mar 4 2018, 2:21 PM
This revision is now accepted and ready to land.Mar 4 2018, 2:21 PM
Closed by commit rHGbf485b70d0ae: setdiscovery: remove initialsamplesize from a condition (authored by martinvonz). · Explain WhyMar 4 2018, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/setdiscovery.py (2 lines)

Diff 6594

mercurial/setdiscovery.py

# compatibility reasons) # compatibility reasons)
ui.status(_("searching for changes\n")) ui.status(_("searching for changes\n"))
srvheads = dag.internalizeall(srvheadhashes, filterunknown=True) srvheads = dag.internalizeall(srvheadhashes, filterunknown=True)
if len(srvheads) == len(srvheadhashes): if len(srvheads) == len(srvheadhashes):
ui.debug("all remote heads known locally\n") ui.debug("all remote heads known locally\n")
return (srvheadhashes, False, srvheadhashes,) return (srvheadhashes, False, srvheadhashes,)
if sample and len(ownheads) <= initialsamplesize and all(yesno): if len(sample) == len(ownheads) and all(yesno):
ui.note(_("all local heads known remotely\n")) ui.note(_("all local heads known remotely\n"))
ownheadhashes = dag.externalizeall(ownheads) ownheadhashes = dag.externalizeall(ownheads)
return (ownheadhashes, True, srvheadhashes,) return (ownheadhashes, True, srvheadhashes,)
# full blown discovery # full blown discovery
# own nodes I know we both know # own nodes I know we both know
# treat remote heads (and maybe own heads) as a first implicit sample # treat remote heads (and maybe own heads) as a first implicit sample