evolve: use merge.update() for resolving phase divergence Iterating over the manifest when tree manifests and narrowness is in play produces entries for paths outside the narrowspec that represent trees. For example, if the tests/ directory of the hg repo was not in the narrowspec (and the hg repo was using tree manifests, which it doesn't), then there would be a "tests/" entry in the manifest. The merge code deals with some of these cases. For example, it's valid to do a merge if only the local side changes directories outside the narrowspec. That allows rebasing a local commit onto a public commit that had changes to the excluded paths to work. However, _resolvephasedivergent() was iterating of the manifests, which resulted in crashes for some of our users when they tried to resolve phase-divergent commits (actually content-divergent commits that became phase-divergent after the intermediate rebase). We can fix that by relying on merge.update(), since that already handles this case. [This re-install a changeset backed out for compatibility reason]

     1

# Copyright 2017 FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

     2

#

     3

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

     4

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

     5

"""

     6

Compatibility module

     7

"""

     8

from __future__ import absolute_import

     9

    10

from mercurial import (

    11

    obsolete,

    12

)

    13

    14

getmarkers = None

    15

successorssets = None

    16

try:

    17

    from mercurial import obsutil

    18

    getmarkers = getattr(obsutil, 'getmarkers', None)

    19

    successorssets = getattr(obsutil, 'successorssets', None)

    20

except ImportError:

    21

    pass

    22

    23

if getmarkers is None:

    24

    getmarkers = obsolete.getmarkers

    25

if successorssets is None:

    26

    successorssets = obsolete.successorssets