changeset 1072:05dc7aba22eb

Fixes for push corner case

TAH found a bug where push would push things the remote already had,
raising an assertion. This turned out to be because the changeset
protocol was not recording a common subset node in one case.

Also discovered was that the protocol was queueing multiple copies of
a node for pull. Fixed by changing fetch to a hash.

Add some more debugging output.

--- a/mercurial/hg.py	Fri Aug 26 14:05:52 2005 -0700
+++ b/mercurial/hg.py	Fri Aug 26 16:49:23 2005 -0700
@@ -1310,7 +1310,7 @@
     def findincoming(self, remote, base=None, heads=None):
         m = self.changelog.nodemap
         search = []
-        fetch = []
+        fetch = {}
         seen = {}
         seenbranch = {}
         if base == None:
@@ -1364,7 +1364,7 @@
                         if n[2] in m and n[3] in m:
                             self.ui.debug("found new changeset %s\n" %
                                           short(n[1]))
-                            fetch.append(n[1]) # earliest unknown
+                            fetch[n[1]] = 1 # earliest unknown
                             base[n[2]] = 1 # latest known
                             continue
 
@@ -1383,7 +1383,10 @@
                     for b in remote.branches(r[p:p+10]):
                         self.ui.debug("received %s:%s\n" %
                                       (short(b[0]), short(b[1])))
-                        if b[0] not in m and b[0] not in seen:
+                        if b[0] in m:
+                            self.ui.debug("found base node %s\n" % short(b[0]))
+                            base[b[0]] = 1
+                        elif b[0] not in seen:
                             unknown.append(b)
 
         # do binary search on the branches we found
@@ -1400,7 +1403,7 @@
                     if f <= 2:
                         self.ui.debug("found new branch changeset %s\n" %
                                           short(p))
-                        fetch.append(p)
+                        fetch[p] = 1
                         base[i] = 1
                     else:
                         self.ui.debug("narrowed branch search to %s:%s\n"
@@ -1410,25 +1413,28 @@
                 p, f = i, f * 2
 
         # sanity check our fetch list
-        for f in fetch:
+        for f in fetch.keys():
             if f in m:
                 raise RepoError("already have changeset " + short(f[:4]))
 
         if base.keys() == [nullid]:
             self.ui.warn("warning: pulling from an unrelated repository!\n")
 
-        self.ui.note("adding new changesets starting at " +
+        self.ui.note("found new changesets starting at " +
                      " ".join([short(f) for f in fetch]) + "\n")
 
         self.ui.debug("%d total queries\n" % reqcnt)
 
-        return fetch
+        return fetch.keys()
 
     def findoutgoing(self, remote, base=None, heads=None):
         if base == None:
             base = {}
             self.findincoming(remote, base, heads)
 
+        self.ui.debug("common changesets up to "
+                      + " ".join(map(short, base.keys())) + "\n")
+
         remain = dict.fromkeys(self.changelog.nodemap)
 
         # prune everything remote has from the tree