| hg-reviewers |
All the callers are updated to call setdefault of branchcache.entries
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| return iter(self.entries) | return iter(self.entries) | ||||
| def __setitem__(self, key, value): | def __setitem__(self, key, value): | ||||
| self.entries[key] = value | self.entries[key] = value | ||||
| def __getitem__(self, key): | def __getitem__(self, key): | ||||
| return self.entries[key] | return self.entries[key] | ||||
| def setdefault(self, *args): | |||||
| return self.entries.setdefault(*args) | |||||
| def iteritems(self): | def iteritems(self): | ||||
| return self.entries.iteritems() | return self.entries.iteritems() | ||||
| @classmethod | @classmethod | ||||
| def fromfile(cls, repo): | def fromfile(cls, repo): | ||||
| f = None | f = None | ||||
| try: | try: | ||||
| f = repo.cachevfs(cls._filename(repo)) | f = repo.cachevfs(cls._filename(repo)) | ||||
| node, state, label = line.split(" ", 2) | node, state, label = line.split(" ", 2) | ||||
| if state not in 'oc': | if state not in 'oc': | ||||
| raise ValueError(r'invalid branch state') | raise ValueError(r'invalid branch state') | ||||
| label = encoding.tolocal(label.strip()) | label = encoding.tolocal(label.strip()) | ||||
| node = bin(node) | node = bin(node) | ||||
| if not cl.hasnode(node): | if not cl.hasnode(node): | ||||
| raise ValueError( | raise ValueError( | ||||
| r'node %s does not exist' % pycompat.sysstr(hex(node))) | r'node %s does not exist' % pycompat.sysstr(hex(node))) | ||||
| self.setdefault(label, []).append(node) | self.entries.setdefault(label, []).append(node) | ||||
| if state == 'c': | if state == 'c': | ||||
| self._closednodes.add(node) | self._closednodes.add(node) | ||||
| @staticmethod | @staticmethod | ||||
| def _filename(repo): | def _filename(repo): | ||||
| """name of a branchcache file for a given repo or repoview""" | """name of a branchcache file for a given repo or repoview""" | ||||
| filename = "branch2" | filename = "branch2" | ||||
| if repo.filtername: | if repo.filtername: | ||||
| # fetch current topological heads to speed up filtering | # fetch current topological heads to speed up filtering | ||||
| topoheads = set(cl.headrevs()) | topoheads = set(cl.headrevs()) | ||||
| # if older branchheads are reachable from new ones, they aren't | # if older branchheads are reachable from new ones, they aren't | ||||
| # really branchheads. Note checking parents is insufficient: | # really branchheads. Note checking parents is insufficient: | ||||
| # 1 (branch a) -> 2 (branch b) -> 3 (branch a) | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) | ||||
| for branch, newheadrevs in newbranches.iteritems(): | for branch, newheadrevs in newbranches.iteritems(): | ||||
| bheads = self.setdefault(branch, []) | bheads = self.entries.setdefault(branch, []) | ||||
| bheadset = set(cl.rev(node) for node in bheads) | bheadset = set(cl.rev(node) for node in bheads) | ||||
| # This have been tested True on all internal usage of this function. | # This have been tested True on all internal usage of this function. | ||||
| # run it again in case of doubt | # run it again in case of doubt | ||||
| # assert not (set(bheadrevs) & set(newheadrevs)) | # assert not (set(bheadrevs) & set(newheadrevs)) | ||||
| bheadset.update(newheadrevs) | bheadset.update(newheadrevs) | ||||
| # This prunes out two kinds of heads - heads that are superseded by | # This prunes out two kinds of heads - heads that are superseded by | ||||