Mercurial > hg

comparison tests/test-patchbomb.t @ 21725:e8496c4ba6c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-patchbomb: normalize glob lines and record their construction This makes it significantly less painful to use --interactive on run-tests, as you can now use the recorded regular expression substitutions to fix up the glob lines and produce zero diffs. This also tightens the expectations of a few of the lines for the MIME boundaries - it just seemed like the thing to do while in here and causing some changes.
author Augie Fackler <raf@durin42.com>
date Sat, 07 Jun 2014 11:30:06 -0400
parents 36b31f7867a7
children fae032549ca2
comparison
equal deleted inserted replaced
21724:36b31f7867a7 21725:e8496c4ba6c0
1 Note for future hackers of patchbomb: this file is a bit heavy on
2 wildcards in test expectations due to how many things like hostnames
3 tend to make it into outputs. As a result, you may need to perform the
4 following regular expression substitutions:
5 @$HOSTNAME> -> @*> (glob)
6 Mercurial-patchbomb/.* -> Mercurial-patchbomb/* (glob)
7 /mixed; boundary="===+[0-9]+==" -> /mixed; boundary="===*== (glob)"
8 --===+[0-9]+=+--$ -> --===*=-- (glob)
9 --===+[0-9]+=+$ -> --===*= (glob)
10
1 $ echo "[extensions]" >> $HGRCPATH 11 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "patchbomb=" >> $HGRCPATH 12 $ echo "patchbomb=" >> $HGRCPATH
3 13
4 $ hg init t 14 $ hg init t
5 $ cd t 15 $ cd t
208 > -c bar -s test -r tip -b --desc description 218 > -c bar -s test -r tip -b --desc description
209 searching for changes 219 searching for changes
210 1 changesets found 220 1 changesets found
211 221
212 displaying test ... 222 displaying test ...
213 Content-Type: multipart/mixed; boundary="===*" (glob) 223 Content-Type: multipart/mixed; boundary="===*==" (glob)
214 MIME-Version: 1.0 224 MIME-Version: 1.0
215 Subject: test 225 Subject: test
216 Message-Id: <patchbomb.180@*> (glob) 226 Message-Id: <patchbomb.180@*> (glob)
217 X-Mercurial-Series-Id: <patchbomb.180@*> (glob) 227 X-Mercurial-Series-Id: <patchbomb.180@*> (glob)
218 User-Agent: Mercurial-patchbomb/* (glob) 228 User-Agent: Mercurial-patchbomb/* (glob)
219 Date: Thu, 01 Jan 1970 00:03:00 +0000 229 Date: Thu, 01 Jan 1970 00:03:00 +0000
220 From: quux 230 From: quux
221 To: foo 231 To: foo
222 Cc: bar 232 Cc: bar
223 233
224 --===* (glob) 234 --===*= (glob)
225 Content-Type: text/plain; charset="us-ascii" 235 Content-Type: text/plain; charset="us-ascii"
226 MIME-Version: 1.0 236 MIME-Version: 1.0
227 Content-Transfer-Encoding: 7bit 237 Content-Transfer-Encoding: 7bit
228 238
229 a multiline 239 a multiline
230 240
231 description 241 description
232 242
233 --===* (glob) 243 --===*= (glob)
234 Content-Type: application/x-mercurial-bundle 244 Content-Type: application/x-mercurial-bundle
235 MIME-Version: 1.0 245 MIME-Version: 1.0
236 Content-Disposition: attachment; filename="bundle.hg" 246 Content-Disposition: attachment; filename="bundle.hg"
237 Content-Transfer-Encoding: base64 247 Content-Transfer-Encoding: base64
238 248
241 oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2 251 oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2
242 Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE 252 Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE
243 SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD 253 SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD
244 sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC 254 sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC
245 Q70eyNw= 255 Q70eyNw=
246 --===*-- (glob) 256 --===*=-- (glob)
247 257
248 utf-8 patch: 258 utf-8 patch:
249 $ python -c 'fp = open("utf", "wb"); fp.write("h\xC3\xB6mma!\n"); fp.close();' 259 $ python -c 'fp = open("utf", "wb"); fp.write("h\xC3\xB6mma!\n"); fp.close();'
250 $ hg commit -A -d '4 0' -m 'utf-8 content' 260 $ hg commit -A -d '4 0' -m 'utf-8 content'
251 adding description 261 adding description
685 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 695 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
686 this patch series consists of 1 patches. 696 this patch series consists of 1 patches.
687 697
688 698
689 displaying [PATCH] test ... 699 displaying [PATCH] test ...
690 Content-Type: multipart/mixed; boundary="===*" (glob) 700 Content-Type: multipart/mixed; boundary="===*==" (glob)
691 MIME-Version: 1.0 701 MIME-Version: 1.0
692 Subject: [PATCH] test 702 Subject: [PATCH] test
693 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f 703 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
694 X-Mercurial-Series-Index: 1 704 X-Mercurial-Series-Index: 1
695 X-Mercurial-Series-Total: 1 705 X-Mercurial-Series-Total: 1
699 Date: Thu, 01 Jan 1970 00:01:00 +0000 709 Date: Thu, 01 Jan 1970 00:01:00 +0000
700 From: quux 710 From: quux
701 To: foo 711 To: foo
702 Cc: bar 712 Cc: bar
703 713
704 --===* (glob) 714 --===*= (glob)
705 Content-Type: text/x-patch; charset="us-ascii" 715 Content-Type: text/x-patch; charset="us-ascii"
706 MIME-Version: 1.0 716 MIME-Version: 1.0
707 Content-Transfer-Encoding: 7bit 717 Content-Transfer-Encoding: 7bit
708 Content-Disposition: inline; filename=t2.patch 718 Content-Disposition: inline; filename=t2.patch
709 719
719 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 729 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
720 +++ b/c Thu Jan 01 00:00:03 1970 +0000 730 +++ b/c Thu Jan 01 00:00:03 1970 +0000
721 @@ -0,0 +1,1 @@ 731 @@ -0,0 +1,1 @@
722 +c 732 +c
723 733
724 --===*-- (glob) 734 --===*=-- (glob)
725 735
726 736
727 test inline for single patch (quoted-printable): 737 test inline for single patch (quoted-printable):
728 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4 738 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4
729 this patch series consists of 1 patches. 739 this patch series consists of 1 patches.
730 740
731 741
732 displaying [PATCH] test ... 742 displaying [PATCH] test ...
733 Content-Type: multipart/mixed; boundary="===*" (glob) 743 Content-Type: multipart/mixed; boundary="===*==" (glob)
734 MIME-Version: 1.0 744 MIME-Version: 1.0
735 Subject: [PATCH] test 745 Subject: [PATCH] test
736 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 746 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
737 X-Mercurial-Series-Index: 1 747 X-Mercurial-Series-Index: 1
738 X-Mercurial-Series-Total: 1 748 X-Mercurial-Series-Total: 1
742 Date: Thu, 01 Jan 1970 00:01:00 +0000 752 Date: Thu, 01 Jan 1970 00:01:00 +0000
743 From: quux 753 From: quux
744 To: foo 754 To: foo
745 Cc: bar 755 Cc: bar
746 756
747 --===* (glob) 757 --===*= (glob)
748 Content-Type: text/x-patch; charset="us-ascii" 758 Content-Type: text/x-patch; charset="us-ascii"
749 MIME-Version: 1.0 759 MIME-Version: 1.0
750 Content-Transfer-Encoding: quoted-printable 760 Content-Transfer-Encoding: quoted-printable
751 Content-Disposition: inline; filename=t2.patch 761 Content-Disposition: inline; filename=t2.patch
752 762
778 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 788 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
779 +foo 789 +foo
780 + 790 +
781 +bar 791 +bar
782 792
783 --===*-- (glob) 793 --===*=-- (glob)
784 794
785 test inline for multiple patches: 795 test inline for multiple patches:
786 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ 796 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
787 > -r 0:1 -r 4 797 > -r 0:1 -r 4
788 this patch series consists of 3 patches. 798 this patch series consists of 3 patches.
804 To: foo 814 To: foo
805 Cc: bar 815 Cc: bar
806 816
807 817
808 displaying [PATCH 1 of 3] a ... 818 displaying [PATCH 1 of 3] a ...
809 Content-Type: multipart/mixed; boundary="===*" (glob) 819 Content-Type: multipart/mixed; boundary="===*==" (glob)
810 MIME-Version: 1.0 820 MIME-Version: 1.0
811 Subject: [PATCH 1 of 3] a 821 Subject: [PATCH 1 of 3] a
812 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab 822 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
813 X-Mercurial-Series-Index: 1 823 X-Mercurial-Series-Index: 1
814 X-Mercurial-Series-Total: 3 824 X-Mercurial-Series-Total: 3
820 Date: Thu, 01 Jan 1970 00:01:01 +0000 830 Date: Thu, 01 Jan 1970 00:01:01 +0000
821 From: quux 831 From: quux
822 To: foo 832 To: foo
823 Cc: bar 833 Cc: bar
824 834
825 --===* (glob) 835 --===*= (glob)
826 Content-Type: text/x-patch; charset="us-ascii" 836 Content-Type: text/x-patch; charset="us-ascii"
827 MIME-Version: 1.0 837 MIME-Version: 1.0
828 Content-Transfer-Encoding: 7bit 838 Content-Transfer-Encoding: 7bit
829 Content-Disposition: inline; filename=t2-1.patch 839 Content-Disposition: inline; filename=t2-1.patch
830 840
840 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 850 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
841 +++ b/a Thu Jan 01 00:00:01 1970 +0000 851 +++ b/a Thu Jan 01 00:00:01 1970 +0000
842 @@ -0,0 +1,1 @@ 852 @@ -0,0 +1,1 @@
843 +a 853 +a
844 854
845 --===*-- (glob) 855 --===*=-- (glob)
846 displaying [PATCH 2 of 3] b ... 856 displaying [PATCH 2 of 3] b ...
847 Content-Type: multipart/mixed; boundary="===*" (glob) 857 Content-Type: multipart/mixed; boundary="===*==" (glob)
848 MIME-Version: 1.0 858 MIME-Version: 1.0
849 Subject: [PATCH 2 of 3] b 859 Subject: [PATCH 2 of 3] b
850 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 860 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
851 X-Mercurial-Series-Index: 2 861 X-Mercurial-Series-Index: 2
852 X-Mercurial-Series-Total: 3 862 X-Mercurial-Series-Total: 3
858 Date: Thu, 01 Jan 1970 00:01:02 +0000 868 Date: Thu, 01 Jan 1970 00:01:02 +0000
859 From: quux 869 From: quux
860 To: foo 870 To: foo
861 Cc: bar 871 Cc: bar
862 872
863 --===* (glob) 873 --===*= (glob)
864 Content-Type: text/x-patch; charset="us-ascii" 874 Content-Type: text/x-patch; charset="us-ascii"
865 MIME-Version: 1.0 875 MIME-Version: 1.0
866 Content-Transfer-Encoding: 7bit 876 Content-Transfer-Encoding: 7bit
867 Content-Disposition: inline; filename=t2-2.patch 877 Content-Disposition: inline; filename=t2-2.patch
868 878
878 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 888 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
879 +++ b/b Thu Jan 01 00:00:02 1970 +0000 889 +++ b/b Thu Jan 01 00:00:02 1970 +0000
880 @@ -0,0 +1,1 @@ 890 @@ -0,0 +1,1 @@
881 +b 891 +b
882 892
883 --===*-- (glob) 893 --===*=-- (glob)
884 displaying [PATCH 3 of 3] long line ... 894 displaying [PATCH 3 of 3] long line ...
885 Content-Type: multipart/mixed; boundary="===*" (glob) 895 Content-Type: multipart/mixed; boundary="===*==" (glob)
886 MIME-Version: 1.0 896 MIME-Version: 1.0
887 Subject: [PATCH 3 of 3] long line 897 Subject: [PATCH 3 of 3] long line
888 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 898 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
889 X-Mercurial-Series-Index: 3 899 X-Mercurial-Series-Index: 3
890 X-Mercurial-Series-Total: 3 900 X-Mercurial-Series-Total: 3
896 Date: Thu, 01 Jan 1970 00:01:03 +0000 906 Date: Thu, 01 Jan 1970 00:01:03 +0000
897 From: quux 907 From: quux
898 To: foo 908 To: foo
899 Cc: bar 909 Cc: bar
900 910
901 --===* (glob) 911 --===*= (glob)
902 Content-Type: text/x-patch; charset="us-ascii" 912 Content-Type: text/x-patch; charset="us-ascii"
903 MIME-Version: 1.0 913 MIME-Version: 1.0
904 Content-Transfer-Encoding: quoted-printable 914 Content-Transfer-Encoding: quoted-printable
905 Content-Disposition: inline; filename=t2-3.patch 915 Content-Disposition: inline; filename=t2-3.patch
906 916
932 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 942 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
933 +foo 943 +foo
934 + 944 +
935 +bar 945 +bar
936 946
937 --===*-- (glob) 947 --===*=-- (glob)
938 948
939 test attach for single patch: 949 test attach for single patch:
940 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2 950 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2
941 this patch series consists of 1 patches. 951 this patch series consists of 1 patches.
942 952
943 953
944 displaying [PATCH] test ... 954 displaying [PATCH] test ...
945 Content-Type: multipart/mixed; boundary="===*" (glob) 955 Content-Type: multipart/mixed; boundary="===*==" (glob)
946 MIME-Version: 1.0 956 MIME-Version: 1.0
947 Subject: [PATCH] test 957 Subject: [PATCH] test
948 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f 958 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
949 X-Mercurial-Series-Index: 1 959 X-Mercurial-Series-Index: 1
950 X-Mercurial-Series-Total: 1 960 X-Mercurial-Series-Total: 1
954 Date: Thu, 01 Jan 1970 00:01:00 +0000 964 Date: Thu, 01 Jan 1970 00:01:00 +0000
955 From: quux 965 From: quux
956 To: foo 966 To: foo
957 Cc: bar 967 Cc: bar
958 968
959 --===* (glob) 969 --===*= (glob)
960 Content-Type: text/plain; charset="us-ascii" 970 Content-Type: text/plain; charset="us-ascii"
961 MIME-Version: 1.0 971 MIME-Version: 1.0
962 Content-Transfer-Encoding: 7bit 972 Content-Transfer-Encoding: 7bit
963 973
964 Patch subject is complete summary. 974 Patch subject is complete summary.
965 975
966 976
967 977
968 --===* (glob) 978 --===*= (glob)
969 Content-Type: text/x-patch; charset="us-ascii" 979 Content-Type: text/x-patch; charset="us-ascii"
970 MIME-Version: 1.0 980 MIME-Version: 1.0
971 Content-Transfer-Encoding: 7bit 981 Content-Transfer-Encoding: 7bit
972 Content-Disposition: attachment; filename=t2.patch 982 Content-Disposition: attachment; filename=t2.patch
973 983
983 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 993 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
984 +++ b/c Thu Jan 01 00:00:03 1970 +0000 994 +++ b/c Thu Jan 01 00:00:03 1970 +0000
985 @@ -0,0 +1,1 @@ 995 @@ -0,0 +1,1 @@
986 +c 996 +c
987 997
988 --===*-- (glob) 998 --===*=-- (glob)
989 999
990 test attach for single patch (quoted-printable): 1000 test attach for single patch (quoted-printable):
991 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4 1001 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4
992 this patch series consists of 1 patches. 1002 this patch series consists of 1 patches.
993 1003
994 1004
995 displaying [PATCH] test ... 1005 displaying [PATCH] test ...
996 Content-Type: multipart/mixed; boundary="===*" (glob) 1006 Content-Type: multipart/mixed; boundary="===*==" (glob)
997 MIME-Version: 1.0 1007 MIME-Version: 1.0
998 Subject: [PATCH] test 1008 Subject: [PATCH] test
999 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 1009 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1000 X-Mercurial-Series-Index: 1 1010 X-Mercurial-Series-Index: 1
1001 X-Mercurial-Series-Total: 1 1011 X-Mercurial-Series-Total: 1
1005 Date: Thu, 01 Jan 1970 00:01:00 +0000 1015 Date: Thu, 01 Jan 1970 00:01:00 +0000
1006 From: quux 1016 From: quux
1007 To: foo 1017 To: foo
1008 Cc: bar 1018 Cc: bar
1009 1019
1010 --===* (glob) 1020 --===*= (glob)
1011 Content-Type: text/plain; charset="us-ascii" 1021 Content-Type: text/plain; charset="us-ascii"
1012 MIME-Version: 1.0 1022 MIME-Version: 1.0
1013 Content-Transfer-Encoding: 7bit 1023 Content-Transfer-Encoding: 7bit
1014 1024
1015 Patch subject is complete summary. 1025 Patch subject is complete summary.
1016 1026
1017 1027
1018 1028
1019 --===* (glob) 1029 --===*= (glob)
1020 Content-Type: text/x-patch; charset="us-ascii" 1030 Content-Type: text/x-patch; charset="us-ascii"
1021 MIME-Version: 1.0 1031 MIME-Version: 1.0
1022 Content-Transfer-Encoding: quoted-printable 1032 Content-Transfer-Encoding: quoted-printable
1023 Content-Disposition: attachment; filename=t2.patch 1033 Content-Disposition: attachment; filename=t2.patch
1024 1034
1050 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 1060 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
1051 +foo 1061 +foo
1052 + 1062 +
1053 +bar 1063 +bar
1054 1064
1055 --===*-- (glob) 1065 --===*=-- (glob)
1056 1066
1057 test attach and body for single patch: 1067 test attach and body for single patch:
1058 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2 1068 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2
1059 this patch series consists of 1 patches. 1069 this patch series consists of 1 patches.
1060 1070
1061 1071
1062 displaying [PATCH] test ... 1072 displaying [PATCH] test ...
1063 Content-Type: multipart/mixed; boundary="===*" (glob) 1073 Content-Type: multipart/mixed; boundary="===*==" (glob)
1064 MIME-Version: 1.0 1074 MIME-Version: 1.0
1065 Subject: [PATCH] test 1075 Subject: [PATCH] test
1066 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f 1076 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1067 X-Mercurial-Series-Index: 1 1077 X-Mercurial-Series-Index: 1
1068 X-Mercurial-Series-Total: 1 1078 X-Mercurial-Series-Total: 1
1072 Date: Thu, 01 Jan 1970 00:01:00 +0000 1082 Date: Thu, 01 Jan 1970 00:01:00 +0000
1073 From: quux 1083 From: quux
1074 To: foo 1084 To: foo
1075 Cc: bar 1085 Cc: bar
1076 1086
1077 --===* (glob) 1087 --===*= (glob)
1078 Content-Type: text/plain; charset="us-ascii" 1088 Content-Type: text/plain; charset="us-ascii"
1079 MIME-Version: 1.0 1089 MIME-Version: 1.0
1080 Content-Transfer-Encoding: 7bit 1090 Content-Transfer-Encoding: 7bit
1081 1091
1082 # HG changeset patch 1092 # HG changeset patch
1091 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1101 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1092 +++ b/c Thu Jan 01 00:00:03 1970 +0000 1102 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1093 @@ -0,0 +1,1 @@ 1103 @@ -0,0 +1,1 @@
1094 +c 1104 +c
1095 1105
1096 --===* (glob) 1106 --===*= (glob)
1097 Content-Type: text/x-patch; charset="us-ascii" 1107 Content-Type: text/x-patch; charset="us-ascii"
1098 MIME-Version: 1.0 1108 MIME-Version: 1.0
1099 Content-Transfer-Encoding: 7bit 1109 Content-Transfer-Encoding: 7bit
1100 Content-Disposition: attachment; filename=t2.patch 1110 Content-Disposition: attachment; filename=t2.patch
1101 1111
1111 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1121 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1112 +++ b/c Thu Jan 01 00:00:03 1970 +0000 1122 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1113 @@ -0,0 +1,1 @@ 1123 @@ -0,0 +1,1 @@
1114 +c 1124 +c
1115 1125
1116 --===*-- (glob) 1126 --===*=-- (glob)
1117 1127
1118 test attach for multiple patches: 1128 test attach for multiple patches:
1119 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \ 1129 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \
1120 > -r 0:1 -r 4 1130 > -r 0:1 -r 4
1121 this patch series consists of 3 patches. 1131 this patch series consists of 3 patches.
1137 To: foo 1147 To: foo
1138 Cc: bar 1148 Cc: bar
1139 1149
1140 1150
1141 displaying [PATCH 1 of 3] a ... 1151 displaying [PATCH 1 of 3] a ...
1142 Content-Type: multipart/mixed; boundary="===*" (glob) 1152 Content-Type: multipart/mixed; boundary="===*==" (glob)
1143 MIME-Version: 1.0 1153 MIME-Version: 1.0
1144 Subject: [PATCH 1 of 3] a 1154 Subject: [PATCH 1 of 3] a
1145 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab 1155 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1146 X-Mercurial-Series-Index: 1 1156 X-Mercurial-Series-Index: 1
1147 X-Mercurial-Series-Total: 3 1157 X-Mercurial-Series-Total: 3
1153 Date: Thu, 01 Jan 1970 00:01:01 +0000 1163 Date: Thu, 01 Jan 1970 00:01:01 +0000
1154 From: quux 1164 From: quux
1155 To: foo 1165 To: foo
1156 Cc: bar 1166 Cc: bar
1157 1167
1158 --===* (glob) 1168 --===*= (glob)
1159 Content-Type: text/plain; charset="us-ascii" 1169 Content-Type: text/plain; charset="us-ascii"
1160 MIME-Version: 1.0 1170 MIME-Version: 1.0
1161 Content-Transfer-Encoding: 7bit 1171 Content-Transfer-Encoding: 7bit
1162 1172
1163 Patch subject is complete summary. 1173 Patch subject is complete summary.
1164 1174
1165 1175
1166 1176
1167 --===* (glob) 1177 --===*= (glob)
1168 Content-Type: text/x-patch; charset="us-ascii" 1178 Content-Type: text/x-patch; charset="us-ascii"
1169 MIME-Version: 1.0 1179 MIME-Version: 1.0
1170 Content-Transfer-Encoding: 7bit 1180 Content-Transfer-Encoding: 7bit
1171 Content-Disposition: attachment; filename=t2-1.patch 1181 Content-Disposition: attachment; filename=t2-1.patch
1172 1182
1182 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1192 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1183 +++ b/a Thu Jan 01 00:00:01 1970 +0000 1193 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1184 @@ -0,0 +1,1 @@ 1194 @@ -0,0 +1,1 @@
1185 +a 1195 +a
1186 1196
1187 --===*-- (glob) 1197 --===*=-- (glob)
1188 displaying [PATCH 2 of 3] b ... 1198 displaying [PATCH 2 of 3] b ...
1189 Content-Type: multipart/mixed; boundary="===*" (glob) 1199 Content-Type: multipart/mixed; boundary="===*==" (glob)
1190 MIME-Version: 1.0 1200 MIME-Version: 1.0
1191 Subject: [PATCH 2 of 3] b 1201 Subject: [PATCH 2 of 3] b
1192 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 1202 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1193 X-Mercurial-Series-Index: 2 1203 X-Mercurial-Series-Index: 2
1194 X-Mercurial-Series-Total: 3 1204 X-Mercurial-Series-Total: 3
1200 Date: Thu, 01 Jan 1970 00:01:02 +0000 1210 Date: Thu, 01 Jan 1970 00:01:02 +0000
1201 From: quux 1211 From: quux
1202 To: foo 1212 To: foo
1203 Cc: bar 1213 Cc: bar
1204 1214
1205 --===* (glob) 1215 --===*= (glob)
1206 Content-Type: text/plain; charset="us-ascii" 1216 Content-Type: text/plain; charset="us-ascii"
1207 MIME-Version: 1.0 1217 MIME-Version: 1.0
1208 Content-Transfer-Encoding: 7bit 1218 Content-Transfer-Encoding: 7bit
1209 1219
1210 Patch subject is complete summary. 1220 Patch subject is complete summary.
1211 1221
1212 1222
1213 1223
1214 --===* (glob) 1224 --===*= (glob)
1215 Content-Type: text/x-patch; charset="us-ascii" 1225 Content-Type: text/x-patch; charset="us-ascii"
1216 MIME-Version: 1.0 1226 MIME-Version: 1.0
1217 Content-Transfer-Encoding: 7bit 1227 Content-Transfer-Encoding: 7bit
1218 Content-Disposition: attachment; filename=t2-2.patch 1228 Content-Disposition: attachment; filename=t2-2.patch
1219 1229
1229 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1239 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1230 +++ b/b Thu Jan 01 00:00:02 1970 +0000 1240 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1231 @@ -0,0 +1,1 @@ 1241 @@ -0,0 +1,1 @@
1232 +b 1242 +b
1233 1243
1234 --===*-- (glob) 1244 --===*=-- (glob)
1235 displaying [PATCH 3 of 3] long line ... 1245 displaying [PATCH 3 of 3] long line ...
1236 Content-Type: multipart/mixed; boundary="===*" (glob) 1246 Content-Type: multipart/mixed; boundary="===*==" (glob)
1237 MIME-Version: 1.0 1247 MIME-Version: 1.0
1238 Subject: [PATCH 3 of 3] long line 1248 Subject: [PATCH 3 of 3] long line
1239 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1 1249 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1240 X-Mercurial-Series-Index: 3 1250 X-Mercurial-Series-Index: 3
1241 X-Mercurial-Series-Total: 3 1251 X-Mercurial-Series-Total: 3
1247 Date: Thu, 01 Jan 1970 00:01:03 +0000 1257 Date: Thu, 01 Jan 1970 00:01:03 +0000
1248 From: quux 1258 From: quux
1249 To: foo 1259 To: foo
1250 Cc: bar 1260 Cc: bar
1251 1261
1252 --===* (glob) 1262 --===*= (glob)
1253 Content-Type: text/plain; charset="us-ascii" 1263 Content-Type: text/plain; charset="us-ascii"
1254 MIME-Version: 1.0 1264 MIME-Version: 1.0
1255 Content-Transfer-Encoding: 7bit 1265 Content-Transfer-Encoding: 7bit
1256 1266
1257 Patch subject is complete summary. 1267 Patch subject is complete summary.
1258 1268
1259 1269
1260 1270
1261 --===* (glob) 1271 --===*= (glob)
1262 Content-Type: text/x-patch; charset="us-ascii" 1272 Content-Type: text/x-patch; charset="us-ascii"
1263 MIME-Version: 1.0 1273 MIME-Version: 1.0
1264 Content-Transfer-Encoding: quoted-printable 1274 Content-Transfer-Encoding: quoted-printable
1265 Content-Disposition: attachment; filename=t2-3.patch 1275 Content-Disposition: attachment; filename=t2-3.patch
1266 1276
1292 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx 1302 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
1293 +foo 1303 +foo
1294 + 1304 +
1295 +bar 1305 +bar
1296 1306
1297 --===*-- (glob) 1307 --===*=-- (glob)
1298 1308
1299 test intro for single patch: 1309 test intro for single patch:
1300 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \ 1310 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \
1301 > -r 2 1311 > -r 2
1302 this patch series consists of 1 patches. 1312 this patch series consists of 1 patches.
1580 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 1590 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
1581 this patch series consists of 1 patches. 1591 this patch series consists of 1 patches.
1582 1592
1583 1593
1584 displaying [PATCH] test ... 1594 displaying [PATCH] test ...
1585 Content-Type: multipart/mixed; boundary="===*" (glob) 1595 Content-Type: multipart/mixed; boundary="===*==" (glob)
1586 MIME-Version: 1.0 1596 MIME-Version: 1.0
1587 Subject: [PATCH] test 1597 Subject: [PATCH] test
1588 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f 1598 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1589 X-Mercurial-Series-Index: 1 1599 X-Mercurial-Series-Index: 1
1590 X-Mercurial-Series-Total: 1 1600 X-Mercurial-Series-Total: 1
1594 Date: Thu, 01 Jan 1970 00:01:00 +0000 1604 Date: Thu, 01 Jan 1970 00:01:00 +0000
1595 From: quux 1605 From: quux
1596 To: foo 1606 To: foo
1597 Cc: bar 1607 Cc: bar
1598 1608
1599 --===* (glob) 1609 --===*= (glob)
1600 Content-Type: text/x-patch; charset="us-ascii" 1610 Content-Type: text/x-patch; charset="us-ascii"
1601 MIME-Version: 1.0 1611 MIME-Version: 1.0
1602 Content-Transfer-Encoding: 7bit 1612 Content-Transfer-Encoding: 7bit
1603 Content-Disposition: inline; filename=two.diff 1613 Content-Disposition: inline; filename=two.diff
1604 1614
1614 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1624 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1615 +++ b/c Thu Jan 01 00:00:03 1970 +0000 1625 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1616 @@ -0,0 +1,1 @@ 1626 @@ -0,0 +1,1 @@
1617 +c 1627 +c
1618 1628
1619 --===*-- (glob) 1629 --===*=-- (glob)
1620 1630
1621 test inline for multiple named/unnamed patches: 1631 test inline for multiple named/unnamed patches:
1622 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1 1632 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1
1623 this patch series consists of 2 patches. 1633 this patch series consists of 2 patches.
1624 1634
1639 To: foo 1649 To: foo
1640 Cc: bar 1650 Cc: bar
1641 1651
1642 1652
1643 displaying [PATCH 1 of 2] a ... 1653 displaying [PATCH 1 of 2] a ...
1644 Content-Type: multipart/mixed; boundary="===*" (glob) 1654 Content-Type: multipart/mixed; boundary="===*==" (glob)
1645 MIME-Version: 1.0 1655 MIME-Version: 1.0
1646 Subject: [PATCH 1 of 2] a 1656 Subject: [PATCH 1 of 2] a
1647 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab 1657 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1648 X-Mercurial-Series-Index: 1 1658 X-Mercurial-Series-Index: 1
1649 X-Mercurial-Series-Total: 2 1659 X-Mercurial-Series-Total: 2
1655 Date: Thu, 01 Jan 1970 00:01:01 +0000 1665 Date: Thu, 01 Jan 1970 00:01:01 +0000
1656 From: quux 1666 From: quux
1657 To: foo 1667 To: foo
1658 Cc: bar 1668 Cc: bar
1659 1669
1660 --===* (glob) 1670 --===*= (glob)
1661 Content-Type: text/x-patch; charset="us-ascii" 1671 Content-Type: text/x-patch; charset="us-ascii"
1662 MIME-Version: 1.0 1672 MIME-Version: 1.0
1663 Content-Transfer-Encoding: 7bit 1673 Content-Transfer-Encoding: 7bit
1664 Content-Disposition: inline; filename=t2-1.patch 1674 Content-Disposition: inline; filename=t2-1.patch
1665 1675
1675 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1685 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1676 +++ b/a Thu Jan 01 00:00:01 1970 +0000 1686 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1677 @@ -0,0 +1,1 @@ 1687 @@ -0,0 +1,1 @@
1678 +a 1688 +a
1679 1689
1680 --===*-- (glob) 1690 --===*=-- (glob)
1681 displaying [PATCH 2 of 2] b ... 1691 displaying [PATCH 2 of 2] b ...
1682 Content-Type: multipart/mixed; boundary="===*" (glob) 1692 Content-Type: multipart/mixed; boundary="===*==" (glob)
1683 MIME-Version: 1.0 1693 MIME-Version: 1.0
1684 Subject: [PATCH 2 of 2] b 1694 Subject: [PATCH 2 of 2] b
1685 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9 1695 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1686 X-Mercurial-Series-Index: 2 1696 X-Mercurial-Series-Index: 2
1687 X-Mercurial-Series-Total: 2 1697 X-Mercurial-Series-Total: 2
1693 Date: Thu, 01 Jan 1970 00:01:02 +0000 1703 Date: Thu, 01 Jan 1970 00:01:02 +0000
1694 From: quux 1704 From: quux
1695 To: foo 1705 To: foo
1696 Cc: bar 1706 Cc: bar
1697 1707
1698 --===* (glob) 1708 --===*= (glob)
1699 Content-Type: text/x-patch; charset="us-ascii" 1709 Content-Type: text/x-patch; charset="us-ascii"
1700 MIME-Version: 1.0 1710 MIME-Version: 1.0
1701 Content-Transfer-Encoding: 7bit 1711 Content-Transfer-Encoding: 7bit
1702 Content-Disposition: inline; filename=one.patch 1712 Content-Disposition: inline; filename=one.patch
1703 1713
1713 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1723 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1714 +++ b/b Thu Jan 01 00:00:02 1970 +0000 1724 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1715 @@ -0,0 +1,1 @@ 1725 @@ -0,0 +1,1 @@
1716 +b 1726 +b
1717 1727
1718 --===*-- (glob) 1728 --===*=-- (glob)
1719 1729
1720 1730
1721 test inreplyto: 1731 test inreplyto:
1722 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \ 1732 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1723 > -r tip 1733 > -r tip