patchbomb: quoted-printable encode overly long lines

RfC2822 mandates a line length limit of 998 byte + CRLF.
Python mail tools break lines at 990 byte. To prevent
that, we quoted-printable encode overly long lines.

mercurial/mail.py

@@ -1,170 +1,187 b''
 # mail.py - mail sending bits for mercurial
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import util, encoding
-import os, smtplib, socket
+import os, smtplib, socket, quopri
 import email.Header, email.MIMEText, email.Utils
 
 def _smtp(ui):
     '''build an smtp connection and return a function to send mail'''
     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))
     ui.note(_('sending mail: smtp host %s, port %s\n') %
             (mailhost, mailport))
     s.connect(host=mailhost, port=mailport)
     if ui.configbool('smtp', 'tls'):
         if not hasattr(socket, 'ssl'):
             raise util.Abort(_("can't use TLS: Python SSL support "
                                "not installed"))
         ui.note(_('(using tls)\n'))
         s.ehlo()
         s.starttls()
         s.ehlo()
     username = ui.config('smtp', 'username')
     password = ui.config('smtp', 'password')
     if username and not password:
         password = ui.getpass()
     if username and password:
         ui.note(_('(authenticating to mail server as %s)\n') %
                   (username))
         s.login(username, password)
 
     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)
 
     return send
 
 def _sendmail(ui, sender, recipients, msg):
     '''send mail using sendmail.'''
     program = ui.config('email', 'method')
     cmdline = '%s -f %s %s' % (program, util.email(sender),
                                ' '.join(map(util.email, recipients)))
     ui.note(_('sending mail: %s\n') % cmdline)
     fp = util.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]))
 
 def connect(ui):
     '''make a mail connection. return a function to send mail.
     call as sendmail(sender, list-of-recipients, msg).'''
     if ui.config('email', 'method', 'smtp') == 'smtp':
         return _smtp(ui)
     return lambda s, r, m: _sendmail(ui, s, r, m)
 
 def sendmail(ui, sender, recipients, msg):
     send = connect(ui)
     return send(sender, recipients, msg)
 
 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)
 
 def mimetextpatch(s, subtype='plain', display=False):
     '''If patch in utf-8 transfer-encode it.'''
+
+    enc = None
+    for line in s.splitlines():
+        if len(line) > 950:
+            s = quopri.encodestring(s)
+            enc = "quoted-printable"
+            break
+
+    cs = 'us-ascii'
     if not display:
-        for cs in ('us-ascii', 'utf-8'):
+        try:
+            s.decode('us-ascii')
+        except UnicodeDecodeError:
             try:
-                s.decode(cs)
-                return email.MIMEText.MIMEText(s, subtype, cs)
+                s.decode('utf-8')
+                cs = 'utf-8'
             except UnicodeDecodeError:
+                # We'll go with us-ascii as a fallback.
                 pass
-    return email.MIMEText.MIMEText(s, subtype)
+
+    msg = email.MIMEText.MIMEText(s, subtype, cs)
+    if enc:
+        del msg['Content-Transfer-Encoding']
+        msg['Content-Transfer-Encoding'] = enc
+    return msg
 
 def _charsets(ui):
     '''Obtains charsets to send mail parts not containing patches.'''
     charsets = [cs.lower() for cs in ui.configlist('email', 'charsets')]
     fallbacks = [encoding.fallbackencoding.lower(),
                  encoding.encoding.lower(), 'utf-8']
     for cs in fallbacks: # util.unique does not keep order
         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
     order. Tries both encoding and fallbackencoding for input. Only as
     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)
         for ics in (encoding.encoding, encoding.fallbackencoding):
             try:
                 u = s.decode(ics)
             except UnicodeDecodeError:
                 continue
             for ocs in sendcharsets:
                 try:
                     return u.encode(ocs), ocs
                 except UnicodeEncodeError:
                     pass
                 except LookupError:
                     ui.warn(_('ignoring invalid sendcharset: %s\n') % ocs)
     # 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
 
 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)
     name = headencode(ui, name, charsets)
     try:
         acc, dom = addr.split('@')
         acc = acc.encode('ascii')
         dom = dom.encode('idna')
         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))
 
 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)
     return email.MIMEText.MIMEText(s, 'plain', cs)

tests/test-patchbomb

@@ -1,123 +1,147 b''
 #!/bin/sh
 
 fixheaders()
 {
     sed -e 's/\(Message-Id:.*@\).*/\1/'  \
         -e 's/\(In-Reply-To:.*@\).*/\1/' \
         -e 's/\(References:.*@\).*/\1/'  \
         -e 's/\(User-Agent:.*\)\/.*/\1/'  \
         -e 's/===.*/===/'
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "patchbomb=" >> $HGRCPATH
 
 COLUMNS=80; export COLUMNS
 
 hg init t
 cd t
 echo a > a
 hg commit -Ama -d '1 0'
 
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar tip | \
   fixheaders
 
 echo b > b
 hg commit -Amb -d '2 0'
 
 hg email --date '1970-1-1 0:2' -n -f quux -t foo -c bar -s test 0:tip | \
   fixheaders
 
 hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip
 
 cd ..
 
 hg clone -q t t2
 cd t2
 echo c > c
 hg commit -Amc -d '3 0'
 
 cat > description <<EOF
 a multiline
 
 description
 EOF
 
 echo "% test bundle and description"
 hg email --date '1970-1-1 0:3' -n -f quux -t foo \
     -c bar -s test -r tip -b --desc description | \
     fixheaders
 
 echo "% utf-8 patch"
 python -c 'fp = open("utf", "wb"); fp.write("h\xC3\xB6mma!\n"); fp.close();'
 hg commit -A -d '4 0' -m 'charset=utf-8; content-transfer-encoding: base64'
 
 echo "% no mime encoding for email --test"
 hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n | fixheaders > mailtest
 echo "% md5sum of 8-bit output"
 $TESTDIR/md5sum.py mailtest
 rm mailtest
 
-echo "% mime encoded mbox"
+echo "% mime encoded mbox (base64)"
+hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox
+cat mbox | fixheaders
+rm mbox
+
+echo "% mime encoded mbox (quoted-printable)"
+python -c 'fp = open("qp", "wb"); fp.write("%s\nfoo\n\nbar\n" % \
+  ("x" * 1024)); fp.close();'
+hg commit -A -d '4 0' -m 'charset=utf-8; content-transfer-encoding: quoted-printable'
+
+echo "% no mime encoding for email --test"
+hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n | fixheaders > mailtest
+echo "% md5sum of qp output"
+$TESTDIR/md5sum.py mailtest
+rm mailtest
+
+echo "% mime encoded mbox (quoted-printable)"
 hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox
 cat mbox | fixheaders
 rm mbox
 
 echo "% iso-8859-1 patch"
 python -c 'fp = open("isolatin", "wb"); fp.write("h\xF6mma!\n"); fp.close();'
 hg commit -A -d '5 0' -m 'charset=us-ascii; content-transfer-encoding: 8bit'
 
 echo "% fake ascii mbox"
 hg email --date '1970-1-1 0:5' -f quux -t foo -c bar -r tip -m mbox
 fixheaders < mbox > mboxfix
 echo "% md5sum of 8-bit output"
 $TESTDIR/md5sum.py mboxfix
 
 echo "% test diffstat for single patch"
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y 2 | \
   fixheaders
 
 echo "% test diffstat for multiple patches"
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y 0:1 | \
   fixheaders
 
 echo "% test inline for single patch"
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i 2 | \
   fixheaders
 
+echo "% test inline for single patch (quoted-printable)"
+hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i 4 | \
+  fixheaders
+
 echo "% test inline for multiple patches"
-hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i 0:1 | \
-  fixheaders
+hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
+  -r 0:1 -r 4 | fixheaders
 
 echo "% test attach for single patch"
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a 2 | \
   fixheaders
 
+echo "% test attach for single patch (quoted-printable)"
+hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a 4 | \
+  fixheaders
+
 echo "% test attach for multiple patches"
-hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a 0:1 | \
-  fixheaders
+hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \
+  -r 0:1 -r 4 | fixheaders
 
 echo "% test intro for single patch"
 hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test 2 | \
   fixheaders
 
 echo "% test intro for multiple patches"
 hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test 0:1 | \
   fixheaders
 
 echo "% tagging csets"
 hg tag -r0 zero zero.foo
 hg tag -r1 one one.patch
 hg tag -r2 two two.diff
 
 echo "% test inline for single named patch"
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i 2 | \
   fixheaders
 
 echo "% test inline for multiple named/unnamed patches"
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i 0:1 | \
   fixheaders
 
 echo "% test inreplyto"
 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz tip | \
   fixheaders

tests/test-patchbomb.out

@@ -1,902 +1,1179 b''
 adding a
 This patch series consists of 1 patches.
 
 
 Displaying [PATCH] a ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
 Message-Id: <8580ff50825a50c8f716.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 # HG changeset patch
 # User test
 # Date 1 0
 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
 # Parent  0000000000000000000000000000000000000000
 a
 
 diff -r 000000000000 -r 8580ff50825a a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 adding b
 This patch series consists of 2 patches.
 
 
 Write the introductory message for the patch series.
 
 
 Displaying [PATCH 0 of 2] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 2] test
 Message-Id: <patchbomb.120@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:02:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 
 Displaying [PATCH 1 of 2] a ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
 Message-Id: <8580ff50825a50c8f716.121@
 In-Reply-To: <patchbomb.120@
 References: <patchbomb.120@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:02:01 +0000
 From: quux
 To: foo
 Cc: bar
 
 # HG changeset patch
 # User test
 # Date 1 0
 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
 # Parent  0000000000000000000000000000000000000000
 a
 
 diff -r 000000000000 -r 8580ff50825a a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 Displaying [PATCH 2 of 2] b ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 Message-Id: <97d72e5f12c7e84f8506.122@
 In-Reply-To: <patchbomb.120@
 References: <patchbomb.120@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:02:02 +0000
 From: quux
 To: foo
 Cc: bar
 
 # HG changeset patch
 # User test
 # Date 2 0
 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 # Parent  8580ff50825a50c8f716709acdf8de0deddcd6ab
 b
 
 diff -r 8580ff50825a -r 97d72e5f12c7 b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:02 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 This patch series consists of 2 patches.
 
 
 Write the introductory message for the patch series.
 
 
 Writing [PATCH 0 of 2] test ...
 Writing [PATCH 1 of 2] a ...
 Writing [PATCH 2 of 2] b ...
 adding c
 % test bundle and description
 searching for changes
 1 changesets found
 
 Displaying test ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
 Subject: test
 Message-Id: <patchbomb.180@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:03:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 
 a multiline
 
 description
 
 --===
 Content-Type: application/x-mercurial-bundle
 MIME-Version: 1.0
 Content-Disposition: attachment; filename="bundle.hg"
 Content-Transfer-Encoding: base64
 
 SEcxMEJaaDkxQVkmU1nvR7I3AAAN////lFYQWj1/4HwRkdC/AywIAk0E4pfoSIIIgQCgGEQOcLAA
 2tA1VPyp4mkeoG0EaaPU0GTT1GjRiNPIg9CZGBqZ6UbU9J+KFU09DNUaGgAAAAAANAGgAAAAA1U8
 oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2
 Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE
 SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD
 sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC
 Q70eyNw=
 --===
 % utf-8 patch
 adding description
 adding utf
 % no mime encoding for email --test
 % md5sum of 8-bit output
 e726c29b3008e77994c7572563e57c34  mailtest
-% mime encoded mbox
+% mime encoded mbox (base64)
 This patch series consists of 1 patches.
 
 
 Writing [PATCH] charset=utf-8; content-transfer-encoding: base64 ...
 From quux Thu Jan 01 00:04:01 1970
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
 Subject: [PATCH] charset=utf-8; content-transfer-encoding: base64
 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
 Message-Id: <c3c9e37db9f4fe4882cd.240@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:04:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgYzNj
 OWUzN2RiOWY0ZmU0ODgyY2RhMzliYWY0MmZlZDZiYWQ4YjE1YQojIFBhcmVudCAgZmYyYzlmYTIw
 MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5ZgpjaGFyc2V0PXV0Zi04OyBjb250ZW50LXRy
 YW5zZmVyLWVuY29kaW5nOiBiYXNlNjQKCmRpZmYgLXIgZmYyYzlmYTIwMThiIC1yIGMzYzllMzdk
 YjlmNCBkZXNjcmlwdGlvbgotLS0gL2Rldi9udWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCAr
 MDAwMAorKysgYi9kZXNjcmlwdGlvbglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAKQEAg
 LTAsMCArMSwzIEBACithIG11bHRpbGluZQorCitkZXNjcmlwdGlvbgpkaWZmIC1yIGZmMmM5ZmEy
 MDE4YiAtciBjM2M5ZTM3ZGI5ZjQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDowMDow
 MCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAKQEAg
 LTAsMCArMSwxIEBACitow7ZtbWEhCg==
 
 
+% mime encoded mbox (quoted-printable)
+adding qp
+% no mime encoding for email --test
+% md5sum of qp output
+0402c7d033e04044e423bb04816f9dae  mailtest
+% mime encoded mbox (quoted-printable)
+This patch series consists of 1 patches.
+
+
+Writing [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ...
+From quux Thu Jan 01 00:04:01 1970
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Subject: [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable
+X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
+Message-Id: <c655633f8c87700bb38c.240@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:04:00 +0000
+From: quux
+To: foo
+Cc: bar
+
+# HG changeset patch
+# User test
+# Date 4 0
+# Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376
+# Parent  c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+charset=3Dutf-8; content-transfer-encoding: quoted-printable
+
+diff -r c3c9e37db9f4 -r c655633f8c87 qp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/qp	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,4 @@
++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
++foo
++
++bar
+
+
 % iso-8859-1 patch
 adding isolatin
 % fake ascii mbox
 This patch series consists of 1 patches.
 
 
 Writing [PATCH] charset=us-ascii; content-transfer-encoding: 8bit ...
 % md5sum of 8-bit output
-40190791e367a851e42f0887b2d9439e  mboxfix
+9ea043d8fc43a71045114508baed144b  mboxfix
 % test diffstat for single patch
 This patch series consists of 1 patches.
 
 c
 
  c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 
 Displaying [PATCH] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
 Message-Id: <ff2c9fa2018b15fa74b3.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
  c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 
 # HG changeset patch
 # User test
 # Date 3 0
 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
 # Parent  97d72e5f12c7e84f85064aa72e5a297142c36ed9
 c
 
 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,1 @@
 +c
 
 % test diffstat for multiple patches
 This patch series consists of 2 patches.
 
 a
 
  a |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 b
 
  b |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 Final summary:
 
  a |  1 +
  b |  1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
 
 
 Write the introductory message for the patch series.
 
 
 Displaying [PATCH 0 of 2] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 2] test
 Message-Id: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 
  a |  1 +
  b |  1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
 
 Displaying [PATCH 1 of 2] a ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
 Message-Id: <8580ff50825a50c8f716.61@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 
  a |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 
 # HG changeset patch
 # User test
 # Date 1 0
 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
 # Parent  0000000000000000000000000000000000000000
 a
 
 diff -r 000000000000 -r 8580ff50825a a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 Displaying [PATCH 2 of 2] b ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 Message-Id: <97d72e5f12c7e84f8506.62@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 
  b |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 
 # HG changeset patch
 # User test
 # Date 2 0
 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 # Parent  8580ff50825a50c8f716709acdf8de0deddcd6ab
 b
 
 diff -r 8580ff50825a -r 97d72e5f12c7 b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:02 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 % test inline for single patch
 This patch series consists of 1 patches.
 
 
 Displaying [PATCH] test ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
 Message-Id: <ff2c9fa2018b15fa74b3.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2.patch
 
 # HG changeset patch
 # User test
 # Date 3 0
 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
 # Parent  97d72e5f12c7e84f85064aa72e5a297142c36ed9
 c
 
 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,1 @@
 +c
 
 --===
+% test inline for single patch (quoted-printable)
+This patch series consists of 1 patches.
+
+
+Displaying [PATCH] test ...
+Content-Type: multipart/mixed; boundary="===
+MIME-Version: 1.0
+Subject: [PATCH] test
+X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
+Message-Id: <c655633f8c87700bb38c.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:00 +0000
+From: quux
+To: foo
+Cc: bar
+
+--===
+Content-Type: text/x-patch; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline; filename=t2.patch
+
+# HG changeset patch
+# User test
+# Date 4 0
+# Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376
+# Parent  c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+charset=3Dutf-8; content-transfer-encoding: quoted-printable
+
+diff -r c3c9e37db9f4 -r c655633f8c87 qp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/qp	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,4 @@
++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
++foo
++
++bar
+
+--===
 % test inline for multiple patches
-This patch series consists of 2 patches.
+This patch series consists of 3 patches.
 
 
 Write the introductory message for the patch series.
 
 
-Displaying [PATCH 0 of 2] test ...
+Displaying [PATCH 0 of 3] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
-Subject: [PATCH 0 of 2] test
+Subject: [PATCH 0 of 3] test
 Message-Id: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 
-Displaying [PATCH 1 of 2] a ...
+Displaying [PATCH 1 of 3] a ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
-Subject: [PATCH 1 of 2] a
+Subject: [PATCH 1 of 3] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
 Message-Id: <8580ff50825a50c8f716.61@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2-1.patch
 
 # HG changeset patch
 # User test
 # Date 1 0
 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
 # Parent  0000000000000000000000000000000000000000
 a
 
 diff -r 000000000000 -r 8580ff50825a a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 --===
-Displaying [PATCH 2 of 2] b ...
+Displaying [PATCH 2 of 3] b ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
-Subject: [PATCH 2 of 2] b
+Subject: [PATCH 2 of 3] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 Message-Id: <97d72e5f12c7e84f8506.62@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2-2.patch
 
 # HG changeset patch
 # User test
 # Date 2 0
 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 # Parent  8580ff50825a50c8f716709acdf8de0deddcd6ab
 b
 
 diff -r 8580ff50825a -r 97d72e5f12c7 b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:02 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 --===
+Displaying [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable ...
+Content-Type: multipart/mixed; boundary="===
+MIME-Version: 1.0
+Subject: [PATCH 3 of 3] charset=utf-8;
+	content-transfer-encoding: quoted-printable
+X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
+Message-Id: <c655633f8c87700bb38c.63@
+In-Reply-To: <patchbomb.60@
+References: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:03 +0000
+From: quux
+To: foo
+Cc: bar
+
+--===
+Content-Type: text/x-patch; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline; filename=t2-3.patch
+
+# HG changeset patch
+# User test
+# Date 4 0
+# Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376
+# Parent  c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+charset=3Dutf-8; content-transfer-encoding: quoted-printable
+
+diff -r c3c9e37db9f4 -r c655633f8c87 qp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/qp	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,4 @@
++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
++foo
++
++bar
+
+--===
 % test attach for single patch
 This patch series consists of 1 patches.
 
 
 Displaying [PATCH] test ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
 Message-Id: <ff2c9fa2018b15fa74b3.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 
 Patch subject is complete summary.
 
 
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=t2.patch
 
 # HG changeset patch
 # User test
 # Date 3 0
 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
 # Parent  97d72e5f12c7e84f85064aa72e5a297142c36ed9
 c
 
 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,1 @@
 +c
 
 --===
+% test attach for single patch (quoted-printable)
+This patch series consists of 1 patches.
+
+
+Displaying [PATCH] test ...
+Content-Type: multipart/mixed; boundary="===
+MIME-Version: 1.0
+Subject: [PATCH] test
+X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
+Message-Id: <c655633f8c87700bb38c.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:00 +0000
+From: quux
+To: foo
+Cc: bar
+
+--===
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+Patch subject is complete summary.
+
+
+
+--===
+Content-Type: text/x-patch; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename=t2.patch
+
+# HG changeset patch
+# User test
+# Date 4 0
+# Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376
+# Parent  c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+charset=3Dutf-8; content-transfer-encoding: quoted-printable
+
+diff -r c3c9e37db9f4 -r c655633f8c87 qp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/qp	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,4 @@
++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
++foo
++
++bar
+
+--===
 % test attach for multiple patches
-This patch series consists of 2 patches.
+This patch series consists of 3 patches.
 
 
 Write the introductory message for the patch series.
 
 
-Displaying [PATCH 0 of 2] test ...
+Displaying [PATCH 0 of 3] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
-Subject: [PATCH 0 of 2] test
+Subject: [PATCH 0 of 3] test
 Message-Id: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 
-Displaying [PATCH 1 of 2] a ...
+Displaying [PATCH 1 of 3] a ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
-Subject: [PATCH 1 of 2] a
+Subject: [PATCH 1 of 3] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
 Message-Id: <8580ff50825a50c8f716.61@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 
 Patch subject is complete summary.
 
 
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=t2-1.patch
 
 # HG changeset patch
 # User test
 # Date 1 0
 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
 # Parent  0000000000000000000000000000000000000000
 a
 
 diff -r 000000000000 -r 8580ff50825a a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 --===
-Displaying [PATCH 2 of 2] b ...
+Displaying [PATCH 2 of 3] b ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
-Subject: [PATCH 2 of 2] b
+Subject: [PATCH 2 of 3] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 Message-Id: <97d72e5f12c7e84f8506.62@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 
 Patch subject is complete summary.
 
 
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=t2-2.patch
 
 # HG changeset patch
 # User test
 # Date 2 0
 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 # Parent  8580ff50825a50c8f716709acdf8de0deddcd6ab
 b
 
 diff -r 8580ff50825a -r 97d72e5f12c7 b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:02 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 --===
+Displaying [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable ...
+Content-Type: multipart/mixed; boundary="===
+MIME-Version: 1.0
+Subject: [PATCH 3 of 3] charset=utf-8;
+	content-transfer-encoding: quoted-printable
+X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
+Message-Id: <c655633f8c87700bb38c.63@
+In-Reply-To: <patchbomb.60@
+References: <patchbomb.60@
+User-Agent: Mercurial-patchbomb
+Date: Thu, 01 Jan 1970 00:01:03 +0000
+From: quux
+To: foo
+Cc: bar
+
+--===
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+Patch subject is complete summary.
+
+
+
+--===
+Content-Type: text/x-patch; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename=t2-3.patch
+
+# HG changeset patch
+# User test
+# Date 4 0
+# Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376
+# Parent  c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+charset=3Dutf-8; content-transfer-encoding: quoted-printable
+
+diff -r c3c9e37db9f4 -r c655633f8c87 qp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/qp	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,4 @@
++xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
++foo
++
++bar
+
+--===
 % test intro for single patch
 This patch series consists of 1 patches.
 
 
 Write the introductory message for the patch series.
 
 
 Displaying [PATCH 0 of 1] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 1] test
 Message-Id: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 
 Displaying [PATCH 1 of 1] c ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 1 of 1] c
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
 Message-Id: <ff2c9fa2018b15fa74b3.61@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 
 # HG changeset patch
 # User test
 # Date 3 0
 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
 # Parent  97d72e5f12c7e84f85064aa72e5a297142c36ed9
 c
 
 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,1 @@
 +c
 
 % test intro for multiple patches
 This patch series consists of 2 patches.
 
 
 Write the introductory message for the patch series.
 
 
 Displaying [PATCH 0 of 2] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 2] test
 Message-Id: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 
 Displaying [PATCH 1 of 2] a ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
 Message-Id: <8580ff50825a50c8f716.61@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 
 # HG changeset patch
 # User test
 # Date 1 0
 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
 # Parent  0000000000000000000000000000000000000000
 a
 
 diff -r 000000000000 -r 8580ff50825a a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 Displaying [PATCH 2 of 2] b ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 Message-Id: <97d72e5f12c7e84f8506.62@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 
 # HG changeset patch
 # User test
 # Date 2 0
 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 # Parent  8580ff50825a50c8f716709acdf8de0deddcd6ab
 b
 
 diff -r 8580ff50825a -r 97d72e5f12c7 b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:02 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 % tagging csets
 % test inline for single named patch
 This patch series consists of 1 patches.
 
 
 Displaying [PATCH] test ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
 Message-Id: <ff2c9fa2018b15fa74b3.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=two.diff
 
 # HG changeset patch
 # User test
 # Date 3 0
 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
 # Parent  97d72e5f12c7e84f85064aa72e5a297142c36ed9
 c
 
 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/c	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,1 @@
 +c
 
 --===
 % test inline for multiple named/unnamed patches
 This patch series consists of 2 patches.
 
 
 Write the introductory message for the patch series.
 
 
 Displaying [PATCH 0 of 2] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 2] test
 Message-Id: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 
 Displaying [PATCH 1 of 2] a ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
 Message-Id: <8580ff50825a50c8f716.61@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2-1.patch
 
 # HG changeset patch
 # User test
 # Date 1 0
 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
 # Parent  0000000000000000000000000000000000000000
 a
 
 diff -r 000000000000 -r 8580ff50825a a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:01 1970 +0000
 @@ -0,0 +1,1 @@
 +a
 
 --===
 Displaying [PATCH 2 of 2] b ...
 Content-Type: multipart/mixed; boundary="===
 MIME-Version: 1.0
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 Message-Id: <97d72e5f12c7e84f8506.62@
 In-Reply-To: <patchbomb.60@
 References: <patchbomb.60@
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 
 --===
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=one.patch
 
 # HG changeset patch
 # User test
 # Date 2 0
 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
 # Parent  8580ff50825a50c8f716709acdf8de0deddcd6ab
 b
 
 diff -r 8580ff50825a -r 97d72e5f12c7 b
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/b	Thu Jan 01 00:00:02 1970 +0000
 @@ -0,0 +1,1 @@
 +b
 
 --===
 % test inreplyto
 This patch series consists of 1 patches.
 
 
 Displaying [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b
-X-Mercurial-Node: 2c502b2db30e1ddd5e4ecabd68d9002f6c77a5a3
-Message-Id: <2c502b2db30e1ddd5e4e.60@
+X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6
+Message-Id: <e317db6a6f288748d1f6.60@
 In-Reply-To: baz
 References: baz
 User-Agent: Mercurial-patchbomb
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 
 # HG changeset patch
 # User test
 # Date 0 0
-# Node ID 2c502b2db30e1ddd5e4ecabd68d9002f6c77a5a3
-# Parent  91c0d1bdb4bc9cfd3b38a53a5ec53e9ae412a275
+# Node ID e317db6a6f288748d1f6cb064f3810fcba66b1b6
+# Parent  eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff
 Added tag two, two.diff for changeset ff2c9fa2018b
 
-diff -r 91c0d1bdb4bc -r 2c502b2db30e .hgtags
+diff -r eae5fcf795ee -r e317db6a6f28 .hgtags
 --- a/.hgtags	Thu Jan 01 00:00:00 1970 +0000
 +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
 @@ -2,3 +2,5 @@
  8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
  97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
  97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two
 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff