comparison mercurial/httppeer.py @ 40024:86b22a4cfab1

wireprotov2: client support for advertising redirect targets

With the server now able to emit a redirect target descriptor, we can
start to teach the client to recognize it.

This commit implements support for filtering the advertised
redirect targets against supported features and for advertising
compatible redirect targets as part of command requests. It also
adds the minimal boilerplate required to fail when a content
redirect is seen.

The server doesn't yet do anything with the advertised redirect
targets. And the client can't yet follow redirects if it did. But
at least we're putting bytes on the wire.

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

40023:10cf8b116dd8

        return self._callstream(cmd, _compressible=True, **args)

    def _abort(self, exception):
        raise exception

def sendv2request(ui, opener, requestbuilder, apiurl, permission, requests):
    reactor = wireprotoframing.clientreactor(hasmultiplesend=False,
                                             buffersends=True)

    handler = wireprotov2peer.clienthandler(ui, reactor)

    ui.debug('sending %d commands\n' % len(requests))
    for command, args, f in requests:
        ui.debug('sending command %s: %s\n' % (
            command, stringutil.pprint(args, indent=2)))
        assert not list(handler.callcommand(command, args, f))

    # TODO stream this.
    body = b''.join(map(bytes, handler.flushcommands()))

    # TODO modify user-agent to reflect v2

        # will resolve to Future.result.
        return self.result(timeout)

@interfaceutil.implementer(repository.ipeercommandexecutor)
class httpv2executor(object):
    def __init__(self, ui, opener, requestbuilder, apiurl, descriptor):
        self._ui = ui
        self._opener = opener
        self._requestbuilder = requestbuilder
        self._apiurl = apiurl
        self._descriptor = descriptor
        self._sent = False
        self._closed = False
        self._neededpermissions = set()
        self._calls = []
        self._futures = weakref.WeakSet()

            'pull': 'ro',
        }[permissions.pop()]

        handler, resp = sendv2request(
            self._ui, self._opener, self._requestbuilder, self._apiurl,
            permission, calls)

        # TODO we probably want to validate the HTTP code, media type, etc.

        self._responseexecutor = pycompat.futures.ThreadPoolExecutor(1)
        self._responsef = self._responseexecutor.submit(self._handleresponse,

        self._apiurl = '%s/%s' % (repourl, apipath)
        self._opener = opener
        self._requestbuilder = requestbuilder
        self._descriptor = apidescriptor

    # Start of ipeerconnection.

    def url(self):
        return self._url

        with self.commandexecutor() as e:
            return e.callcommand(name, args).result()

    def commandexecutor(self):
        return httpv2executor(self.ui, self._opener, self._requestbuilder,
                              self._apiurl, self._descriptor)

# Registry of API service names to metadata about peers that handle it.
#
# The following keys are meaningful:
#

40024:86b22a4cfab1

        return self._callstream(cmd, _compressible=True, **args)

    def _abort(self, exception):
        raise exception

def sendv2request(ui, opener, requestbuilder, apiurl, permission, requests,
                  redirect):
    reactor = wireprotoframing.clientreactor(hasmultiplesend=False,
                                             buffersends=True)

    handler = wireprotov2peer.clienthandler(ui, reactor)

    ui.debug('sending %d commands\n' % len(requests))
    for command, args, f in requests:
        ui.debug('sending command %s: %s\n' % (
            command, stringutil.pprint(args, indent=2)))
        assert not list(handler.callcommand(command, args, f,
                                            redirect=redirect))

    # TODO stream this.
    body = b''.join(map(bytes, handler.flushcommands()))

    # TODO modify user-agent to reflect v2

        # will resolve to Future.result.
        return self.result(timeout)

@interfaceutil.implementer(repository.ipeercommandexecutor)
class httpv2executor(object):
    def __init__(self, ui, opener, requestbuilder, apiurl, descriptor,
                 redirect):
        self._ui = ui
        self._opener = opener
        self._requestbuilder = requestbuilder
        self._apiurl = apiurl
        self._descriptor = descriptor
        self._redirect = redirect
        self._sent = False
        self._closed = False
        self._neededpermissions = set()
        self._calls = []
        self._futures = weakref.WeakSet()

            'pull': 'ro',
        }[permissions.pop()]

        handler, resp = sendv2request(
            self._ui, self._opener, self._requestbuilder, self._apiurl,
            permission, calls, self._redirect)

        # TODO we probably want to validate the HTTP code, media type, etc.

        self._responseexecutor = pycompat.futures.ThreadPoolExecutor(1)
        self._responsef = self._responseexecutor.submit(self._handleresponse,

        self._apiurl = '%s/%s' % (repourl, apipath)
        self._opener = opener
        self._requestbuilder = requestbuilder
        self._descriptor = apidescriptor

        self._redirect = wireprotov2peer.supportedredirects(ui, apidescriptor)

    # Start of ipeerconnection.

    def url(self):
        return self._url

        with self.commandexecutor() as e:
            return e.callcommand(name, args).result()

    def commandexecutor(self):
        return httpv2executor(self.ui, self._opener, self._requestbuilder,
                              self._apiurl, self._descriptor, self._redirect)

# Registry of API service names to metadata about peers that handle it.
#
# The following keys are meaningful:
#