Mercurial > hg
changeset 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 | eb85d5f89fef |
| children | 7f47873d7484 |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun Jan 29 14:07:45 2012 -0600 +++ b/mercurial/localrepo.py Mon Jan 30 11:15:34 2012 -0600 @@ -1679,13 +1679,13 @@ # We can pick: # * missingheads part of comon (::commonheads) common = set(outgoing.common) - cheads = [n for node in revs if n in common] + cheads = [node for node in revs if node in common] # and # * commonheads parents on missing - rvset = repo.revset('%ln and parents(roots(%ln))', - outgoing.commonheads, - outgoing.missing) - cheads.extend(c.node() for c in rvset) + revset = self.set('%ln and parents(roots(%ln))', + outgoing.commonheads, + outgoing.missing) + cheads.extend(c.node() for c in revset) # even when we don't push, exchanging phase data is useful remotephases = remote.listkeys('phases') if not remotephases: # old server or public only repo