Show More
@@ -1679,13 +1679,13 class localrepository(repo.repository): | |||||
1679 | # We can pick: |
|
1679 | # We can pick: | |
1680 | # * missingheads part of comon (::commonheads) |
|
1680 | # * missingheads part of comon (::commonheads) | |
1681 | common = set(outgoing.common) |
|
1681 | common = set(outgoing.common) | |
1682 | cheads = [n for node in revs if n in common] |
|
1682 | cheads = [node for node in revs if node in common] | |
1683 | # and |
|
1683 | # and | |
1684 | # * commonheads parents on missing |
|
1684 | # * commonheads parents on missing | |
1685 |
rvset = |
|
1685 | revset = self.set('%ln and parents(roots(%ln))', | |
1686 |
|
|
1686 | outgoing.commonheads, | |
1687 |
|
|
1687 | outgoing.missing) | |
1688 | cheads.extend(c.node() for c in rvset) |
|
1688 | cheads.extend(c.node() for c in revset) | |
1689 | # even when we don't push, exchanging phase data is useful |
|
1689 | # even when we don't push, exchanging phase data is useful | |
1690 | remotephases = remote.listkeys('phases') |
|
1690 | remotephases = remote.listkeys('phases') | |
1691 | if not remotephases: # old server or public only repo |
|
1691 | if not remotephases: # old server or public only repo |
General Comments 0
You need to be logged in to leave comments.
Login now