mercurial/exchangev2.py
changeset 43546 a166fadf5c3b
parent 43117 8ff1ecfadcd1
child 45117 b1e51ef4e536
equal deleted inserted replaced
43545:9c1f4e2f1fc4 43546:a166fadf5c3b
   289 
   289 
   290     # If a remote head is filtered locally, put it back in the common set.
   290     # If a remote head is filtered locally, put it back in the common set.
   291     # See the comment in exchange._pulldiscoverychangegroup() for more.
   291     # See the comment in exchange._pulldiscoverychangegroup() for more.
   292 
   292 
   293     if fetch and remoteheads:
   293     if fetch and remoteheads:
   294         nodemap = repo.unfiltered().changelog.nodemap
   294         has_node = repo.unfiltered().changelog.index.has_node
   295 
   295 
   296         common |= {head for head in remoteheads if head in nodemap}
   296         common |= {head for head in remoteheads if has_node(head)}
   297 
   297 
   298         if set(remoteheads).issubset(common):
   298         if set(remoteheads).issubset(common):
   299             fetch = []
   299             fetch = []
   300 
   300 
   301     common.discard(nullid)
   301     common.discard(nullid)