add "mr -q" to shut up all the repository related info

[code/myrepos.git] / mr

diff --git a/mr b/mr
index f4a93b6472b779db3fa8902a180c05de157a699a..a03856acab61b768f4e8cdedd5ed5589b9097a5f 100755 (executable)
--- a/mr
+++ b/mr
@@ -147,6 +147,10 @@ Use the specified mrconfig file. The default is B<~/.mrconfig>
 
 Be verbose.
 
 
 Be verbose.
 

+=item -q
+
+Be quiet.
+

 =item -s
 
 Expand the statistics line displayed at the end to include information
 =item -s
 
 Expand the statistics line displayed at the end to include information


@@ -316,6 +320,7 @@ use constant {
 # configurables
 my $config_overridden=0;
 my $verbose=0;
 # configurables
 my $config_overridden=0;
 my $verbose=0;

+my $quiet=0;

 my $stats=0;
 my $max_depth;
 my $no_chdir=0;
 my $stats=0;
 my $max_depth;
 my $no_chdir=0;


@@ -462,12 +467,12 @@ sub action { #{{{
        }
        else {
                if (! $no_chdir) {
        }
        else {
                if (! $no_chdir) {

-                       print "mr $action: $topdir$subdir\n";
+                       print "mr $action: $topdir$subdir\n" unless $quiet;

                }
                else {
                        my $s=$directory;
                        $s=~s/^\Q$topdir$subdir\E\/?//;
                }
                else {
                        my $s=$directory;
                        $s=~s/^\Q$topdir$subdir\E\/?//;

-                       print "mr $action: $topdir$subdir (in subdir $s)\n";
+                       print "mr $action: $topdir$subdir (in subdir $s)\n" unless $quiet;

                }
                $command="set -e; ".$lib.
                        "my_action(){ $command\n }; my_action ".
                }
                $command="set -e; ".$lib.
                        "my_action(){ $command\n }; my_action ".


@@ -605,10 +610,10 @@ sub showstats { #{{{
                showstat($#ok+1, "ok", "ok"),
                showstat($#failed+1, "failed", "failed"),
                showstat($#skipped+1, "skipped", "skipped"),
                showstat($#ok+1, "ok", "ok"),
                showstat($#failed+1, "failed", "failed"),
                showstat($#skipped+1, "skipped", "skipped"),

-       ).")\n";
+       ).")\n" unless $quiet;

        if ($stats) {
                if (@skipped) {
        if ($stats) {
                if (@skipped) {

-                       print "mr $action: (skipped: ".join(" ", @skipped).")\n";
+                       print "mr $action: (skipped: ".join(" ", @skipped).")\n" unless $quiet;

                }
                if (@failed) {
                        print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";
                }
                if (@failed) {
                        print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";


@@ -1054,6 +1059,7 @@ sub getopts { #{{{
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
                "v|verbose" => \$verbose,
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
                "v|verbose" => \$verbose,

+               "q|quiet" => \$quiet,

                "s|stats" => \$stats,
                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,
                "s|stats" => \$stats,
                "n|no-recurse:i" => \$max_depth,
                "j|jobs:i" => \$jobs,


@@ -1166,7 +1172,12 @@ git_bare_test =
        test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
 
 svn_update = svn update "$@"
        test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
 
 svn_update = svn update "$@"

-git_update = if [ "$@" ]; then git pull "$@"; else git pull -t origin master; fi
+git_update =
+       if [ "$@" ]; then
+               git pull "$@"
+       else
+               git pull
+       fi

 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"