Re: [PATCH 5/6] fetch: teach independent negotiation (no packfile)
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Apr 9, 2021, 16:38 UTC
- Message-ID
- <20210409163835.2560428-1-jonathantanmy@google.com>
- In-Reply-To
- <xmqqczv4nhem.fsf@gitster.g>
Show 12 quoted lines
> Jonathan Tan <jonathantanmy@google.com> writes: > > > There are 2 code paths that do not go through fetch_refs_via_pack() that > > needed to be individually excluded: the bundle transport (excluded > > through requiring smart_options, which the bundle transport doesn't > > support) and transport helpers that do not support takeover. > > Fortunately, none of these support protocol v2. > > I am a bit puzzled by this mention of "Fortunately". If one says > "this shiny new feature only works with protocol v2" and "transport > X does not support protocol v2", doesn't it imply that the shiny new > feature cannot be used with the transport X, which is unfortunate?
I meant to say that we don't have to do much about these cases because they are out of scope for the support that we planned (protocol v2), but perhaps "fortunately" is the wrong way to say it. Perhaps a better way of explaining it is that most code paths go through fetch_refs_via_pack(), and for the ones that don't (bundle transport and non-takeover transport helpers), we need to address them separately. But in this case, we are not planning to support either, so we just check if we have requested independent negotiation and if yes, report failure.
Show 24 quoted lines
> I can understand "while interacting with the bundle transport, you > cannot do independent negotiation, but there is nothing to negotiate > with a static file that is a bundle anyway, so nothing is lost" as > an explanation, though. > > > Documentation/technical/protocol-v2.txt | 8 +++ > > builtin/fetch.c | 27 +++++++- > > fetch-pack.c | 89 +++++++++++++++++++++++-- > > fetch-pack.h | 11 +++ > > object.h | 2 +- > > t/t5701-git-serve.sh | 2 +- > > t/t5702-protocol-v2.sh | 89 +++++++++++++++++++++++++ > > transport-helper.c | 10 +++ > > transport.c | 30 +++++++-- > > transport.h | 6 ++ > > upload-pack.c | 18 +++-- > > 11 files changed, 275 insertions(+), 17 deletions(-) > > It is a bit surprising that there isn't much code removed, as I > expected that we'd be factoring out and reusing existing code used > in negotiation for fetching into a new helper function (hence the > existing codepath would lose a lot of code to be replaced by a call > to a new helper function), but that is apparently not what is going > on.
That's what I was trying to do (hence the earlier patches), but the main thing I ran into is that a lot of the fetch code assumes that you're fetching at least one ref, so I couldn't use a lot of it without more code updating. Having said that, I may have missed more opportunities for reuse.
> I'll have to revisit this step and the next step tomorrow. > > Thanks.
Thanks for taking a look.