Mercurial > public > mercurial-scm > hg

comparison mercurial/url.py @ 12607:1393a81b3bdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin Geisler <mg@aragost.com>
date Fri, 01 Oct 2010 16:43:03 +0200
parents 0f83a402faa0 14198926975d
children 6ab4a7d3c179
comparison
equal deleted inserted replaced
12606:5c8353692123 12607:1393a81b3bdc
526 self.sock = _ssl_wrap_socket(sock, self.key_file, 526 self.sock = _ssl_wrap_socket(sock, self.key_file,
527 self.cert_file, cert_reqs=CERT_REQUIRED, 527 self.cert_file, cert_reqs=CERT_REQUIRED,
528 ca_certs=cacerts) 528 ca_certs=cacerts)
529 msg = _verifycert(self.sock.getpeercert(), self.host) 529 msg = _verifycert(self.sock.getpeercert(), self.host)
530 if msg: 530 if msg:
531 raise util.Abort('%s certificate error: %s' % (self.host, msg)) 531 raise util.Abort(_('%s certificate error: %s') %
532 self.ui.debug(_('%s certificate successfully verified\n') % 532 (self.host, msg))
533 self.host) 533 self.ui.debug('%s certificate successfully verified\n' %
534 self.host)
534 else: 535 else:
535 httplib.HTTPSConnection.connect(self) 536 httplib.HTTPSConnection.connect(self)
536 537
537 class httpsconnection(BetterHTTPS): 538 class httpsconnection(BetterHTTPS):
538 response_class = keepalive.HTTPResponse 539 response_class = keepalive.HTTPResponse