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

Create a repo and add some commits

     2

     3

  $ hg init mm

     4

  $ cd mm

     5

  $ echo "Test content" > testfile1

     6

  $ hg add testfile1

     7

  $ hg commit -m "First commit" -u "Proper <commit@m.c>"

     8

  $ echo "Test content 2" > testfile2

     9

  $ hg add testfile2

    10

  $ hg commit -m "Second commit" -u "Commit Name 2 <commit2@m.c>"

    11

  $ echo "Test content 3" > testfile3

    12

  $ hg add testfile3

    13

  $ hg commit -m "Third commit" -u "Commit Name 3 <commit3@m.c>"

    14

  $ echo "Test content 4" > testfile4

    15

  $ hg add testfile4

    16

  $ hg commit -m "Fourth commit" -u "Commit Name 4 <commit4@m.c>"

    17

    18

Add a .mailmap file with each possible entry type plus comments

    19

  $ cat > .mailmap << EOF

    20

  > # Comment shouldn't break anything

    21

  > <proper@m.c> <commit@m.c> # Should update email only

    22

  > Proper Name 2 <commit2@m.c> # Should update name only

    23

  > Proper Name 3 <proper@m.c> <commit3@m.c> # Should update name, email due to email

    24

  > Proper Name 4 <proper@m.c> Commit Name 4 <commit4@m.c> # Should update name, email due to name, email

    25

  > EOF

    26

  $ hg add .mailmap

    27

  $ hg commit -m "Add mailmap file" -u "Testuser <test123@m.c>"

    28

    29

Output of commits should be normal without filter

    30

  $ hg log -T "{author}\n" -r "all()"

    31

  Proper <commit@m.c>

    32

  Commit Name 2 <commit2@m.c>

    33

  Commit Name 3 <commit3@m.c>

    34

  Commit Name 4 <commit4@m.c>

    35

  Testuser <test123@m.c>

    36

    37

Output of commits with filter shows their mailmap values

    38

  $ hg log -T "{mailmap(author)}\n" -r "all()"

    39

  Proper <proper@m.c>

    40

  Proper Name 2 <commit2@m.c>

    41

  Proper Name 3 <proper@m.c>

    42

  Proper Name 4 <proper@m.c>

    43

  Testuser <test123@m.c>

    44

    45

Add new mailmap entry for testuser

    46

  $ cat >> .mailmap << EOF

    47

  > <newmmentry@m.c> <test123@m.c>

    48

  > EOF

    49

    50

Output of commits with filter shows their updated mailmap values

    51

  $ hg log -T "{mailmap(author)}\n" -r "all()"

    52

  Proper <proper@m.c>

    53

  Proper Name 2 <commit2@m.c>

    54

  Proper Name 3 <proper@m.c>

    55

  Proper Name 4 <proper@m.c>

    56

  Testuser <newmmentry@m.c>

    57

    58

A commit with improperly formatted user field should not break the filter

    59

  $ echo "some more test content" > testfile1

    60

  $ hg commit -m "Commit with improper user field" -u "Improper user"

    61

  $ hg log -T "{mailmap(author)}\n" -r "all()"

    62

  Proper <proper@m.c>

    63

  Proper Name 2 <commit2@m.c>

    64

  Proper Name 3 <proper@m.c>

    65

  Proper Name 4 <proper@m.c>

    66

  Testuser <newmmentry@m.c>

    67

  Improper user

    68

    69

No TypeError beacause of invalid input

    70

    71

  $ hg log -T '{mailmap(termwidth)}\n' -r0

    72

  80