Patchwork ssl: remove special case of web.cacerts=! from remoteui()

login
register
mail settings
Submitter Yuya Nishihara
Date July 18, 2016, 2:32 p.m.
Message ID <978d5fc0b3544fc03829.1468852333@mimosa>
Download mbox | patch
Permalink /patch/15940/
State Accepted
Headers show

Comments

Yuya Nishihara - July 18, 2016, 2:32 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1465096700 -32400
#      Sun Jun 05 12:18:20 2016 +0900
# Node ID 978d5fc0b3544fc038293821a74c1aa2b36b11c3
# Parent  357dee3a00fd5a31e2aa4560a2045825d240ba4d
ssl: remove special case of web.cacerts=! from remoteui()

It was introduced by b76d8c641746, which is no longer necessary thanks to
recent refactoring of sslutil including ef316c653b7f.
Gregory Szorc - July 18, 2016, 3:59 p.m.
On Mon, Jul 18, 2016 at 7:32 AM, Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1465096700 -32400
> #      Sun Jun 05 12:18:20 2016 +0900
> # Node ID 978d5fc0b3544fc038293821a74c1aa2b36b11c3
> # Parent  357dee3a00fd5a31e2aa4560a2045825d240ba4d
> ssl: remove special case of web.cacerts=! from remoteui()
>
>
LGTM


> It was introduced by b76d8c641746, which is no longer necessary thanks to
> recent refactoring of sslutil including ef316c653b7f.
>
> diff --git a/mercurial/hg.py b/mercurial/hg.py
> --- a/mercurial/hg.py
> +++ b/mercurial/hg.py
> @@ -927,9 +927,7 @@ def remoteui(src, opts):
>          for key, val in src.configitems(sect):
>              dst.setconfig(sect, key, val, 'copied')
>      v = src.config('web', 'cacerts')
> -    if v == '!':
> -        dst.setconfig('web', 'cacerts', v, 'copied')
> -    elif v:
> +    if v:
>          dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied')
>
>      return dst
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Augie Fackler - July 18, 2016, 5:22 p.m.
On Mon, Jul 18, 2016 at 08:59:55AM -0700, Gregory Szorc wrote:
> On Mon, Jul 18, 2016 at 7:32 AM, Yuya Nishihara <yuya@tcha.org> wrote:
>
> > # HG changeset patch
> > # User Yuya Nishihara <yuya@tcha.org>
> > # Date 1465096700 -32400
> > #      Sun Jun 05 12:18:20 2016 +0900
> > # Node ID 978d5fc0b3544fc038293821a74c1aa2b36b11c3
> > # Parent  357dee3a00fd5a31e2aa4560a2045825d240ba4d
> > ssl: remove special case of web.cacerts=! from remoteui()
> >
> >
> LGTM

Queued, thanks.

>
>
> > It was introduced by b76d8c641746, which is no longer necessary thanks to
> > recent refactoring of sslutil including ef316c653b7f.
> >
> > diff --git a/mercurial/hg.py b/mercurial/hg.py
> > --- a/mercurial/hg.py
> > +++ b/mercurial/hg.py
> > @@ -927,9 +927,7 @@ def remoteui(src, opts):
> >          for key, val in src.configitems(sect):
> >              dst.setconfig(sect, key, val, 'copied')
> >      v = src.config('web', 'cacerts')
> > -    if v == '!':
> > -        dst.setconfig('web', 'cacerts', v, 'copied')
> > -    elif v:
> > +    if v:
> >          dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied')
> >
> >      return dst
> > _______________________________________________
> > Mercurial-devel mailing list
> > Mercurial-devel@mercurial-scm.org
> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> >

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -927,9 +927,7 @@  def remoteui(src, opts):
         for key, val in src.configitems(sect):
             dst.setconfig(sect, key, val, 'copied')
     v = src.config('web', 'cacerts')
-    if v == '!':
-        dst.setconfig('web', 'cacerts', v, 'copied')
-    elif v:
+    if v:
         dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied')
 
     return dst