Show More
@@ -519,7 +519,7 b' class branchcache(object):' | |||||
519 | # checks can be skipped. Otherwise, the ancestors of the |
|
519 | # checks can be skipped. Otherwise, the ancestors of the | |
520 | # "uncertain" set are removed from branchheads. |
|
520 | # "uncertain" set are removed from branchheads. | |
521 | # This computation is heavy and avoided if at all possible. |
|
521 | # This computation is heavy and avoided if at all possible. | |
522 |
bheads = self._entries. |
|
522 | bheads = self._entries.get(branch, []) | |
523 | bheadset = {cl.rev(node) for node in bheads} |
|
523 | bheadset = {cl.rev(node) for node in bheads} | |
524 | uncertain = set() |
|
524 | uncertain = set() | |
525 | for newrev in sorted(newheadrevs): |
|
525 | for newrev in sorted(newheadrevs): | |
@@ -562,8 +562,8 b' class branchcache(object):' | |||||
562 | if floorrev <= max(uncertain): |
|
562 | if floorrev <= max(uncertain): | |
563 | ancestors = set(cl.ancestors(uncertain, floorrev)) |
|
563 | ancestors = set(cl.ancestors(uncertain, floorrev)) | |
564 | bheadset -= ancestors |
|
564 | bheadset -= ancestors | |
565 |
|
|
565 | if bheadset: | |
566 |
self[branch] = [cl.node(rev) for rev in bhead |
|
566 | self[branch] = [cl.node(rev) for rev in sorted(bheadset)] | |
567 | tiprev = max(newheadrevs) |
|
567 | tiprev = max(newheadrevs) | |
568 | if tiprev > ntiprev: |
|
568 | if tiprev > ntiprev: | |
569 | ntiprev = tiprev |
|
569 | ntiprev = tiprev |
General Comments 0
You need to be logged in to leave comments.
Login now