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.

mercurial/setdiscovery.py

@@ -138,22 +138,12 b' def findcommonheads(ui, local, remote,'
     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 = []
 
     if cl.tip() == nullid:
         if srvheadhashes != [nullid]: