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

Sync with -stable

comparison

equal deleted inserted replaced

-:a8bd7280330f
+:4df475e22248
 assert orderedout
 assert roots
 assert heads
 return (orderedout, roots, heads)
-def heads(self, start=None):
+def heads(self, start=None, stop=None):
 """return the list of all nodes that have no children
 if start is specified, only heads that are descendants of
 start will be returned
+if stop is specified, it will consider all the revs from stop
+as if they had no children
 """
 if start is None:
 start = nullid
+if stop is None:
+stop = []
+stoprevs = dict.fromkeys([self.rev(n) for n in stop])
 startrev = self.rev(start)
 reachable = {startrev: 1}
 heads = {startrev: 1}
 parentrevs = self.parentrevs
 for r in xrange(startrev + 1, self.count()):
 for p in parentrevs(r):
 if p in reachable:
-reachable[r] = 1
+if r not in stoprevs:
+reachable[r] = 1
 heads[r] = 1
-if p in heads:
+if p in heads and p not in stoprevs:
 del heads[p]
 return [self.node(r) for r in heads]
 def children(self, node):
 """find the children of a given node"""
 c = []

Mercurial > hg > mercurial-crew-with-dirclash