From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v4 08/22] send-pack: factor out capability string generation
Date: Fri, 5 Sep 2014 13:54:56 -0700 [thread overview]
Message-ID: <1409950510-10209-9-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1409950510-10209-1-git-send-email-gitster@pobox.com>
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>
---
send-pack.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/send-pack.c b/send-pack.c
index e81f741..0cb44ab 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -218,6 +218,7 @@ int send_pack(struct send_pack_args *args,
int in = fd[0];
int out = fd[1];
struct strbuf req_buf = STRBUF_INIT;
+ struct strbuf cap_buf = STRBUF_INIT;
struct ref *ref;
int new_refs;
int allow_deleting_refs = 0;
@@ -251,6 +252,15 @@ int send_pack(struct send_pack_args *args,
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
* send-pack machinery that set_ref_status_for_push() cannot
@@ -279,18 +289,12 @@ int send_pack(struct send_pack_args *args,
} else {
char *old_hex = sha1_to_hex(ref->old_sha1);
char *new_hex = sha1_to_hex(ref->new_sha1);
- int quiet = quiet_supported && (args->quiet || !args->progress);
if (!cmds_sent)
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,
- status_report ? " report-status" : "",
- use_sideband ? " side-band-64k" : "",
- quiet ? " quiet" : "",
- agent_supported ? " agent=" : "",
- agent_supported ? git_user_agent_sanitized() : ""
- );
+ cap_buf.buf);
else
packet_buf_write(&req_buf, "%s %s %s",
old_hex, new_hex, ref->name);
@@ -311,6 +315,7 @@ int send_pack(struct send_pack_args *args,
packet_flush(out);
}
strbuf_release(&req_buf);
+ strbuf_release(&cap_buf);
if (use_sideband && cmds_sent) {
memset(&demux, 0, sizeof(demux));
--
2.1.0-399-g2df620b
next prev parent reply other threads:[~2014-09-05 20:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 20:54 [PATCH v4 00/22] Signed push Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 01/22] receive-pack: do not overallocate command structure Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 02/22] receive-pack: parse feature request a bit earlier Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 03/22] receive-pack: do not reuse old_sha1[] for other things Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 04/22] receive-pack: factor out queueing of command Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 05/22] send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 06/22] send-pack: refactor decision to send update per ref Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 07/22] send-pack: always send capabilities Junio C Hamano
2014-09-05 20:54 ` Junio C Hamano [this message]
2014-09-05 20:54 ` [PATCH v4 09/22] receive-pack: factor out capability string generation Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 10/22] send-pack: rename "new_refs" to "need_pack_data" Junio C Hamano
2014-09-05 20:54 ` [PATCH v4 11/22] send-pack: refactor inspecting and resetting status and sending commands Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 12/22] send-pack: clarify that cmds_sent is a boolean Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 13/22] gpg-interface: move parse_gpg_output() to where it should be Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 14/22] gpg-interface: move parse_signature() " Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 15/22] pack-protocol doc: typofix for PKT-LINE Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 16/22] push: the beginning of "git push --signed" Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 17/22] receive-pack: GPG-validate push certificates Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 18/22] send-pack: send feature request on push-cert packet Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 19/22] signed push: remove duplicated protocol info Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 20/22] signed push: add "pushee" header to push certificate Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 21/22] signed push: fortify against replay attacks Junio C Hamano
2014-09-05 20:55 ` [PATCH v4 22/22] signed push: allow stale nonce in stateless mode Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409950510-10209-9-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).