Mercurial > hg

changeset 637:31e090c34d3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up the broken bits in findoutgoing
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jul 2005 22:21:23 -0800
parents ac0ec421e3a5
children 35f7adfefa69
files mercurial/hg.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Jul 06 22:20:56 2005 -0800
+++ b/mercurial/hg.py	Wed Jul 06 22:21:23 2005 -0800
@@ -977,17 +977,18 @@
 
     def findoutgoing(self, remote):
         base = {}
-        findincoming(self, remote, base)
+        self.findincoming(remote, base)
         remain = dict.fromkeys(self.changelog.nodemap)
 
         # prune everything remote has from the tree
+        del remain[nullid]
         remove = base.keys()
         while remove:
             n = remove.pop(0)
             if n in remain:
                 del remain[n]
                 for p in self.changelog.parents(n):
-                    remain.append(p)
+                    remove.append(p)
 
         # find every node whose parents have been pruned
         subset = []