##// END OF EJS Templates
Fix bad behaviour when specifying an invalid date (issue700)...
Fix bad behaviour when specifying an invalid date (issue700) commit (aborts _after_ typing in a commit message) backout (aborted after the initial revert) tag (edited .hgtags and couldn't commit) import (patch applied, then commit fails) qnew (aborts on bad dates, but writes any valid date into the # Date header) qrefresh (like qnew) sign (like tag) fetch (merge, merge, merge, merge, abort)

File last commit:

r5975:75d9fe70 default
r6139:989467e8 default
Show More
mail.py
85 lines | 3.1 KiB | text/x-python | PythonLexer
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 # mail.py - mail sending bits for mercurial
#
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Matt Mackall
templater: move email function to util
r5975 import os, smtplib, util, socket
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
def _smtp(ui):
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 '''build an smtp connection and return a function to send mail'''
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 local_hostname = ui.config('smtp', 'local_hostname')
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'))
mailport = int(ui.config('smtp', 'port', 25))
Alexis S. L. Carvalho
fix typo in mail.py
r2964 ui.note(_('sending mail: smtp host %s, port %s\n') %
(mailhost, mailport))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 s.connect(host=mailhost, port=mailport)
if ui.configbool('smtp', 'tls'):
Alexis S. L. Carvalho
mail.py: don't try to use TLS if python doesn't have SSL support...
r4093 if not hasattr(socket, 'ssl'):
raise util.Abort(_("can't use TLS: Python SSL support "
"not installed"))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 ui.note(_('(using tls)\n'))
s.ehlo()
s.starttls()
s.ehlo()
username = ui.config('smtp', 'username')
password = ui.config('smtp', 'password')
Arun Thomas
Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc....
r5749 if username and not password:
password = ui.getpass()
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 if username and password:
ui.note(_('(authenticating to mail server as %s)\n') %
(username))
s.login(username, password)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 def send(sender, recipients, msg):
try:
return s.sendmail(sender, recipients, msg)
except smtplib.SMTPRecipientsRefused, inst:
recipients = [r[1] for r in inst.recipients.values()]
raise util.Abort('\n' + '\n'.join(recipients))
except smtplib.SMTPException, inst:
raise util.Abort(inst)
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return send
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 def _sendmail(ui, sender, recipients, msg):
'''send mail using sendmail.'''
program = ui.config('email', 'method')
Matt Mackall
templater: move email function to util
r5975 cmdline = '%s -f %s %s' % (program, util.email(sender),
' '.join(map(util.email, recipients)))
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 ui.note(_('sending mail: %s\n') % cmdline)
fp = os.popen(cmdline, 'w')
fp.write(msg)
ret = fp.close()
if ret:
raise util.Abort('%s %s' % (
os.path.basename(program.split(None, 1)[0]),
util.explain_exit(ret)[0]))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
def connect(ui):
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 '''make a mail connection. return a function to send mail.
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 call as sendmail(sender, list-of-recipients, msg).'''
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 if ui.config('email', 'method', 'smtp') == 'smtp':
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947 return _smtp(ui)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return lambda s, r, m: _sendmail(ui, s, r, m)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
def sendmail(ui, sender, recipients, msg):
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 send = connect(ui)
return send(sender, recipients, msg)
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489
def validateconfig(ui):
'''determine if we have enough config data to try sending email.'''
method = ui.config('email', 'method', 'smtp')
if method == 'smtp':
if not ui.config('smtp', 'host'):
raise util.Abort(_('smtp specified as email transport, '
'but no smtp host configured'))
else:
if not util.find_exe(method):
raise util.Abort(_('%r specified as email transport, '
'but not in PATH') % method)