Mercurial > hg
comparison mercurial/localrepo.py @ 16020:7460f3a1fd6c stable
push: fix coding errors in unused branch
This branch will get re-enabled in a subsequent fix
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 30 Jan 2012 11:15:34 -0600 |
| parents | ed9f40bc346f |
| children | 90f8b8dd0326 |
comparison
equal
deleted
inserted
replaced
| 16019:eb85d5f89fef | 16020:7460f3a1fd6c |
|---|---|
| 1677 # missing = ((commonheads::missingheads) - commonheads) | 1677 # missing = ((commonheads::missingheads) - commonheads) |
| 1678 # | 1678 # |
| 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 = repo.revset('%ln and parents(roots(%ln))', | 1685 revset = self.set('%ln and parents(roots(%ln))', |
| 1686 outgoing.commonheads, | 1686 outgoing.commonheads, |
| 1687 outgoing.missing) | 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 |
| 1692 phases.advanceboundary(self, phases.public, cheads) | 1692 phases.advanceboundary(self, phases.public, cheads) |
| 1693 # don't push any phase data as there is nothing to push | 1693 # don't push any phase data as there is nothing to push |