From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Arlott Subject: [PATCH] git-svn: add a double quiet option to hide git commits Date: Mon, 30 Mar 2009 19:31:41 +0100 Message-ID: <49D1100D.8010206@simon.arlott.org.uk> References: <49CFCD5A.1080801@simon.arlott.org.uk> <20090329224324.GB20675@dcvr.yhbt.net> <7vvdprjyrc.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Eric Wong , git@vger.kernel.org, mdpoole@troilus.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Mar 30 20:36:44 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LoMLj-0007Vr-R2 for gcvg-git-2@gmane.org; Mon, 30 Mar 2009 20:36:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753246AbZC3Sbt (ORCPT ); Mon, 30 Mar 2009 14:31:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752317AbZC3Sbt (ORCPT ); Mon, 30 Mar 2009 14:31:49 -0400 Received: from proxima.lp0.eu ([81.187.201.134]:59732 "EHLO proxima.lp0.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751436AbZC3Sbs (ORCPT ); Mon, 30 Mar 2009 14:31:48 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=exim; d=fire.lp0.eu; h=Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=KRL4g423XY4TYTIRsY4KobjBeIXviXRQTMEFHW7PPbQpHrA08kDOWLWBIAXv0ffs/8YFTCA6wZVumrbpHgmile0MlDU3efFakAPpy6UGxRzjx0HQ8urb+r2SEWPdy6HB; Received: from redrum.lp0.eu ([2001:8b0:ffea:0:2e0:81ff:fe4d:2bec]:33015) by proxima.lp0.eu ([2001:8b0:ffea:0:205:b4ff:fe12:530]:465) with esmtpsav (TLSv1:AES256-SHA:256/CN=Simon Arlott) id 1LoMGr-0003an-8m; Mon, 30 Mar 2009 19:31:41 +0100 User-Agent: Thunderbird 2.0.0.21 (X11/20090328) In-Reply-To: <7vvdprjyrc.fsf@gitster.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: People may expect/prefer -q to still show git commits, so this change allows a second -q to hide them. Signed-off-by: Michael Poole Signed-off-by: Simon Arlott --- On 30/03/09 07:44, Junio C Hamano wrote: > Eric Wong writes: >> Simon Arlott wrote: >>> Ideally only errors should be output in this mode so fetch >>> can be run from cron and normally produce no output. Without >>> this change it would output a single line on each git commit, >>> e.g. >>> r1909 = 32ef87860662526d4a62f903949ed21e0341079e (u2_10_12_branch) Documentation/git-svn.txt | 3 ++- git-svn.perl | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index cda3389..8163a19 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -385,7 +385,8 @@ config key: svn.authorsfile -q:: --quiet:: - Make 'git-svn' less verbose. + Make 'git-svn' less verbose. Specify a second time to make it + even less verbose. --repack[=]:: --repack-flags=:: diff --git a/git-svn.perl b/git-svn.perl index e5c3dfe..d919798 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -68,6 +68,7 @@ my ($_stdin, $_help, $_edit, $_prefix, $_no_checkout, $_url, $_verbose, $_git_format, $_commit_url, $_tag); $Git::SVN::_follow_parent = 1; +$_q ||= 0; my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, 'config-dir=s' => \$Git::SVN::Ra::config_dir, 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache, @@ -80,7 +81,7 @@ my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent, 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props, 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size, 'no-checkout' => \$_no_checkout, - 'quiet|q' => \$_q, + 'quiet|q+' => \$_q, 'repack-flags|repack-args|repack-opts=s' => \$Git::SVN::_repack_flags, 'use-log-author' => \$Git::SVN::_use_log_author, @@ -2331,13 +2332,13 @@ sub do_git_commit { $self->{last_rev} = $log_entry->{revision}; $self->{last_commit} = $commit; - print "r$log_entry->{revision}" unless $::_q; + print "r$log_entry->{revision}" unless $::_q > 1; if (defined $log_entry->{svm_revision}) { - print " (\@$log_entry->{svm_revision})" unless $::_q; + print " (\@$log_entry->{svm_revision})" unless $::_q > 1; $self->rev_map_set($log_entry->{svm_revision}, $commit, 0, $self->svm_uuid); } - print " = $commit ($self->{ref_id})\n" unless $::_q; + print " = $commit ($self->{ref_id})\n" unless $::_q > 1; if (--$_gc_nr == 0) { $_gc_nr = $_gc_period; gc(); -- 1.6.2 -- Simon Arlott