sslutil: check for ui.insecureconnections in sslkwargs
The end result of this function is the same. We now have a more
explicit return branch.
We still keep the old code looking at web.cacerts=! a few lines
below because we're still setting web.cacerts=! and need to react
to the variable. This will be removed in an upcoming patch.
--- a/mercurial/sslutil.py Thu May 05 00:34:22 2016 -0700
+++ b/mercurial/sslutil.py Thu May 05 00:35:45 2016 -0700
@@ -243,8 +243,13 @@
if hostfingerprint:
return kws
- # dispatch sets web.cacerts=! when --insecure is used.
+ # The code below sets up CA verification arguments. If --insecure is
+ # used, we don't take CAs into consideration, so return early.
+ if ui.insecureconnections:
+ return kws
+
cacerts = ui.config('web', 'cacerts')
+ # TODO remove check when we stop setting this config.
if cacerts == '!':
return kws