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

  > absorb=

     4

  > EOF

     5

     6

  $ hg init repo1

     7

  $ cd repo1

     8

     9

Make some commits:

    10

    11

  $ for i in 1 2 3; do

    12

  >   echo $i >> a

    13

  >   hg commit -A a -m "commit $i" -q

    14

  > done

    15

    16

absorb --edit-lines will run the editor if filename is provided:

    17

    18

  $ hg absorb --edit-lines

    19

  nothing applied

    20

  [1]

    21

  $ HGEDITOR=cat hg absorb --edit-lines a

    22

  HG: editing a

    23

  HG: "y" means the line to the right exists in the changeset to the top

    24

  HG:

    25

  HG: /---- 4ec16f85269a commit 1

    26

  HG: |/--- 5c5f95224a50 commit 2

    27

  HG: ||/-- 43f0a75bede7 commit 3

    28

  HG: |||

    29

      yyy : 1

    30

       yy : 2

    31

        y : 3

    32

  nothing applied

    33

  [1]

    34

    35

Edit the file using --edit-lines:

    36

    37

  $ cat > editortext << EOF

    38

  >       y : a

    39

  >      yy :  b

    40

  >      y  : c

    41

  >     yy  : d  

    42

  >     y y : e

    43

  >     y   : f

    44

  >     yyy : g

    45

  > EOF

    46

  $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines a

    47

  $ hg cat -r 0 a

    48

  d  

    49

  e

    50

  f

    51

  g

    52

  $ hg cat -r 1 a

    53

   b

    54

  c

    55

  d  

    56

  g

    57

  $ hg cat -r 2 a

    58

  a

    59

   b

    60

  e

    61

  g