comparison mercurial/localrepo.py @ 9673:863ba2ea1f0b

localrepo/branchcache: rebuild the "charset-aware" branchcache when needed

It's simpler and the two cache weren't always in sync otherwise:
localrepo.branchcache would not be updated after calling branchmap()

9672:5bbf4f130684

            self._writebranchcache(partial, self.changelog.tip(), tiprev)

        return partial

    def lbranchmap(self):
        tip = self.changelog.tip()
        if self.branchcache is not None and self._branchcachetip == tip:
            return self.branchcache

        partial = self.branchmap()

        # the branch cache is stored on disk as UTF-8, but in the local
        # charset internally
        for k, v in partial.iteritems():

        if self._ubranchcache is not None and self._branchcachetip == tip:
            return self._ubranchcache

        oldtip = self._branchcachetip
        self._branchcachetip = tip
        if self.branchcache is None:
            self.branchcache = {} # avoid recursion in changectx
        else:
            self.branchcache.clear() # keep using the same dict
        if oldtip is None or oldtip not in self.changelog.nodemap:
            partial, last, lrev = self._readbranchcache()
        else:
            lrev = self.changelog.rev(oldtip)
            partial = self._ubranchcache

9673:863ba2ea1f0b

            self._writebranchcache(partial, self.changelog.tip(), tiprev)

        return partial

    def lbranchmap(self):
        self.branchcache = {}
        partial = self.branchmap()

        # the branch cache is stored on disk as UTF-8, but in the local
        # charset internally
        for k, v in partial.iteritems():

        if self._ubranchcache is not None and self._branchcachetip == tip:
            return self._ubranchcache

        oldtip = self._branchcachetip
        self._branchcachetip = tip
        if oldtip is None or oldtip not in self.changelog.nodemap:
            partial, last, lrev = self._readbranchcache()
        else:
            lrev = self.changelog.rev(oldtip)
            partial = self._ubranchcache