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

send-pack: factor out capability string generation

Browse Source 
A run of 'var ? " var" : ""' fed to a long printf string in a deeply
nested block was hard to read.  Move it outside the loop and format
it into a strbuf.

As an added bonus, the trick to add "agent=<agent-name>" by using
two conditionals is replaced by a more readable version.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2014-08-15 11:37:01 -07:00
parent 64de20a126
commit 887f3533fd
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
send-pack.c
View File

@ -218,6 +218,7 @@ int send_pack(struct send_pack_args *args,
int in = fd[0]; int in = fd[0];
int out = fd[1]; int out = fd[1];
struct strbuf req_buf = STRBUF_INIT; struct strbuf req_buf = STRBUF_INIT;
struct strbuf cap_buf = STRBUF_INIT;
struct ref *ref; struct ref *ref;
int new_refs; int new_refs;
int allow_deleting_refs = 0; int allow_deleting_refs = 0;
@ -251,6 +252,15 @@ int send_pack(struct send_pack_args *args,
return 0; return 0;
} }
if (status_report)
strbuf_addstr(&cap_buf, " report-status");
if (use_sideband)
strbuf_addstr(&cap_buf, " side-band-64k");
if (quiet_supported && (args->quiet || !args->progress))
strbuf_addstr(&cap_buf, " quiet");
if (agent_supported)
strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
/* /*
* NEEDSWORK: why does delete-refs have to be so specific to * NEEDSWORK: why does delete-refs have to be so specific to
* send-pack machinery that set_ref_status_for_push() cannot * send-pack machinery that set_ref_status_for_push() cannot
@ -279,18 +289,12 @@ int send_pack(struct send_pack_args *args,
} else { } else {
char *old_hex = sha1_to_hex(ref->old_sha1); char *old_hex = sha1_to_hex(ref->old_sha1);
char *new_hex = sha1_to_hex(ref->new_sha1); char *new_hex = sha1_to_hex(ref->new_sha1);
int quiet = quiet_supported && (args->quiet || !args->progress);
if (!cmds_sent) if (!cmds_sent)
packet_buf_write(&req_buf, packet_buf_write(&req_buf,
"%s %s %s%c%s%s%s%s%s", "%s %s %s%c%s",
old_hex, new_hex, ref->name, 0, old_hex, new_hex, ref->name, 0,
status_report ? " report-status" : "", cap_buf.buf);
use_sideband ? " side-band-64k" : "",
quiet ? " quiet" : "",
agent_supported ? " agent=" : "",
agent_supported ? git_user_agent_sanitized() : ""
);
else else
packet_buf_write(&req_buf, "%s %s %s", packet_buf_write(&req_buf, "%s %s %s",
old_hex, new_hex, ref->name); old_hex, new_hex, ref->name);
@ -311,6 +315,7 @@ int send_pack(struct send_pack_args *args,
packet_flush(out); packet_flush(out);
} }
strbuf_release(&req_buf); strbuf_release(&req_buf);
strbuf_release(&cap_buf);
if (use_sideband && cmds_sent) { if (use_sideband && cmds_sent) {
memset(&demux, 0, sizeof(demux)); memset(&demux, 0, sizeof(demux));