]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Add darcs grep command using ack-grep
[code/myrepos.git] / mr
diff --git a/mr b/mr
index d59dc39299cec62bcc44e2c55e92f1a14969bde9..18e87616423e7d94ab3686733c137e094f84420b 100755 (executable)
--- a/mr
+++ b/mr
@@ -152,6 +152,11 @@ C<ssh://[user@]host:file>.
 
 You can retrieve the config file by other means and pass its B<path> as C<src>.
 
+=item standard input
+
+If source C<src> consists in a single dash C<->, config file is read from
+standard input.
+
 =back
 
 The directory will be created if it does not exist. If no directory is
@@ -260,6 +265,13 @@ configuration.
 
 Be verbose.
 
+=item -m
+
+=item --minimal
+
+Minimise output. If a command fails or there is any output then the usual
+output will be shown.
+
 =item -q
 
 =item --quiet
@@ -563,6 +575,7 @@ use constant {
 # configurables
 my $config_overridden=0;
 my $verbose=0;
+my $minimal=0;
 my $quiet=0;
 my $stats=0;
 my $force=0;
@@ -573,6 +586,7 @@ my $no_chdir=0;
 my $jobs=1;
 my $trust_all=0;
 my $directory=getcwd();
+my $terminal=-t STDOUT && eval{require IO::Pty::Easy;IO::Pty::Easy->import();1;};
 
 my $HOME_MR_CONFIG = "$ENV{HOME}/.mrconfig";
 $ENV{MR_CONFIG}=find_mrconfig();
@@ -716,6 +730,34 @@ sub fulldir {
        return $subdir =~ /^\// ? $subdir : $topdir.$subdir;
 }
 
+sub terminal_friendly_spawn {
+       my $actionmsg = shift;
+       my $sh = shift;
+       my $quiet = shift;
+       my $minimal = shift;
+       my $output = "";
+       if ($terminal) {
+               my $pty = IO::Pty::Easy->new;
+               $pty->spawn($sh);
+               while ($pty->is_active) {
+                       my $data = $pty->read();
+                       $output .= $data if defined $data;
+               }
+               $pty->close;
+       } else {
+               $output = qx/$sh 2>&1/;
+       }
+       my $ret = $?;
+       if ($quiet && $ret != 0) {
+               print "$actionmsg\n" if $actionmsg;
+               print STDERR $output;
+       } elsif (!$quiet && (!$minimal || $output)) {
+               print "$actionmsg\n" if $actionmsg;
+               print $output;
+       }
+       return ($ret, $output ? 1 : 0);
+}
+
 sub action {
        my ($action, $dir, $topdir, $subdir, $force_checkout) = @_;
        my $fulldir=fulldir($topdir, $subdir);
@@ -795,7 +837,7 @@ sub action {
                        return FAILED;
                }
                else {
-                       print STDERR "mr $action: no defined action for $vcs repository $fulldir, skipping\n";
+                       print STDERR "mr $action: no defined action for $vcs repository $fulldir, skipping\n" unless $minimal;
                        return SKIPPED;
                }
        }
@@ -809,22 +851,16 @@ sub action {
                        $s=~s/^\Q$fulldir\E\/?//;
                        $actionmsg="mr $action: $fulldir (in subdir $s)";
                }
-               print "$actionmsg\n" unless $quiet;
+               print "$actionmsg\n" unless $quiet || $minimal;
 
-               my $hookret=hook("pre_$action", $topdir, $subdir);
+               my ($hookret, $hook_out)=hook("pre_$action", $topdir, $subdir);
                return $hookret if $hookret != OK;
 
-               my $ret=runsh $action, $topdir, $subdir,
+               my ($ret, $out)=runsh $action, $topdir, $subdir,
                        $command, \@ARGV, sub {
                                my $sh=shift;
-                               if ($quiet) {
-                                       my $output = qx/$sh 2>&1/;
-                                       my $ret = $?;
-                                       if ($ret != 0) {
-                                               print "$actionmsg\n";
-                                               print STDERR $output;
-                                       }
-                                       return $ret;
+                               if (!$jobs || $jobs > 1 || $quiet || $minimal) {
+                                       return terminal_friendly_spawn($actionmsg, $sh, $quiet, $minimal);
                                }
                                else {
                                        system($sh);
@@ -862,7 +898,7 @@ sub action {
                                return FAILED;
                        }
 
-                       my $ret=hook("post_$action", $topdir, $subdir);
+                       my ($ret, $hook_out)=hook("post_$action", $topdir, $subdir);
                        return $ret if $ret != OK;
                        
                        if ($is_checkout || $is_update) {
@@ -872,11 +908,11 @@ sub action {
                                                return FAILED;
                                        }
                                }
-                               my $ret=hook("fixups", $topdir, $subdir);
+                               my ($ret, $hook_out)=hook("fixups", $topdir, $subdir);
                                return $ret if $ret != OK;
                        }
                        
-                       return OK;
+                       return (OK, $out || $hook_out);
                }
        }
 }
@@ -886,15 +922,10 @@ sub hook {
 
        my $command=$config{$topdir}{$subdir}{$hook};
        return OK unless defined $command;
-       my $ret=runsh $hook, $topdir, $subdir, $command, [], sub {
+       my ($ret,$out)=runsh $hook, $topdir, $subdir, $command, [], sub {
                        my $sh=shift;
-                       if ($quiet) {
-                               my $output = qx/$sh 2>&1/;
-                               my $ret = $?;
-                               if ($ret != 0) {
-                                       print STDERR $output;
-                               }
-                               return $ret;
+                       if (!$jobs || $jobs > 1 || $quiet || $minimal) {
+                               return terminal_friendly_spawn(undef, $sh, $quiet, $minimal);
                        }
                        else {
                                system($sh);
@@ -914,7 +945,7 @@ sub hook {
                }
        }
 
-       return OK;
+       return (OK, $out);
 }
 
 # run actions on multiple repos, in parallel
@@ -942,7 +973,7 @@ sub mrs {
                                close CHILD_STDERR;
                                close $outfh;
                                close $errfh;
-                               exit action($action, @$repo);
+                               exit +(action($action, @$repo))[0];
                        }
                        close CHILD_STDOUT;
                        close CHILD_STDERR;
@@ -973,7 +1004,7 @@ sub mrs {
                                                        waitpid($active[$i][0], 0);
                                                        print STDOUT $out[$i][0];
                                                        print STDERR $out[$i][1];
-                                                       record($active[$i][1], $? >> 8);
+                                                       record($active[$i][1], $? >> 8, $out[$i][0] || $out[$i][1]);
                                                        splice(@fhs, $i, 1);
                                                        splice(@active, $i, 1);
                                                        splice(@out, $i, 1);
@@ -990,10 +1021,11 @@ sub mrs {
 sub record {
        my $dir=shift()->[0];
        my $ret=shift;
+       my $out=shift;
 
        if ($ret == OK) {
                push @ok, $dir;
-               print "\n" unless $quiet;
+               print "\n" unless $quiet || ($minimal && !$out);
        }
        elsif ($ret == FAILED) {
                if ($interactive) {
@@ -1002,7 +1034,7 @@ sub record {
                        system((getpwuid($<))[8], "-i");
                }
                push @failed, $dir;
-               print "\n" unless $quiet;
+               print "\n";
        }
        elsif ($ret == SKIPPED) {
                push @skipped, $dir;
@@ -1024,10 +1056,10 @@ sub showstats {
                showstat($#ok+1, "ok", "ok"),
                showstat($#failed+1, "failed", "failed"),
                showstat($#skipped+1, "skipped", "skipped"),
-       ).")\n" unless $quiet;
+       ).")\n" unless $quiet || $minimal;
        if ($stats) {
                if (@skipped) {
-                       print "mr $action: (skipped: ".join(" ", @skipped).")\n" unless $quiet;
+                       print "mr $action: (skipped: ".join(" ", @skipped).")\n" unless $quiet || $minimal;
                }
                if (@failed) {
                        print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";
@@ -1149,7 +1181,8 @@ sub is_trusted_config {
                        while (<TRUST>) {
                                chomp;
                                s/^~\//$ENV{HOME}\//;
-                               $trusted{abs_path($_)}=1;
+                               my $d=abs_path($_);
+                               $trusted{$d}=1 if defined $d;
                        }
                        close TRUST;
                }
@@ -1568,10 +1601,7 @@ sub dispatch {
        my $action=shift;
 
        # actions that do not operate on all repos
-       if ($action eq 'help') {
-               help(@ARGV);
-       }
-       elsif ($action eq 'config') {
+       if ($action eq 'config') {
                config(@ARGV);
        }
        elsif ($action eq 'register') {
@@ -1599,7 +1629,27 @@ sub dispatch {
 }
 
 sub help {
-       exec($config{''}{DEFAULT}{help}) || die "exec: $!";
+       my $help=q#
+               case `uname -s` in
+                       SunOS)
+                       SHOWMANFILE="man -f"
+                       ;;
+                       Darwin)
+                       SHOWMANFILE="man"
+                       ;;
+                       *)
+                       SHOWMANFILE="man"
+                       ;;
+               esac
+               if [ ! -e "$MR_PATH" ]; then
+                       error "cannot find program path"
+               fi
+               tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
+               trap "rm -f $tmp" exit
+               pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
+               $SHOWMANFILE "$tmp" || error "man failed"
+       #;
+       exec($help) || die "exec: $!";
 }
 
 sub config {
@@ -1801,6 +1851,7 @@ sub getopts {
                "p|path" => sub { }, # now default, ignore
                "f|force" => \$force,
                "v|verbose" => \$verbose,
+               "m|minimal" => \$minimal,
                "q|quiet" => \$quiet,
                "s|stats" => \$stats,
                "k|insecure" => \$insecure,
@@ -1857,6 +1908,7 @@ sub exitstats {
 sub main {
        getopts();
        init();
+       help(@ARGV) if $ARGV[0] eq 'help';
 
        startingconfig();
        loadconfig($HOME_MR_CONFIG);
@@ -2035,6 +2087,7 @@ svn_grep = ack-grep "$@"
 git_svn_grep = git grep "$@"
 git_grep = git grep "$@"
 bzr_grep = ack-grep "$@"
+darcs_grep = ack-grep "$@"
 
 run = "$@"
 
@@ -2108,30 +2161,12 @@ bzr_trusted_checkout = bzr checkout|clone|branch|get $url $repo
 hg_trusted_checkout = hg clone $url $repo
 darcs_trusted_checkout = darcs get $url $repo
 git_bare_trusted_checkout = git clone --bare $url $repo
-vcsh_trusted_checkout = vcsh run "$MR_REPO" git clone $url $repo
+vcsh_old_trusted_checkout = vcsh run "$MR_REPO" git clone $url $repo
+vcsh_trusted_checkout = vcsh clone $url $repo
 # fossil: messy to do
 veracity_trusted_checkout = vv clone $url $repo
 
 
-help =
-       case `uname -s` in
-               SunOS)
-               SHOWMANFILE="man -f"
-               ;;
-               Darwin)
-               SHOWMANFILE="man"
-               ;;
-               *)
-               SHOWMANFILE="man"
-               ;;
-       esac
-       if [ ! -e "$MR_PATH" ]; then
-               error "cannot find program path"
-       fi
-       tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
-       trap "rm -f $tmp" exit
-       pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
-       $SHOWMANFILE "$tmp" || error "man failed"
 list = true
 config = 
 bootstrap =