equal
deleted
inserted
replaced
508 |
508 |
509 def _makeconnection(self, host, port=None, *args, **kwargs): |
509 def _makeconnection(self, host, port=None, *args, **kwargs): |
510 keyfile = None |
510 keyfile = None |
511 certfile = None |
511 certfile = None |
512 |
512 |
513 if args: # key_file |
513 if len(args) >= 1: # key_file |
514 keyfile = args.pop(0) |
514 keyfile = args[0] |
515 if args: # cert_file |
515 if len(args) >= 2: # cert_file |
516 certfile = args.pop(0) |
516 certfile = args[1] |
|
517 args = args[2:] |
517 |
518 |
518 # if the user has specified different key/cert files in |
519 # if the user has specified different key/cert files in |
519 # hgrc, we prefer these |
520 # hgrc, we prefer these |
520 if self.auth and 'key' in self.auth and 'cert' in self.auth: |
521 if self.auth and 'key' in self.auth and 'cert' in self.auth: |
521 keyfile = self.auth['key'] |
522 keyfile = self.auth['key'] |