Show More
@@ -172,9 +172,6 b' class branchcache(object):' | |||||
172 | def __getitem__(self, key): |
|
172 | def __getitem__(self, key): | |
173 | return self.entries[key] |
|
173 | return self.entries[key] | |
174 |
|
174 | |||
175 | def setdefault(self, *args): |
|
|||
176 | return self.entries.setdefault(*args) |
|
|||
177 |
|
||||
178 | def iteritems(self): |
|
175 | def iteritems(self): | |
179 | return self.entries.iteritems() |
|
176 | return self.entries.iteritems() | |
180 |
|
177 | |||
@@ -229,7 +226,7 b' class branchcache(object):' | |||||
229 | if not cl.hasnode(node): |
|
226 | if not cl.hasnode(node): | |
230 | raise ValueError( |
|
227 | raise ValueError( | |
231 | r'node %s does not exist' % pycompat.sysstr(hex(node))) |
|
228 | r'node %s does not exist' % pycompat.sysstr(hex(node))) | |
232 | self.setdefault(label, []).append(node) |
|
229 | self.entries.setdefault(label, []).append(node) | |
233 | if state == 'c': |
|
230 | if state == 'c': | |
234 | self._closednodes.add(node) |
|
231 | self._closednodes.add(node) | |
235 |
|
232 | |||
@@ -343,7 +340,7 b' class branchcache(object):' | |||||
343 | # really branchheads. Note checking parents is insufficient: |
|
340 | # really branchheads. Note checking parents is insufficient: | |
344 | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) |
|
341 | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) | |
345 | for branch, newheadrevs in newbranches.iteritems(): |
|
342 | for branch, newheadrevs in newbranches.iteritems(): | |
346 | bheads = self.setdefault(branch, []) |
|
343 | bheads = self.entries.setdefault(branch, []) | |
347 | bheadset = set(cl.rev(node) for node in bheads) |
|
344 | bheadset = set(cl.rev(node) for node in bheads) | |
348 |
|
345 | |||
349 | # This have been tested True on all internal usage of this function. |
|
346 | # This have been tested True on all internal usage of this function. |
General Comments 0
You need to be logged in to leave comments.
Login now