mercurial: comparison tests/test-patchbomb.t

equal deleted inserted replaced

-:2607de602105
+:1346bf5ff901
 $ "$TESTDIR/hghave" system-sh || exit 80
-$ 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
 $ hg init t
 $ cd t
 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@* (glob)
+Message-Id: <8580ff50825a50c8f716.60@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 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@[^>]*> (re)
+Message-Id: <patchbomb.120@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:02:00 +0000
 From: quux
 To: foo
 Cc: bar
 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@[^>]*> (re)
+Message-Id: <8580ff50825a50c8f716.121@*> (glob)
-In-Reply-To: <patchbomb\.120@[^>]*> (re)
+In-Reply-To: <patchbomb.120@*> (glob)
-References: <patchbomb\.120@[^>]*> (re)
+References: <patchbomb.120@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:02:01 +0000
 From: quux
 To: foo
 Cc: bar
 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@[^>]*> (re)
+Message-Id: <97d72e5f12c7e84f8506.122@*> (glob)
-In-Reply-To: <patchbomb\.120@[^>]*> (re)
+In-Reply-To: <patchbomb.120@*> (glob)
-References: <patchbomb\.120@[^>]*> (re)
+References: <patchbomb.120@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:02:02 +0000
 From: quux
 To: foo
 Cc: bar
 > EOF
 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
+>  -c bar -s test -r tip -b --desc description
 searching for changes
 1 changesets found
 Displaying test ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: test
-Message-Id: <patchbomb.180@
+Message-Id: <patchbomb.180@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:03:00 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 a multiline
 description
---===
+--===* (glob)
 Content-Type: application/x-mercurial-bundle
 MIME-Version: 1.0
 Content-Disposition: attachment; filename="bundle.hg"
 Content-Transfer-Encoding: base64
 oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2
 Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE
 SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD
 sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC
 Q70eyNw=
---===
+--===*-- (glob)
 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'
 adding description
 adding utf
 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
+$ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n
+This patch series consists of 1 patches.
-md5sum of 8-bit output:
-$ $TESTDIR/md5sum.py mailtest
-e726c29b3008e77994c7572563e57c34  mailtest
+Displaying [PATCH] charset=utf-8; content-transfer-encoding: base64 ...
+Content-Type: text/plain; charset="us-ascii"
-$ rm mailtest
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [PATCH] charset=utf-8; content-transfer-encoding: base64
+X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+Message-Id: <c3c9e37db9f4fe4882cd.240@*> (glob)
+User-Agent: Mercurial-patchbomb/* (glob)
+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 c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+# Parent  ff2c9fa2018b15fa74b33363bda9527323e2a99f
+charset=utf-8; content-transfer-encoding: base64
+diff -r ff2c9fa2018b -r c3c9e37db9f4 description
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/description	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,3 @@
++a multiline
++
++description
+diff -r ff2c9fa2018b -r c3c9e37db9f4 utf
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/utf	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,1 @@
++h\xc3\xb6mma! (esc)
 mime encoded mbox (base64):
 $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox
 This patch series consists of 1 patches.
 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@* (glob)
+Message-Id: <c3c9e37db9f4fe4882cd.240@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:04:00 +0000
 From: quux
 To: foo
 Cc: bar
 MDE4YiAtciBjM2M5ZTM3ZGI5ZjQgdXRmCi0tLSAvZGV2L251bGwJVGh1IEphbiAwMSAwMDowMDow
 MCAxOTcwICswMDAwCisrKyBiL3V0ZglUaHUgSmFuIDAxIDAwOjAwOjA0IDE5NzAgKzAwMDAKQEAg
 LTAsMCArMSwxIEBACitow7ZtbWEhCg==
+$ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")'
+# HG changeset patch
+# User test
+# Date 4 0
+# Node ID c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
+# Parent  ff2c9fa2018b15fa74b33363bda9527323e2a99f
+charset=utf-8; content-transfer-encoding: base64
+diff -r ff2c9fa2018b -r c3c9e37db9f4 description
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/description	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,3 @@
++a multiline
++
++description
+diff -r ff2c9fa2018b -r c3c9e37db9f4 utf
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/utf	Thu Jan 01 00:00:04 1970 +0000
+@@ -0,0 +1,1 @@
++h\xc3\xb6mma! (esc)
 $ rm mbox
 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'
 adding qp
 no mime encoding for email --test:
-$ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n | \
+$ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n
->  fixheaders > mailtest
-md5sum of qp output:
-$ $TESTDIR/md5sum.py mailtest
-0402c7d033e04044e423bb04816f9dae  mailtest
-$ rm mailtest
-mime encoded mbox (quoted-printable):
-$ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox
 This patch series consists of 1 patches.
-Writing [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ...
+Displaying [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ...
-$ cat mbox | fixheaders
-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@
+Message-Id: <c655633f8c87700bb38c.240@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:04:00 +0000
 From: quux
 To: foo
 Cc: bar
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 +foo
 +
 +bar
+mime encoded mbox (quoted-printable):
+$ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox
+This patch series consists of 1 patches.
+Writing [PATCH] charset=utf-8; content-transfer-encoding: quoted-printable ...
+$ cat mbox
+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@*> (glob)
+User-Agent: Mercurial-patchbomb/* (glob)
+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
 $ rm mbox
 iso-8859-1 patch:
 $ hg email --date '1970-1-1 0:5' -f quux -t foo -c bar -r tip -m mbox
 This patch series consists of 1 patches.
 Writing [PATCH] charset=us-ascii; content-transfer-encoding: 8bit ...
-$ fixheaders < mbox > mboxfix
+$ cat mbox
+From quux Thu Jan 01 00:05:01 1970
-md5sum of 8-bit output:
+Content-Type: text/plain; charset="us-ascii"
-$ $TESTDIR/md5sum.py mboxfix
+MIME-Version: 1.0
-9ea043d8fc43a71045114508baed144b  mboxfix
+Content-Transfer-Encoding: 8bit
+Subject: [PATCH] charset=us-ascii; content-transfer-encoding: 8bit
+X-Mercurial-Node: 22d0f96be12f5945fd67d101af58f7bc8263c835
+Message-Id: <22d0f96be12f5945fd67.300@*> (glob)
+User-Agent: Mercurial-patchbomb/* (glob)
+Date: Thu, 01 Jan 1970 00:05:00 +0000
+From: quux
+To: foo
+Cc: bar
+# HG changeset patch
+# User test
+# Date 5 0
+# Node ID 22d0f96be12f5945fd67d101af58f7bc8263c835
+# Parent  c655633f8c87700bb38cc6a59a2753bdc5a6c376
+charset=us-ascii; content-transfer-encoding: 8bit
+diff -r c655633f8c87 -r 22d0f96be12f isolatin
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/isolatin	Thu Jan 01 00:00:05 1970 +0000
+@@ -0,0 +1,1 @@
++h\xf6mma! (esc)
 test diffstat for single patch:
-$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y -r 2 | \
+$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y -r 2
->  fixheaders
 This patch series consists of 1 patches.
 Final summary:
 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@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 +c
 test diffstat for multiple patches:
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y \
->  -r 0:1 | fixheaders
+>  -r 0:1
 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@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 @@ -0,0 +1,1 @@
 +b
 test inline for single patch:
-$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 | \
+$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
->  fixheaders
 This patch series consists of 1 patches.
 Displaying [PATCH] test ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.60@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2.patch
 --- /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
---===
+--===*-- (glob)
 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 -r 4 | \
+$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4
->  fixheaders
 This patch series consists of 1 patches.
 Displaying [PATCH] test ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
-Message-Id: <c655633f8c87700bb38c.60@
+Message-Id: <c655633f8c87700bb38c.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline; filename=t2.patch
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 +foo
 +
 +bar
---===
+--===*-- (glob)
 test inline for multiple patches:
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
->  -r 0:1 -r 4 | fixheaders
+>  -r 0:1 -r 4
 This patch series consists of 3 patches.
 Write the introductory message for the patch series.
 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 3] test
-Message-Id: <patchbomb.60@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 Displaying [PATCH 1 of 3] a ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH 1 of 3] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2-1.patch
 --- /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
---===
+--===*-- (glob)
 Displaying [PATCH 2 of 3] b ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH 2 of 3] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2-2.patch
 --- /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
---===
+--===*-- (glob)
 Displaying [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 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@
+Message-Id: <c655633f8c87700bb38c.63@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:03 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline; filename=t2-3.patch
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 +foo
 +
 +bar
---===
+--===*-- (glob)
 test attach for single patch:
-$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2 | \
+$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2
->  fixheaders
 This patch series consists of 1 patches.
 Displaying [PATCH] test ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.60@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Patch subject is complete summary.
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=t2.patch
 --- /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
---===
+--===*-- (glob)
 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 -r 4 | \
+$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4
->  fixheaders
 This patch series consists of 1 patches.
 Displaying [PATCH] test ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
-Message-Id: <c655633f8c87700bb38c.60@
+Message-Id: <c655633f8c87700bb38c.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Patch subject is complete summary.
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=t2.patch
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 +foo
 +
 +bar
---===
+--===*-- (glob)
 test attach for multiple patches:
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \
->  -r 0:1 -r 4 | fixheaders
+>  -r 0:1 -r 4
 This patch series consists of 3 patches.
 Write the introductory message for the patch series.
 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 3] test
-Message-Id: <patchbomb.60@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 Displaying [PATCH 1 of 3] a ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH 1 of 3] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Patch subject is complete summary.
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=t2-1.patch
 --- /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
---===
+--===*-- (glob)
 Displaying [PATCH 2 of 3] b ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH 2 of 3] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Patch subject is complete summary.
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=t2-2.patch
 --- /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
---===
+--===*-- (glob)
 Displaying [PATCH 3 of 3] charset=utf-8; content-transfer-encoding: quoted-printable ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 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@
+Message-Id: <c655633f8c87700bb38c.63@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:03 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Patch subject is complete summary.
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=t2-3.patch
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 +foo
 +
 +bar
---===
+--===*-- (glob)
 test intro for single patch:
 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \
->  -r 2 | fixheaders
+>  -r 2
 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@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 1 of 1] c
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.61@
+Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 test --desc without --intro for a single patch:
 $ echo foo > intro.text
 $ hg email --date '1970-1-1 0:1' -n --desc intro.text -f quux -t foo -c bar \
->  -s test -r 2 | fixheaders
+>  -s test -r 2
 This patch series consists of 1 patches.
 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@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 1 of 1] c
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.61@
+Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 +c
 test intro for multiple patches:
 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \
->  -r 0:1 | fixheaders
+>  -r 0:1
 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@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 +b
 test reply-to via config:
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \
->  --config patchbomb.reply-to='baz@example.com' | fixheaders
+>  --config patchbomb.reply-to='baz@example.com'
 This patch series consists of 1 patches.
 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@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 Reply-To: baz@example.com
 +c
 test reply-to via command line:
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \
->  --reply-to baz --reply-to fred | fixheaders
+>  --reply-to baz --reply-to fred
 This patch series consists of 1 patches.
 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@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 Reply-To: baz, fred
 $ hg tag -r0 zero zero.foo
 $ hg tag -r1 one one.patch
 $ hg tag -r2 two two.diff
 test inline for single named patch:
-$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 | \
+$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
->  fixheaders
 This patch series consists of 1 patches.
 Displaying [PATCH] test ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.60@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=two.diff
 --- /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
---===
+--===*-- (glob)
 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 -r 0:1 | \
+$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1
->  fixheaders
 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@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=t2-1.patch
 --- /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
---===
+--===*-- (glob)
 Displaying [PATCH 2 of 2] b ...
-Content-Type: multipart/mixed; boundary="===
+Content-Type: multipart/mixed; boundary="===*" (glob)
 MIME-Version: 1.0
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
---===
+--===* (glob)
 Content-Type: text/x-patch; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline; filename=one.patch
 --- /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
---===
+--===*-- (glob)
 test inreplyto:
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
->  -r tip | fixheaders
+>  -r tip
 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: e317db6a6f288748d1f6cb064f3810fcba66b1b6
-Message-Id: <e317db6a6f288748d1f6.60@
+Message-Id: <e317db6a6f288748d1f6.60@*> (glob)
 In-Reply-To: <baz>
 References: <baz>
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two
 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff
 no intro message in non-interactive mode
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
->  -r 0:1 | fixheaders
+>  -r 0:1
 This patch series consists of 2 patches.
 Subject: [PATCH 0 of 2]
 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.60@
+Message-Id: <8580ff50825a50c8f716.60@*> (glob)
 In-Reply-To: <baz>
 References: <baz>
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.61@
+Message-Id: <97d72e5f12c7e84f8506.61@*> (glob)
-In-Reply-To: <8580ff50825a50c8f716.60@
+In-Reply-To: <8580ff50825a50c8f716.60@*> (glob)
-References: <8580ff50825a50c8f716.60@
+References: <8580ff50825a50c8f716.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:01 +0000
 From: quux
 To: foo
 Cc: bar
 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
->  -s test -r 0:1 | fixheaders
+>  -s test -r 0:1
 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@
+Message-Id: <patchbomb.60@*> (glob)
 In-Reply-To: <baz>
 References: <baz>
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 1 of 2] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 2 of 2] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 +b
 test single flag for single patch:
 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
->  -r 2 | fixheaders
+>  -r 2
 This patch series consists of 1 patches.
 Displaying [PATCH fooFlag] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH fooFlag] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.60@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 +c
 test single flag for multiple patches:
 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
->  -r 0:1 | fixheaders
+>  -r 0:1
 This patch series consists of 2 patches.
 Write the introductory message for the patch series.
 Displaying [PATCH 0 of 2 fooFlag] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 2 fooFlag] test
-Message-Id: <patchbomb.60@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 1 of 2 fooFlag] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 2 of 2 fooFlag] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 +b
 test mutiple flags for single patch:
 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
->  -c bar -s test -r 2 | fixheaders
+>  -c bar -s test -r 2
 This patch series consists of 1 patches.
 Displaying [PATCH fooFlag barFlag] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH fooFlag barFlag] test
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.60@
+Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:00 +0000
 From: quux
 To: foo
 Cc: bar
 +c
 test multiple flags for multiple patches:
 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
->  -c bar -s test -r 0:1 | fixheaders
+>  -c bar -s test -r 0:1
 This patch series consists of 2 patches.
 Write the introductory message for the patch series.
 Displaying [PATCH 0 of 2 fooFlag barFlag] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 2 fooFlag barFlag] test
-Message-Id: <patchbomb.60@
+Message-Id: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 1 of 2 fooFlag barFlag] a
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.61@
+Message-Id: <8580ff50825a50c8f716.61@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 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
 Subject: [PATCH 2 of 2 fooFlag barFlag] b
 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
-Message-Id: <97d72e5f12c7e84f8506.62@
+Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
-In-Reply-To: <patchbomb.60@
+In-Reply-To: <patchbomb.60@*> (glob)
-References: <patchbomb.60@
+References: <patchbomb.60@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Thu, 01 Jan 1970 00:01:02 +0000
 From: quux
 To: foo
 Cc: bar
 >  --config email.bcc='"Quux, A." <quux>'
 This patch series consists of 1 patches.
 Writing [PATCH] test ...
-$ fixheaders < tmp.mbox
+$ cat < tmp.mbox
 From quux Tue Jan 01 00:01:01 1980
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH] test
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.315532860@
+Message-Id: <8580ff50825a50c8f716.315532860@*> (glob)
-User-Agent: Mercurial-patchbomb
+User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:00 +0000
 From: quux
 To: spam <spam>, eggs, toast
 Cc: foo, bar@example.com, "A, B <>" <a@example.com>
 Bcc: "Quux, A." <quux>
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH] test
 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
-Message-Id: <8580ff50825a50c8f716.315532860@* (glob)
+Message-Id: <8580ff50825a50c8f716.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:00 +0000
 From: quux
 To: bar@xn--nicode-2ya.com
 Displaying [PATCH 0 of 8] test ...
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 0 of 8] test
-Message-Id: <patchbomb.315532860@* (glob)
+Message-Id: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:00 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 1 of 8] c
 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
-Message-Id: <ff2c9fa2018b15fa74b3.315532861@* (glob)
+Message-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:01 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 Subject: [PATCH 2 of 8] charset=utf-8; content-transfer-encoding: base64
 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
-Message-Id: <c3c9e37db9f4fe4882cd.315532862@* (glob)
+Message-Id: <c3c9e37db9f4fe4882cd.315532862@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:02 +0000
 From: test
 To: foo
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Subject: [PATCH 3 of 8] charset=utf-8;
 content-transfer-encoding: quoted-printable
 X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
-Message-Id: <c655633f8c87700bb38c.315532863@* (glob)
+Message-Id: <c655633f8c87700bb38c.315532863@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:03 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 Subject: [PATCH 4 of 8] charset=us-ascii; content-transfer-encoding: 8bit
 X-Mercurial-Node: 22d0f96be12f5945fd67d101af58f7bc8263c835
-Message-Id: <22d0f96be12f5945fd67.315532864@* (glob)
+Message-Id: <22d0f96be12f5945fd67.315532864@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:04 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a
 X-Mercurial-Node: dd9c2b4b8a8a0934d5523c15f2c119b362360903
-Message-Id: <dd9c2b4b8a8a0934d552.315532865@* (glob)
+Message-Id: <dd9c2b4b8a8a0934d552.315532865@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:05 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7
 X-Mercurial-Node: eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff
-Message-Id: <eae5fcf795eee29d0e45.315532866@* (glob)
+Message-Id: <eae5fcf795eee29d0e45.315532866@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:06 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b
 X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6
-Message-Id: <e317db6a6f288748d1f6.315532867@* (glob)
+Message-Id: <e317db6a6f288748d1f6.315532867@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:07 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH 8 of 8] d
 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
-Message-Id: <2f9fa9b998c5fe3ac2bd\.315532868[^>]*> (re)
+Message-Id: <2f9fa9b998c5fe3ac2bd.315532868@*> (glob)
-In-Reply-To: <patchbomb\.315532860@[^>]*> (re)
+In-Reply-To: <patchbomb.315532860@*> (glob)
-References: <patchbomb\.315532860@[^>]*> (re)
+References: <patchbomb.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:08 +0000
 From: test
 To: foo
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [PATCH] test
 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
-Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@* (glob)
+Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@*> (glob)
 User-Agent: Mercurial-patchbomb/* (glob)
 Date: Tue, 01 Jan 1980 00:01:00 +0000
 From: test
 To: foo

changeset 15546	1346bf5ff901
parent 15519	bb9ad375b51c
child 15547	7f1d263a1bcb