From: Lars Schneider <larsxschneider@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Christian Couder <christian.couder@gmail.com>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
Ben Peart <Ben.Peart@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Mike Hommey <mh@glandium.org>, Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH 4/6] t0021/rot13-filter: add packet_initialize()
Date: Sat, 28 Oct 2017 16:59:00 +0200 [thread overview]
Message-ID: <09393EDB-19A3-4244-A88F-68EDA8470898@gmail.com> (raw)
In-Reply-To: <xmqqr2tpcn6g.fsf@gitster.mtv.corp.google.com>
> On 27 Oct 2017, at 04:57, Junio C Hamano <gitster@pobox.com> wrote:
>
> Junio C Hamano <gitster@pobox.com> writes:
>
>> It is fine to leave the original code broken at this step while we
>> purely move the lines around, and hopefully this will be corrected
>> in a later step in the series (I am responding as I read on, so I do
>> not yet know at which patch that happens in this series).
>
> Actually, I think you'd probably be better off if you fixed these
> broken comparisions that does (@list1 eq @list2) very early in the
> series, perhaps as [PATCH 0.8/6].
>
> I am sure Perl experts among us on the list can come up with a
> cleaner and better implementation of compare_lists sub I am adding
> here, but in the meantime, here is what I would start with if I were
> working on this topic.
>
Thanks for spotting this! I had some trouble applying the patch in
this email. I got an error about "corrupt patch at line 54"
BTW: I am using this little snippet to apply patches from the mailing:
PATCH=$(curl -L --silent https://public-inbox.org/git/xmqqr2tpcn6g.fsf@gitster.mtv.corp.google.com/raw);
((printf '%s' "$PATCH" | git am -3) || (git am --abort; printf '%s' "$PATCH" | git apply)) &&
echo && echo "Patch successfully applied"
Does this look sensible to you?
I applied the patch "manually" and the result looks good to me.
The patch looks good to me, too, but I am by no means a Perl
expert.
Thanks,
Lars
> Thanks.
>
> t/t0021/rot13-filter.pl | 35 ++++++++++++++++++++++++++++-------
> 1 file changed, 28 insertions(+), 7 deletions(-)
>
> diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
> index ad685d92f8..9bf5a756af 100644
> --- a/t/t0021/rot13-filter.pl
> +++ b/t/t0021/rot13-filter.pl
> @@ -107,21 +107,42 @@ sub packet_flush {
> STDOUT->flush();
> }
>
> +sub compare_lists {
> + my ($expect, @result) = @_;
> + my $ix;
> + if (scalar @$expect != scalar @result) {
> + return undef;
> + }
> + for ($ix = 0; $ix < $#result; $ix++) {
> + if ($expect->[$ix] ne $result[$ix]) {
> + return undef;
> + }
> + }
> + return 1;
> +}
> +
> print $debug "START\n";
> $debug->flush();
>
> -( packet_txt_read() eq ( 0, "git-filter-client" ) ) || die "bad initialize";
> -( packet_txt_read() eq ( 0, "version=2" ) ) || die "bad version";
> -( packet_bin_read() eq ( 1, "" ) ) || die "bad version end";
> +compare_lists([0, "git-filter-client"], packet_txt_read()) ||
> + die "bad initialize";
> +compare_lists([0, "version=2"], packet_txt_read()) ||
> + die "bad version";
> +compare_lists([1, ""], packet_bin_read()) ||
> + die "bad version end";
>
> packet_txt_write("git-filter-server");
> packet_txt_write("version=2");
> packet_flush();
>
> -( packet_txt_read() eq ( 0, "capability=clean" ) ) || die "bad capability";
> -( packet_txt_read() eq ( 0, "capability=smudge" ) ) || die "bad capability";
> -( packet_txt_read() eq ( 0, "capability=delay" ) ) || die "bad capability";
> -( packet_bin_read() eq ( 1, "" ) ) || die "bad capability end";
> +compare_lists([0, "capability=clean"], packet_txt_read()) ||
> + die "bad capability";
> +compare_lists([0, "capability=smudge"], packet_txt_read()) ||
> + die "bad capability";
> +compare_lists([0, "capability=delay"], packet_txt_read()) ||
> + die "bad capability";
> +compare_lists([1, ""], packet_bin_read()) ||
> + die "bad capability end";
>
> foreach (@capabilities) {
> packet_txt_write( "capability=" . $_ );
next prev parent reply other threads:[~2017-10-28 14:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 12:30 [PATCH 0/6] Create Git/Packet.pm Christian Couder
2017-10-19 12:30 ` [PATCH 1/6] t0021/rot13-filter: refactor packet reading functions Christian Couder
2017-10-19 22:01 ` Stefan Beller
2017-10-22 0:58 ` Junio C Hamano
2017-11-05 12:50 ` Christian Couder
2017-10-19 12:30 ` [PATCH 2/6] t0021/rot13-filter: improve 'if .. elsif .. else' style Christian Couder
2017-10-19 12:30 ` [PATCH 3/6] t0021/rot13-filter: improve error message Christian Couder
2017-10-19 12:30 ` [PATCH 4/6] t0021/rot13-filter: add packet_initialize() Christian Couder
2017-10-22 1:12 ` Junio C Hamano
2017-10-27 2:57 ` Junio C Hamano
2017-10-27 5:07 ` Christian Couder
2017-10-28 14:59 ` Lars Schneider [this message]
2017-10-29 0:14 ` Junio C Hamano
2017-10-19 12:30 ` [PATCH 5/6] t0021/rot13-filter: add capability functions Christian Couder
2017-10-22 1:46 ` Junio C Hamano
2017-11-04 8:38 ` Christian Couder
2017-11-05 2:03 ` Junio C Hamano
2017-10-19 12:30 ` [PATCH 6/6] Add Git/Packet.pm from parts of t0021/rot13-filter.pl Christian Couder
2017-10-19 22:06 ` Stefan Beller
2017-10-22 2:04 ` [PATCH 0/6] Create Git/Packet.pm Junio C Hamano
2017-10-23 12:26 ` Philip Oakley
2017-10-30 18:08 ` Jeff King
2017-10-25 23:10 ` Johannes Schindelin
2017-10-26 5:38 ` Junio C Hamano
2017-10-26 9:07 ` Jacob Keller
2017-10-26 9:08 ` Bryan Turner
2017-10-26 9:12 ` Bryan Turner
2017-10-27 15:09 ` Johannes Schindelin
2017-10-27 15:05 ` Johannes Schindelin
2017-10-30 0:38 ` Junio C Hamano
2017-10-30 6:18 ` Christian Couder
2017-10-30 12:37 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=09393EDB-19A3-4244-A88F-68EDA8470898@gmail.com \
--to=larsxschneider@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).