bisect: avoid copying ancestor list for non-merge commits During a bisection, hg needs to compute a list of all ancestors for every candidate commit. This is accomplished via a bottom-up traversal of the set of candidates, during which each revision's ancestor list is populated using the ancestor list of its parent(s). Previously, this involved copying the entire list, which could be very long in if the bisection range was large. To help improve this, we can observe that each candidate commit is visited exactly once, at which point its ancestor list is copied into its children's lists and then dropped. In the case of non-merge commits, a commit's ancestor list consists exactly of its parent's list plus itself. This means that we can trivially reuse the parent's existing list for one of its non-merge children, which avoids copying entirely if that commit is the parent's only child. This makes bisections over linear ranges of commits much faster. During some informal testing in the large publicly-available `mozilla-central` repository, this noticeably sped up bisections over large ranges of history: Setup: $ cd mozilla-central $ hg bisect --reset $ hg bisect --good 0 $ hg log -r tip -T '{rev}\n' 628417 Test: $ time hg bisect --bad tip --noupdate Before: real 3m35.927s user 3m35.553s sys 0m0.319s After: real 1m41.142s user 1m40.810s sys 0m0.285s

     1

A script that implements uppercasing all letters in a file.

     2

     3

  $ UPPERCASEPY="$TESTTMP/uppercase.py"

     4

  $ cat > $UPPERCASEPY <<EOF

     5

  > import sys

     6

  > from mercurial.utils.procutil import setbinary

     7

  > setbinary(sys.stdin)

     8

  > setbinary(sys.stdout)

     9

  > sys.stdout.write(sys.stdin.read().upper())

    10

  > EOF

    11

  $ TESTLINES="foo\nbar\nbaz\n"

    12

  $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY

    13

  FOO

    14

  BAR

    15

  BAZ

    16

    17

This file attempts to test our workarounds for pickle's lack of

    18

support for short reads.

    19

    20

  $ cat >> $HGRCPATH <<EOF

    21

  > [extensions]

    22

  > fix =

    23

  > [fix]

    24

  > uppercase-whole-file:command="$PYTHON" $UPPERCASEPY

    25

  > uppercase-whole-file:pattern=set:**

    26

  > EOF

    27

    28

  $ hg init repo

    29

  $ cd repo

    30

    31

# Create a file that's large enough that it seems to not fit in

    32

# pickle's buffer, making it use the code path that expects our

    33

# _blockingreader's read() method to return bytes.

    34

  $ echo "some stuff" > file

    35

  $ for i in $($TESTDIR/seq.py 13); do

    36

  >   cat file file > tmp

    37

  >   mv -f tmp file

    38

  > done

    39

  $ hg commit -Am "add large file"

    40

  adding file

    41

    42

Check that we don't get a crash

    43

    44

  $ hg fix -r .

    45

  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-fix.hg (glob)