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

Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb

     2

(merge correctly when all the files in a directory are moved

     3

but then local changes are added in the same directory)

     4

     5

  $ hg init a

     6

  $ cd a

     7

  $ mkdir -p testdir

     8

  $ echo a > testdir/a

     9

  $ hg add testdir/a

    10

  $ hg commit -m a

    11

  $ cd ..

    12

    13

  $ hg clone a b

    14

  updating to branch default

    15

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    16

  $ cd a

    17

  $ echo alpha > testdir/a

    18

  $ hg commit -m remote-change

    19

  $ cd ..

    20

    21

  $ cd b

    22

  $ mkdir testdir/subdir

    23

  $ hg mv testdir/a testdir/subdir/a

    24

  $ hg commit -m move

    25

  $ mkdir newdir

    26

  $ echo beta > newdir/beta

    27

  $ hg add newdir/beta

    28

  $ hg commit -m local-addition

    29

  $ hg pull ../a

    30

  pulling from ../a

    31

  searching for changes

    32

  adding changesets

    33

  adding manifests

    34

  adding file changes

    35

  added 1 changesets with 1 changes to 1 files (+1 heads)

    36

  new changesets cc7000b01af9

    37

  (run 'hg heads' to see heads, 'hg merge' to merge)

    38

  $ hg up -C 2

    39

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    40

Abuse this test for also testing that merge respects ui.relative-paths

    41

  $ hg --cwd testdir merge --config ui.relative-paths=yes

    42

  merging subdir/a and a to subdir/a

    43

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

    44

  (branch merge, don't forget to commit)

    45

  $ hg stat

    46

  M testdir/subdir/a

    47

  $ hg diff --nodates

    48

  diff -r bc21c9773bfa testdir/subdir/a

    49

  --- a/testdir/subdir/a

    50

  +++ b/testdir/subdir/a

    51

  @@ -1,1 +1,1 @@

    52

  -a

    53

  +alpha

    54

    55

  $ cd ..