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

  $ cat >> $HGRCPATH << EOF

     2

  > [extensions]

     3

  > fastannotate=

     4

  > EOF

     5

     6

  $ hg init repo

     7

  $ cd repo

     8

  $ for i in 0 1 2 3 4; do

     9

  >   echo $i >> a

    10

  >   echo $i >> b

    11

  >   hg commit -A -m $i a b

    12

  > done

    13

    14

use the "debugbuildannotatecache" command to build annotate cache at rev 0

    15

    16

  $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=0

    17

  fastannotate: a: 1 new changesets in the main branch

    18

  fastannotate: b: 1 new changesets in the main branch

    19

    20

"debugbuildannotatecache" should work with broken cache (and other files would

    21

be built without being affected). note: linelog being broken is only noticed

    22

when we try to append to it.

    23

    24

  $ echo 'CORRUPT!' >> .hg/fastannotate/default/a.m

    25

  $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=1

    26

  fastannotate: a: rebuilding broken cache

    27

  fastannotate: a: 2 new changesets in the main branch

    28

  fastannotate: b: 1 new changesets in the main branch

    29

    30

  $ echo 'CANNOT REUSE!' > .hg/fastannotate/default/a.l

    31

  $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=2

    32

  fastannotate: a: rebuilding broken cache

    33

  fastannotate: a: 3 new changesets in the main branch

    34

  fastannotate: b: 1 new changesets in the main branch

    35

    36

  $ rm .hg/fastannotate/default/a.m

    37

  $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=3

    38

  fastannotate: a: rebuilding broken cache

    39

  fastannotate: a: 4 new changesets in the main branch

    40

  fastannotate: b: 1 new changesets in the main branch

    41

    42

  $ rm .hg/fastannotate/default/a.l

    43

  $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=3

    44

  $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=4

    45

  fastannotate: a: rebuilding broken cache

    46

  fastannotate: a: 5 new changesets in the main branch

    47

  fastannotate: b: 1 new changesets in the main branch

    48

    49

"fastannotate" should deal with file corruption as well

    50

    51

  $ rm -rf .hg/fastannotate

    52

  $ hg fastannotate --debug -r 0 a

    53

  fastannotate: a: 1 new changesets in the main branch

    54

  0: 0

    55

    56

  $ echo 'CORRUPT!' >> .hg/fastannotate/default/a.m

    57

  $ hg fastannotate --debug -r 0 a

    58

  fastannotate: a: cache broken and deleted

    59

  fastannotate: a: 1 new changesets in the main branch

    60

  0: 0

    61

    62

  $ echo 'CORRUPT!' > .hg/fastannotate/default/a.l

    63

  $ hg fastannotate --debug -r 1 a

    64

  fastannotate: a: cache broken and deleted

    65

  fastannotate: a: 2 new changesets in the main branch

    66

  0: 0

    67

  1: 1

    68

    69

  $ rm .hg/fastannotate/default/a.l

    70

  $ hg fastannotate --debug -r 1 a

    71

  fastannotate: a: using fast path (resolved fctx: True)

    72

  fastannotate: a: cache broken and deleted

    73

  fastannotate: a: 2 new changesets in the main branch

    74

  0: 0

    75

  1: 1

    76

    77

  $ rm .hg/fastannotate/default/a.m

    78

  $ hg fastannotate --debug -r 2 a

    79

  fastannotate: a: cache broken and deleted

    80

  fastannotate: a: 3 new changesets in the main branch

    81

  0: 0

    82

  1: 1

    83

  2: 2