comparison hgext/remotefilelog/__init__.py @ 45294:30f3e278c5d7

mergeactions: use action constants instead of string values

Having constants inplace of strings like 'c', 'cm' etc. makes it easier to
understand the code.

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

45293:4e6a2889dd1d

    extensions,
    hg,
    localrepo,
    match as matchmod,
    merge,
    node as nodemod,
    patch,
    pycompat,
    registrar,
    repair,

    orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts
):
    if isenabled(repo):
        manifest = mctx.manifest()
        files = []
        for f, args, msg in actions[b'g']:
            files.append((f, hex(manifest[f])))
        # batch fetch the needed files from the server
        repo.fileservice.prefetch(files)
    return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts)

        files = []
        sparsematch = repo.maybesparsematch(mctx.rev())
        for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions):
            if sparsematch and not sparsematch(f):
                continue
            if m in (b'c', b'dc', b'cm'):
                files.append((f, hex(mctx.filenode(f))))
            elif m == b'dg':
                f2 = actionargs[0]
                files.append((f2, hex(mctx.filenode(f2))))
        # batch fetch the needed files from the server
        repo.fileservice.prefetch(files)
    return orig(repo, wctx, mctx, force, mresult, *args, **kwargs)

45294:30f3e278c5d7

    extensions,
    hg,
    localrepo,
    match as matchmod,
    merge,
    mergestate as mergestatemod,
    node as nodemod,
    patch,
    pycompat,
    registrar,
    repair,

    orig, repo, actions, wctx, mctx, overwrite, wantfiledata, **opts
):
    if isenabled(repo):
        manifest = mctx.manifest()
        files = []
        for f, args, msg in actions[mergestatemod.ACTION_GET]:
            files.append((f, hex(manifest[f])))
        # batch fetch the needed files from the server
        repo.fileservice.prefetch(files)
    return orig(repo, actions, wctx, mctx, overwrite, wantfiledata, **opts)

        files = []
        sparsematch = repo.maybesparsematch(mctx.rev())
        for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions):
            if sparsematch and not sparsematch(f):
                continue
            if m in (
                mergestatemod.ACTION_CREATED,
                mergestatemod.ACTION_DELETED_CHANGED,
                mergestatemod.ACTION_CREATED_MERGE,
            ):
                files.append((f, hex(mctx.filenode(f))))
            elif m == mergestatemod.ACTION_LOCAL_DIR_RENAME_GET:
                f2 = actionargs[0]
                files.append((f2, hex(mctx.filenode(f2))))
        # batch fetch the needed files from the server
        repo.fileservice.prefetch(files)
    return orig(repo, wctx, mctx, force, mresult, *args, **kwargs)