From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH v3 08/21] send-pack: factor out capability string generation Date: Thu, 4 Sep 2014 13:04:44 -0700 Message-ID: <1409861097-19151-9-git-send-email-gitster@pobox.com> References: <1409861097-19151-1-git-send-email-gitster@pobox.com> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Sep 04 22:05:45 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XPdHt-0000jh-Fp for gcvg-git-2@plane.gmane.org; Thu, 04 Sep 2014 22:05:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755395AbaIDUFi (ORCPT ); Thu, 4 Sep 2014 16:05:38 -0400 Received: from smtp.pobox.com ([208.72.237.35]:55936 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755385AbaIDUFg (ORCPT ); Thu, 4 Sep 2014 16:05:36 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 556B0381A4; Thu, 4 Sep 2014 16:05:34 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references; s=sasl; bh=p2L2 ZNsaroWm7s3WgA9Ozn77UyY=; b=TScfV7seY+926kQYulca+JqfLpVqGxLpI0BU AXrVV6//h+dYjj1jPVoUyfmiq1W1kCEmwP9a86dI1hf19ItP1DijTTbSLvlOqT33 WIaN/MAjZIGfeE+H+ERcyTV3faxs1GmfDUPtxySJExHncfCqnvjtwdhqrDEq6fhD C0cvvtg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:subject :date:message-id:in-reply-to:references; q=dns; s=sasl; b=ankjbo eZlM8X5ylAtCY/T+bdWRBJA8xWgDzQ/x/3nuwGRKv19OyqJLVm1DaxpOtF3cHycA jWQRV3WtEC3WDFvtMjChQwq8x5j3CpeuR3haC3SM5IQI1nJiaBV0+aFcwgSr04NH b7s7NKtrDPEm+oBUsZbZrPW1Vw6cAjrCkn74c= Received: from pb-smtp0. (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id F082F381A1; Thu, 4 Sep 2014 16:05:33 -0400 (EDT) Received: from pobox.com (unknown [72.14.226.9]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp0.pobox.com (Postfix) with ESMTPSA id 8386938188; Thu, 4 Sep 2014 16:05:28 -0400 (EDT) X-Mailer: git-send-email 2.1.0-399-g1364b4d In-Reply-To: <1409861097-19151-1-git-send-email-gitster@pobox.com> X-Pobox-Relay-ID: D100AADC-346E-11E4-9050-BD2DC4D60FE0-77302942!pb-smtp0.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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=" by using two conditionals is replaced by a more readable version. Signed-off-by: Junio C Hamano --- send-pack.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/send-pack.c b/send-pack.c index 2fa6c34..c1c64ee 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 is delete-refs so specific to send-pack * machinery that set_ref_status_for_push() cannot set this @@ -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-g1364b4d