add -s option

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 83b595221886af7b802cecc888aedc2aab1f11ce..4e3d73889b3080816fb9659761cd429f24baf0ce 100755 (executable)
--- a/mr
+++ b/mr
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+#man{{{
+

 =head1 NAME
 
 mr - a Multiple Repository management tool
 =head1 NAME
 
 mr - a Multiple Repository management tool


@@ -26,20 +28,18 @@ B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 

-B<mr> is a Multiple Repository management tool. It allows you to register a
-set of repositories in a .mrconfig file, and then checkout, update, or
-perform other actions on the repositories as if they were one big
-respository.
-
-Any mix of revision control systems can be used with B<mr>, and you can
-define arbitrary actions for commands like "update", "checkout", or "commit".
+B<mr> is a Multiple Repository management tool. It
+can checkout, update, or perform other actions on
+a set of repositories as if they were one combined respository. It
+supports any combination of subversion, git, cvs, and bzr repositories, 
+and support for other revision control systems can easily be added.

 
 B<mr> cds into and operates on all registered repsitories at or below your
 working directory. Or, if you are in a subdirectory of a repository that
 contains no other registered repositories, it will stay in that directory,
 and work on only that repository,
 
 
 B<mr> cds into and operates on all registered repsitories at or below your
 working directory. Or, if you are in a subdirectory of a repository that
 contains no other registered repositories, it will stay in that directory,
 and work on only that repository,
 

-The predefined commands should be fairly familiar to users of any revision
+These predefined commands should be fairly familiar to users of any revision

 control system:
 
 =over 4
 control system:
 
 =over 4


@@ -74,6 +74,12 @@ Show a diff of uncommitted changes.
 
 Show the commit log.
 
 
 Show the commit log.
 

+=back
+
+These commands are also available:
+
+=over 4
+

 =item list (or ls)
 
 List the repositories that mr will act on.
 =item list (or ls)
 
 List the repositories that mr will act on.


@@ -132,6 +138,11 @@ directory.
 
 Be verbose.
 
 
 Be verbose.
 

+=item -s
+
+Expand the statistics line displayed at the end to include information
+about exactly which repositories failed and were skipped, if any.
+

 =back
 
 =head1 FILES
 =back
 
 =head1 FILES


@@ -229,6 +240,8 @@ http://kitenet.net/~joey/code/mr/
 
 =cut
 
 
 =cut
 

+#}}}
+

 use warnings;
 use strict;
 use Getopt::Long;
 use warnings;
 use strict;
 use Getopt::Long;


@@ -237,6 +250,7 @@ use Cwd qw(getcwd abs_path);
 my $directory=getcwd();
 my $config="$ENV{HOME}/.mrconfig";
 my $verbose=0;
 my $directory=getcwd();
 my $config="$ENV{HOME}/.mrconfig";
 my $verbose=0;

+my $stats=0;

 my %config;
 my %knownactions;
 my %alias;
 my %config;
 my %knownactions;
 my %alias;


@@ -245,7 +259,8 @@ Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },
        "c|config=s" => \$config,
 my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },
        "c|config=s" => \$config,

-       "verbose" => \$verbose,
+       "v|verbose" => \$verbose,
+       "s|stats" => \$stats,

 );
 if (! $result || @ARGV < 1) {
        die("Usage: mr [-d directory] action [params ...]\n".
 );
 if (! $result || @ARGV < 1) {
        die("Usage: mr [-d directory] action [params ...]\n".


@@ -361,12 +376,12 @@ if (! @repos) {
        $nochdir=1;
 }
 
        $nochdir=1;
 }
 

-my (@failed, @successful, @skipped);
+my (@failed, @ok, @skipped);

 foreach my $repo (@repos) {
        action($action, @$repo);
 }
 
 foreach my $repo (@repos) {
        action($action, @$repo);
 }
 

-sub action {
+sub action { #{{{

        my ($action, $dir, $topdir, $subdir) = @_;
        
        my $lib= exists $config{$topdir}{$subdir}{lib} ?
        my ($action, $dir, $topdir, $subdir) = @_;
        
        my $lib= exists $config{$topdir}{$subdir}{lib} ?


@@ -447,14 +462,14 @@ sub action {
                        }
                }
                else {
                        }
                }
                else {

-                       push @successful, $dir;
+                       push @ok, $dir;

                }
 
                print "\n";
        }
                }
 
                print "\n";
        }

-}
+} #}}}

 
 

-sub showstat {
+sub showstat { #{{{

        my $count=shift;
        my $singular=shift;
        my $plural=shift;
        my $count=shift;
        my $singular=shift;
        my $plural=shift;


@@ -462,25 +477,33 @@ sub showstat {
                return "$count ".($count > 1 ? $plural : $singular);
        }
        return;
                return "$count ".($count > 1 ? $plural : $singular);
        }
        return;

-}
-if (! @successful && ! @failed && ! @skipped) {
+} #}}}
+if (! @ok && ! @failed && ! @skipped) {

        die "mr $action: no repositories found to work on\n";
 }
 print "mr $action: finished (".join("; ",
        die "mr $action: no repositories found to work on\n";
 }
 print "mr $action: finished (".join("; ",

-       showstat($#successful+1, "successful", "successful"),
+       showstat($#ok+1, "ok", "ok"),

        showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
        showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";

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

 if (@failed) {
        exit 1;
 }
 if (@failed) {
        exit 1;
 }

-elsif (! @successful && @skipped) {
+elsif (! @ok && @skipped) {

        exit 1;
 }
 exit 0;
 
 my %loaded;
        exit 1;
 }
 exit 0;
 
 my %loaded;

-sub loadconfig {
+sub loadconfig { #{{{

        my $f=shift;
 
        my @toload;
        my $f=shift;
 
        my @toload;


@@ -510,7 +533,10 @@ sub loadconfig {
 
                # copy in defaults from first parent
                my $parent=$dir;
 
                # copy in defaults from first parent
                my $parent=$dir;

-               while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) {
+               while ($parent=~s/^(.*\/)[^\/]+\/?$/$1/) {
+                       if ($parent eq '/') {
+                               $parent="";
+                       }

                        if (exists $config{$parent} &&
                            exists $config{$parent}{DEFAULT}) {
                                $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };
                        if (exists $config{$parent} &&
                            exists $config{$parent}{DEFAULT}) {
                                $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };


@@ -525,8 +551,10 @@ sub loadconfig {
        close $in;
 
        my $section;
        close $in;
 
        my $section;

+       my $line=0;

        while (@lines) {
                $_=shift @lines;
        while (@lines) {
                $_=shift @lines;

+               $line++;

                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {
                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {


@@ -539,6 +567,7 @@ sub loadconfig {
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
                                shift(@lines);
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
                                shift(@lines);

+                               $line++;

                                $value.="\n$1";
                                chomp $value;
                        }
                                $value.="\n$1";
                                chomp $value;
                        }


@@ -570,16 +599,16 @@ sub loadconfig {
                        }
                }
                else {
                        }
                }
                else {

-                       die "$f line $.: parse error\n";
+                       die "$f line $line: parse error\n";

                }
        }
 
        foreach (@toload) {
                loadconfig($_);
        }
                }
        }
 
        foreach (@toload) {
                loadconfig($_);
        }

-}
+} #}}}

 
 

-sub modifyconfig {
+sub modifyconfig { #{{{

        my $f=shift;
        # the section to modify or add
        my $targetsection=shift;
        my $f=shift;
        # the section to modify or add
        my $targetsection=shift;


@@ -674,10 +703,11 @@ sub modifyconfig {
        open(my $out, ">", $f) || die "mr: write $f: $!\n";
        print $out @out;
        close $out;     
        open(my $out, ">", $f) || die "mr: write $f: $!\n";
        print $out @out;
        close $out;     

-}
+} #}}}

 
 # Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.
 
 # Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.

+#DATA{{{

 __DATA__
 [ALIAS]
 co = checkout
 __DATA__
 [ALIAS]
 co = checkout


@@ -803,3 +833,5 @@ config =
 
 ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
 
 ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."

+right = echo "Not found."
+#}}}