git-svn: add a double quiet option to hide git commits

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 <mdpoole@troilus.org>
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Acked-by: Eric Wong <normalperson@yhbt.net>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index cda3389331edd615cab316574e4dedc5cc30bd31..8163a19843a290c84e460a1f1c3fe5d59fa6f2ac 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -385,7 +385,8 @@ config key: svn.authorsfile
 
 -q::
 --quiet::
 
 -q::
 --quiet::

-       Make 'git-svn' less verbose.
+       Make 'git-svn' less verbose. Specify a second time to make it
+       even less verbose.

 
 --repack[=<n>]::
 --repack-flags=<flags>::
 
 --repack[=<n>]::
 --repack-flags=<flags>::

diff --git a/git-svn.perl b/git-svn.perl
index e5c3dfe5d2c9d11c6225da725d86f343912f5782..d9197989d2e063ecf0bbbac143a046f8de79ce52 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -68,6 +68,7 @@ BEGIN
        $_prefix, $_no_checkout, $_url, $_verbose,
        $_git_format, $_commit_url, $_tag);
 $Git::SVN::_follow_parent = 1;
        $_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,
 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 @@ BEGIN
                'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
                'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
                'no-checkout' => \$_no_checkout,
                '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,
                '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;
 
        $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}) {
        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);
        }
                 $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();
        if (--$_gc_nr == 0) {
                $_gc_nr = $_gc_period;
                gc();