Show More
@@ -239,14 +239,8 b' class branchcache(dict):' | |||||
239 | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) |
|
239 | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) | |
240 | for branch, newnodes in newbranches.iteritems(): |
|
240 | for branch, newnodes in newbranches.iteritems(): | |
241 | bheads = self.setdefault(branch, []) |
|
241 | bheads = self.setdefault(branch, []) | |
242 | # Remove candidate heads that no longer are in the repo (e.g., as |
|
242 | bheadrevs = [cl.rev(node) for node in bheads] | |
243 | # the result of a strip that just happened). Avoid using 'node in |
|
243 | newheadrevs = [cl.rev(node) for node in newnodes] | |
244 | # self' here because that dives down into branchcache code somewhat |
|
|||
245 | # recursively. |
|
|||
246 | bheadrevs = [cl.rev(node) for node in bheads |
|
|||
247 | if cl.hasnode(node)] |
|
|||
248 | newheadrevs = [cl.rev(node) for node in newnodes |
|
|||
249 | if cl.hasnode(node)] |
|
|||
250 | ctxisnew = bheadrevs and min(newheadrevs) > max(bheadrevs) |
|
244 | ctxisnew = bheadrevs and min(newheadrevs) > max(bheadrevs) | |
251 | # Remove duplicates - nodes that are in newheadrevs and are already |
|
245 | # Remove duplicates - nodes that are in newheadrevs and are already | |
252 | # in bheadrevs. This can happen if you strip a node whose parent |
|
246 | # in bheadrevs. This can happen if you strip a node whose parent |
General Comments 0
You need to be logged in to leave comments.
Login now