comparison mercurial/bundle2.py @ 35790:c1b9eb15a51c

bundle2: don't advertise stream bundle2 capability when feature disabled

The server.uncompressed config option can be used to disable streaming
clones. While the top-level capability to advertise streaming clone
support isn't advertised when this option is set, we were still sending
the bundle2-level capabilities advertising support for stream parts.
It makes sense to not advertise that support when streaming clones
are globally disabled.

If the structure of the new code seems a bit odd, it is because we'll
have to further tweak the behavior in commit(s) ahead.

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

35789:8ed5f7609728

    cpmode = repo.ui.config('server', 'concurrent-push-mode')
    if cpmode == 'check-related':
        caps['checkheads'] = ('related',)
    if 'phases' in repo.ui.configlist('devel', 'legacy.exchange'):
        caps.pop('phases')
    if not repo.ui.configbool('experimental', 'bundle2.stream'):
        caps.pop('stream')
    return caps

def bundle2caps(remote):
    """return the bundle capabilities of a peer as dict"""
    raw = remote.capable('bundle2')

35790:c1b9eb15a51c

    cpmode = repo.ui.config('server', 'concurrent-push-mode')
    if cpmode == 'check-related':
        caps['checkheads'] = ('related',)
    if 'phases' in repo.ui.configlist('devel', 'legacy.exchange'):
        caps.pop('phases')

    # Don't advertise stream clone support in server mode if not configured.
    if role == 'server':
        streamsupported = repo.ui.configbool('server', 'uncompressed',
                                             untrusted=True)
        featuresupported = repo.ui.configbool('experimental', 'bundle2.stream')

        if not streamsupported or not featuresupported:
            caps.pop('stream')
    # role == 'client'
    else:
        if not repo.ui.configbool('experimental', 'bundle2.stream'):
            caps.pop('stream')

    return caps

def bundle2caps(remote):
    """return the bundle capabilities of a peer as dict"""
    raw = remote.capable('bundle2')