equal
deleted
inserted
replaced
65 remote, |
65 remote, |
66 abortwhenunrelated=not force, |
66 abortwhenunrelated=not force, |
67 ancestorsof=ancestorsof, |
67 ancestorsof=ancestorsof, |
68 ) |
68 ) |
69 common, anyinc, srvheads = res |
69 common, anyinc, srvheads = res |
|
70 if heads and not anyinc: |
|
71 # server could be lying on the advertised heads |
|
72 has_node = repo.changelog.hasnode |
|
73 anyinc = any(not has_node(n) for n in heads) |
70 return (list(common), anyinc, heads or list(srvheads)) |
74 return (list(common), anyinc, heads or list(srvheads)) |
71 |
75 |
72 |
76 |
73 class outgoing(object): |
77 class outgoing(object): |
74 '''Represents the set of nodes present in a local repo but not in a |
78 '''Represents the set of nodes present in a local repo but not in a |