The code to process arguments only makes sense if there are
arguments. So change an "else" to "elif args", remove an
"if" that isn't necessary, and add some docs for good measure.
| Lint Skipped |
| Unit Tests Skipped |
| self.ui.debug("sending %s command\n" % cmd) | self.ui.debug("sending %s command\n" % cmd) | ||||
| q = [('cmd', cmd)] | q = [('cmd', cmd)] | ||||
| headersize = 0 | headersize = 0 | ||||
| varyheaders = [] | varyheaders = [] | ||||
| # Important: don't use self.capable() here or else you end up | # Important: don't use self.capable() here or else you end up | ||||
| # with infinite recursion when trying to look up capabilities | # with infinite recursion when trying to look up capabilities | ||||
| # for the first time. | # for the first time. | ||||
| postargsok = self._caps is not None and 'httppostargs' in self._caps | postargsok = self._caps is not None and 'httppostargs' in self._caps | ||||
| # Send arguments via POST. | |||||
| if postargsok and args: | if postargsok and args: | ||||
| strargs = urlreq.urlencode(sorted(args.items())) | strargs = urlreq.urlencode(sorted(args.items())) | ||||
| if not data: | if not data: | ||||
| data = strargs | data = strargs | ||||
| else: | else: | ||||
| if isinstance(data, bytes): | if isinstance(data, bytes): | ||||
| i = io.BytesIO(data) | i = io.BytesIO(data) | ||||
| i.length = len(data) | i.length = len(data) | ||||
| data = i | data = i | ||||
| argsio = io.BytesIO(strargs) | argsio = io.BytesIO(strargs) | ||||
| argsio.length = len(strargs) | argsio.length = len(strargs) | ||||
| data = _multifile(argsio, data) | data = _multifile(argsio, data) | ||||
| headers[r'X-HgArgs-Post'] = len(strargs) | headers[r'X-HgArgs-Post'] = len(strargs) | ||||
| else: | elif args: | ||||
| if len(args) > 0: | # Calling self.capable() can infinite loop if we are calling | ||||
| # "capabilities". But that command should never accept wire | |||||
| # protocol arguments. So this should never happen. | |||||
| assert cmd != 'capabilities' | |||||
| httpheader = self.capable('httpheader') | httpheader = self.capable('httpheader') | ||||
| if httpheader: | if httpheader: | ||||
| headersize = int(httpheader.split(',', 1)[0]) | headersize = int(httpheader.split(',', 1)[0]) | ||||
| # Send arguments via HTTP headers. | |||||
| if headersize > 0: | if headersize > 0: | ||||
| # The headers can typically carry more data than the URL. | # The headers can typically carry more data than the URL. | ||||
| encargs = urlreq.urlencode(sorted(args.items())) | encargs = urlreq.urlencode(sorted(args.items())) | ||||
| for header, value in encodevalueinheaders(encargs, 'X-HgArg', | for header, value in encodevalueinheaders(encargs, 'X-HgArg', | ||||
| headersize): | headersize): | ||||
| headers[header] = value | headers[header] = value | ||||
| varyheaders.append(header) | varyheaders.append(header) | ||||
| # Send arguments via query string (Mercurial <1.9). | |||||
| else: | else: | ||||
| q += sorted(args.items()) | q += sorted(args.items()) | ||||
| qs = '?%s' % urlreq.urlencode(q) | qs = '?%s' % urlreq.urlencode(q) | ||||
| cu = "%s%s" % (self._url, qs) | cu = "%s%s" % (self._url, qs) | ||||
| size = 0 | size = 0 | ||||
| if util.safehasattr(data, 'length'): | if util.safehasattr(data, 'length'): | ||||
| size = data.length | size = data.length | ||||
| elif data is not None: | elif data is not None: | ||||
| size = len(data) | size = len(data) | ||||
| if size and self.ui.configbool('ui', 'usehttp2'): | if size and self.ui.configbool('ui', 'usehttp2'): | ||||