* Fix line number display for config file parse errors.

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 29e5fadfa2b3af82c39d0816574e9d765b2956a1..11d1c2beb9874c310d2178d188f71b270775468e 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


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

+#}}}
+

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


@@ -364,7 +368,7 @@ foreach my $repo (@repos) {
        action($action, @$repo);
 }
 
        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} ?


@@ -450,9 +454,9 @@ sub action {
 
                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;


@@ -460,7 +464,7 @@ sub showstat {
                return "$count ".($count > 1 ? $plural : $singular);
        }
        return;
                return "$count ".($count > 1 ? $plural : $singular);
        }
        return;

-}
+} #}}}

 if (! @ok && ! @failed && ! @skipped) {
        die "mr $action: no repositories found to work on\n";
 }
 if (! @ok && ! @failed && ! @skipped) {
        die "mr $action: no repositories found to work on\n";
 }


@@ -478,7 +482,7 @@ elsif (! @ok && @skipped) {
 exit 0;
 
 my %loaded;
 exit 0;
 
 my %loaded;

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

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


@@ -523,8 +527,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*$/) {


@@ -537,6 +543,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;
                        }


@@ -568,16 +575,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;


@@ -672,10 +679,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


@@ -801,3 +809,4 @@ 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."

+#}}}