# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1283201520 -7200
# Node ID 339bd18c772f545e624b74489dde50a63d74ce09
# Parent  70f4a0f4e9a33456f9792664c484625d19effc90# Parent  ee601a6264e0e78caa36a43709494669214fccfe
merge with stable

diff -r 70f4a0f4e9a3 -r 339bd18c772f mercurial/mail.py
--- 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))