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

  $ hg init

     2

  $ touch a

     3

  $ hg add a

     4

  $ hg ci -m "a"

     5

     6

  $ echo 123 > b

     7

  $ hg add b

     8

  $ hg diff --nodates

     9

  diff -r 3903775176ed b

    10

  --- /dev/null

    11

  +++ b/b

    12

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

    13

  +123

    14

    15

  $ hg diff --nodates -r tip

    16

  diff -r 3903775176ed b

    17

  --- /dev/null

    18

  +++ b/b

    19

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

    20

  +123

    21

    22

  $ echo foo > a

    23

  $ hg diff --nodates

    24

  diff -r 3903775176ed a

    25

  --- a/a

    26

  +++ b/a

    27

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

    28

  +foo

    29

  diff -r 3903775176ed b

    30

  --- /dev/null

    31

  +++ b/b

    32

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

    33

  +123

    34

    35

  $ hg diff -r ""

    36

  hg: parse error: empty query

    37

  [10]

    38

  $ hg diff -r tip -r ""

    39

  hg: parse error: empty query

    40

  [10]

    41

    42

Remove a file that was added via merge. Since the file is not in parent 1,

    43

it should not be in the diff.

    44

    45

  $ hg ci -m 'a=foo' a

    46

  $ hg co -Cq null

    47

  $ echo 123 > b

    48

  $ hg add b

    49

  $ hg ci -m "b"

    50

  created new head

    51

  $ hg merge 1

    52

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

    53

  (branch merge, don't forget to commit)

    54

  $ hg rm -f a

    55

  $ hg diff --nodates

    56

    57

Rename a file that was added via merge. Since the rename source is not in

    58

parent 1, the diff should be relative to /dev/null

    59

    60

  $ hg co -Cq 2

    61

  $ hg merge 1

    62

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

    63

  (branch merge, don't forget to commit)

    64

  $ hg mv a a2

    65

  $ hg diff --nodates

    66

  diff -r cf44b38435e5 a2

    67

  --- /dev/null

    68

  +++ b/a2

    69

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

    70

  +foo

    71

  $ hg diff --nodates --git

    72

  diff --git a/a2 b/a2

    73

  new file mode 100644

    74

  --- /dev/null

    75

  +++ b/a2

    76

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

    77

  +foo