comparison hgext/largefiles/overrides.py @ 45942:89a2afe31e82

formating: upgrade to black 20.8b1

This required a couple of small tweaks to un-confuse black, but now it
works. Big formatting changes come from:

 * Dramatically improved collection-splitting logic upstream
 * Black having a strong (correct IMO) opinion that """ is better than '''

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

45941:346af7687c6f

# -- Utility functions: commonly/repeatedly needed functionality ---------------


def composelargefilematcher(match, manifest):
    '''create a matcher that matches only the largefiles in the original
    matcher'''
    m = copy.copy(match)
    lfile = lambda f: lfutil.standin(f) in manifest
    m._files = [lf for lf in m._files if lfile(lf)]
    m._fileset = set(m._files)
    m.always = lambda: False

                mresult.addfile(standin, b'g', sargs, b'replaces standin')
            else:  # keep local normal file
                mresult.addfile(lfile, b'k', None, b'replaces standin')
                if branchmerge:
                    mresult.addfile(
                        standin, b'k', None, b'replaced by non-standin',
                    )
                else:
                    mresult.addfile(
                        standin, b'r', None, b'replaced by non-standin',
                    )
        elif lm in (b'g', b'dc') and sm != b'r':
            if lm == b'dc':
                f1, f2, fa, move, anc = largs
                largs = (p2[f2].flags(), False)

            )
            if repo.ui.promptchoice(usermsg, 0) == 0:  # keep local largefile
                if branchmerge:
                    # largefile can be restored from standin safely
                    mresult.addfile(
                        lfile, b'k', None, b'replaced by standin',
                    )
                    mresult.addfile(standin, b'k', None, b'replaces standin')
                else:
                    # "lfile" should be marked as "removed" without
                    # removal of itself

                    # linear-merge should treat this largefile as 're-added'
                    mresult.addfile(standin, b'a', None, b'keep standin')
            else:  # pick remote normal file
                mresult.addfile(lfile, b'g', largs, b'replaces standin')
                mresult.addfile(
                    standin, b'r', None, b'replaced by non-standin',
                )

    return mresult

45942:89a2afe31e82

# -- Utility functions: commonly/repeatedly needed functionality ---------------


def composelargefilematcher(match, manifest):
    """create a matcher that matches only the largefiles in the original
    matcher"""
    m = copy.copy(match)
    lfile = lambda f: lfutil.standin(f) in manifest
    m._files = [lf for lf in m._files if lfile(lf)]
    m._fileset = set(m._files)
    m.always = lambda: False

                mresult.addfile(standin, b'g', sargs, b'replaces standin')
            else:  # keep local normal file
                mresult.addfile(lfile, b'k', None, b'replaces standin')
                if branchmerge:
                    mresult.addfile(
                        standin,
                        b'k',
                        None,
                        b'replaced by non-standin',
                    )
                else:
                    mresult.addfile(
                        standin,
                        b'r',
                        None,
                        b'replaced by non-standin',
                    )
        elif lm in (b'g', b'dc') and sm != b'r':
            if lm == b'dc':
                f1, f2, fa, move, anc = largs
                largs = (p2[f2].flags(), False)

            )
            if repo.ui.promptchoice(usermsg, 0) == 0:  # keep local largefile
                if branchmerge:
                    # largefile can be restored from standin safely
                    mresult.addfile(
                        lfile,
                        b'k',
                        None,
                        b'replaced by standin',
                    )
                    mresult.addfile(standin, b'k', None, b'replaces standin')
                else:
                    # "lfile" should be marked as "removed" without
                    # removal of itself

                    # linear-merge should treat this largefile as 're-added'
                    mresult.addfile(standin, b'a', None, b'keep standin')
            else:  # pick remote normal file
                mresult.addfile(lfile, b'g', largs, b'replaces standin')
                mresult.addfile(
                    standin,
                    b'r',
                    None,
                    b'replaced by non-standin',
                )

    return mresult