diff mercurial/mail.py @ 12091:339bd18c772f

merge with stable

--- a/mercurial/mail.py	Sat Aug 28 21:57:36 2010 -0500
+++ b/mercurial/mail.py	Mon Aug 30 22:52:00 2010 +0200
@@ -36,7 +36,7 @@
     s = smtplib.SMTP(local_hostname=local_hostname)
     mailhost = ui.config('smtp', 'host')
     if not mailhost:
-        raise util.Abort(_('no [smtp]host in hgrc - cannot send mail'))
+        raise util.Abort(_('smtp.host not configured - cannot send mail'))
     mailport = util.getport(ui.config('smtp', 'port', 25))
     ui.note(_('sending mail: smtp host %s, port %s\n') %
             (mailhost, mailport))