comparison mercurial/merge.py @ 45275:8e8d513941b4

merge: introduce 'commitinfo' in mergeresult

commitinfo will be used to pass information which is required on commit phase
from the merge phase.

One common example is, merge chooses filenode from second parent and we need to
tell commit to choose that. Right now this one and related cases are not very
neatly implement and there is no clear line on how to pass on such information.
Upcoming patches will try to work on in this area and make things easier.

Differential Revision: https://phab.mercurial-scm.org/D8742

45274:0e18861f96ab

    ''''An object representing result of merging manifests.

    It has information about what actions need to be performed on dirstate
    mapping of divergent renames and other such cases. '''

    def __init__(self, actions, diverge, renamedelete):
        """
        actions: dict of filename as keys and action related info as values
        diverge: mapping of source name -> list of dest name for
                 divergent renames
        renamedelete: mapping of source name -> list of destinations for files
                      deleted on one side and renamed on other.
        """

        self._actions = actions
        self._diverge = diverge
        self._renamedelete = renamedelete

    @property
    def actions(self):
        return self._actions

        return self._diverge

    @property
    def renamedelete(self):
        return self._renamedelete

    def setactions(self, actions):
        self._actions = actions

    ]

    branch_copies1 = copies.branch_copies()
    branch_copies2 = copies.branch_copies()
    diverge = {}
    if followcopies:
        branch_copies1, branch_copies2, diverge = copies.mergecopies(
            repo, wctx, p2, pa
        )

                            if branchmerge
                            else mergestatemod.ACTION_GET,
                            (fl2, False),
                            b'remote is newer',
                        )
                elif nol and n2 == a:  # remote only changed 'x'
                    actions[f] = (
                        mergestatemod.ACTION_EXEC,
                        (fl2,),
                        b'update permissions',

                        if branchmerge
                        else mergestatemod.ACTION_GET,
                        (fl1, False),
                        b'remote is newer',
                    )
                else:  # both changed something
                    actions[f] = (
                        mergestatemod.ACTION_MERGE,
                        (f, f, f, False, pa.node()),
                        b'versions differ',

        _filternarrowactions(narrowmatch, branchmerge, actions)

    renamedelete = branch_copies1.renamedelete
    renamedelete.update(branch_copies2.renamedelete)

    return mergeresult(actions, diverge, renamedelete)


def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
    """Resolves false conflicts where the nodeid changed but the content
       remained the same."""

                _(b' %s: ambiguous merge - picked %s action\n') % (f, m)
            )
            actions[f] = l[0]
            continue
        repo.ui.note(_(b'end of auction\n\n'))
        mresult = mergeresult(actions, diverge, renamedelete)

    if wctx.rev() is None:
        fractions = _forgetremoved(wctx, mctx, branchmerge)
        mresult.actions.update(fractions)

45275:8e8d513941b4

    ''''An object representing result of merging manifests.

    It has information about what actions need to be performed on dirstate
    mapping of divergent renames and other such cases. '''

    def __init__(self, actions, diverge, renamedelete, commitinfo):
        """
        actions: dict of filename as keys and action related info as values
        diverge: mapping of source name -> list of dest name for
                 divergent renames
        renamedelete: mapping of source name -> list of destinations for files
                      deleted on one side and renamed on other.
        commitinfo: dict containing data which should be used on commit
                    contains a filename -> info mapping
        """

        self._actions = actions
        self._diverge = diverge
        self._renamedelete = renamedelete
        self._commitinfo = commitinfo

    @property
    def actions(self):
        return self._actions

        return self._diverge

    @property
    def renamedelete(self):
        return self._renamedelete

    @property
    def commitinfo(self):
        return self._commitinfo

    def setactions(self, actions):
        self._actions = actions

    ]

    branch_copies1 = copies.branch_copies()
    branch_copies2 = copies.branch_copies()
    diverge = {}
    # information from merge which is needed at commit time
    # for example choosing filelog of which parent to commit
    # TODO: use specific constants in future for this mapping
    commitinfo = {}
    if followcopies:
        branch_copies1, branch_copies2, diverge = copies.mergecopies(
            repo, wctx, p2, pa
        )

                            if branchmerge
                            else mergestatemod.ACTION_GET,
                            (fl2, False),
                            b'remote is newer',
                        )
                        if branchmerge:
                            commitinfo[f] = b'other'
                elif nol and n2 == a:  # remote only changed 'x'
                    actions[f] = (
                        mergestatemod.ACTION_EXEC,
                        (fl2,),
                        b'update permissions',

                        if branchmerge
                        else mergestatemod.ACTION_GET,
                        (fl1, False),
                        b'remote is newer',
                    )
                    if branchmerge:
                        commitinfo[f] = b'other'
                else:  # both changed something
                    actions[f] = (
                        mergestatemod.ACTION_MERGE,
                        (f, f, f, False, pa.node()),
                        b'versions differ',

        _filternarrowactions(narrowmatch, branchmerge, actions)

    renamedelete = branch_copies1.renamedelete
    renamedelete.update(branch_copies2.renamedelete)

    return mergeresult(actions, diverge, renamedelete, commitinfo)


def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
    """Resolves false conflicts where the nodeid changed but the content
       remained the same."""

                _(b' %s: ambiguous merge - picked %s action\n') % (f, m)
            )
            actions[f] = l[0]
            continue
        repo.ui.note(_(b'end of auction\n\n'))
        # TODO: think about commitinfo when bid merge is used
        mresult = mergeresult(actions, diverge, renamedelete, {})

    if wctx.rev() is None:
        fractions = _forgetremoved(wctx, mctx, branchmerge)
        mresult.actions.update(fractions)