* mr register will now write to whatever config file is specified with -c

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 29e5fadfa2b3af82c39d0816574e9d765b2956a1..50564f7420c7811e5772215910e96b46af88bf01 100755 (executable)
--- a/mr
+++ b/mr
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+#man{{{
+
 =head1 NAME
 
 mr - a Multiple Repository management tool
@@ -37,7 +39,7 @@ 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
@@ -72,6 +74,12 @@ Show a diff of uncommitted changes.
 
 Show the commit log.
 
+=back
+
+These commands are also available:
+
+=over 4
+
 =item list (or ls)
 
 List the repositories that mr will act on.
@@ -130,6 +138,11 @@ directory.
 
 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
@@ -175,7 +188,7 @@ environment, where any additional parameters you pass are available in
 directory, since the repository isn't checked out yet. All other commands
 are run inside the repository, though not necessarily at the top of it.
 The "MR_REPO" environment variable is set to the path to the top of the
-repository.
+repository, and "MR_CONFIG" is set to the topmost .mrconfig file used.
 
 A few parameters have special meanings:
 
@@ -227,14 +240,17 @@ http://kitenet.net/~joey/code/mr/
 
 =cut
 
+#}}}
+
 use warnings;
 use strict;
 use Getopt::Long;
 use Cwd qw(getcwd abs_path);
 
+$ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
 my $directory=getcwd();
-my $config="$ENV{HOME}/.mrconfig";
 my $verbose=0;
+my $stats=0;
 my %config;
 my %knownactions;
 my %alias;
@@ -242,8 +258,9 @@ my %alias;
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },
-       "c|config=s" => \$config,
-       "verbose" => \$verbose,
+       "c|config=s" => \$ENV{MR_CONFIG},
+       "v|verbose" => \$verbose,
+       "s|stats" => \$stats,
 );
 if (! $result || @ARGV < 1) {
        die("Usage: mr [-d directory] action [params ...]\n".
@@ -252,7 +269,7 @@ if (! $result || @ARGV < 1) {
 }
 
 loadconfig(\*DATA);
-loadconfig($config);
+loadconfig($ENV{MR_CONFIG});
 #use Data::Dumper;
 #print Dumper(\%config);
 
@@ -292,7 +309,7 @@ elsif ($action eq 'config') {
        my $section=shift;
        if ($section=~/^\//) {
                # try to convert to a path relative to $config's dir
-               my ($dir)=$config=~/^(.*\/)[^\/]+$/;
+               my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
                if ($section=~/^\Q$dir\E(.*)/) {
                        $section=$1;
                }
@@ -316,7 +333,7 @@ elsif ($action eq 'config') {
                        }
                }
        }
-       modifyconfig($config, $section, %changefields) if %changefields;
+       modifyconfig($ENV{MR_CONFIG}, $section, %changefields) if %changefields;
        exit 0;
 }
 elsif ($action eq 'register') {
@@ -364,7 +381,7 @@ foreach my $repo (@repos) {
        action($action, @$repo);
 }
 
-sub action {
+sub action { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
        
        my $lib= exists $config{$topdir}{$subdir}{lib} ?
@@ -445,14 +462,20 @@ sub action {
                        }
                }
                else {
+                       if ($action eq 'checkout' && ! -d $dir) {
+                               print STDERR "mr $action: $dir missing after checkout\n";;
+                               push @failed, $dir;
+                               return;
+                       }
+
                        push @ok, $dir;
                }
 
                print "\n";
        }
-}
+} #}}}
 
-sub showstat {
+sub showstat { #{{{
        my $count=shift;
        my $singular=shift;
        my $plural=shift;
@@ -460,7 +483,7 @@ sub showstat {
                return "$count ".($count > 1 ? $plural : $singular);
        }
        return;
-}
+} #}}}
 if (! @ok && ! @failed && ! @skipped) {
        die "mr $action: no repositories found to work on\n";
 }
@@ -469,6 +492,14 @@ print "mr $action: finished (".join("; ",
        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;
 }
@@ -478,7 +509,7 @@ elsif (! @ok && @skipped) {
 exit 0;
 
 my %loaded;
-sub loadconfig {
+sub loadconfig { #{{{
        my $f=shift;
 
        my @toload;
@@ -508,7 +539,10 @@ sub loadconfig {
 
                # 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}} };
@@ -523,8 +557,10 @@ sub loadconfig {
        close $in;
 
        my $section;
+       my $line=0;
        while (@lines) {
                $_=shift @lines;
+               $line++;
                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {
@@ -537,6 +573,7 @@ sub loadconfig {
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
                                shift(@lines);
+                               $line++;
                                $value.="\n$1";
                                chomp $value;
                        }
@@ -568,16 +605,16 @@ sub loadconfig {
                        }
                }
                else {
-                       die "$f line $.: parse error\n";
+                       die "$f line $line: parse error\n";
                }
        }
 
        foreach (@toload) {
                loadconfig($_);
        }
-}
+} #}}}
 
-sub modifyconfig {
+sub modifyconfig { #{{{
        my $f=shift;
        # the section to modify or add
        my $targetsection=shift;
@@ -672,10 +709,11 @@ sub modifyconfig {
        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.
+#DATA{{{
 __DATA__
 [ALIAS]
 co = checkout
@@ -773,21 +811,21 @@ register =
                        error "cannot determine svn url"
                fi
                echo "Registering svn url: $url"
-               mr config "$(pwd)" checkout="svn co $url $basedir"
+               mr -c "$MR_CONFIG" config "$(pwd)" checkout="svn co $url $basedir"
        elif [ -d .git ]; then
                url=$(LANG=C git-config --get remote.origin.url)
                if [ -z "$url" ]; then
                        error "cannot determine git url"
                fi
                echo "Registering git url: $url"
-               mr config "$(pwd)" checkout="git clone $url $basedir"
+               mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir"
        elif [ -d .bzr ]; then
                url=$(cat .bzr/branch/parent)
                if [ -z "$url" ]; then
                        error "cannot determine bzr url"
                fi
                echo "Registering bzr url: $url"
-               mr config "$(pwd)" checkout="bzr clone $url $basedir"
+               mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir"
        else
                error "unable to register this repo type"
        fi
@@ -801,3 +839,5 @@ config =
 
 ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
+right = echo "Not found."
+#}}}