[PATCH 3 of 7] url: remove test for self.ui in BetterHTTPS

Mads Kiilerich mads at kiilerich.com
Tue Feb 15 21:41:24 CST 2011


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1297826897 -3600
# Node ID 507fea07a4584e5921e86e66ad4be0b8cb2b0b20
# Parent  48d6cce4f54c21df81d516a6b571d6aefe37b4df
url: remove test for self.ui in BetterHTTPS

We use self.ui unconditionally anyway so we would have noticed if it in some
cases wasn't set.

diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -546,12 +546,9 @@
         send = keepalive.safesend
 
         def connect(self):
-            if hasattr(self, 'ui'):
-                cacerts = self.ui.config('web', 'cacerts')
-                if cacerts:
-                    cacerts = util.expandpath(cacerts)
-            else:
-                cacerts = None
+            cacerts = self.ui.config('web', 'cacerts')
+            if cacerts:
+                cacerts = util.expandpath(cacerts)
 
             hostfingerprint = self.ui.config('hostfingerprints', self.host)
             if cacerts and not hostfingerprint:


More information about the Mercurial-devel mailing list