phases: rework the logic of _pushdiscoveryphase to bound complexity This rework the various graph traversal in _pushdiscoveryphase to keep the complexity in check. This is done though a couple of things: - first, limiting the space we have to explore, for example, if we are not in publishing push, we don't need to consider remote draft roots that are also draft locally, as there is nothing to be moved there. - avoid unbounded descendant computation, and use the faster "rev between" computation. This provide a massive boost to performance when exchanging with repository with a massive amount of draft, like mozilla-try: ### data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog # benchmark.name = hg.command.push # bin-env-vars.hg.flavor = default # bin-env-vars.hg.py-re2-module = default # benchmark.variants.explicit-rev = all-out-heads # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.reuse-external-delta-parent = default ## benchmark.variants.revs = any-1-extra-rev before: 20.346590 seconds after: 11.232059 seconds (-38.15%, -7.48 seconds) ## benchmark.variants.revs = any-100-extra-rev before: 24.752051 seconds after: 15.367412 seconds (-37.91%, -9.38 seconds) After this changes, the push operation is still quite too slow. Some of this can be attributed to general phases slowness (reading all the roots from disk for example) and other know slowness (not using persistent-nodemap, branchmap, tags, etc. We are also working on them, but with this series, phase discovery during push no longer showing up in profile and this is a pretty nice and bit low-hanging fruit out of the way. ### (same case as the above) # benchmark.variants.revs = any-1-extra-rev pre-%ln-change: 44.235070 this-changeset: 11.232059 seconds (-74.61%, -33.00 seconds) # benchmark.variants.revs = any-100-extra-rev pre-%ln-change: 49.234697 this-changeset: 15.367412 seconds (-68.79%, -33.87 seconds) Note that with this change, the `hg push` performance is now much closer to the `hg pull` performance, even it still lagging behind a bit. (and the overall performance are still too slow). ### data-env-vars.name = mozilla-try-2023-03-22-ds2-pnm # benchmark.variants.explicit-rev = all-out-heads # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.pulled-delta-reuse-policy = default # bin-env-vars.hg.flavor = rust ## benchmark.variants.revs = any-1-extra-rev hg.command.pull: 6.517450 hg.command.push: 11.219888 ## benchmark.variants.revs = any-100-extra-rev hg.command.pull: 10.160991 hg.command.push: 14.251107 ### data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog # bin-env-vars.hg.py-re2-module = default # benchmark.variants.explicit-rev = all-out-heads # benchmark.variants.issue6528 = disabled # benchmark.variants.protocol = ssh # benchmark.variants.pulled-delta-reuse-policy = default ## bin-env-vars.hg.flavor = default ## benchmark.variants.revs = any-1-extra-rev hg.command.pull: 8.577772 hg.command.push: 11.232059 ## bin-env-vars.hg.flavor = default ## benchmark.variants.revs = any-100-extra-rev hg.command.pull: 13.152976 hg.command.push: 15.367412 ## bin-env-vars.hg.flavor = rust ## benchmark.variants.revs = any-1-extra-rev hg.command.pull: 8.731982 hg.command.push: 11.178751 ## bin-env-vars.hg.flavor = rust ## benchmark.variants.revs = any-100-extra-rev hg.command.pull: 13.184236 hg.command.push: 15.620843

     1

#!/bin/sh

     2

#

     3

# This is an example of using HGEDITOR to create of diff to review the

     4

# changes while committing.

     5

     6

# If you want to pass your favourite editor some other parameters

     7

# only for Mercurial, modify this:

     8

case "${EDITOR}" in

     9

    "")

    10

        EDITOR="vi"

    11

        ;;

    12

    emacs)

    13

        EDITOR="$EDITOR -nw"

    14

        ;;

    15

    gvim|vim)

    16

        EDITOR="$EDITOR -f -o"

    17

        ;;

    18

esac

    19

    20

    21

HGTMP=""

    22

cleanup_exit() {

    23

    rm -rf "$HGTMP"

    24

}

    25

    26

# Remove temporary files even if we get interrupted

    27

trap "cleanup_exit" 0 # normal exit

    28

trap "exit 255" HUP INT QUIT ABRT TERM

    29

    30

HGTMP=$(mktemp -d ${TMPDIR-/tmp}/hgeditor.XXXXXX)

    31

[ x$HGTMP != x -a -d $HGTMP ] || {

    32

  echo "Could not create temporary directory! Exiting." 1>&2

    33

  exit 1

    34

}

    35

    36

(

    37

    grep '^HG: changed' "$1" | cut -b 13- | while read changed; do

    38

        "$HG" diff "$changed" >> "$HGTMP/diff"

    39

    done

    40

)

    41

    42

cat "$1" > "$HGTMP/msg"

    43

    44

MD5=$(which md5sum 2>/dev/null) || \

    45

    MD5=$(which md5 2>/dev/null)

    46

[ -x "${MD5}" ] && CHECKSUM=`${MD5} "$HGTMP/msg"`

    47

if [ -s "$HGTMP/diff" ]; then

    48

    $EDITOR "$HGTMP/msg" "$HGTMP/diff" || exit $?

    49

else

    50

    $EDITOR "$HGTMP/msg" || exit $?

    51

fi

    52

[ -x "${MD5}" ] && (echo "$CHECKSUM" | ${MD5} -c >/dev/null 2>&1 && exit 13)

    53

    54

mv "$HGTMP/msg" "$1"

    55

    56

exit $?