Re: [GUILT v2 07/29] Added test cases for "guilt fold".
On Tue, May 13, 2014 at 11:30 PM, Jeff Sipek wrote:
> On Tue, May 13, 2014 at 10:30:43PM +0200, Per Cederqvist wrote:
>> Test that we can combine any combination of patches with empty and
>> non-empty messages, both with and without guilt.diffstat. (All
>> patches are empty.)
>>
>> Signed-off-by: Per Cederqvist
>> ---
>> regression/t-035.out | 467
>> +++
>> regression/t-035.sh | 62 +++
>> 2 files changed, 529 insertions(+)
>> create mode 100644 regression/t-035.out
>> create mode 100755 regression/t-035.sh
>>
> ...
>> diff --git a/regression/t-035.sh b/regression/t-035.sh
>> new file mode 100755
>> index 000..e914b32
>> --- /dev/null
>> +++ b/regression/t-035.sh
>> @@ -0,0 +1,62 @@
>> +#!/bin/bash
>> +#
>> +# Test the fold code
>> +#
>> +
>> +source "$REG_DIR/scaffold"
>> +
>> +cmd setup_repo
>> +
>> +function fixup_time_info
>> +{
>> + cmd guilt pop
>> + touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1"
>> + cmd guilt push
>> +}
>> +
>> +function empty_patch
>> +{
>> + cmd guilt new "empty$1"
>> + fixup_time_info "empty$1"
>> +}
>> +
>> +function nonempty_patch
>> +{
>> + if [ "$1" = -2 ]; then
>> + msg="Another commit message."
>> + else
>> + msg="A commit message."
>> + fi
>> +
>> + cmd guilt new -f -s -m "$msg" "nonempty$1"
>> + fixup_time_info "nonempty$1"
>> +}
>> +
>> +for using_diffstat in true false; do
>> + cmd git config guilt.diffstat $using_diffstat
>> + for patcha in empty nonempty; do
>> + for patchb in empty nonempty; do
>> +
>> + if [ $patcha = $patchb ]
>> + then
>
> I know that this is before patch 29, but ... style? ;)
>
> Otherwise, looks good. I like this way better than the unrolled loop in v1
> of this patch.
>
> Signed-off-by: Josef 'Jeff' Sipek
It is hard to change a habit. :-)
I'll fix this and add your signed-off-by.
/ceder
>
>> + suffixa=-1
>> + suffixb=-2
>> + else
>> + suffixa=
>> + suffixb=
>> + fi
>> +
>> + echo "%% $patcha + $patchb (diffstat=$using_diffstat)"
>> + ${patcha}_patch $suffixa
>> + ${patchb}_patch $suffixb
>> + cmd guilt pop
>> + cmd guilt fold $patchb$suffixb
>> + fixup_time_info $patcha$suffixa
>> + cmd list_files
>> + cmd guilt pop
>> + cmd guilt delete -f $patcha$suffixa
>> + cmd list_files
>> +
>> + done
>> + done
>> +done
>> --
>> 1.8.3.1
>>
>
> --
> *NOTE: This message is ROT-13 encrypted twice for extra protection*
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GUILT v2 07/29] Added test cases for "guilt fold".
On Tue, May 13, 2014 at 10:30:43PM +0200, Per Cederqvist wrote:
> Test that we can combine any combination of patches with empty and
> non-empty messages, both with and without guilt.diffstat. (All
> patches are empty.)
>
> Signed-off-by: Per Cederqvist
> ---
> regression/t-035.out | 467
> +++
> regression/t-035.sh | 62 +++
> 2 files changed, 529 insertions(+)
> create mode 100644 regression/t-035.out
> create mode 100755 regression/t-035.sh
>
...
> diff --git a/regression/t-035.sh b/regression/t-035.sh
> new file mode 100755
> index 000..e914b32
> --- /dev/null
> +++ b/regression/t-035.sh
> @@ -0,0 +1,62 @@
> +#!/bin/bash
> +#
> +# Test the fold code
> +#
> +
> +source "$REG_DIR/scaffold"
> +
> +cmd setup_repo
> +
> +function fixup_time_info
> +{
> + cmd guilt pop
> + touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1"
> + cmd guilt push
> +}
> +
> +function empty_patch
> +{
> + cmd guilt new "empty$1"
> + fixup_time_info "empty$1"
> +}
> +
> +function nonempty_patch
> +{
> + if [ "$1" = -2 ]; then
> + msg="Another commit message."
> + else
> + msg="A commit message."
> + fi
> +
> + cmd guilt new -f -s -m "$msg" "nonempty$1"
> + fixup_time_info "nonempty$1"
> +}
> +
> +for using_diffstat in true false; do
> + cmd git config guilt.diffstat $using_diffstat
> + for patcha in empty nonempty; do
> + for patchb in empty nonempty; do
> +
> + if [ $patcha = $patchb ]
> + then
I know that this is before patch 29, but ... style? ;)
Otherwise, looks good. I like this way better than the unrolled loop in v1
of this patch.
Signed-off-by: Josef 'Jeff' Sipek
> + suffixa=-1
> + suffixb=-2
> + else
> + suffixa=
> + suffixb=
> + fi
> +
> + echo "%% $patcha + $patchb (diffstat=$using_diffstat)"
> + ${patcha}_patch $suffixa
> + ${patchb}_patch $suffixb
> + cmd guilt pop
> + cmd guilt fold $patchb$suffixb
> + fixup_time_info $patcha$suffixa
> + cmd list_files
> + cmd guilt pop
> + cmd guilt delete -f $patcha$suffixa
> + cmd list_files
> +
> + done
> + done
> +done
> --
> 1.8.3.1
>
--
*NOTE: This message is ROT-13 encrypted twice for extra protection*
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[GUILT v2 07/29] Added test cases for "guilt fold".
Test that we can combine any combination of patches with empty and non-empty messages, both with and without guilt.diffstat. (All patches are empty.) Signed-off-by: Per Cederqvist --- regression/t-035.out | 467 +++ regression/t-035.sh | 62 +++ 2 files changed, 529 insertions(+) create mode 100644 regression/t-035.out create mode 100755 regression/t-035.sh diff --git a/regression/t-035.out b/regression/t-035.out new file mode 100644 index 000..cc16fb4 --- /dev/null +++ b/regression/t-035.out @@ -0,0 +1,467 @@ +% setup_repo +% git config guilt.diffstat true +%% empty + empty (diffstat=true) +% guilt new empty-1 +% guilt pop +All patches popped. +% guilt push +Applying patch..empty-1 +Patch applied. +% guilt new empty-2 +% guilt pop +Now at empty-1. +% guilt push +Applying patch..empty-2 +Patch applied. +% guilt pop +Now at empty-1. +% guilt fold empty-2 +% guilt pop +All patches popped. +% guilt push +Applying patch..empty-1 +Patch applied. +% list_files +d .git/patches +d .git/patches/master +d .git/refs/patches +d .git/refs/patches/master +f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode +f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove +f 4ea806e306f0228a8ef41f186035e7b04097f1f2 .git/patches/master/status +f 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty-1 +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add +f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify +f d28d87b88c1e24d637e390dc3603cfa7c1715711 .git/patches/master/series +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ +r bde3d337af70f36836ad606c800d194006f883b3 .git/refs/patches/master/empty-1 +% guilt pop +All patches popped. +% guilt delete -f empty-1 +% list_files +d .git/patches +d .git/patches/master +d .git/refs/patches +d .git/refs/patches/master +f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode +f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add +f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series +f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status +%% empty + nonempty (diffstat=true) +% guilt new empty +% guilt pop +All patches popped. +% guilt push +Applying patch..empty +Patch applied. +% guilt new -f -s -m A commit message. nonempty +% guilt pop +Now at empty. +% guilt push +Applying patch..nonempty +Patch applied. +% guilt pop +Now at empty. +% guilt fold nonempty +% guilt pop +All patches popped. +% guilt push +Applying patch..empty +Patch applied. +% list_files +d .git/patches +d .git/patches/master +d .git/refs/patches +d .git/refs/patches/master +f 15aab0fd8b937eb3bb01841693f35dcb75da2faf .git/patches/master/status +f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode +f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove +f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~ +f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ +f 683678040eef9334d6329e00d5b9babda3e65b57 .git/patches/master/empty +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add +f a26a22287b500a2a372e42c2bab03599bbe37cdf .git/patches/master/series +f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ +r 4eedaa32894fc07af3298d8c1178052942a3ca6a .git/refs/patches/master/empty +% guilt pop +All patches popped. +% guilt delete -f empty +% list_files +d .git/patches +d .git/patches/master +d .git/refs/patches +d .git/refs/patches/master +f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode +f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove +f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/empty~ +f 51fcfcf16db2903f19ab4a4a3caacd297ea9f6cd .git/patches/master/nonempty~ +f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add +f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series +f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-1~ +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/empty-2~ +f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status +%% nonempty + empty (diffstat=true) +% guilt new -f -s -m A commit message. nonempty +% guilt pop +All patches popped. +% guilt push +Applying p
