Show More
@@ -75,6 +75,7 b' from __future__ import absolute_import' | |||||
75 |
|
75 | |||
76 | import email as emailmod |
|
76 | import email as emailmod | |
77 | import email.generator as emailgen |
|
77 | import email.generator as emailgen | |
|
78 | import email.utils as eutil | |||
78 | import errno |
|
79 | import errno | |
79 | import os |
|
80 | import os | |
80 | import socket |
|
81 | import socket | |
@@ -745,7 +746,7 b' def email(ui, repo, *revs, **opts):' | |||||
745 | if not parent.endswith('>'): |
|
746 | if not parent.endswith('>'): | |
746 | parent += '>' |
|
747 | parent += '>' | |
747 |
|
748 | |||
748 |
sender_addr = e |
|
749 | sender_addr = eutil.parseaddr(sender)[1] | |
749 | sender = mail.addressencode(ui, sender, _charsets, opts.get('test')) |
|
750 | sender = mail.addressencode(ui, sender, _charsets, opts.get('test')) | |
750 | sendmail = None |
|
751 | sendmail = None | |
751 | firstpatch = None |
|
752 | firstpatch = None | |
@@ -764,7 +765,7 b' def email(ui, repo, *revs, **opts):' | |||||
764 | parent = m['Message-Id'] |
|
765 | parent = m['Message-Id'] | |
765 |
|
766 | |||
766 | m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version() |
|
767 | m['User-Agent'] = 'Mercurial-patchbomb/%s' % util.version() | |
767 |
m['Date'] = e |
|
768 | m['Date'] = eutil.formatdate(start_time[0], localtime=True) | |
768 |
|
769 | |||
769 | start_time = (start_time[0] + 1, start_time[1]) |
|
770 | start_time = (start_time[0] + 1, start_time[1]) | |
770 | m['From'] = sender |
|
771 | m['From'] = sender |
General Comments 0
You need to be logged in to leave comments.
Login now