From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: git@vger•kernel.org, pclouds@gmail•com, peff@peff•net
Subject: Re: [RFCv2 09/16] remote.h: add get_remote_capabilities, request_capabilities
Date: Tue, 02 Jun 2015 14:24:34 -0700 [thread overview]
Message-ID: <xmqqd21d248d.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1433203338-27493-10-git-send-email-sbeller@google.com> (Stefan Beller's message of "Mon, 1 Jun 2015 17:02:11 -0700")
Stefan Beller <sbeller@google•com> writes:
> Instead of calling get_remote_heads as a first command during the
> protocol exchange, we need to have fine grained control over the
> capability negotiation in version 2 of the protocol.
>
> Introduce get_remote_capabilities, which will just listen to
> capabilities of the remote and request_capabilities which will
> tell the selection of capabilities to the remote.
>
> Signed-off-by: Stefan Beller <sbeller@google•com>
> ---
> connect.c | 37 +++++++++++++++++++++++++++++++++++++
> remote.h | 3 +++
> 2 files changed, 40 insertions(+)
>
> diff --git a/connect.c b/connect.c
> index a2c777e..4ebe1dc 100644
> --- a/connect.c
> +++ b/connect.c
> @@ -105,6 +105,43 @@ static void annotate_refs_with_symref_info(struct ref *ref)
> string_list_clear(&symref, 0);
> }
>
> +void get_remote_capabilities(int in, char *src_buf, size_t src_len)
We need to clarify that this is for v2 only in its name, no?
> +{
> + string_list_clear(&server_capabilities, 1);
> + for (;;) {
> + int len;
> + char *line = packet_buffer;
> +
> + len = packet_read(in, &src_buf, &src_len,
> + packet_buffer, sizeof(packet_buffer),
> + PACKET_READ_GENTLE_ON_EOF |
> + PACKET_READ_CHOMP_NEWLINE);
> + if (len < 0)
> + die_initial_contact(0);
> +
> + if (!len)
> + break;
OK, so we get sequence of capabilities, one per packet, until
packet_flush(). I wonder if we want to hint that with:
if (!len)
break; /* flush */
or something like that.
> + string_list_append(&server_capabilities, line);
> + }
> +}
> +int request_capabilities(int out, struct transport_options *options)
> +{
> + if (options->multi_ack == 2) packet_write(out, "multi_ack_detailed");
Spell these just like you would do any other functions, i.e.
if (options->multi_ack == 2)
packet_write(out, "multi_ack_detailed");
I think this step is sensible, and anticipate that a new method that
corresponds to this will be introduced to the transport layer.
next prev parent reply other threads:[~2015-06-02 21:24 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 0:02 [RFCv2 00/16] Protocol version 2 Stefan Beller
2015-06-02 0:02 ` [RFCv2 01/16] stringlist: add from_space_separated_string Stefan Beller
2015-06-02 9:42 ` Duy Nguyen
2015-06-02 15:10 ` Eric Sunshine
2015-06-02 17:54 ` Stefan Beller
2015-06-02 0:02 ` [RFCv2 02/16] upload-pack: make client capability parsing code a separate function Stefan Beller
2015-06-02 0:02 ` [RFCv2 03/16] connect: rewrite feature parsing to work on string_list Stefan Beller
2015-06-02 18:48 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack Stefan Beller
2015-06-02 18:59 ` Junio C Hamano
2015-06-02 23:08 ` Stefan Beller
2015-06-02 0:02 ` [RFCv2 05/16] remote.h: Change get_remote_heads return to void Stefan Beller
2015-06-02 21:17 ` Junio C Hamano
2015-06-02 21:25 ` Stefan Beller
2015-06-02 21:41 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 06/16] remote.h: add new struct for options Stefan Beller
2015-06-02 21:18 ` Junio C Hamano
2015-06-02 21:40 ` Stefan Beller
2015-06-02 21:43 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 07/16] transport: add infrastructure to support a protocol version number Stefan Beller
2015-06-02 0:02 ` [RFCv2 08/16] transport: select transport version via command line or config Stefan Beller
2015-06-02 0:02 ` [RFCv2 09/16] remote.h: add get_remote_capabilities, request_capabilities Stefan Beller
2015-06-02 21:24 ` Junio C Hamano [this message]
2015-06-02 0:02 ` [RFCv2 10/16] transport: connect_setup appends protocol version number Stefan Beller
2015-06-02 9:58 ` Duy Nguyen
2015-06-02 18:04 ` Stefan Beller
2015-06-02 21:37 ` Junio C Hamano
2015-06-02 22:09 ` Stefan Beller
2015-06-02 22:27 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 11/16] remote: have preselect_capabilities Stefan Beller
2015-06-02 21:45 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 12/16] transport: get_refs_via_connect exchanges capabilities before refs Stefan Beller
2015-06-02 21:55 ` Junio C Hamano
2015-06-02 22:19 ` Stefan Beller
2015-06-02 0:02 ` [RFCv2 13/16] fetch-pack: use the configured transport protocol Stefan Beller
2015-06-02 9:55 ` Duy Nguyen
2015-06-02 10:02 ` Duy Nguyen
2015-06-02 11:32 ` Ilari Liusvaara
2015-06-02 0:02 ` [RFCv2 14/16] t5544: add a test case for the new protocol Stefan Beller
2015-06-03 0:16 ` Eric Sunshine
2015-06-02 0:02 ` [RFCv2 15/16] Documentation/technical/pack-protocol: Mention http as possible protocol Stefan Beller
2015-06-02 21:57 ` Junio C Hamano
2015-06-02 22:00 ` Junio C Hamano
2015-06-02 0:02 ` [RFCv2 16/16] Document protocol version 2 Stefan Beller
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=xmqqd21d248d.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox