mercurial/discovery.py
changeset 35849 5cfdf6137af8
parent 35305 483b5dd0f1aa
child 35879 6c1d3779c052
equal deleted inserted replaced
35848:8a7140ec4c89 35849:5cfdf6137af8
    60                 allknown = False
    60                 allknown = False
    61                 break
    61                 break
    62         if allknown:
    62         if allknown:
    63             return (heads, False, heads)
    63             return (heads, False, heads)
    64 
    64 
    65     res = setdiscovery.findcommonheads(repo.ui, repo, remote,
    65     res = setdiscovery.findcommonheads(repo.ui, repo, remote, heads,
    66                                        abortwhenunrelated=not force,
    66                                        abortwhenunrelated=not force,
    67                                        ancestorsof=ancestorsof)
    67                                        ancestorsof=ancestorsof)
    68     common, anyinc, srvheads = res
    68     common, anyinc, srvheads = res
    69     return (list(common), anyinc, heads or list(srvheads))
    69     return (list(common), anyinc, heads or list(srvheads))
    70 
    70