comparison mercurial/merge.py @ 45524:6877b0ee5f9d

mergestate: introduce a new ACTION_KEEP_NEW

`ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this
KEEP, what was the state of things.

In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files
which are kept absent in the working directory.

There is another special case where we keep the file when it's not present on
both ancestor and remote side. We introduce a dedicated action for that.

The goal is to use these information to make bid merge smarter.

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

45521:e7587430ca23

    mapping of divergent renames and other such cases. '''

    NO_OP_ACTIONS = (
        mergestatemod.ACTION_KEEP,
        mergestatemod.ACTION_KEEP_ABSENT,
    )

    def __init__(self):
        """
        filemapping: dict of filename as keys and action related info as values

                        f, mergestatemod.ACTION_REMOVE, None, b'other deleted',
                    )
            else:  # file not in ancestor, not in remote
                mresult.addfile(
                    f,
                    mergestatemod.ACTION_KEEP,
                    None,
                    b'ancestor missing, remote missing',
                )

        elif n2:  # file exists only on remote side

                continue
            # If keep absent is an option, just do that
            if mergestatemod.ACTION_KEEP_ABSENT in bids:
                repo.ui.note(_(b" %s: picking 'keep absent' action\n") % f)
                mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_ABSENT][0])
                continue
            # If there are gets and they all agree [how could they not?], do it.
            if mergestatemod.ACTION_GET in bids:
                ga0 = bids[mergestatemod.ACTION_GET][0]
                if all(a == ga0 for a in bids[mergestatemod.ACTION_GET][1:]):

    ):
        repo.ui.debug(b" %s: %s -> am\n" % (f, msg))
        progress.increment(item=f)

    # keep (noop, just log it)
    for f, args, msg in mresult.getactions(
        (mergestatemod.ACTION_KEEP,), sort=True
    ):
        repo.ui.debug(b" %s: %s -> k\n" % (f, msg))
        # no progress
    for f, args, msg in mresult.getactions(
        (mergestatemod.ACTION_KEEP_ABSENT,), sort=True
    ):
        repo.ui.debug(b" %s: %s -> ka\n" % (f, msg))
        # no progress

    # directory rename, move local
    for f, args, msg in mresult.getactions(
        (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True
    ):

45524:6877b0ee5f9d

    mapping of divergent renames and other such cases. '''

    NO_OP_ACTIONS = (
        mergestatemod.ACTION_KEEP,
        mergestatemod.ACTION_KEEP_ABSENT,
        mergestatemod.ACTION_KEEP_NEW,
    )

    def __init__(self):
        """
        filemapping: dict of filename as keys and action related info as values

                        f, mergestatemod.ACTION_REMOVE, None, b'other deleted',
                    )
            else:  # file not in ancestor, not in remote
                mresult.addfile(
                    f,
                    mergestatemod.ACTION_KEEP_NEW,
                    None,
                    b'ancestor missing, remote missing',
                )

        elif n2:  # file exists only on remote side

                continue
            # If keep absent is an option, just do that
            if mergestatemod.ACTION_KEEP_ABSENT in bids:
                repo.ui.note(_(b" %s: picking 'keep absent' action\n") % f)
                mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_ABSENT][0])
                continue
            # If keep new is an option, let's just do that
            if mergestatemod.ACTION_KEEP_NEW in bids:
                repo.ui.note(_(b" %s: picking 'keep new' action\n") % f)
                mresult.addfile(f, *bids[mergestatemod.ACTION_KEEP_NEW][0])
                continue
            # If there are gets and they all agree [how could they not?], do it.
            if mergestatemod.ACTION_GET in bids:
                ga0 = bids[mergestatemod.ACTION_GET][0]
                if all(a == ga0 for a in bids[mergestatemod.ACTION_GET][1:]):

    ):
        repo.ui.debug(b" %s: %s -> am\n" % (f, msg))
        progress.increment(item=f)

    # keep (noop, just log it)
    for a in mergeresult.NO_OP_ACTIONS:
        for f, args, msg in mresult.getactions((a,), sort=True):
            repo.ui.debug(b" %s: %s -> %s\n" % (f, msg, a))
            # no progress

    # directory rename, move local
    for f, args, msg in mresult.getactions(
        (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True
    ):