improve output for leaf dirs

[code/myrepos.git] / mr

diff --git a/mr b/mr
index b1139e5b2a12f0e908d278fdf18ccac0112e2327..ab93c7d48944ec138d0b4620318c93714fccb80d 100755 (executable)
--- a/mr
+++ b/mr
@@ -16,6 +16,8 @@ B<mr> [options] commit [-m "message"]
 
 B<mr> [options] diff
 
+B<mr> [options] log
+
 B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
@@ -28,6 +30,11 @@ respository.
 Any mix of revision control systems can be used with B<mr>, and you can
 define arbitrary actions for commands like "update", "checkout", or "commit".
 
+B<mr> cds into and operates on all registered repsitories at or below your
+working directory. Or, if you are in a subdirectory of a repository that
+contains no other registered repositories, it will stay in that directory,
+and work on only that repository,
+
 The predefined commands should be fairly familiar to users of any revision
 control system:
 
@@ -59,6 +66,10 @@ The optional -m parameter allows specifying a commit message.
 
 Show a diff of uncommitted changes.
 
+=item log
+
+Show the commit log.
+
 =item list
 
 List the repositories that mr will act on.
@@ -70,11 +81,8 @@ Displays this help.
 =back
 
 Actions can be abbreviated to any unambiguous subsctring, so
-"mr st" is equivilant to "mr status".
-
-B<mr> operates on all registered repsitories at or below your working
-directory. Or, if you are in a subdirectory of a repository that contains
-no other registered repositories, it will act on only that repository.
+"mr st" is equivilant to "mr status", and "mr up" is equivilant to "mr
+update"
 
 Additional parameters can be passed to other commands than "commit", they
 will be passed on unchanged to the underlying revision control system.
@@ -217,8 +225,13 @@ if (! exists $knownactions{$action}) {
                if (@matches == 1) {
                        $action=$matches[0];
                }
+               elsif (@matches == 0) {
+                       die "mr: unknown action \"$action\" (known actions: ".
+                               join(", ", sort keys %knownactions).")\n";
+               }
                else {
-                       die "mr: ambiguous action \"$action\" (matches @matches)\n";
+                       die "mr: ambiguous action \"$action\" (matches: ".
+                               join(", ", @matches).")\n";
                }
        }
 }
@@ -232,6 +245,7 @@ my @repos;
 my $nochdir=0;
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
+               next if $subdir eq 'default';
                my $dir=$topdir.$subdir;
                next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
                push @repos, [$dir, $topdir, $subdir];
@@ -239,20 +253,20 @@ foreach my $topdir (sort keys %config) {
 }
 if (! @repos) {
        # fallback to find a leaf repo
-       foreach my $topdir (sort keys %config) {
-               foreach my $subdir (sort keys %{$config{$topdir}}) {
+       LEAF: foreach my $topdir (reverse sort keys %config) {
+               foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
+                       next if $subdir eq 'default';
                        my $dir=$topdir.$subdir;
                        my $d=$directory;
                        $dir.="/" unless $dir=~/\/$/;
                        $d.="/" unless $d=~/\/$/;
                        if ($d=~/^\Q$dir\E/) {
                                push @repos, [$dir, $topdir, $subdir];
+                               last LEAF;
                        }
                }
        }
-       if (@repos > 1) {
-               die "mr: found multiple leaf repos (should never happen)";
-       }
+       $nochdir=1;
 }
 
 my (@failed, @successful, @skipped);
@@ -300,7 +314,12 @@ sub action {
                push @skipped, $dir;
        }
        else {
-               print "mr $action: $dir\n";
+               if (! $nochdir) {
+                       print "mr $action: $dir\n";
+               }
+               else {
+                       print "mr $action: $dir (in subdir $directory)\n";
+               }
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
@@ -485,6 +504,14 @@ diff = \
        else \
                error "unknown repo type"; \
        fi
+log = \
+       if [ -d "$MR_REPO"/.svn ]; then \
+               svn log"$@"; \
+       elif [ -d "$MR_REPO"/.git ]; then \
+               git log "$@"; \
+       else \
+               error "unknown repo type"; \
+       fi
 list = true
 help = \
        if [ ! -e "$MR_PATH" ]; then \