comparison hgext/narrow/narrowbundle2.py @ 39665:c73c7653dfb9

narrow: use diffmatcher to send only new filelogs in non-ellipses widening

Before this patch, when we widen a non-ellipses narrow clone, we downloads all
the filelogs matching the resulting new matcher. This is same as the ellipses
case but can be improved because, we don't pull new csets in non-ellipses cases,
we can only download the new added files instead of downloading all the files
which matches the new matcher.

So, we only download files which matches the new matcher but does not matches
the old matcher. There exists a match.differencematcher() which is used here.

This will lead to significant amount of speedup in extending a non-ellipses
narrow copy on large repos because we will download and process only the new
required filelogs.

The tests changes demonstrate that we are downloading now less files.

Thanks to Augie for pointing that functionality of differencematcher exists in
core.

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

39664:322aaf80acf3

    bundle2,
    changegroup,
    error,
    exchange,
    extensions,
    narrowspec,
    repair,
    repository,
    util,
    wireprototypes,

    include = sorted(filter(bool, kwargs.get(r'includepats', [])))
    exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
    newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)
    oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', [])))
    oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', [])))
    common = set(common or [nullid])

    if (oldinclude != include or oldexclude != exclude):
        common = repo.revs("::%ln", common)
        commonnodes = set()

            commonnodes.add(cl.node(c))
        if commonnodes:
            # XXX: we should only send the filelogs (and treemanifest). user
            # already has the changelog and manifest
            packer = changegroup.getbundler(version, repo,
                                            filematcher=newmatch,
                                            fullnodes=commonnodes)
            cgdata = packer.generate(set([nullid]), list(commonnodes), False,
                    source)

            part = bundler.newpart('changegroup', data=cgdata)

39665:c73c7653dfb9

    bundle2,
    changegroup,
    error,
    exchange,
    extensions,
    match as matchmod,
    narrowspec,
    repair,
    repository,
    util,
    wireprototypes,

    include = sorted(filter(bool, kwargs.get(r'includepats', [])))
    exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
    newmatch = narrowspec.match(repo.root, include=include, exclude=exclude)
    oldinclude = sorted(filter(bool, kwargs.get(r'oldincludepats', [])))
    oldexclude = sorted(filter(bool, kwargs.get(r'oldexcludepats', [])))
    oldmatch = narrowspec.match(repo.root, include=oldinclude,
                                exclude=oldexclude)
    diffmatch = matchmod.differencematcher(newmatch, oldmatch)
    common = set(common or [nullid])

    if (oldinclude != include or oldexclude != exclude):
        common = repo.revs("::%ln", common)
        commonnodes = set()

            commonnodes.add(cl.node(c))
        if commonnodes:
            # XXX: we should only send the filelogs (and treemanifest). user
            # already has the changelog and manifest
            packer = changegroup.getbundler(version, repo,
                                            filematcher=diffmatch,
                                            fullnodes=commonnodes)
            cgdata = packer.generate(set([nullid]), list(commonnodes), False,
                    source)

            part = bundler.newpart('changegroup', data=cgdata)