diff mercurial/url.py @ 13329:4e92ad05fe18

merge with stable
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 01 Feb 2011 01:55:45 +0100
parents 0d1dca7d2a04 a939f08fae9c
children d13a533a0b11
line wrap: on
line diff
--- a/mercurial/url.py	Mon Jan 31 22:16:33 2011 +0100
+++ b/mercurial/url.py	Tue Feb 01 01:55:45 2011 +0100
@@ -559,8 +559,9 @@
                         ca_certs=cacerts)
                 msg = _verifycert(self.sock.getpeercert(), self.host)
                 if msg:
-                    raise util.Abort(_('%s certificate error: %s') %
-                                     (self.host, msg))
+                    raise util.Abort(_('%s certificate error: %s '
+                                       '(use --insecure to connect '
+                                       'insecurely)') % (self.host, msg))
                 self.ui.debug('%s certificate successfully verified\n' %
                               self.host)
             else: