зеркало из https://github.com/microsoft/git.git
fetch-pack: use a common function for verbose printing
This reduces the number of "if (verbose)" which makes it a bit easier to read imo. It also makes it easier to redirect all these printouts, to a file for example. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
Junio C Hamano
Родитель
45a3e52641
Коммит
0d789a5bc1
88
fetch-pack.c
88
fetch-pack.c
|
|
@ -50,6 +50,21 @@ static int non_common_revs, multi_ack, use_sideband;
|
|||
#define ALLOW_REACHABLE_SHA1 02
|
||||
static unsigned int allow_unadvertised_object_request;
|
||||
|
||||
__attribute__((format (printf, 2, 3)))
|
||||
static inline void print_verbose(const struct fetch_pack_args *args,
|
||||
const char *fmt, ...)
|
||||
{
|
||||
va_list params;
|
||||
|
||||
if (!args->verbose)
|
||||
return;
|
||||
|
||||
va_start(params, fmt);
|
||||
vfprintf(stderr, fmt, params);
|
||||
va_end(params);
|
||||
fputc('\n', stderr);
|
||||
}
|
||||
|
||||
static void rev_list_push(struct commit *commit, int mark)
|
||||
{
|
||||
if (!(commit->object.flags & mark)) {
|
||||
|
|
@ -375,8 +390,7 @@ static int find_common(struct fetch_pack_args *args,
|
|||
retval = -1;
|
||||
while ((sha1 = get_rev())) {
|
||||
packet_buf_write(&req_buf, "have %s\n", sha1_to_hex(sha1));
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "have %s\n", sha1_to_hex(sha1));
|
||||
print_verbose(args, "have %s", sha1_to_hex(sha1));
|
||||
in_vain++;
|
||||
if (flush_at <= ++count) {
|
||||
int ack;
|
||||
|
|
@ -397,9 +411,9 @@ static int find_common(struct fetch_pack_args *args,
|
|||
consume_shallow_list(args, fd[0]);
|
||||
do {
|
||||
ack = get_ack(fd[0], result_sha1);
|
||||
if (args->verbose && ack)
|
||||
fprintf(stderr, "got ack %d %s\n", ack,
|
||||
sha1_to_hex(result_sha1));
|
||||
if (ack)
|
||||
print_verbose(args, "got ack %d %s", ack,
|
||||
sha1_to_hex(result_sha1));
|
||||
switch (ack) {
|
||||
case ACK:
|
||||
flushes = 0;
|
||||
|
|
@ -438,8 +452,7 @@ static int find_common(struct fetch_pack_args *args,
|
|||
} while (ack);
|
||||
flushes--;
|
||||
if (got_continue && MAX_IN_VAIN < in_vain) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "giving up\n");
|
||||
print_verbose(args, "giving up");
|
||||
break; /* give up */
|
||||
}
|
||||
}
|
||||
|
|
@ -449,8 +462,7 @@ done:
|
|||
packet_buf_write(&req_buf, "done\n");
|
||||
send_request(args, fd[1], &req_buf);
|
||||
}
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "done\n");
|
||||
print_verbose(args, "done");
|
||||
if (retval != 0) {
|
||||
multi_ack = 0;
|
||||
flushes++;
|
||||
|
|
@ -462,9 +474,8 @@ done:
|
|||
while (flushes || multi_ack) {
|
||||
int ack = get_ack(fd[0], result_sha1);
|
||||
if (ack) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "got ack (%d) %s\n", ack,
|
||||
sha1_to_hex(result_sha1));
|
||||
print_verbose(args, "got ack (%d) %s", ack,
|
||||
sha1_to_hex(result_sha1));
|
||||
if (ack == ACK)
|
||||
return 0;
|
||||
multi_ack = 1;
|
||||
|
|
@ -509,9 +520,8 @@ static void mark_recent_complete_commits(struct fetch_pack_args *args,
|
|||
unsigned long cutoff)
|
||||
{
|
||||
while (complete && cutoff <= complete->item->date) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Marking %s as complete\n",
|
||||
oid_to_hex(&complete->item->object.oid));
|
||||
print_verbose(args, "Marking %s as complete",
|
||||
oid_to_hex(&complete->item->object.oid));
|
||||
pop_most_recent_commit(&complete, COMPLETE);
|
||||
}
|
||||
}
|
||||
|
|
@ -652,18 +662,12 @@ static int everything_local(struct fetch_pack_args *args,
|
|||
o = lookup_object(remote);
|
||||
if (!o || !(o->flags & COMPLETE)) {
|
||||
retval = 0;
|
||||
if (!args->verbose)
|
||||
continue;
|
||||
fprintf(stderr,
|
||||
"want %s (%s)\n", sha1_to_hex(remote),
|
||||
ref->name);
|
||||
print_verbose(args, "want %s (%s)", sha1_to_hex(remote),
|
||||
ref->name);
|
||||
continue;
|
||||
}
|
||||
if (!args->verbose)
|
||||
continue;
|
||||
fprintf(stderr,
|
||||
"already have %s (%s)\n", sha1_to_hex(remote),
|
||||
ref->name);
|
||||
print_verbose(args, "already have %s (%s)", sha1_to_hex(remote),
|
||||
ref->name);
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -810,39 +814,32 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
|
|||
if ((args->depth > 0 || is_repository_shallow()) && !server_supports("shallow"))
|
||||
die("Server does not support shallow clients");
|
||||
if (server_supports("multi_ack_detailed")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports multi_ack_detailed\n");
|
||||
print_verbose(args, "Server supports multi_ack_detailed");
|
||||
multi_ack = 2;
|
||||
if (server_supports("no-done")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports no-done\n");
|
||||
print_verbose(args, "Server supports no-done");
|
||||
if (args->stateless_rpc)
|
||||
no_done = 1;
|
||||
}
|
||||
}
|
||||
else if (server_supports("multi_ack")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports multi_ack\n");
|
||||
print_verbose(args, "Server supports multi_ack");
|
||||
multi_ack = 1;
|
||||
}
|
||||
if (server_supports("side-band-64k")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports side-band-64k\n");
|
||||
print_verbose(args, "Server supports side-band-64k");
|
||||
use_sideband = 2;
|
||||
}
|
||||
else if (server_supports("side-band")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports side-band\n");
|
||||
print_verbose(args, "Server supports side-band");
|
||||
use_sideband = 1;
|
||||
}
|
||||
if (server_supports("allow-tip-sha1-in-want")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports allow-tip-sha1-in-want\n");
|
||||
print_verbose(args, "Server supports allow-tip-sha1-in-want");
|
||||
allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
|
||||
}
|
||||
if (server_supports("allow-reachable-sha1-in-want")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports allow-reachable-sha1-in-want\n");
|
||||
print_verbose(args, "Server supports allow-reachable-sha1-in-want");
|
||||
allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
|
||||
}
|
||||
if (!server_supports("thin-pack"))
|
||||
|
|
@ -851,17 +848,16 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
|
|||
args->no_progress = 0;
|
||||
if (!server_supports("include-tag"))
|
||||
args->include_tag = 0;
|
||||
if (server_supports("ofs-delta")) {
|
||||
if (args->verbose)
|
||||
fprintf(stderr, "Server supports ofs-delta\n");
|
||||
} else
|
||||
if (server_supports("ofs-delta"))
|
||||
print_verbose(args, "Server supports ofs-delta");
|
||||
else
|
||||
prefer_ofs_delta = 0;
|
||||
|
||||
if ((agent_feature = server_feature_value("agent", &agent_len))) {
|
||||
agent_supported = 1;
|
||||
if (args->verbose && agent_len)
|
||||
fprintf(stderr, "Server version is %.*s\n",
|
||||
agent_len, agent_feature);
|
||||
if (agent_len)
|
||||
print_verbose(args, "Server version is %.*s",
|
||||
agent_len, agent_feature);
|
||||
}
|
||||
|
||||
if (everything_local(args, &ref, sought, nr_sought)) {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче