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

#!/usr/bin/env bash

     2

# A simple script for opening merge conflicts in the editor.

     3

# Use the following Mercurial settings to enable it.

     4

#

     5

# [ui]

     6

# merge = editmerge

     7

#

     8

# [merge-tools]

     9

# editmerge.args=$output

    10

# editmerge.check=changed

    11

# editmerge.premerge=keep

    12

    13

FILE="$1"

    14

    15

getlines() {

    16

  grep -n "^<<<<<<" "$FILE" | cut -f1 -d:

    17

}

    18

    19

# editor preference loosely based on https://mercurial-scm.org/wiki/editor

    20

# hg showconfig is at the bottom though, since it's slow to run (0.15 seconds)

    21

ED="$HGEDITOR"

    22

if [ "$ED" = "" ] ; then

    23

  ED="$VISUAL"

    24

fi

    25

if [ "$ED" = "" ] ; then

    26

  ED="$EDITOR"

    27

fi

    28

if [ "$ED" = "" ] ; then

    29

  ED="$(hg showconfig ui.editor)"

    30

fi

    31

if [ "$ED" = "" ] ; then

    32

  echo "merge failed - unable to find editor"

    33

  exit 1

    34

fi

    35

    36

if [ "$ED" = "emacs" ] || [ "$ED" = "nano" ] || [ "$ED" = "vim" ] ; then

    37

  FIRSTLINE="$(getlines | head -n 1)"

    38

  PREVIOUSLINE=""

    39

    40

  # open the editor to the first conflict until there are no more

    41

  # or the user stops editing the file

    42

  while [ ! "$FIRSTLINE" = "" ] && [ ! "$FIRSTLINE" = "$PREVIOUSLINE" ] ; do

    43

    $ED "+$FIRSTLINE" "$FILE"

    44

    PREVIOUSLINE="$FIRSTLINE"

    45

    FIRSTLINE="$(getlines | head -n 1)"

    46

  done

    47

else

    48

  $ED "$FILE"

    49

fi

    50

    51

# get the line numbers of the remaining conflicts

    52

CONFLICTS="$(getlines | sed ':a;N;$!ba;s/\n/, /g')"

    53

if [ ! "$CONFLICTS" = "" ] ; then

    54

  echo "merge failed - resolve the conflicts (line $CONFLICTS) then use 'hg resolve --mark'"

    55

  exit 1

    56

fi

    57

    58

exit 0