push: rework the computation of fallbackheads to be correct The previous computation tried to be smart but ended up being wrong. This was caught by phase movement test while reworking the phase discovery logic to be faster. The previous logic was failing to catch case where the pushed set was not based on a common heads (i.e. when the discovery seemed to have "over discovered" content, outside the pushed set) In the following graph, `e` is a common head and we `hg push -r f`. We need to detect `c` as a fallback heads and we previous failed to do so:: e | d f |/ c | b | a The performance impact of the change seems minimal. On the most impacted repository at hand (mozilla-try), the slowdown seems mostly mixed in the overall noise `hg push` but seems to be in the hundred of milliseconds order of magnitude. When using rust, we seems to be a bit faster, probably because we leverage more accelaratd internals. I added a couple of performance related common for further investigation later on.

     1

# mergeutil.py - help for merge processing in mercurial

     2

#

     3

# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

     9

from .i18n import _

    10

    11

from . import error

    12

    13

    14

def checkunresolved(ms):

    15

    if ms.unresolvedcount():

    16

        raise error.StateError(

    17

            _(b"unresolved merge conflicts (see 'hg help resolve')")

    18

        )