From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tay Ray Chuan Subject: [PATCH v2 05/10] push: support multiple levels of verbosity Date: Wed, 24 Feb 2010 20:50:24 +0800 Message-ID: <1267015829-5344-6-git-send-email-rctay89@gmail.com> References: <1267015829-5344-1-git-send-email-rctay89@gmail.com> Cc: "Junio C Hamano" , "Jeff King" , "Sebastian Thiel" To: "Git Mailing List" X-From: git-owner@vger.kernel.org Wed Feb 24 13:51:25 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NkGi4-0005M5-64 for gcvg-git-2@lo.gmane.org; Wed, 24 Feb 2010 13:51:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756877Ab0BXMu7 (ORCPT ); Wed, 24 Feb 2010 07:50:59 -0500 Received: from qw-out-2122.google.com ([74.125.92.25]:20746 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756844Ab0BXMu5 (ORCPT ); Wed, 24 Feb 2010 07:50:57 -0500 Received: by qw-out-2122.google.com with SMTP id 8so870366qwh.37 for ; Wed, 24 Feb 2010 04:50:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=/844aem5lPnvYLaLgK9KCDEC2L2cr43VQ65vx7fviwU=; b=Q460KeWvdOWnb4mSAZDMLp/XSIqyophbQhrrqJqZFRb0TxZziJgqdogzhIDUk9wJUu q0FoLdoCqV91IiuuqqQ0OTiW3HY+t4QkYxrohBvqsXOGSxSNLdbsXlS7OZERrvEGExeu Bgh31o8gymXihK5j1Oabf/k092BnIkwzTzyZo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=EqjeCTg2iF8VsY6mv0GByXvzzxzkCNbvYbaq8q5nCbsEwtAtZC7CmD9pR/x+nXojCA 8p0RB8xKWAusRH1NGBQ4XgxJO3v6Kpj9f5DwjtyvnkjSn2n8oPuLOtokXLCrz78Z+nvo zE61eNRE3a23cD4Uqff1kY+0LBU6pIJ7NVh7I= Received: by 10.229.35.80 with SMTP id o16mr296471qcd.93.1267015857405; Wed, 24 Feb 2010 04:50:57 -0800 (PST) Received: from localhost.localdomain (cm91.zeta153.maxonline.com.sg [116.87.153.91]) by mx.google.com with ESMTPS id 23sm253680qyk.15.2010.02.24.04.50.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 24 Feb 2010 04:50:56 -0800 (PST) X-Mailer: git-send-email 1.7.0.20.gcb44ed In-Reply-To: <1267015829-5344-1-git-send-email-rctay89@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Remove the flags TRANSPORT_PUSH_QUIET and TRANSPORT_PUSH_VERBOSE; use transport->verbose instead to determine verbosity for pushing. Signed-off-by: Tay Ray Chuan --- builtin-push.c | 9 ++++++--- transport-helper.c | 1 - transport.c | 8 ++++---- transport.h | 2 -- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin-push.c b/builtin-push.c index 5633f0a..0082dad 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -17,6 +17,7 @@ static const char * const push_usage[] = { static int thin; static int deleterefs; static const char *receivepack; +static int verbosity; static const char **refspec; static int refspec_nr; @@ -105,13 +106,16 @@ static int push_with_options(struct transport *transport, int flags) { int err; int nonfastforward; + + transport_set_verbosity(transport, verbosity); + if (receivepack) transport_set_option(transport, TRANS_OPT_RECEIVEPACK, receivepack); if (thin) transport_set_option(transport, TRANS_OPT_THIN, "yes"); - if (flags & TRANSPORT_PUSH_VERBOSE) + if (verbosity > 0) fprintf(stderr, "Pushing to %s\n", transport->url); err = transport_push(transport, refspec_nr, refspec, flags, &nonfastforward); @@ -204,8 +208,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) int rc; const char *repo = NULL; /* default repository */ struct option options[] = { - OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET), - OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE), + OPT__VERBOSITY(&verbosity), OPT_STRING( 0 , "repo", &repo, "repository", "repository"), OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL), OPT_BIT( 0 , "mirror", &flags, "mirror all refs", diff --git a/transport-helper.c b/transport-helper.c index f822972..b868ea4 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -576,7 +576,6 @@ static int push_refs(struct transport *transport, if (buf.len == 0) return 0; - transport->verbose = flags & TRANSPORT_PUSH_VERBOSE ? 1 : 0; standard_options(transport); if (flags & TRANSPORT_PUSH_DRY_RUN) { diff --git a/transport.c b/transport.c index 54f5ede..f29fd6c 100644 --- a/transport.c +++ b/transport.c @@ -786,8 +786,8 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); args.use_thin_pack = data->options.thin; - args.verbose = !!(flags & TRANSPORT_PUSH_VERBOSE); - args.quiet = !!(flags & TRANSPORT_PUSH_QUIET); + args.verbose = (transport->verbose > 0); + args.quiet = (transport->verbose < 0); args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); ret = send_pack(&args, data->fd, data->conn, remote_refs, @@ -1038,8 +1038,8 @@ int transport_push(struct transport *transport, transport->get_refs_list(transport, 1); struct ref *local_refs = get_local_heads(); int match_flags = MATCH_REFS_NONE; - int verbose = flags & TRANSPORT_PUSH_VERBOSE; - int quiet = flags & TRANSPORT_PUSH_QUIET; + int verbose = (transport->verbose > 0); + int quiet = (transport->verbose < 0); int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; int pretend = flags & TRANSPORT_PUSH_DRY_RUN; int ret, err; diff --git a/transport.h b/transport.h index 5a5ce3a..d5973ee 100644 --- a/transport.h +++ b/transport.h @@ -94,9 +94,7 @@ struct transport { #define TRANSPORT_PUSH_FORCE 2 #define TRANSPORT_PUSH_DRY_RUN 4 #define TRANSPORT_PUSH_MIRROR 8 -#define TRANSPORT_PUSH_VERBOSE 16 #define TRANSPORT_PUSH_PORCELAIN 32 -#define TRANSPORT_PUSH_QUIET 64 #define TRANSPORT_PUSH_SET_UPSTREAM 128 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) -- 1.7.0.20.gcb44ed