comparison mercurial/merge.py @ 48701:85c69b0dfa8f

merge: break up a not-so-one-liner for readability

(even if not fully satisfied this time)

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

48700:d8577d00c023

        elif not branchmerge:
            mresult.removefile(f)  # just updating, ignore changes outside clone
        elif action[0] in mergestatemod.NO_OP_ACTIONS:
            mresult.removefile(f)  # merge does not affect file
        elif action[0] in nonconflicttypes:
            raise error.Abort(
                _(
                    b'merge affects file \'%s\' outside narrow, '
                    b'which is not yet supported'
                )
                % f,
                hint=_(b'merging in the other direction may work'),
            )
        else:
            raise error.StateError(
                _(b'conflict in file \'%s\' is outside narrow clone') % f
            )

48701:85c69b0dfa8f

        elif not branchmerge:
            mresult.removefile(f)  # just updating, ignore changes outside clone
        elif action[0] in mergestatemod.NO_OP_ACTIONS:
            mresult.removefile(f)  # merge does not affect file
        elif action[0] in nonconflicttypes:
            msg = _(
                b'merge affects file \'%s\' outside narrow, '
                b'which is not yet supported'
            )
            hint = _(b'merging in the other direction may work')
            raise error.Abort(msg % f, hint=hint)
        else:
            raise error.StateError(
                _(b'conflict in file \'%s\' is outside narrow clone') % f
            )