From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, 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>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH v2 7/8] t0021/rot13-filter: add capability functions
Date: Sun, 5 Nov 2017 22:38:35 +0100 [thread overview]
Message-ID: <20171105213836.11717-8-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20171105213836.11717-1-chriscool@tuxfamily.org>
These function help read and write capabilities.
To make them more generic and make it easy to reuse them,
the following changes are made:
- we don't require capabilities to come in a fixed order,
- we allow duplicates,
- we check that the remote supports the capabilities we
advertise,
- we don't check if the remote declares any capability we
don't know about.
The reason behind the last change is that the protocol
should work using only the capabilities that both ends
support, and it should not stop working if one end starts
to advertise a new capability.
Despite those changes, we can still require a set of
capabilities, and die if one of them is not supported.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/t0021/rot13-filter.pl | 58 ++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 45 insertions(+), 13 deletions(-)
diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index d47b7f5666..f919d798a6 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -150,24 +150,56 @@ sub packet_initialize {
packet_flush();
}
+sub packet_read_capabilities {
+ my @cap;
+ while (1) {
+ my ( $res, $buf ) = packet_bin_read();
+ if ( $res == -1 ) {
+ die "unexpected EOF when reading capabilities";
+ }
+ return ( $res, @cap ) if ( $res != 0 );
+ $buf = remove_final_lf_or_die($buf);
+ unless ( $buf =~ s/capability=// ) {
+ die "bad capability buf: '$buf'";
+ }
+ push @cap, $buf;
+ }
+}
+
+# Read remote capabilities and check them against capabilities we require
+sub packet_read_and_check_capabilities {
+ my @required_caps = @_;
+ my ($res, @remote_caps) = packet_read_capabilities();
+ my %remote_caps = map { $_ => 1 } @remote_caps;
+ foreach (@required_caps) {
+ unless (exists($remote_caps{$_})) {
+ die "required '$_' capability not available from remote" ;
+ }
+ }
+ return %remote_caps;
+}
+
+# Check our capabilities we want to advertise against the remote ones
+# and then advertise our capabilities
+sub packet_check_and_write_capabilities {
+ my ($remote_caps, @our_caps) = @_;
+ foreach (@our_caps) {
+ unless (exists($remote_caps->{$_})) {
+ die "our capability '$_' is not available from remote"
+ }
+ packet_txt_write( "capability=" . $_ );
+ }
+ packet_flush();
+}
+
print $debug "START\n";
$debug->flush();
packet_initialize("git-filter", 2);
-packet_compare_lists([0, "capability=clean"], packet_txt_read()) ||
- die "bad capability";
-packet_compare_lists([0, "capability=smudge"], packet_txt_read()) ||
- die "bad capability";
-packet_compare_lists([0, "capability=delay"], packet_txt_read()) ||
- die "bad capability";
-packet_compare_lists([1, ""], packet_bin_read()) ||
- die "bad capability end";
-
-foreach (@capabilities) {
- packet_txt_write( "capability=" . $_ );
-}
-packet_flush();
+my %remote_caps = packet_read_and_check_capabilities("clean", "smudge", "delay");
+packet_check_and_write_capabilities(\%remote_caps, @capabilities);
+
print $debug "init handshake complete\n";
$debug->flush();
--
2.15.0.7.ga9ff306ed9.dirty
next prev parent reply other threads:[~2017-11-05 21:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-05 21:38 [PATCH v2 0/8] Create Git/Packet.pm Christian Couder
2017-11-05 21:38 ` [PATCH v2 1/8] t0021/rot13-filter: fix list comparison Christian Couder
2017-11-07 1:00 ` Junio C Hamano
2017-11-05 21:38 ` [PATCH v2 2/8] t0021/rot13-filter: refactor packet reading functions Christian Couder
2017-11-07 1:15 ` Junio C Hamano
2017-11-07 6:34 ` Christian Couder
2017-11-05 21:38 ` [PATCH v2 3/8] t0021/rot13-filter: improve 'if .. elsif .. else' style Christian Couder
2017-11-05 21:38 ` [PATCH v2 4/8] t0021/rot13-filter: improve error message Christian Couder
2017-11-05 21:38 ` [PATCH v2 5/8] t0021/rot13-filter: add packet_initialize() Christian Couder
2017-11-05 21:38 ` [PATCH v2 6/8] t0021/rot13-filter: refactor checking final lf Christian Couder
2017-11-07 1:18 ` Junio C Hamano
2017-11-05 21:38 ` Christian Couder [this message]
2017-11-07 1:24 ` [PATCH v2 7/8] t0021/rot13-filter: add capability functions Junio C Hamano
2017-11-05 21:38 ` [PATCH v2 8/8] Add Git/Packet.pm from parts of t0021/rot13-filter.pl Christian Couder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171105213836.11717-8-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=larsxschneider@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.