findincoming: build the correct list from the start
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 24 Oct 2008 16:20:53 +0200
changeset 7237 b9bf36905b55
parent 7236 db6fbb785800
child 7238 b1a9ad7b464e
child 7243 a8e4e599e17f
child 7244 127a624406b4
findincoming: build the correct list from the start
mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Oct 24 15:00:40 2008 +0200
+++ b/mercurial/localrepo.py	Fri Oct 24 16:20:53 2008 +0200
@@ -1318,7 +1318,7 @@
                 elif n[1] and n[1] in m: # do we know the base?
                     self.ui.debug(_("found incomplete branch %s:%s\n")
                                   % (short(n[0]), short(n[1])))
-                    search.append(n) # schedule branch range for scanning
+                    search.append(n[0:2]) # schedule branch range for scanning
                     seenbranch[n] = 1
                 else:
                     if n[1] not in seen and n[1] not in fetch:
@@ -1347,7 +1347,6 @@
                         unknown.append(b)
 
         # do binary search on the branches we found
-        search = [(t, b) for (t, b, p1, p2) in search]
         while search:
             newsearch = []
             reqcnt += 1