don't count skipping a directory because of cwd a skip for the statistics

[code/myrepos.git] / mr

diff --git a/mr b/mr
index f2e4af5142c3518635d1541c077cf5c498d55b34..577fa85a60aac12cc115c710fcaf3e37adf6c4d6 100755 (executable)
--- a/mr
+++ b/mr
@@ -175,6 +175,7 @@ loadconfig($config);
 #use Data::Dumper;
 #print Dumper(\%config);
 
 #use Data::Dumper;
 #print Dumper(\%config);
 

+# alias expansion and command stemming

 my $action=shift @ARGV;
 if (! exists $knownactions{$action}) {
        if (exists $alias{$action}) {
 my $action=shift @ARGV;
 if (! exists $knownactions{$action}) {
        if (exists $alias{$action}) {


@@ -192,6 +193,15 @@ if (! exists $knownactions{$action}) {
        }
 }
 
        }
 }
 

+# handle being in a subdir of a repository
+foreach my $topdir (sort keys %config) {
+       foreach my $subdir (sort keys %{$config{$topdir}}) {
+               if ($directory =~ /^\Q$topdir$subdir\E\//) {
+                       $directory=$topdir.$subdir;
+               }
+       }
+}
+

 my (@failed, @successful, @skipped);
 my $first=1;
 foreach my $topdir (sort keys %config) {
 my (@failed, @successful, @skipped);
 my $first=1;
 foreach my $topdir (sort keys %config) {


@@ -203,8 +213,6 @@ foreach my $topdir (sort keys %config) {
                if (defined $directory &&
                    $dir ne $directory &&
                    $dir !~ /^\Q$directory\E\//) {
                if (defined $directory &&
                    $dir ne $directory &&
                    $dir !~ /^\Q$directory\E\//) {

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

                        next;
                }
 
                        next;
                }
 


@@ -405,17 +413,17 @@ lib = \
        }
 update = \
        if [ -d .svn ]; then \
        }
 update = \
        if [ -d .svn ]; then \

-               svn update; \
+               svn update "$@"; \

        elif [ -d .git ]; then \
        elif [ -d .git ]; then \

-               git pull origin master; \
+               git pull origin master "$@"; \

        else \
                error "unknown repo type"; \
        fi
 status = \
        if [ -d .svn ]; then \
        else \
                error "unknown repo type"; \
        fi
 status = \
        if [ -d .svn ]; then \

-               svn status; \
+               svn status "$@"; \

        elif [ -d .git ]; then \
        elif [ -d .git ]; then \

-               git status || true; \
+               git status "$@" || true; \

        else \
                error "unknown repo type"; \
        fi
        else \
                error "unknown repo type"; \
        fi