diff -r 624d6683c705 -r 662ffdde5adf mercurial/branchmap.py --- a/mercurial/branchmap.py Mon Mar 18 18:59:38 2019 +0300 +++ b/mercurial/branchmap.py Mon Mar 18 19:01:29 2019 +0300 @@ -178,9 +178,6 @@ def iteritems(self): return self.entries.iteritems() - def itervalues(self): - return self.entries.itervalues() - @classmethod def fromfile(cls, repo): f = None @@ -287,6 +284,10 @@ for bn, heads in self.iteritems(): yield (bn, heads) + self._branchtip(heads) + def iterheads(self): + """ returns all the heads """ + return self.entries.itervalues() + def copy(self): """return an deep copy of the branchcache object""" return branchcache( @@ -369,7 +370,7 @@ # cache key are not valid anymore self.tipnode = nullid self.tiprev = nullrev - for heads in self.itervalues(): + for heads in self.iterheads(): tiprev = max(cl.rev(node) for node in heads) if tiprev > self.tiprev: self.tipnode = cl.node(tiprev)