| hg-reviewers |
Visible progress in test-patchbomb.t on Python 3.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/mail.py (8 lines) |
| except smtplib.SMTPException as inst: | except smtplib.SMTPException as inst: | ||||
| raise error.Abort(inst) | raise error.Abort(inst) | ||||
| return send | return send | ||||
| def _sendmail(ui, sender, recipients, msg): | def _sendmail(ui, sender, recipients, msg): | ||||
| '''send mail using sendmail.''' | '''send mail using sendmail.''' | ||||
| program = ui.config('email', 'method') | program = ui.config('email', 'method') | ||||
| cmdline = '%s -f %s %s' % (program, stringutil.email(sender), | stremail = lambda x: stringutil.email(encoding.strtolocal(x)) | ||||
| ' '.join(map(stringutil.email, recipients))) | cmdline = '%s -f %s %s' % (program, stremail(sender), | ||||
| ' '.join(map(stremail, recipients))) | |||||
| ui.note(_('sending mail: %s\n') % cmdline) | ui.note(_('sending mail: %s\n') % cmdline) | ||||
| fp = procutil.popen(cmdline, 'wb') | fp = procutil.popen(cmdline, 'wb') | ||||
| fp.write(util.tonativeeol(msg)) | fp.write(util.tonativeeol(msg)) | ||||
| ret = fp.close() | ret = fp.close() | ||||
| if ret: | if ret: | ||||
| raise error.Abort('%s %s' % ( | raise error.Abort('%s %s' % ( | ||||
| os.path.basename(program.split(None, 1)[0]), | os.path.basename(program.split(None, 1)[0]), | ||||
| procutil.explainexit(ret))) | procutil.explainexit(ret))) | ||||
| def _mbox(mbox, sender, recipients, msg): | def _mbox(mbox, sender, recipients, msg): | ||||
| '''write mails to mbox''' | '''write mails to mbox''' | ||||
| fp = open(mbox, 'ab+') | fp = open(mbox, 'ab+') | ||||
| # Should be time.asctime(), but Windows prints 2-characters day | # Should be time.asctime(), but Windows prints 2-characters day | ||||
| # of month instead of one. Make them print the same thing. | # of month instead of one. Make them print the same thing. | ||||
| date = time.strftime(r'%a %b %d %H:%M:%S %Y', time.localtime()) | date = time.strftime(r'%a %b %d %H:%M:%S %Y', time.localtime()) | ||||
| fp.write('From %s %s\n' % (sender, date)) | fp.write('From %s %s\n' % (encoding.strtolocal(sender), | ||||
| encoding.strtolocal(date))) | |||||
| fp.write(msg) | fp.write(msg) | ||||
| fp.write('\n\n') | fp.write('\n\n') | ||||
| fp.close() | fp.close() | ||||
| def connect(ui, mbox=None): | def connect(ui, mbox=None): | ||||
| '''make a mail connection. return a function to send mail. | '''make a mail connection. return a function to send mail. | ||||
| call as sendmail(sender, list-of-recipients, msg).''' | call as sendmail(sender, list-of-recipients, msg).''' | ||||
| if mbox: | if mbox: | ||||