# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1292706371 -3600
# Node ID b75fc70f0a9fdbacbf0cc8f2cc982bc2c231e89c
# Parent  115a9760c38222ee01fabea6904c6bf1956d6f12# Parent  2fa2e6444645563835537e889dd7b5d230348430
merge with stable

diff -r 115a9760c382 -r b75fc70f0a9f mercurial/url.py
--- a/mercurial/url.py	Mon Dec 13 11:46:31 2010 -0500
+++ b/mercurial/url.py	Sat Dec 18 22:06:11 2010 +0100
@@ -545,6 +545,9 @@
                 self.ui.debug('%s certificate successfully verified\n' %
                               self.host)
             else:
+                self.ui.warn(_("warning: %s certificate not verified "
+                               "(check web.cacerts config setting)\n") % 
+                             self.host)
                 httplib.HTTPSConnection.connect(self)
 
     class httpsconnection(BetterHTTPS):
diff -r 115a9760c382 -r b75fc70f0a9f tests/test-https.t
--- a/tests/test-https.t	Mon Dec 13 11:46:31 2010 -0500
+++ b/tests/test-https.t	Sat Dec 18 22:06:11 2010 +0100
@@ -106,6 +106,7 @@
 clone via pull
 
   $ hg clone https://localhost:$HGPORT/ copy-pull
+  warning: localhost certificate not verified (check web.cacerts config setting)
   requesting all changes
   adding changesets
   adding manifests
@@ -131,6 +132,7 @@
   $ echo '[hooks]' >> .hg/hgrc
   $ echo "changegroup = python '$TESTDIR'/printenv.py changegroup" >> .hg/hgrc
   $ hg pull
+  warning: localhost certificate not verified (check web.cacerts config setting)
   changegroup hook: HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_URL=https://localhost:$HGPORT/ 
   pulling from https://localhost:$HGPORT/
   searching for changes