Show More
@@ -22,7 +22,9 b' Mercurial-patchbomb/.* -> Mercurial-patc' | |||||
22 | > skipblank = False |
|
22 | > skipblank = False | |
23 | > print(l, end='') |
|
23 | > print(l, end='') | |
24 | > EOF |
|
24 | > EOF | |
25 | $ FILTERBOUNDARY="$PYTHON `pwd`/prune-blank-after-boundary.py" |
|
25 | $ filterboundary() { | |
|
26 | > "$PYTHON" "$TESTTMP/prune-blank-after-boundary.py" | |||
|
27 | > } | |||
26 | $ echo "[extensions]" >> $HGRCPATH |
|
28 | $ echo "[extensions]" >> $HGRCPATH | |
27 | $ echo "patchbomb=" >> $HGRCPATH |
|
29 | $ echo "patchbomb=" >> $HGRCPATH | |
28 |
|
30 | |||
@@ -357,7 +359,7 b" Test breaking format changes aren't" | |||||
357 |
|
359 | |||
358 | test bundle and description: |
|
360 | test bundle and description: | |
359 | $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \ |
|
361 | $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \ | |
360 |
> -c bar -s test -r tip -b --desc description | |
|
362 | > -c bar -s test -r tip -b --desc description | filterboundary | |
361 | searching for changes |
|
363 | searching for changes | |
362 | 1 changesets found |
|
364 | 1 changesets found | |
363 |
|
365 | |||
@@ -403,7 +405,7 b' with a specific bundle type' | |||||
403 |
|
405 | |||
404 | $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \ |
|
406 | $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \ | |
405 | > -c bar -s test -r tip -b --desc description \ |
|
407 | > -c bar -s test -r tip -b --desc description \ | |
406 |
> --config patchbomb.bundletype=gzip-v1 | |
|
408 | > --config patchbomb.bundletype=gzip-v1 | filterboundary | |
407 | searching for changes |
|
409 | searching for changes | |
408 | 1 changesets found |
|
410 | 1 changesets found | |
409 |
|
411 | |||
@@ -884,7 +886,7 b' test diffstat for multiple patches:' | |||||
884 |
|
886 | |||
885 |
|
887 | |||
886 | test inline for single patch: |
|
888 | test inline for single patch: | |
887 |
$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 | |
|
889 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2 | filterboundary | |
888 | this patch series consists of 1 patches. |
|
890 | this patch series consists of 1 patches. | |
889 |
|
891 | |||
890 |
|
892 | |||
@@ -927,7 +929,7 b' test inline for single patch:' | |||||
927 |
|
929 | |||
928 |
|
930 | |||
929 | test inline for single patch (quoted-printable): |
|
931 | test inline for single patch (quoted-printable): | |
930 |
$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4 | |
|
932 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4 | filterboundary | |
931 | this patch series consists of 1 patches. |
|
933 | this patch series consists of 1 patches. | |
932 |
|
934 | |||
933 |
|
935 | |||
@@ -986,7 +988,7 b' test inline for single patch (quoted-pri' | |||||
986 |
|
988 | |||
987 | test inline for multiple patches: |
|
989 | test inline for multiple patches: | |
988 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ |
|
990 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ | |
989 | > -r 0:1 -r 4 | $FILTERBOUNDARY |
|
991 | > -r 0:1 -r 4 | filterboundary | |
990 | this patch series consists of 3 patches. |
|
992 | this patch series consists of 3 patches. | |
991 |
|
993 | |||
992 |
|
994 | |||
@@ -1138,7 +1140,7 b' test inline for multiple patches:' | |||||
1138 | --===*=-- (glob) |
|
1140 | --===*=-- (glob) | |
1139 |
|
1141 | |||
1140 | test attach for single patch: |
|
1142 | test attach for single patch: | |
1141 |
$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2 | |
|
1143 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2 | filterboundary | |
1142 | this patch series consists of 1 patches. |
|
1144 | this patch series consists of 1 patches. | |
1143 |
|
1145 | |||
1144 |
|
1146 | |||
@@ -1189,7 +1191,7 b' test attach for single patch:' | |||||
1189 | --===*=-- (glob) |
|
1191 | --===*=-- (glob) | |
1190 |
|
1192 | |||
1191 | test attach for single patch (quoted-printable): |
|
1193 | test attach for single patch (quoted-printable): | |
1192 |
$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4 | |
|
1194 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4 | filterboundary | |
1193 | this patch series consists of 1 patches. |
|
1195 | this patch series consists of 1 patches. | |
1194 |
|
1196 | |||
1195 |
|
1197 | |||
@@ -1256,7 +1258,7 b' test attach for single patch (quoted-pri' | |||||
1256 | --===*=-- (glob) |
|
1258 | --===*=-- (glob) | |
1257 |
|
1259 | |||
1258 | test attach and body for single patch: |
|
1260 | test attach and body for single patch: | |
1259 |
$ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2 | |
|
1261 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2 | filterboundary | |
1260 | this patch series consists of 1 patches. |
|
1262 | this patch series consists of 1 patches. | |
1261 |
|
1263 | |||
1262 |
|
1264 | |||
@@ -1318,7 +1320,7 b' test attach and body for single patch:' | |||||
1318 |
|
1320 | |||
1319 | test attach for multiple patches: |
|
1321 | test attach for multiple patches: | |
1320 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \ |
|
1322 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \ | |
1321 | > -r 0:1 -r 4 | $FILTERBOUNDARY |
|
1323 | > -r 0:1 -r 4 | filterboundary | |
1322 | this patch series consists of 3 patches. |
|
1324 | this patch series consists of 3 patches. | |
1323 |
|
1325 | |||
1324 |
|
1326 | |||
@@ -1775,7 +1777,7 b' tagging csets:' | |||||
1775 |
|
1777 | |||
1776 | test inline for single named patch: |
|
1778 | test inline for single named patch: | |
1777 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ |
|
1779 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ | |
1778 | > -r 2 | $FILTERBOUNDARY |
|
1780 | > -r 2 | filterboundary | |
1779 | this patch series consists of 1 patches. |
|
1781 | this patch series consists of 1 patches. | |
1780 |
|
1782 | |||
1781 |
|
1783 | |||
@@ -1818,7 +1820,7 b' test inline for single named patch:' | |||||
1818 |
|
1820 | |||
1819 | test inline for multiple named/unnamed patches: |
|
1821 | test inline for multiple named/unnamed patches: | |
1820 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ |
|
1822 | $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \ | |
1821 | > -r 0:1 | $FILTERBOUNDARY |
|
1823 | > -r 0:1 | filterboundary | |
1822 | this patch series consists of 2 patches. |
|
1824 | this patch series consists of 2 patches. | |
1823 |
|
1825 | |||
1824 |
|
1826 | |||
@@ -2124,7 +2126,7 b' test single flag for single patch (and n' | |||||
2124 | $ hg up -qr1 |
|
2126 | $ hg up -qr1 | |
2125 | $ echo dirt > a |
|
2127 | $ echo dirt > a | |
2126 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \ |
|
2128 | $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \ | |
2127 | > -r 2 | $FILTERBOUNDARY |
|
2129 | > -r 2 | filterboundary | |
2128 | this patch series consists of 1 patches. |
|
2130 | this patch series consists of 1 patches. | |
2129 |
|
2131 | |||
2130 |
|
2132 |
General Comments 0
You need to be logged in to leave comments.
Login now