fix mr update when inside a repo

[code/myrepos.git] / mr

diff --git a/mr b/mr
index aa15728925c0b3ee00cd09acce516e1cda41e2e1..c15b3a393725f28ec55a84613a87daefcea2f668 100755 (executable)
--- a/mr
+++ b/mr
@@ -128,8 +128,9 @@ foreach my $topdir (sort keys %config) {
                my $dir=$topdir.$subdir;
 
                if (defined $directory &&
                my $dir=$topdir.$subdir;
 
                if (defined $directory &&

+                   $dir ne $directory &&

                    $dir !~ /^\Q$directory\E\//) {
                    $dir !~ /^\Q$directory\E\//) {

-                       print "mr $action: $dir skipped per -d parameter\n" if $verbose;
+                       print "mr $action: $dir skipped per -d parameter ($directory)\n" if $verbose;

                        push @skipped, $dir;
                        next;
                }
                        push @skipped, $dir;
                        next;
                }


@@ -193,7 +194,7 @@ sub showstat {
        return;
 }
 print "\nmr $action: finished (".join("; ",
        return;
 }
 print "\nmr $action: finished (".join("; ",

-       showstat($#successes+1, "success", "sucesses"),
+       showstat($#successes+1, "success", "successes"),

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


@@ -212,16 +213,17 @@ sub loadconfig {
                $dir="";
        }
        else {
                $dir="";
        }
        else {

-               $f=abs_path($f);
-
-               if ($loaded{$f}) {
+               # $f might be a symlink
+               my $absf=abs_path($f);
+               if ($loaded{$absf}) {

                        return;
                }
                        return;
                }

-               $loaded{$f}=1;
+               $loaded{$absf}=1;

 
                print "mr: loading config $f\n" if $verbose;
                open($in, "<", $f) || die "mr: open $f: $!\n";
                ($dir)=$f=~/^(.*\/)[^\/]+$/;
 
                print "mr: loading config $f\n" if $verbose;
                open($in, "<", $f) || die "mr: open $f: $!\n";
                ($dir)=$f=~/^(.*\/)[^\/]+$/;

+               $dir=abs_path($dir)."/";

 
                # copy in defaults from first parent
                my $parent=$dir;
 
                # copy in defaults from first parent
                my $parent=$dir;