# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2012-01-30 17:15:34
# Node ID 7460f3a1fd6c68f1cc78a144fc9baa27f69bea88
# Parent  eb85d5f89fefee0e989f2a975a5aee30c502d298

push: fix coding errors in unused branch

This branch will get re-enabled in a subsequent fix

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1679,13 +1679,13 @@ class localrepository(repo.repository):
                     # 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