undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport: store protocol version

Browse Source 
Once protocol_v2 is introduced requesting a fetch or a push will need to
be handled differently depending on the protocol version.  Store the
protocol version the server is speaking in 'struct git_transport_data'
and use it to determine what to do in the case of a fetch or a push.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2018-03-14 11:31:46 -07:00 committed by Junio C Hamano
parent ad6ac1244f
commit 432e956510
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
transport.c
View File

@ -118,6 +118,7 @@ struct git_transport_data {
struct child_process *conn; struct child_process *conn;
int fd[2]; int fd[2];
unsigned got_remote_heads : 1; unsigned got_remote_heads : 1;
enum protocol_version version;
struct oid_array extra_have; struct oid_array extra_have;
struct oid_array shallow; struct oid_array shallow;
}; };
@ -200,7 +201,8 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
PACKET_READ_CHOMP_NEWLINE | PACKET_READ_CHOMP_NEWLINE |
PACKET_READ_GENTLE_ON_EOF); PACKET_READ_GENTLE_ON_EOF);
switch (discover_version(&reader)) { data->version = discover_version(&reader);
switch (data->version) {
case protocol_v1: case protocol_v1:
case protocol_v0: case protocol_v0:
get_remote_heads(&reader, &refs, get_remote_heads(&reader, &refs,
@ -221,7 +223,7 @@ static int fetch_refs_via_pack(struct transport *transport,
{ {
int ret = 0; int ret = 0;
struct git_transport_data *data = transport->data; struct git_transport_data *data = transport->data;
struct ref *refs; struct ref *refs = NULL;
char *dest = xstrdup(transport->url); char *dest = xstrdup(transport->url);
struct fetch_pack_args args; struct fetch_pack_args args;
struct ref *refs_tmp = NULL; struct ref *refs_tmp = NULL;
@ -247,10 +249,18 @@ static int fetch_refs_via_pack(struct transport *transport,
if (!data->got_remote_heads) if (!data->got_remote_heads)
refs_tmp = get_refs_via_connect(transport, 0); refs_tmp = get_refs_via_connect(transport, 0);
switch (data->version) {
case protocol_v1:
case protocol_v0:
refs = fetch_pack(&args, data->fd, data->conn, refs = fetch_pack(&args, data->fd, data->conn,
refs_tmp ? refs_tmp : transport->remote_refs, refs_tmp ? refs_tmp : transport->remote_refs,
dest, to_fetch, nr_heads, &data->shallow, dest, to_fetch, nr_heads, &data->shallow,
&transport->pack_lockfile); &transport->pack_lockfile);
break;
case protocol_unknown_version:
BUG("unknown protocol version");
}
close(data->fd[0]); close(data->fd[0]);
close(data->fd[1]); close(data->fd[1]);
if (finish_connect(data->conn)) if (finish_connect(data->conn))
@ -549,7 +559,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
{ {
struct git_transport_data *data = transport->data; struct git_transport_data *data = transport->data;
struct send_pack_args args; struct send_pack_args args;
int ret; int ret = 0;
if (!data->got_remote_heads) if (!data->got_remote_heads)
get_refs_via_connect(transport, 1); get_refs_via_connect(transport, 1);
@ -574,8 +584,15 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
else else
args.push_cert = SEND_PACK_PUSH_CERT_NEVER; args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
switch (data->version) {
case protocol_v1:
case protocol_v0:
ret = send_pack(&args, data->fd, data->conn, remote_refs, ret = send_pack(&args, data->fd, data->conn, remote_refs,
&data->extra_have); &data->extra_have);
break;
case protocol_unknown_version:
BUG("unknown protocol version");
}
close(data->fd[1]); close(data->fd[1]);
close(data->fd[0]); close(data->fd[0]);