##// END OF EJS Templates
convert: keep branch switching merges with ancestors (issue3340)...
convert: keep branch switching merges with ancestors (issue3340) When running convert with a filemap, merge parents which are ancestors of other parents are ignored. This is hardly a problem when parents belong to the same branch, but the result could be confusing when named branches are involved. With: -o-a1-a2-a3... <- A \ \ b1-b2-b3...-m- <- B If all b* revisions are discarded, it is useful to preserve 'm' even if it is empty after filtering to record the branch switch. This patch makes filemap preserve "ancestor parents" if there is no "non-ancestor parent" on the same branch than the merge revision. Remarks: - I am not completely convinced by the reasons given above and those detailed by Matt in this thread: http://selenic.com/pipermail/mercurial-devel/2012-May/040627.html The properties we try to preserve are not clearly defined. That said, I know this patch already helped someone on IRC and the tests output look reasonable. - This is a new version of the original "convert: filemap must preserve fast-forward merges" patch. It has exactly the same output for 2 parents merges, the additional complexity is here to handle more than two parents.

File last commit:

r15562:a82b6038 default
r17103:5146de7b default
Show More
mail.py
255 lines | 9.2 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>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import util, encoding
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 import os, smtplib, socket, quopri, time
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 import email.Header, email.MIMEText, email.Utils
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Nicolas Dumazet
mail: ensure that Python2.4 to 2.7 use the same header format...
r11542 _oldheaderinit = email.Header.Header.__init__
def _unifiedheaderinit(self, *args, **kw):
"""
Python2.7 introduces a backwards incompatible change
(Python issue1974, r70772) in email.Generator.Generator code:
pre-2.7 code passed "continuation_ws='\t'" to the Header
constructor, and 2.7 removed this parameter.
Default argument is continuation_ws=' ', which means that the
behaviour is different in <2.7 and 2.7
We consider the 2.7 behaviour to be preferable, but need
to have an unified behaviour for versions 2.4 to 2.7
"""
# override continuation_ws
kw['continuation_ws'] = ' '
_oldheaderinit(self, *args, **kw)
email.Header.Header.__dict__['__init__'] = _unifiedheaderinit
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')
Patrick Mezard
mail: fix regression when parsing unset smtp.tls option
r13244 tls = ui.config('smtp', 'tls', 'none')
Zhigang Wang
smtp: fix for server doesn't support starttls extension...
r13201 # backward compatible: when tls = true, we use starttls.
starttls = tls == 'starttls' or util.parsebool(tls)
smtps = tls == 'smtps'
Augie Fackler
mail: use safehasattr instead of hasattr
r14965 if (starttls or smtps) and not util.safehasattr(socket, 'ssl'):
Zhigang Wang
smtp: fix for server doesn't support starttls extension...
r13201 raise util.Abort(_("can't use TLS: Python SSL support not installed"))
if smtps:
ui.note(_('(using smtps)\n'))
s = smtplib.SMTP_SSL(local_hostname=local_hostname)
else:
s = smtplib.SMTP(local_hostname=local_hostname)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 mailhost = ui.config('smtp', 'host')
if not mailhost:
Martin Geisler
mail: use standard section.entry format in error message
r12090 raise util.Abort(_('smtp.host not configured - cannot send mail'))
Brodie Rao
mail/hgweb: support service names for ports (issue2350)...
r12076 mailport = util.getport(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)
Zhigang Wang
smtp: fix for server doesn't support starttls extension...
r13201 if starttls:
ui.note(_('(using starttls)\n'))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 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))
David Soria Parra
email: Catch exceptions during send....
r9246 try:
s.login(username, password)
except smtplib.SMTPException, inst:
raise util.Abort(inst)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
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)
Dirkjan Ochtman
replace usage of os.popen() with util.popen()...
r6548 fp = util.popen(cmdline, 'w')
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 fp.write(msg)
ret = fp.close()
if ret:
raise util.Abort('%s %s' % (
os.path.basename(program.split(None, 1)[0]),
Adrian Buehlmann
rename explain_exit to explainexit
r14234 util.explainexit(ret)[0]))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 def _mbox(mbox, sender, recipients, msg):
'''write mails to mbox'''
fp = open(mbox, 'ab+')
# Should be time.asctime(), but Windows prints 2-characters day
# of month instead of one. Make them print the same thing.
date = time.strftime('%a %b %d %H:%M:%S %Y', time.localtime())
fp.write('From %s %s\n' % (sender, date))
fp.write(msg)
fp.write('\n\n')
fp.close()
def connect(ui, mbox=None):
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).'''
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 if mbox:
open(mbox, 'wb').close()
return lambda s, r, m: _mbox(mbox, s, r, m)
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
Mads Kiilerich
notify: add option for writing to mbox...
r15561 def sendmail(ui, sender, recipients, msg, mbox=None):
send = connect(ui, mbox=mbox)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 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:
Adrian Buehlmann
rename util.find_exe to findexe
r14271 if not util.findexe(method):
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489 raise util.Abort(_('%r specified as email transport, '
'but not in PATH') % method)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191 def mimetextpatch(s, subtype='plain', display=False):
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 '''Return MIME message suitable for a patch.
Charset will be detected as utf-8 or (possibly fake) us-ascii.
Transfer encodings will be used if necessary.'''
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332
cs = 'us-ascii'
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191 if not display:
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 try:
s.decode('us-ascii')
except UnicodeDecodeError:
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191 try:
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 s.decode('utf-8')
cs = 'utf-8'
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191 except UnicodeDecodeError:
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 # We'll go with us-ascii as a fallback.
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191 pass
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 return mimetextqp(s, subtype, cs)
def mimetextqp(body, subtype, charset):
'''Return MIME message.
Qouted-printable transfer encoding will be used if necessary.
'''
enc = None
for line in body.splitlines():
if len(line) > 950:
body = quopri.encodestring(body)
enc = "quoted-printable"
break
msg = email.MIMEText.MIMEText(body, subtype, charset)
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 if enc:
del msg['Content-Transfer-Encoding']
msg['Content-Transfer-Encoding'] = enc
return msg
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def _charsets(ui):
'''Obtains charsets to send mail parts not containing patches.'''
charsets = [cs.lower() for cs in ui.configlist('email', 'charsets')]
Matt Mackall
move encoding bits from util to encoding...
r7948 fallbacks = [encoding.fallbackencoding.lower(),
encoding.encoding.lower(), 'utf-8']
Martin Geisler
mail: updated comment
r8343 for cs in fallbacks: # find unique charsets while keeping order
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 if cs not in charsets:
charsets.append(cs)
return [cs for cs in charsets if not cs.endswith('ascii')]
def _encode(ui, s, charsets):
'''Returns (converted) string, charset tuple.
Finds out best charset by cycling through sendcharsets in descending
Matt Mackall
move encoding bits from util to encoding...
r7948 order. Tries both encoding and fallbackencoding for input. Only as
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 last resort send as is in fake ascii.
Caveat: Do not use for mail parts containing patches!'''
try:
s.decode('ascii')
except UnicodeDecodeError:
sendcharsets = charsets or _charsets(ui)
Matt Mackall
move encoding bits from util to encoding...
r7948 for ics in (encoding.encoding, encoding.fallbackencoding):
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 try:
u = s.decode(ics)
except UnicodeDecodeError:
continue
for ocs in sendcharsets:
try:
return u.encode(ocs), ocs
except UnicodeEncodeError:
pass
except LookupError:
Christian Ebert
mail: correct typo in variable name
r7195 ui.warn(_('ignoring invalid sendcharset: %s\n') % ocs)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 # if ascii, or all conversion attempts fail, send (broken) ascii
return s, 'us-ascii'
def headencode(ui, s, charsets=None, display=False):
'''Returns RFC-2047 compliant header from given string.'''
if not display:
# split into words?
s, cs = _encode(ui, s, charsets)
return str(email.Header.Header(s, cs))
return s
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 def _addressencode(ui, name, addr, charsets=None):
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 name = headencode(ui, name, charsets)
try:
acc, dom = addr.split('@')
acc = acc.encode('ascii')
Marti Raudsepp
patchbomb: fix handling of email addresses with Unicode domains (IDNA)...
r9715 dom = dom.decode(encoding.encoding).encode('idna')
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 addr = '%s@%s' % (acc, dom)
except UnicodeDecodeError:
raise util.Abort(_('invalid email address: %s') % addr)
except ValueError:
try:
# too strict?
addr = addr.encode('ascii')
except UnicodeDecodeError:
raise util.Abort(_('invalid local address: %s') % addr)
return email.Utils.formataddr((name, addr))
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 def addressencode(ui, address, charsets=None, display=False):
'''Turns address into RFC-2047 compliant header.'''
if display or not address:
return address or ''
name, addr = email.Utils.parseaddr(address)
return _addressencode(ui, name, addr, charsets)
def addrlistencode(ui, addrs, charsets=None, display=False):
'''Turns a list of addresses into a list of RFC-2047 compliant headers.
A single element of input list may contain multiple addresses, but output
always has one address per item'''
if display:
return [a.strip() for a in addrs if a.strip()]
result = []
for name, addr in email.Utils.getaddresses(addrs):
if name or addr:
result.append(_addressencode(ui, name, addr, charsets))
return result
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def mimeencode(ui, s, charsets=None, display=False):
'''creates mime text object, encodes it if needed, and sets
charset and transfer-encoding accordingly.'''
cs = 'us-ascii'
if not display:
s, cs = _encode(ui, s, charsets)
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 return mimetextqp(s, 'plain', cs)