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

from mercurial.thirdparty import attr

     2

from mercurial import (

     3

    cmdutil,

     4

    commands,

     5

    extensions,

     6

    logcmdutil,

     7

    revsetlang,

     8

    smartset,

     9

)

    10

    11

from mercurial.utils import stringutil

    12

    13

    14

def logrevset(repo, wopts):

    15

    revs = logcmdutil._initialrevs(repo, wopts)

    16

    if not revs:

    17

        return None

    18

    match, pats, slowpath = logcmdutil._makematcher(repo, revs, wopts)

    19

    wopts = attr.evolve(wopts, pats=pats)

    20

    return logcmdutil._makerevset(repo, wopts, slowpath)

    21

    22

    23

def uisetup(ui):

    24

    def printrevset(orig, repo, wopts):

    25

        revs, filematcher = orig(repo, wopts)

    26

        if wopts.opts.get(b'print_revset'):

    27

            expr = logrevset(repo, wopts)

    28

            if expr:

    29

                tree = revsetlang.parse(expr)

    30

                tree = revsetlang.analyze(tree)

    31

            else:

    32

                tree = []

    33

            ui = repo.ui

    34

            ui.write(b'%s\n' % stringutil.pprint(wopts.opts.get(b'rev', [])))

    35

            ui.write(revsetlang.prettyformat(tree) + b'\n')

    36

            ui.write(stringutil.prettyrepr(revs) + b'\n')

    37

            revs = smartset.baseset()  # display no revisions

    38

        return revs, filematcher

    39

    40

    extensions.wrapfunction(logcmdutil, 'getrevs', printrevset)

    41

    aliases, entry = cmdutil.findcmd(b'log', commands.table)

    42

    entry[1].append(

    43

        (

    44

            b'',

    45

            b'print-revset',

    46

            False,

    47

            b'print generated revset and exit (DEPRECATED)',

    48

        )

    49

    )