Mercurial > hg
changeset 25914:4d77e89652ad
discovery: always use batching now that all peers support batching
Some peers will transparently downgrade batched requests to
non-batched ones, but that simplifies code for everyone using
batching.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 05 Aug 2015 14:21:46 -0400 |
| parents | fa14ba7b9667 |
| children | 7ef98b38163f |
| files | mercurial/setdiscovery.py |
| diffstat | 1 files changed, 6 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/setdiscovery.py Wed Aug 05 14:15:17 2015 -0400 +++ b/mercurial/setdiscovery.py Wed Aug 05 14:21:46 2015 -0400 @@ -138,22 +138,12 @@ sample = _limitsample(ownheads, initialsamplesize) # indices between sample and externalized version must match sample = list(sample) - if remote.local(): - # stopgap until we have a proper localpeer that supports batch() - srvheadhashes = remote.heads() - yesno = remote.known(dag.externalizeall(sample)) - elif remote.capable('batch'): - batch = remote.batch() - srvheadhashesref = batch.heads() - yesnoref = batch.known(dag.externalizeall(sample)) - batch.submit() - srvheadhashes = srvheadhashesref.value - yesno = yesnoref.value - else: - # compatibility with pre-batch, but post-known remotes during 1.9 - # development - srvheadhashes = remote.heads() - sample = [] + batch = remote.batch() + srvheadhashesref = batch.heads() + yesnoref = batch.known(dag.externalizeall(sample)) + batch.submit() + srvheadhashes = srvheadhashesref.value + yesno = yesnoref.value if cl.tip() == nullid: if srvheadhashes != [nullid]: