# HG changeset patch # User Pierre-Yves David # Date 2014-01-06 23:19:31 # Node ID d9e1c167943b994804b36614ee89c8491fc2fce4 # Parent ea4996754d91a7104c0089ad68c5bf892e3e26aa branchmap: use set for update code We are doing membership test and substraction. new code is marginally faster. diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -238,25 +238,24 @@ class branchcache(dict): # 1 (branch a) -> 2 (branch b) -> 3 (branch a) for branch, newheadrevs in newbranches.iteritems(): bheads = self.setdefault(branch, []) - bheadrevs = [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. # run it again in case of doubt # assert not (set(bheadrevs) & set(newheadrevs)) newheadrevs.sort() - bheadrevs.extend(newheadrevs) - bheadrevs.sort() + bheadset.update(newheadrevs) # This loop prunes out two kinds of heads - heads that are # superseded by a head in newheadrevs, and newheadrevs that are not # heads because an existing head is their descendant. while newheadrevs: latest = newheadrevs.pop() - if latest not in bheadrevs: + if latest not in bheadset: continue - ancestors = set(cl.ancestors([latest], bheadrevs[0])) - if ancestors: - bheadrevs = [b for b in bheadrevs if b not in ancestors] + ancestors = set(cl.ancestors([latest], min(bheadset))) + bheadset -= ancestors + bheadrevs = sorted(bheadset) self[branch] = [cl.node(rev) for rev in bheadrevs] tiprev = bheadrevs[-1] if tiprev > self.tiprev: