newline simplification

[code/myrepos.git] / mr

diff --git a/mr b/mr
index f2e4af5142c3518635d1541c077cf5c498d55b34..5cdf9d42d95c364e99089d61367fb3099ea28d76 100755 (executable)
--- a/mr
+++ b/mr
@@ -14,6 +14,8 @@ B<mr> [options] status
 
 B<mr> [options] commit [-m "message"]
 
+B<mr> [options] diff
+
 B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
@@ -54,6 +56,14 @@ like git.)
 
 The optional -m parameter allows specifying a commit message.
 
+=item diff
+
+Show a diff of uncommitted changes.
+
+=item help
+
+Displays this help.
+
 =back
 
 Actions can be abbreviated to any unambiguous subsctring, so
@@ -167,7 +177,9 @@ my $result=GetOptions(
        "v" => \$verbose,
 );
 if (! $result || @ARGV < 1) {
-       die("Usage: mr [-d directory] action [params ...]\n");
+       die("Usage: mr [-d directory] action [params ...]\n".
+           "(Use mr help for man page.)\n");
+
 }
 
 loadconfig(\*DATA);
@@ -175,6 +187,12 @@ loadconfig($config);
 #use Data::Dumper;
 #print Dumper(\%config);
 
+eval {
+       use FindBin qw($Bin $Script);
+       $ENV{MR_PATH}=$Bin."/".$Script;
+};
+
+# alias expansion and command stemming
 my $action=shift @ARGV;
 if (! exists $knownactions{$action}) {
        if (exists $alias{$action}) {
@@ -192,8 +210,20 @@ if (! exists $knownactions{$action}) {
        }
 }
 
+if ($action eq 'help') {
+       exec($config{''}{default}{help});
+}
+
+# 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) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
                next if $subdir eq 'default';
@@ -203,16 +233,10 @@ foreach my $topdir (sort keys %config) {
                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;
                }
 
-               print "\n" unless $first;
-               $first=0;
-
                action($action, $dir, $topdir, $subdir);
-
        }
 }
 
@@ -273,6 +297,8 @@ sub action {
                else {
                        push @successful, $dir;
                }
+
+               print "\n";
        }
 }
 
@@ -285,7 +311,7 @@ sub showstat {
        }
        return;
 }
-print "\nmr $action: finished (".join("; ",
+print "mr $action: finished (".join("; ",
        showstat($#successful+1, "successful", "successful"),
        showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
@@ -405,17 +431,17 @@ lib = \
        }
 update = \
        if [ -d .svn ]; then \
-               svn update; \
+               svn update "$@"; \
        elif [ -d .git ]; then \
-               git pull origin master; \
+               git pull origin master "$@"; \
        else \
                error "unknown repo type"; \
        fi
 status = \
        if [ -d .svn ]; then \
-               svn status; \
+               svn status "$@"; \
        elif [ -d .git ]; then \
-               git status || true; \
+               git status "$@" || true; \
        else \
                error "unknown repo type"; \
        fi
@@ -427,3 +453,17 @@ commit = \
        else \
                error "unknown repo type"; \
        fi
+diff = \
+       if [ -d .svn ]; then \
+               svn diff "$@"; \
+       elif [ -d .git ]; then \
+               git diff "$@"; \
+       else \
+               error "unknown repo type"; \
+       fi
+help = \
+       if [ ! -e "$MR_PATH" ]; then \
+               error "cannot find program path";\
+       fi; \
+       (pod2man -c mr "$MR_PATH" | man -l -) || \
+               error "pod2man or man failed"