| durin42 |
| hg-reviewers |
In theory, the protocol should be passed to this function. But the
argument isn't being used and it is getting in the way of refactoring.
So let's remove it. We can always add it back later if we need it
again.
| Lint Skipped |
| Unit Tests Skipped |
| if gd: | if gd: | ||||
| v = ui.configbool('server', 'bundle1gd') | v = ui.configbool('server', 'bundle1gd') | ||||
| if v is not None: | if v is not None: | ||||
| return v | return v | ||||
| return ui.configbool('server', 'bundle1') | return ui.configbool('server', 'bundle1') | ||||
| def supportedcompengines(ui, proto, role): | def supportedcompengines(ui, role): | ||||
| """Obtain the list of supported compression engines for a request.""" | """Obtain the list of supported compression engines for a request.""" | ||||
| assert role in (util.CLIENTROLE, util.SERVERROLE) | assert role in (util.CLIENTROLE, util.SERVERROLE) | ||||
| compengines = util.compengines.supportedwireengines(role) | compengines = util.compengines.supportedwireengines(role) | ||||
| # Allow config to override default list and ordering. | # Allow config to override default list and ordering. | ||||
| if role == util.SERVERROLE: | if role == util.SERVERROLE: | ||||
| configengines = ui.configlist('server', 'compressionengines') | configengines = ui.configlist('server', 'compressionengines') | ||||
| repo.ui.configint('server', 'maxhttpheaderlen')) | repo.ui.configint('server', 'maxhttpheaderlen')) | ||||
| if repo.ui.configbool('experimental', 'httppostargs'): | if repo.ui.configbool('experimental', 'httppostargs'): | ||||
| caps.append('httppostargs') | caps.append('httppostargs') | ||||
| # FUTURE advertise 0.2rx once support is implemented | # FUTURE advertise 0.2rx once support is implemented | ||||
| # FUTURE advertise minrx and mintx after consulting config option | # FUTURE advertise minrx and mintx after consulting config option | ||||
| caps.append('httpmediatype=0.1rx,0.1tx,0.2tx') | caps.append('httpmediatype=0.1rx,0.1tx,0.2tx') | ||||
| compengines = supportedcompengines(repo.ui, proto, util.SERVERROLE) | compengines = supportedcompengines(repo.ui, util.SERVERROLE) | ||||
| if compengines: | if compengines: | ||||
| comptypes = ','.join(urlreq.quote(e.wireprotosupport().name) | comptypes = ','.join(urlreq.quote(e.wireprotosupport().name) | ||||
| for e in compengines) | for e in compengines) | ||||
| caps.append('compression=%s' % comptypes) | caps.append('compression=%s' % comptypes) | ||||
| return caps | return caps | ||||
| # If you are writing an extension and consider wrapping this function. Wrap | # If you are writing an extension and consider wrapping this function. Wrap | ||||
| # Default as defined by wire protocol spec. | # Default as defined by wire protocol spec. | ||||
| compformats = ['zlib', 'none'] | compformats = ['zlib', 'none'] | ||||
| for cap in protocaps: | for cap in protocaps: | ||||
| if cap.startswith('comp='): | if cap.startswith('comp='): | ||||
| compformats = cap[5:].split(',') | compformats = cap[5:].split(',') | ||||
| break | break | ||||
| # Now find an agreed upon compression format. | # Now find an agreed upon compression format. | ||||
| for engine in wireproto.supportedcompengines(self._ui, self, | for engine in wireproto.supportedcompengines(self._ui, | ||||
| util.SERVERROLE): | util.SERVERROLE): | ||||
| if engine.wireprotosupport().name in compformats: | if engine.wireprotosupport().name in compformats: | ||||
| opts = {} | opts = {} | ||||
| level = self._ui.configint('server', | level = self._ui.configint('server', | ||||
| '%slevel' % engine.name()) | '%slevel' % engine.name()) | ||||
| if level is not None: | if level is not None: | ||||
| opts['level'] = level | opts['level'] = level | ||||