Patchwork [10,of,11] dispatch: stop setting web.cacerts=! to indicate --insecure

login
register
mail settings
Submitter Gregory Szorc
Date May 5, 2016, 7:53 a.m.
Message ID <e2dccc9ec567d9f8aa91.1462434807@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/14901/
State Accepted
Headers show

Comments

Gregory Szorc - May 5, 2016, 7:53 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1462434001 25200
#      Thu May 05 00:40:01 2016 -0700
# Node ID e2dccc9ec567d9f8aa912a7b33f132772fae3ab4
# Parent  13bf97ebea3fb6d7c25b5b396ab2ed3e9948a02c
dispatch: stop setting web.cacerts=! to indicate --insecure

Consumers needing to know if --insecure was used have already
transitioned to using ui.insecureconnections. The previous
patch removed the last meaningful consumer looking for
web.cacerts=!.

Patch

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -821,18 +821,16 @@  def _dispatch(req):
 
     if options['noninteractive']:
         for ui_ in uis:
             ui_.setconfig('ui', 'interactive', 'off', '-y')
 
     if cmdoptions.get('insecure', False):
         for ui_ in uis:
             ui_.insecureconnections = True
-            # TODO remove once consumers are gone.
-            ui_.setconfig('web', 'cacerts', '!', '--insecure')
 
     if options['version']:
         return commands.version_(ui)
     if options['help']:
         return commands.help_(ui, cmd, command=cmd is not None)
     elif not cmd:
         return commands.help_(ui, 'shortlist')