Mercurial > public > mercurial-scm > hg

comparison mercurial/wireproto.py @ 34741:60143d038eb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wireproto: more strkwargs cleanup Differential Revision: https://phab.mercurial-scm.org/D1109
author Augie Fackler <augie@google.com>
date Sun, 15 Oct 2017 00:39:53 -0400
parents b880cc11da5d
children cb4dcd7fabe7
comparison
equal deleted inserted replaced
34740:b2601c5977a4 34741:60143d038eb7
857 if not common and clheads == heads: 857 if not common and clheads == heads:
858 raise error.Abort( 858 raise error.Abort(
859 _('server has pull-based clones disabled'), 859 _('server has pull-based clones disabled'),
860 hint=_('remove --pull if specified or upgrade Mercurial')) 860 hint=_('remove --pull if specified or upgrade Mercurial'))
861 861
862 chunks = exchange.getbundlechunks(repo, 'serve', **opts) 862 chunks = exchange.getbundlechunks(repo, 'serve',
863 **pycompat.strkwargs(opts))
863 except error.Abort as exc: 864 except error.Abort as exc:
864 # cleanly forward Abort error to the client 865 # cleanly forward Abort error to the client
865 if not exchange.bundle2requested(opts.get('bundlecaps')): 866 if not exchange.bundle2requested(opts.get('bundlecaps')):
866 if proto.name == 'http': 867 if proto.name == 'http':
867 return ooberror(str(exc) + '\n') 868 return ooberror(str(exc) + '\n')