comparison mercurial/scmutil.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

            ds.remove(f)

    # Merge old parent and old working dir copies
    oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
    oldcopies.update(copies)
    copies = dict(
        (dst, oldcopies.get(src, src))
        for dst, src in pycompat.iteritems(oldcopies)
    )
    # Adjust the dirstate copies
    for dst, src in pycompat.iteritems(copies):
        if src not in newctx or dst in newctx or ds[dst] != b'a':
            src = None
        ds.copy(src, dst)

44452:9d2b2df2c2ba

            ds.remove(f)

    # Merge old parent and old working dir copies
    oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
    oldcopies.update(copies)
    copies = {
        dst: oldcopies.get(src, src)
        for dst, src in pycompat.iteritems(oldcopies)
    }
    # Adjust the dirstate copies
    for dst, src in pycompat.iteritems(copies):
        if src not in newctx or dst in newctx or ds[dst] != b'a':
            src = None
        ds.copy(src, dst)