This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5111

branchmap: remove redundant sort
ClosedPublic

Authored by mjpieters on Oct 16 2018, 6:22 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5644f7c8982e: branchmap: remove redundant sort
Summary

There is absoluty no benefit in sorting a list that's being merged into a set
on the next line. The changelog.ancestors() call later on also doesn't benefit
from a sorted sequence of revs.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mjpieters created this revision.Oct 16 2018, 6:22 AM
Closed by commit rHG5644f7c8982e: branchmap: remove redundant sort (authored by mjpieters). · Explain WhyOct 16 2018, 6:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (1 line)

Diff 12158

mercurial/branchmap.py

# 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.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))
newheadrevs.sort()
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)