Mercurial > hg
changeset 13231:b335882c2f21 stable
url: expand path for web.cacerts
| author | Eduard-Cristian Stefan <alexandrul.ct@gmail.com> |
|---|---|
| date | Sun, 02 Jan 2011 15:30:12 +0200 |
| parents | 827a1cc127bf |
| children | b25b5ad0cca8 |
| files | mercurial/hg.py mercurial/url.py tests/test-https.t |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Wed Jan 05 10:47:35 2011 +0100 +++ b/mercurial/hg.py Sun Jan 02 15:30:12 2011 +0200 @@ -551,6 +551,6 @@ dst.setconfig(sect, key, val) v = src.config('web', 'cacerts') if v: - dst.setconfig('web', 'cacerts', v) + dst.setconfig('web', 'cacerts', util.expandpath(v)) return dst
--- a/mercurial/url.py Wed Jan 05 10:47:35 2011 +0100 +++ b/mercurial/url.py Sun Jan 02 15:30:12 2011 +0200 @@ -512,6 +512,8 @@ def connect(self): if hasattr(self, 'ui'): cacerts = self.ui.config('web', 'cacerts') + if cacerts: + cacerts = util.expandpath(cacerts) else: cacerts = None
--- a/tests/test-https.t Wed Jan 05 10:47:35 2011 +0100 +++ b/tests/test-https.t Sun Jan 02 15:30:12 2011 +0200 @@ -154,11 +154,12 @@ no changes found $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc -cacert configured globally +cacert configured globally, also testing expansion of environment +variables in the filename $ echo "[web]" >> $HGRCPATH - $ echo "cacerts=`pwd`/pub.pem" >> $HGRCPATH - $ hg -R copy-pull pull + $ echo 'cacerts=$P/pub.pem' >> $HGRCPATH + $ P=`pwd` hg -R copy-pull pull pulling from https://localhost:$HGPORT/ searching for changes no changes found