comparison mercurial/url.py @ 13234:0935ff767285

merge with stable
author Martin Geisler <mg@aragost.com>
date Wed, 05 Jan 2011 15:56:03 +0100
parents f16b3b1a2234 b335882c2f21
children 1a4330e30017
comparison
equal deleted inserted replaced
13229:f3058dd05281 13234:0935ff767285
528 send = keepalive.safesend 528 send = keepalive.safesend
529 529
530 def connect(self): 530 def connect(self):
531 if hasattr(self, 'ui'): 531 if hasattr(self, 'ui'):
532 cacerts = self.ui.config('web', 'cacerts') 532 cacerts = self.ui.config('web', 'cacerts')
533 if cacerts:
534 cacerts = util.expandpath(cacerts)
533 else: 535 else:
534 cacerts = None 536 cacerts = None
535 537
536 if cacerts: 538 if cacerts:
537 sock = _create_connection((self.host, self.port)) 539 sock = _create_connection((self.host, self.port))