add ls = list alias

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 3c998f3e586ea8bc763319543f048ea1aa8af57d..175c5f1d7c749dd1fd457ebff26d51d29afff02e 100755 (executable)
--- a/mr
+++ b/mr
@@ -16,6 +16,8 @@ B<mr> [options] commit [-m "message"]
 
 B<mr> [options] diff
 
 
 B<mr> [options] diff
 

+B<mr> [options] log
+

 B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
 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".
 
 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:
 
 The predefined commands should be fairly familiar to users of any revision
 control system:
 


@@ -59,7 +66,11 @@ The optional -m parameter allows specifying a commit message.
 
 Show a diff of uncommitted changes.
 
 
 Show a diff of uncommitted changes.
 

-=item list
+=item log
+
+Show the commit log.
+
+=item list (or ls)

 
 List the repositories that mr will act on.
 
 
 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
 =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.
 
 Additional parameters can be passed to other commands than "commit", they
 will be passed on unchanged to the underlying revision control system.


@@ -92,7 +100,7 @@ the current working directory.
 
 =item -c mrconfig
 
 
 =item -c mrconfig
 

-Use the specified mrconfig file, instead of looking for on in your home
+Use the specified mrconfig file, instead of looking for one in your home

 directory.
 
 =item -v
 directory.
 
 =item -v


@@ -217,8 +225,13 @@ if (! exists $knownactions{$action}) {
                if (@matches == 1) {
                        $action=$matches[0];
                }
                if (@matches == 1) {
                        $action=$matches[0];
                }

+               elsif (@matches == 0) {
+                       die "mr: unknown action \"$action\" (known actions: ".
+                               join(", ", sort keys %knownactions).")\n";
+               }

                else {
                else {

-                       die "mr: ambiguous action \"$action\" (matches @matches)\n";
+                       die "mr: ambiguous action \"$action\" (matches: ".
+                               join(", ", @matches).")\n";

                }
        }
 }
                }
        }
 }


@@ -301,7 +314,12 @@ sub action {
                push @skipped, $dir;
        }
        else {
                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);
                my $command="set -e; ".$lib.
                        "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
                        join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);


@@ -448,6 +466,7 @@ __DATA__
 [alias]
        co = checkout
        ci = commit
 [alias]
        co = checkout
        ci = commit

+       ls = list

 [default]
 lib = \
        error() { \
 [default]
 lib = \
        error() { \


@@ -486,6 +505,14 @@ diff = \
        else \
                error "unknown repo type"; \
        fi
        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 \
 list = true
 help = \
        if [ ! -e "$MR_PATH" ]; then \