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

equal deleted inserted replaced

-:518da3c3b6ce
+:1033892bbb87
 gy = y.next()
 else:
 #print "next x"
 gx = x.next()
-def group(self, linkmap):
+def group(self, nodelist, lookup, infocollect = None):
 """calculate a delta group
 Given a list of changeset revs, return a set of deltas and
 metadata corresponding to nodes. the first delta is
 parent(nodes[0]) -> nodes[0] the receiver is guaranteed to
 have this parent as it has all history before these
 changesets. parent is parent[0]
 """
-revs = []
+revs = [self.rev(n) for n in nodelist]
-needed = {}
+needed = dict.fromkeys(revs, 1)
-# find file nodes/revs that match changeset revs
-for i in xrange(0, self.count()):
-if self.index[i][3] in linkmap:
-revs.append(i)
-needed[i] = 1
 # if we don't have any revisions touched by these changesets, bail
 if not revs:
 yield struct.pack(">l", 0)
 return
 deltas = []
 for d in xrange(0, len(revs) - 1):
 a, b = revs[d], revs[d + 1]
 n = self.node(b)
+if infocollect is not None:
+infocollect(n)
 # do we need to construct a new delta?
 if a + 1 != b or self.base(b) == b:
 if a >= 0:
 base = self.base(a)
 ta = chunks[self.base(a)]
 d = self.diff(ta, tb)
 else:
 d = chunks[b]
 p = self.parents(n)
-meta = n + p[0] + p[1] + linkmap[self.linkrev(n)]
+meta = n + p[0] + p[1] + lookup(n)
 l = struct.pack(">l", len(meta) + len(d) + 4)
 yield l
 yield meta
 yield d