comparison mercurial/exchange.py @ 35785:ba15580e53d5

exchange: return bundle info from getbundlechunks() (API)

We generally want a mechanism to pass information about the
generated bundle back to callers (in addition to the byte stream).
Ideally we would return a bundler from this function and have the
caller code to an interface. But the bundling APIs are not great
and getbundlechunks() is the best API we have for obtaining bundle
contents in a unified manner.

We change getbundlechunks() to return a dict that we can use to
communicate metadata.

We populate that dict with the bundle version number to demonstrate
some value.

.. api::

   exchange.getbundlechunks() now returns a 2-tuple instead of just
   an iterator.

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

35784:08cc94dd3d3c

    """Return chunks constituting a bundle's raw data.

    Could be a bundle HG10 or a bundle HG20 depending on bundlecaps
    passed.

    Returns an iterator over raw chunks (of varying sizes).
    """
    kwargs = pycompat.byteskwargs(kwargs)
    usebundle2 = bundle2requested(bundlecaps)
    # bundle10 case
    if not usebundle2:
        if bundlecaps and not kwargs.get('cg', True):
            raise ValueError(_('request for bundle10 must include changegroup'))

        if kwargs:
            raise ValueError(_('unsupported getbundle arguments: %s')
                             % ', '.join(sorted(kwargs.keys())))
        outgoing = _computeoutgoing(repo, heads, common)
        return changegroup.makestream(repo, outgoing, '01', source,
                                      bundlecaps=bundlecaps)

    # bundle20 case
    b2caps = {}
    for bcaps in bundlecaps:
        if bcaps.startswith('bundle2='):
            blob = urlreq.unquote(bcaps[len('bundle2='):])
            b2caps.update(bundle2.decodecaps(blob))

    for name in getbundle2partsorder:
        func = getbundle2partsmapping[name]
        func(bundler, repo, source, bundlecaps=bundlecaps, b2caps=b2caps,
             **pycompat.strkwargs(kwargs))

    return bundler.getchunks()

@getbundle2partsgenerator('stream')
def _getbundlestream(bundler, repo, source, bundlecaps=None,
                     b2caps=None, heads=None, common=None, **kwargs):
    if not kwargs.get('stream', False):

35785:ba15580e53d5

    """Return chunks constituting a bundle's raw data.

    Could be a bundle HG10 or a bundle HG20 depending on bundlecaps
    passed.

    Returns a 2-tuple of a dict with metadata about the generated bundle
    and an iterator over raw chunks (of varying sizes).
    """
    kwargs = pycompat.byteskwargs(kwargs)
    info = {}
    usebundle2 = bundle2requested(bundlecaps)
    # bundle10 case
    if not usebundle2:
        if bundlecaps and not kwargs.get('cg', True):
            raise ValueError(_('request for bundle10 must include changegroup'))

        if kwargs:
            raise ValueError(_('unsupported getbundle arguments: %s')
                             % ', '.join(sorted(kwargs.keys())))
        outgoing = _computeoutgoing(repo, heads, common)
        info['bundleversion'] = 1
        return info, changegroup.makestream(repo, outgoing, '01', source,
                                            bundlecaps=bundlecaps)

    # bundle20 case
    info['bundleversion'] = 2
    b2caps = {}
    for bcaps in bundlecaps:
        if bcaps.startswith('bundle2='):
            blob = urlreq.unquote(bcaps[len('bundle2='):])
            b2caps.update(bundle2.decodecaps(blob))

    for name in getbundle2partsorder:
        func = getbundle2partsmapping[name]
        func(bundler, repo, source, bundlecaps=bundlecaps, b2caps=b2caps,
             **pycompat.strkwargs(kwargs))

    return info, bundler.getchunks()

@getbundle2partsgenerator('stream')
def _getbundlestream(bundler, repo, source, bundlecaps=None,
                     b2caps=None, heads=None, common=None, **kwargs):
    if not kwargs.get('stream', False):