comparison mercurial/merge.py @ 45344:4c6004afd836

mergeresult: introduce getfile() and use it where required

We want to hide the underlying dictionary from the users and provide API for
valid and sane use cases.

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

45343:e3826f1dab60

                invalidconflicts.add(p)
            else:
                # A file is in a directory which aliases a local file.
                # We will need to rename the local file.
                localconflicts.add(p)
        if p in mresult.actions and mresult.actions[p][0] in (
            mergestatemod.ACTION_CREATED,
            mergestatemod.ACTION_DELETED_CHANGED,
            mergestatemod.ACTION_MERGE,
            mergestatemod.ACTION_CREATED_MERGE,
        ):

    if remoteconflicts:
        # Check if all files in the conflicting directories have been removed.
        ctxname = bytes(mctx).rstrip(b'+')
        for f, p in _filesindirs(repo, mf, remoteconflicts):
            if f not in deletedfiles:
                m, args, msg = mresult.actions[p]
                pnew = util.safename(
                    p, ctxname, wctx, set(mresult.actions.keys())
                )
                if m in (
                    mergestatemod.ACTION_DELETED_CHANGED,

            a, d, m = self._filemapping[filename]
            del self._actionmapping[a][filename]

        self._filemapping[filename] = (action, data, message)
        self._actionmapping[action][filename] = (data, message)

    def removefile(self, filename):
        """ removes a file from the mergeresult object as the file might
        not merging anymore """
        action, data, message = self._filemapping[filename]

                raise error.Abort(msg, hint=hint)

        # Prompt and create actions. Most of this is in the resolve phase
        # already, but we can't handle .hgsubstate in filemerge or
        # subrepoutil.submerge yet so we have to keep prompting for it.
        if b'.hgsubstate' in mresult.actions:
            f = b'.hgsubstate'
            m, args, msg = mresult.actions[f]
            prompts = filemerge.partextras(labels)
            prompts[b'f'] = f
            if m == mergestatemod.ACTION_CHANGED_DELETED:
                if repo.ui.promptchoice(
                    _(

45344:4c6004afd836

                invalidconflicts.add(p)
            else:
                # A file is in a directory which aliases a local file.
                # We will need to rename the local file.
                localconflicts.add(p)
        pd = mresult.getfile(p)
        if pd and pd[0] in (
            mergestatemod.ACTION_CREATED,
            mergestatemod.ACTION_DELETED_CHANGED,
            mergestatemod.ACTION_MERGE,
            mergestatemod.ACTION_CREATED_MERGE,
        ):

    if remoteconflicts:
        # Check if all files in the conflicting directories have been removed.
        ctxname = bytes(mctx).rstrip(b'+')
        for f, p in _filesindirs(repo, mf, remoteconflicts):
            if f not in deletedfiles:
                m, args, msg = mresult.getfile(p)
                pnew = util.safename(
                    p, ctxname, wctx, set(mresult.actions.keys())
                )
                if m in (
                    mergestatemod.ACTION_DELETED_CHANGED,

            a, d, m = self._filemapping[filename]
            del self._actionmapping[a][filename]

        self._filemapping[filename] = (action, data, message)
        self._actionmapping[action][filename] = (data, message)

    def getfile(self, filename, default_return=None):
        """ returns (action, args, msg) about this file

        returns default_return if the file is not present """
        if filename in self._filemapping:
            return self._filemapping[filename]
        return default_return

    def removefile(self, filename):
        """ removes a file from the mergeresult object as the file might
        not merging anymore """
        action, data, message = self._filemapping[filename]

                raise error.Abort(msg, hint=hint)

        # Prompt and create actions. Most of this is in the resolve phase
        # already, but we can't handle .hgsubstate in filemerge or
        # subrepoutil.submerge yet so we have to keep prompting for it.
        vals = mresult.getfile(b'.hgsubstate')
        if vals:
            f = b'.hgsubstate'
            m, args, msg = vals
            prompts = filemerge.partextras(labels)
            prompts[b'f'] = f
            if m == mergestatemod.ACTION_CHANGED_DELETED:
                if repo.ui.promptchoice(
                    _(