microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

upload-pack: change multi_ack to an enum 

As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's take this opportunity to change the
'multi_ack' variable, which is now part of 'upload_pack_data',
to an enum.

This will make it clear which values this variable can take.

Helped-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2020-06-04 19:54:44 +02:00 коммит произвёл Junio C Hamano
Родитель 53d69506c1
Коммит e9d882b81e
1 изменённых файлов: 10 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
upload-pack.c
Просмотреть файл

@ -80,7 +80,11 @@ struct upload_pack_data {
int deepen_relative; int deepen_relative;
unsigned int timeout; /* v0 only */ unsigned int timeout; /* v0 only */
int multi_ack; /* v0 only */ enum {
NO_MULTI_ACK = 0,
MULTI_ACK = 1,
MULTI_ACK_DETAILED = 2
} multi_ack; /* v0 only */
/* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */ /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */
int use_sideband; int use_sideband;
@ -441,7 +445,7 @@ static int get_common_commits(struct upload_pack_data *data,
reset_timeout(data->timeout); reset_timeout(data->timeout);
if (packet_reader_read(reader) != PACKET_READ_NORMAL) { if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
if (data->multi_ack == 2 if (data->multi_ack == MULTI_ACK_DETAILED
&& got_common && got_common
&& !got_other && !got_other
&& ok_to_give_up(&data->have_obj, &data->want_obj)) { && ok_to_give_up(&data->have_obj, &data->want_obj)) {
@ -468,7 +472,7 @@ static int get_common_commits(struct upload_pack_data *data,
if (data->multi_ack if (data->multi_ack
&& ok_to_give_up(&data->have_obj, &data->want_obj)) { && ok_to_give_up(&data->have_obj, &data->want_obj)) {
const char *hex = oid_to_hex(&oid); const char *hex = oid_to_hex(&oid);
if (data->multi_ack == 2) { if (data->multi_ack == MULTI_ACK_DETAILED) {
sent_ready = 1; sent_ready = 1;
packet_write_fmt(1, "ACK %s ready\n", hex); packet_write_fmt(1, "ACK %s ready\n", hex);
} else } else
@ -478,7 +482,7 @@ static int get_common_commits(struct upload_pack_data *data,
default: default:
got_common = 1; got_common = 1;
oid_to_hex_r(last_hex, &oid); oid_to_hex_r(last_hex, &oid);
if (data->multi_ack == 2) if (data->multi_ack == MULTI_ACK_DETAILED)
packet_write_fmt(1, "ACK %s common\n", last_hex); packet_write_fmt(1, "ACK %s common\n", last_hex);
else if (data->multi_ack) else if (data->multi_ack)
packet_write_fmt(1, "ACK %s continue\n", last_hex); packet_write_fmt(1, "ACK %s continue\n", last_hex);
@ -958,9 +962,9 @@ static void receive_needs(struct upload_pack_data *data,
if (parse_feature_request(features, "deepen-relative")) if (parse_feature_request(features, "deepen-relative"))
data->deepen_relative = 1; data->deepen_relative = 1;
if (parse_feature_request(features, "multi_ack_detailed")) if (parse_feature_request(features, "multi_ack_detailed"))
data->multi_ack = 2; data->multi_ack = MULTI_ACK_DETAILED;
else if (parse_feature_request(features, "multi_ack")) else if (parse_feature_request(features, "multi_ack"))
data->multi_ack = 1; data->multi_ack = MULTI_ACK;
if (parse_feature_request(features, "no-done")) if (parse_feature_request(features, "no-done"))
data->no_done = 1; data->no_done = 1;
if (parse_feature_request(features, "thin-pack")) if (parse_feature_request(features, "thin-pack"))