mercurial/branchmap.py
changeset 46372 3e91d9978bec
parent 46360 1726a53a8494
child 46780 6266d19556ad
equal deleted inserted replaced
46371:0903d6b9b1df 46372:3e91d9978bec
   704         if close:
   704         if close:
   705             branchidx |= _rbccloseflag
   705             branchidx |= _rbccloseflag
   706         self._setcachedata(rev, reponode, branchidx)
   706         self._setcachedata(rev, reponode, branchidx)
   707         return b, close
   707         return b, close
   708 
   708 
   709     def setdata(self, branch, rev, node, close):
   709     def setdata(self, rev, changelogrevision):
   710         """add new data information to the cache"""
   710         """add new data information to the cache"""
       
   711         branch, close = changelogrevision.branchinfo
       
   712 
   711         if branch in self._namesreverse:
   713         if branch in self._namesreverse:
   712             branchidx = self._namesreverse[branch]
   714             branchidx = self._namesreverse[branch]
   713         else:
   715         else:
   714             branchidx = len(self._names)
   716             branchidx = len(self._names)
   715             self._names.append(branch)
   717             self._names.append(branch)
   716             self._namesreverse[branch] = branchidx
   718             self._namesreverse[branch] = branchidx
   717         if close:
   719         if close:
   718             branchidx |= _rbccloseflag
   720             branchidx |= _rbccloseflag
   719         self._setcachedata(rev, node, branchidx)
   721         self._setcachedata(rev, self._repo.changelog.node(rev), branchidx)
   720         # If no cache data were readable (non exists, bad permission, etc)
   722         # If no cache data were readable (non exists, bad permission, etc)
   721         # the cache was bypassing itself by setting:
   723         # the cache was bypassing itself by setting:
   722         #
   724         #
   723         #   self.branchinfo = self._branchinfo
   725         #   self.branchinfo = self._branchinfo
   724         #
   726         #