| hg-reviewers |
Instead of assigning self.tiprev multiple times in the for loop, and calling
cl.node() on it, let's store that in a temporary variable and assign it in the
end of loop.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/branchmap.py (13 lines) |
| branch, closesbranch = getbranchinfo(r) | branch, closesbranch = getbranchinfo(r) | ||||
| newbranches.setdefault(branch, []).append(r) | newbranches.setdefault(branch, []).append(r) | ||||
| if closesbranch: | if closesbranch: | ||||
| self._closednodes.add(cl.node(r)) | self._closednodes.add(cl.node(r)) | ||||
| # fetch current topological heads to speed up filtering | # fetch current topological heads to speed up filtering | ||||
| topoheads = set(cl.headrevs()) | topoheads = set(cl.headrevs()) | ||||
| # new tip revision which we found after iterating items from new | |||||
| # branches | |||||
| ntiprev = self.tiprev | |||||
| # 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._entries.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 | ||||
| # a head in newheadrevs, and newheadrevs that are not heads because | # a head in newheadrevs, and newheadrevs that are not heads because | ||||
| # an existing head is their descendant. | # an existing head is their descendant. | ||||
| uncertain = bheadset - topoheads | uncertain = bheadset - topoheads | ||||
| if uncertain: | if uncertain: | ||||
| floorrev = min(uncertain) | floorrev = min(uncertain) | ||||
| ancestors = set(cl.ancestors(newheadrevs, floorrev)) | ancestors = set(cl.ancestors(newheadrevs, floorrev)) | ||||
| bheadset -= ancestors | bheadset -= ancestors | ||||
| bheadrevs = sorted(bheadset) | bheadrevs = sorted(bheadset) | ||||
| self[branch] = [cl.node(rev) for rev in bheadrevs] | self[branch] = [cl.node(rev) for rev in bheadrevs] | ||||
| tiprev = bheadrevs[-1] | tiprev = bheadrevs[-1] | ||||
| if tiprev > self.tiprev: | if tiprev > ntiprev: | ||||
| self.tipnode = cl.node(tiprev) | ntiprev = tiprev | ||||
| self.tiprev = tiprev | |||||
| if ntiprev > self.tiprev: | |||||
| self.tiprev = ntiprev | |||||
| self.tipnode = cl.node(ntiprev) | |||||
| if not self.validfor(repo): | if not self.validfor(repo): | ||||
| # cache key are not valid anymore | # cache key are not valid anymore | ||||
| self.tipnode = nullid | self.tipnode = nullid | ||||
| self.tiprev = nullrev | self.tiprev = nullrev | ||||
| for heads in self.iterheads(): | for heads in self.iterheads(): | ||||
| tiprev = max(cl.rev(node) for node in heads) | tiprev = max(cl.rev(node) for node in heads) | ||||
| if tiprev > self.tiprev: | if tiprev > self.tiprev: | ||||