changegroup: store old heads as a set Previously, the "oldheads" variable was a list. On a repository at Mozilla with 46,492 heads, profiling revealed that list membership testing was dominating execution time of applying small changegroups. This patch converts the list of old heads to a set. This makes membership testing significantly faster. On the aforementioned repository with 46,492 heads: $ hg unbundle <file with 1 changeset> before: 18.535s wall after: 1.303s Consumers of this variable only check for truthiness (`if oldheads`), length (`len(oldheads)`), and (most importantly) item membership (`h not in oldheads` - which occurs twice). So, the change to a set should be safe and suitable for stable. The practical effect of this change is that changegroup application and related operations (like `hg push`) no longer exhibit an O(n^2) CPU explosion as the number of heads grows.

     1

# extension to emulate interrupting filemerge._filemerge

     2

     3

from __future__ import absolute_import

     4

     5

from mercurial import (

     6

    error,

     7

    extensions,

     8

    filemerge,

     9

)

    10

    11

def failfilemerge(filemergefn,

    12

                  premerge, repo, mynode, orig, fcd, fco, fca, labels=None):

    13

    raise error.Abort("^C")

    14

    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

    15

    16

def extsetup(ui):

    17

    extensions.wrapfunction(filemerge, '_filemerge',

    18

                            failfilemerge)