From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Duy Nguyen <pclouds@gmail.com>, Jeff King <peff@peff.net>
Subject: Re: [RFC/WIP PATCH 11/11] Document protocol version 2
Date: Fri, 29 May 2015 14:36:26 -0700 [thread overview]
Message-ID: <CAGZ79kbELvZ6otnNwGHsgiC9EjgS2vrDGU2KCgF2c_Azm=-rWg@mail.gmail.com> (raw)
In-Reply-To: <xmqqsiafazr7.fsf@gitster.dls.corp.google.com>
On Fri, May 29, 2015 at 1:35 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> @@ -1,11 +1,11 @@
>> Packfile transfer protocols
>> ===========================
>>
>> -Git supports transferring data in packfiles over the ssh://, git:// and
>> +Git supports transferring data in packfiles over the ssh://, git://, http:// and
>
> When you have chance, can you do things like this, which is a clear
> improvement of the current document even if we never had v2, as
> separate patches?
will do.
>
>> +Capability discovery (v2)
>> +-------------------------
>> ...
>> + capability-list = *(capability) [agent LF] flush-pkt
>> + capability = PKT-LINE("capability:" keyvaluepair LF)
>> + agent = keyvaluepair LF
>> + keyvaluepair = 1*(LC_ALPHA / DIGIT / "-" / "_" / "=")
>
> What is the "=" doing there? If you meant to cover things like
> "lang=en" with this, I do not think it is a good idea. Rather, it
> should be more like this:
>
> capability = 1*(LC_ALPHA / DIGIT / "-" / "_") [ "=" value ]
> value = 0*( any octet other than LF, NUL )
>
> in order to leave us wiggle room to have more than very limited
> subset of US-ASCII in 'value'. I suspect that we may want to allow
> anything other than LF (unlike v1 that allowed anything other than
> SP and LF).
Currently we can do a = as part of the line after the first ref, such as
symref=HEAD:refs/heads/master agent=git/2:2.4.0
so I thought we want to keep this. And below I just corrected what I thought
was a difference between documentation and implementation.
>
>> + LC_ALPHA = %x61-7A
>> +----
>> +
>> +The client MUST ignore any data on pkt-lines starting with anything
>> +different than "capability" for future ease of extension.
>> +
>> +The client MUST NOT ask for capabilities the server did not say it
>> +supports. The server MUST diagnose and abort if capabilities it does
>> +not understand was requested. The server MUST NOT ignore capabilities
>> +that client requested and server advertised. As a consequence of these
>> +rules, server MUST NOT advertise capabilities it does not understand.
>
> I think it was already discussed that we shouldn't do the
> "capability:" and "cap:" prefixes in reviews of earlier parts, so
> the details of this part would be updated?
sure
>
>> @@ -154,10 +203,14 @@ If HEAD is a valid ref, HEAD MUST appear as the first advertised
>> ref. If HEAD is not a valid ref, HEAD MUST NOT appear in the
>> advertisement list at all, but other refs may still appear.
>>
>> -The stream MUST include capability declarations behind a NUL on the
>> -first ref. The peeled value of a ref (that is "ref^{}") MUST be
>> -immediately after the ref itself, if presented. A conforming server
>> -MUST peel the ref if it's an annotated tag.
>> +In version 1 the stream MUST include capability declarations behind
>> +a NUL on the first ref. The peeled value of a ref (that is "ref^{}")
>> +MUST be immediately after the ref itself, if presented. A conforming
>> +server MUST peel the ref if it's an annotated tag.
>> +
>> +In version 2 the capabilities are already negotiated, so the first ref
>> +MUST NOT be followed by any capability advertisement, but it should be
>> +treated as any other refs advertising line.
>
> Sensible.
>
>> @@ -178,13 +231,28 @@ MUST peel the ref if it's an annotated tag.
>> shallow = PKT-LINE("shallow" SP obj-id)
>>
>> capability-list = capability *(SP capability)
>> - capability = 1*(LC_ALPHA / DIGIT / "-" / "_")
>> + capability = 1*(LC_ALPHA / DIGIT / "-" / "_" / "=")
>
> Ditto.
>
> Thanks.
next prev parent reply other threads:[~2015-05-29 21:36 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 22:01 [RFC/WIP PATCH 00/11] Protocol version 2, again! Stefan Beller
2015-05-26 22:01 ` [RFC/WIP PATCH 01/11] upload-pack: make client capability parsing code a separate function Stefan Beller
2015-05-26 22:01 ` [RFC/WIP PATCH 02/11] upload-pack: only accept capabilities on the first "want" line Stefan Beller
2015-05-26 22:17 ` Junio C Hamano
2015-05-26 22:20 ` Stefan Beller
2015-05-26 22:01 ` [RFC/WIP PATCH 03/11] upload-pack: move capabilities out of send_ref Stefan Beller
2015-05-26 22:01 ` [RFC/WIP PATCH 04/11] upload-pack-2: Implement the version 2 of upload-pack Stefan Beller
2015-05-27 2:30 ` Eric Sunshine
2015-05-27 6:35 ` Jeff King
2015-05-27 17:30 ` Eric Sunshine
2015-05-27 20:14 ` Jeff King
2015-05-27 17:40 ` Stefan Beller
2015-05-27 20:34 ` Jeff King
2015-05-27 20:45 ` Stefan Beller
2015-05-27 21:46 ` Jeff King
2015-05-26 22:01 ` [RFC/WIP PATCH 05/11] transport: add infrastructure to support a protocol version number Stefan Beller
2015-05-27 6:39 ` Jeff King
2015-05-27 19:01 ` Stefan Beller
2015-05-27 20:17 ` Jeff King
2015-05-27 19:10 ` Junio C Hamano
2015-05-26 22:01 ` [RFC/WIP PATCH 06/11] remote.h: add get_remote_capabilities, request_capabilities Stefan Beller
2015-05-27 3:25 ` Eric Sunshine
2015-05-27 6:50 ` Jeff King
2015-05-27 17:19 ` Eric Sunshine
2015-05-27 20:09 ` Jeff King
2015-05-27 6:45 ` Jeff King
2015-05-29 19:39 ` Stefan Beller
2015-05-29 22:08 ` Jeff King
2015-05-26 22:01 ` [RFC/WIP PATCH 07/11] fetch-pack: use the configured transport protocol Stefan Beller
2015-05-26 22:19 ` Junio C Hamano
2015-05-26 22:23 ` Stefan Beller
2015-05-27 6:53 ` Jeff King
2015-05-26 22:01 ` [RFC/WIP PATCH 08/11] transport: connect_setup appends protocol version number Stefan Beller
2015-05-26 22:21 ` Junio C Hamano
2015-05-26 22:31 ` Stefan Beller
2015-05-27 5:09 ` Junio C Hamano
2015-05-27 6:56 ` Jeff King
2015-05-27 3:33 ` Eric Sunshine
2015-05-27 7:02 ` Jeff King
2015-05-26 22:01 ` [RFC/WIP PATCH 09/11] transport: get_refs_via_connect exchanges capabilities before refs Stefan Beller
2015-05-27 5:37 ` Eric Sunshine
2015-05-27 7:06 ` Jeff King
2015-05-26 22:01 ` [RFC/WIP PATCH 10/11] t5544: add a test case for the new protocol Stefan Beller
2015-05-27 5:34 ` Eric Sunshine
2015-05-27 7:12 ` Jeff King
2015-05-26 22:01 ` [RFC/WIP PATCH 11/11] Document protocol version 2 Stefan Beller
2015-05-29 20:35 ` Junio C Hamano
2015-05-29 21:36 ` Stefan Beller [this message]
2015-05-29 21:52 ` Junio C Hamano
2015-05-29 22:21 ` Jeff King
2015-06-01 23:14 ` Stefan Beller
2015-06-01 23:40 ` Stefan Beller
2015-06-04 13:18 ` Jeff King
2015-06-04 17:01 ` Junio C Hamano
2015-06-02 17:06 ` Junio C Hamano
2015-05-27 6:18 ` [RFC/WIP PATCH 00/11] Protocol version 2, again! Jeff King
2015-05-27 7:08 ` Jeff King
2015-06-01 17:49 ` Stefan Beller
2015-06-02 10:10 ` Duy Nguyen
2015-06-04 13:09 ` Jeff King
2015-06-04 16:44 ` 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
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='CAGZ79kbELvZ6otnNwGHsgiC9EjgS2vrDGU2KCgF2c_Azm=-rWg@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).