mercurial-crew-with-dirclash: mercurial/revlog.py comparison

Repair ancestor logic, fix up test cases

comparison

equal deleted inserted replaced

-:3729e2773cca
+:0e2be889ccd7
 while h:
 d, n = heapq.heappop(h)
 if n not in seen:
 seen[n] = 1
 r = self.rev(n)
-yield (-d, r, n)
+yield (-d, n)
 for p in self.parents(n):
 heapq.heappush(h, (-dist[p], p))
-x = ancestors(a)
+def generations(node):
-y = ancestors(b)
+sg, s = None, {}
-lx = x.next()
+for g,n in ancestors(node):
-ly = y.next()
+if g != sg:
+if sg:
+yield sg, s
+sg, s = g, {n:1}
+else:
+s[n] = 1
+yield sg, s
+x = generations(a)
+y = generations(b)
+gx = x.next()
+gy = y.next()
 # increment each ancestor list until it is closer to root than
 # the other, or they match
 while 1:
-if lx == ly:
+#print "ancestor gen %s %s" % (gx[0], gy[0])
-return lx[2]
+if gx[0] == gy[0]:
-elif lx < ly:
+# find the intersection
-ly = y.next()
+i = [ n for n in gx[1] if n in gy[1] ]
-elif lx > ly:
+if i:
-lx = x.next()
+return i[0]
+else:
+#print "next"
+gy = y.next()
+gx = x.next()
+elif gx[0] < gy[0]:
+#print "next y"
+gy = y.next()
+else:
+#print "next x"
+gx = x.next()
 def group(self, linkmap):
 """calculate a delta group
 Given a list of changeset revs, return a set of deltas and

Mercurial > hg > mercurial-crew-with-dirclash