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

Setup

     2

     3

  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH

     4

  $ export PYTHONPATH

     5

     6

  $ cat > $TESTTMP/pretxnchangegroup.sh << EOF

     7

  > #!/bin/sh

     8

  > env | grep -E "^HG_USERVAR_(DEBUG|BYPASS_REVIEW)" | sort

     9

  > exit 0

    10

  > EOF

    11

  $ cat >> $HGRCPATH << EOF

    12

  > [hooks]

    13

  > pretxnchangegroup = sh $TESTTMP/pretxnchangegroup.sh

    14

  > EOF

    15

    16

  $ hg init repo

    17

  $ hg clone -q repo child

    18

  $ cd child

    19

    20

Test pushing vars to repo with pushvars.server not set

    21

    22

  $ echo b > a

    23

  $ hg commit -Aqm a

    24

  $ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"

    25

  pushing to $TESTTMP/repo

    26

  searching for changes

    27

  adding changesets

    28

  adding manifests

    29

  adding file changes

    30

  added 1 changesets with 1 changes to 1 files

    31

    32

Setting pushvars.sever = true and then pushing.

    33

    34

  $ echo [push] >> $HGRCPATH

    35

  $ echo "pushvars.server = true" >> $HGRCPATH

    36

  $ echo b >> a

    37

  $ hg commit -Aqm a

    38

  $ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"

    39

  pushing to $TESTTMP/repo

    40

  searching for changes

    41

  adding changesets

    42

  adding manifests

    43

  adding file changes

    44

  HG_USERVAR_BYPASS_REVIEW=true

    45

  HG_USERVAR_DEBUG=1

    46

  added 1 changesets with 1 changes to 1 files

    47

    48

Test pushing var with empty right-hand side

    49

    50

  $ echo b >> a

    51

  $ hg commit -Aqm a

    52

  $ hg push --pushvars "DEBUG="

    53

  pushing to $TESTTMP/repo

    54

  searching for changes

    55

  adding changesets

    56

  adding manifests

    57

  adding file changes

    58

  HG_USERVAR_DEBUG=

    59

  added 1 changesets with 1 changes to 1 files

    60

    61

Test pushing bad vars

    62

    63

  $ echo b >> a

    64

  $ hg commit -Aqm b

    65

  $ hg push --pushvars "DEBUG"

    66

  pushing to $TESTTMP/repo

    67

  searching for changes

    68

  abort: unable to parse variable 'DEBUG', should follow 'KEY=VALUE' or 'KEY=' format

    69

  [255]