comparison mercurial/wireproto.py @ 30914:f3807a135e43 stable

wireproto: properly report server Abort during 'getbundle'

Previously Abort raised during 'getbundle' call poorly reported (HTTP-500 for
http, some scary messages for ssh). Abort error have been properly reported for
"push" for a long time, there is not reason to be different for 'getbundle'. We
properly catch such error and report them back the best way available. For
bundle, we issue a valid bundle2 reply (as expected by the client) with an
'error:abort' part. With bundle1 we do as best as we can depending of http or
ssh.

30913:d70971a3ae80

            if proto.name == 'http':
                return ooberror(bundle2required)
            raise error.Abort(bundle2requiredmain,
                              hint=bundle2requiredhint)

    chunks = exchange.getbundlechunks(repo, 'serve', **opts)
    return streamres(gen=chunks, v1compressible=True)

@wireprotocommand('heads')
def heads(repo, proto):
    h = repo.heads()

30914:f3807a135e43

            if proto.name == 'http':
                return ooberror(bundle2required)
            raise error.Abort(bundle2requiredmain,
                              hint=bundle2requiredhint)

    #chunks = exchange.getbundlechunks(repo, 'serve', **opts)
    try:
        chunks = exchange.getbundlechunks(repo, 'serve', **opts)
    except error.Abort as exc:
        # cleanly forward Abort error to the client
        if not exchange.bundle2requested(opts.get('bundlecaps')):
            if proto.name == 'http':
                return ooberror(str(exc) + '\n')
            raise # cannot do better for bundle1 + ssh
        # bundle2 request expect a bundle2 reply
        bundler = bundle2.bundle20(repo.ui)
        manargs = [('message', str(exc))]
        advargs = []
        if exc.hint is not None:
            advargs.append(('hint', exc.hint))
        bundler.addpart(bundle2.bundlepart('error:abort',
                                           manargs, advargs))
        return streamres(gen=bundler.getchunks(), v1compressible=True)
    return streamres(gen=chunks, v1compressible=True)

@wireprotocommand('heads')
def heads(repo, proto):
    h = repo.heads()