heh, aj

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 3cc603f6c3fba08a3007afc2e8139c63238a74a3..3162623b0e86263a93b044f2d2adc198fae222a9 100755 (executable)
--- a/mr
+++ b/mr
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+#man{{{
+
 =head1 NAME
 
 mr - a Multiple Repository management tool
@@ -227,6 +229,8 @@ http://kitenet.net/~joey/code/mr/
 
 =cut
 
+#}}}
+
 use warnings;
 use strict;
 use Getopt::Long;
@@ -359,12 +363,12 @@ if (! @repos) {
        $nochdir=1;
 }
 
-my (@failed, @successful, @skipped);
+my (@failed, @ok, @skipped);
 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 +449,14 @@ sub action {
                        }
                }
                else {
-                       push @successful, $dir;
+                       push @ok, $dir;
                }
 
                print "\n";
        }
-}
+} #}}}
 
-sub showstat {
+sub showstat { #{{{
        my $count=shift;
        my $singular=shift;
        my $plural=shift;
@@ -460,25 +464,25 @@ sub showstat {
                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("; ",
-       showstat($#successful+1, "successful", "successful"),
+       showstat($#ok+1, "ok", "ok"),
        showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
 if (@failed) {
        exit 1;
 }
-elsif (! @successful && @skipped) {
+elsif (! @ok && @skipped) {
        exit 1;
 }
 exit 0;
 
 my %loaded;
-sub loadconfig {
+sub loadconfig { #{{{
        my $f=shift;
 
        my @toload;
@@ -523,8 +527,10 @@ sub loadconfig {
        close $in;
 
        my $section;
+       my $line=0;
        while (@lines) {
                $_=shift @lines;
+               $line++;
                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {
@@ -537,6 +543,7 @@ sub loadconfig {
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
                                shift(@lines);
+                               $line++;
                                $value.="\n$1";
                                chomp $value;
                        }
@@ -568,16 +575,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 +679,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
@@ -801,3 +809,5 @@ config =
 
 ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
+right = echo "Not found."
+#}}}