зеркало из https://github.com/microsoft/git.git
protocol: introduce enum protocol_version value protocol_v2
Introduce protocol_v2, a new value for 'enum protocol_version'. Subsequent patches will fill in the implementation of protocol_v2. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
432e956510
Коммит
8f6982b4e1
|
@ -201,6 +201,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
|
||||||
PACKET_READ_GENTLE_ON_EOF);
|
PACKET_READ_GENTLE_ON_EOF);
|
||||||
|
|
||||||
switch (discover_version(&reader)) {
|
switch (discover_version(&reader)) {
|
||||||
|
case protocol_v2:
|
||||||
|
die("support for protocol v2 not implemented yet");
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
case protocol_v0:
|
case protocol_v0:
|
||||||
get_remote_heads(&reader, &ref, 0, NULL, &shallow);
|
get_remote_heads(&reader, &ref, 0, NULL, &shallow);
|
||||||
|
|
|
@ -1963,6 +1963,12 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
|
||||||
unpack_limit = receive_unpack_limit;
|
unpack_limit = receive_unpack_limit;
|
||||||
|
|
||||||
switch (determine_protocol_version_server()) {
|
switch (determine_protocol_version_server()) {
|
||||||
|
case protocol_v2:
|
||||||
|
/*
|
||||||
|
* push support for protocol v2 has not been implemented yet,
|
||||||
|
* so ignore the request to use v2 and fallback to using v0.
|
||||||
|
*/
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
/*
|
/*
|
||||||
* v1 is just the original protocol with a version string,
|
* v1 is just the original protocol with a version string,
|
||||||
|
|
|
@ -263,6 +263,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
|
||||||
PACKET_READ_GENTLE_ON_EOF);
|
PACKET_READ_GENTLE_ON_EOF);
|
||||||
|
|
||||||
switch (discover_version(&reader)) {
|
switch (discover_version(&reader)) {
|
||||||
|
case protocol_v2:
|
||||||
|
die("support for protocol v2 not implemented yet");
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
case protocol_v0:
|
case protocol_v0:
|
||||||
get_remote_heads(&reader, &remote_refs, REF_NORMAL,
|
get_remote_heads(&reader, &remote_refs, REF_NORMAL,
|
||||||
|
|
|
@ -47,6 +47,13 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
|
||||||
die("'%s' does not appear to be a git repository", dir);
|
die("'%s' does not appear to be a git repository", dir);
|
||||||
|
|
||||||
switch (determine_protocol_version_server()) {
|
switch (determine_protocol_version_server()) {
|
||||||
|
case protocol_v2:
|
||||||
|
/*
|
||||||
|
* fetch support for protocol v2 has not been implemented yet,
|
||||||
|
* so ignore the request to use v2 and fallback to using v0.
|
||||||
|
*/
|
||||||
|
upload_pack(&opts);
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
/*
|
/*
|
||||||
* v1 is just the original protocol with a version string,
|
* v1 is just the original protocol with a version string,
|
||||||
|
|
|
@ -83,6 +83,9 @@ enum protocol_version discover_version(struct packet_reader *reader)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (version) {
|
switch (version) {
|
||||||
|
case protocol_v2:
|
||||||
|
die("support for protocol v2 not implemented yet");
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
/* Read the peeked version line */
|
/* Read the peeked version line */
|
||||||
packet_reader_read(reader);
|
packet_reader_read(reader);
|
||||||
|
|
|
@ -8,6 +8,8 @@ static enum protocol_version parse_protocol_version(const char *value)
|
||||||
return protocol_v0;
|
return protocol_v0;
|
||||||
else if (!strcmp(value, "1"))
|
else if (!strcmp(value, "1"))
|
||||||
return protocol_v1;
|
return protocol_v1;
|
||||||
|
else if (!strcmp(value, "2"))
|
||||||
|
return protocol_v2;
|
||||||
else
|
else
|
||||||
return protocol_unknown_version;
|
return protocol_unknown_version;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@ enum protocol_version {
|
||||||
protocol_unknown_version = -1,
|
protocol_unknown_version = -1,
|
||||||
protocol_v0 = 0,
|
protocol_v0 = 0,
|
||||||
protocol_v1 = 1,
|
protocol_v1 = 1,
|
||||||
|
protocol_v2 = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -185,6 +185,9 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push)
|
||||||
PACKET_READ_GENTLE_ON_EOF);
|
PACKET_READ_GENTLE_ON_EOF);
|
||||||
|
|
||||||
switch (discover_version(&reader)) {
|
switch (discover_version(&reader)) {
|
||||||
|
case protocol_v2:
|
||||||
|
die("support for protocol v2 not implemented yet");
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
case protocol_v0:
|
case protocol_v0:
|
||||||
get_remote_heads(&reader, &list, for_push ? REF_NORMAL : 0,
|
get_remote_heads(&reader, &list, for_push ? REF_NORMAL : 0,
|
||||||
|
|
|
@ -203,6 +203,9 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
|
||||||
|
|
||||||
data->version = discover_version(&reader);
|
data->version = discover_version(&reader);
|
||||||
switch (data->version) {
|
switch (data->version) {
|
||||||
|
case protocol_v2:
|
||||||
|
die("support for protocol v2 not implemented yet");
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
case protocol_v0:
|
case protocol_v0:
|
||||||
get_remote_heads(&reader, &refs,
|
get_remote_heads(&reader, &refs,
|
||||||
|
@ -250,6 +253,9 @@ static int fetch_refs_via_pack(struct transport *transport,
|
||||||
refs_tmp = get_refs_via_connect(transport, 0);
|
refs_tmp = get_refs_via_connect(transport, 0);
|
||||||
|
|
||||||
switch (data->version) {
|
switch (data->version) {
|
||||||
|
case protocol_v2:
|
||||||
|
die("support for protocol v2 not implemented yet");
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
case protocol_v0:
|
case protocol_v0:
|
||||||
refs = fetch_pack(&args, data->fd, data->conn,
|
refs = fetch_pack(&args, data->fd, data->conn,
|
||||||
|
@ -585,6 +591,9 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
|
||||||
args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
|
args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
|
||||||
|
|
||||||
switch (data->version) {
|
switch (data->version) {
|
||||||
|
case protocol_v2:
|
||||||
|
die("support for protocol v2 not implemented yet");
|
||||||
|
break;
|
||||||
case protocol_v1:
|
case protocol_v1:
|
||||||
case protocol_v0:
|
case protocol_v0:
|
||||||
ret = send_pack(&args, data->fd, data->conn, remote_refs,
|
ret = send_pack(&args, data->fd, data->conn, remote_refs,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче