comparison mercurial/merge.py @ 44452:9d2b2df2c2ba

cleanup: run pyupgrade on our source tree to clean up varying things

Built with:

    hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**" - hgext/fsmonitor/pywatchman/**' | xargs pyupgrade --keep-percent-format --keep-extraneous-parens

and then blackened. pyupgrade comes from
https://github.com/asottile/pyupgrade with a patch to let me preserve
extraneous parens (which we use for marking strings that shouldn't be
translated), and lets us clean up a bunch of idioms that have cruftily
accumulated over the years.

# skip-blame no-op automated code cleanups

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

44449:ff72bd52d56a

        )


def emptyactions():
    """create an actions dict, to be populated and passed to applyupdates()"""
    return dict(
        (m, [])
        for m in (
            ACTION_ADD,
            ACTION_ADD_MODIFIED,
            ACTION_FORGET,
            ACTION_GET,

            ACTION_EXEC,
            ACTION_KEEP,
            ACTION_PATH_CONFLICT,
            ACTION_PATH_CONFLICT_RESOLVE,
        )
    )


def applyupdates(
    repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None
):

    merged += msmerged
    removed += msremoved

    extraactions = ms.actions()
    if extraactions:
        mfiles = set(a[0] for a in actions[ACTION_MERGE])
        for k, acts in pycompat.iteritems(extraactions):
            actions[k].extend(acts)
            if k == ACTION_GET and wantfiledata:
                # no filedata until mergestate is updated to provide it
                for a in acts:

44452:9d2b2df2c2ba

        )


def emptyactions():
    """create an actions dict, to be populated and passed to applyupdates()"""
    return {
        m: []
        for m in (
            ACTION_ADD,
            ACTION_ADD_MODIFIED,
            ACTION_FORGET,
            ACTION_GET,

            ACTION_EXEC,
            ACTION_KEEP,
            ACTION_PATH_CONFLICT,
            ACTION_PATH_CONFLICT_RESOLVE,
        )
    }


def applyupdates(
    repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None
):

    merged += msmerged
    removed += msremoved

    extraactions = ms.actions()
    if extraactions:
        mfiles = {a[0] for a in actions[ACTION_MERGE]}
        for k, acts in pycompat.iteritems(extraactions):
            actions[k].extend(acts)
            if k == ACTION_GET and wantfiledata:
                # no filedata until mergestate is updated to provide it
                for a in acts: