changeset 2584:1f4703115e28

merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 09 Jul 2006 14:42:18 +0200
parents 6e5427447f4c (diff) 276de216d2c5 (current diff)
children 5ec2dded1bda
files mercurial/ui.py
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/hgrc.5.txt	Fri Jul 07 14:33:51 2006 -0300
+++ b/doc/hgrc.5.txt	Sun Jul 09 14:42:18 2006 +0200
@@ -309,6 +309,9 @@
     Optional.  Password to authenticate to SMTP server with.
     If username is specified, password must also be specified.
     Default: none.
+  local_hostname;;
+    Optional.  It's the hostname that the sender can use to identify itself
+    to the MTA.
 
 paths::
   Assigns symbolic names to repositories.  The left side is the
--- a/mercurial/ui.py	Fri Jul 07 14:33:51 2006 -0300
+++ b/mercurial/ui.py	Sun Jul 09 14:42:18 2006 +0200
@@ -299,7 +299,8 @@
         def smtp():
             '''send mail using smtp.'''
 
-            s = smtplib.SMTP()
+            local_hostname = self.config('smtp', 'local_hostname')
+            s = smtplib.SMTP(local_hostname=local_hostname)
             mailhost = self.config('smtp', 'host')
             if not mailhost:
                 raise util.Abort(_('no [smtp]host in hgrc - cannot send mail'))