allow aliases to override defined commands

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 17418124d2011194ed5c084afbb2e5eefbc70f8c..01a9feb6ae1001e8c97258423832202fd25f4e82 100755 (executable)
--- a/mr
+++ b/mr
@@ -16,17 +16,25 @@ 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> is a Multiple Repository management tool. It allows you to register a
 set of repositories in a .mrconfig file, and then checkout, update, or
 B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
 
 B<mr> is a Multiple Repository management tool. It allows you to register a
 set of repositories in a .mrconfig file, and then checkout, update, or

-perform other actions on all of the repositories at once.
+perform other actions on the repositories as if they were one big
+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:
 


@@ -34,25 +42,23 @@ control system:
 
 =item checkout (or co)
 
 
 =item checkout (or co)
 

-Checks out all the registered repositories that are not already checked
-out.
+Checks out any repositories that are not already checked out.

 
 =item update
 
 
 =item update
 

-Updates each registered repository from its configured remote repository.
+Updates each repository from its configured remote repository.

 
 If a repository isn't checked out yet, it will first check it out.
 
 =item status
 
 
 If a repository isn't checked out yet, it will first check it out.
 
 =item status
 

-Displays a status report for each registered repository, showing what
+Displays a status report for each repository, showing what

 uncommitted changes are present in the repository.
 
 =item commit (or ci)
 
 uncommitted changes are present in the repository.
 
 =item commit (or ci)
 

-Commits changes to each registered repository. (By default, changes
-are pushed to the remote repository too, when using distributed systems
-like git.)
+Commits changes to each repository. (By default, changes are pushed to the
+remote repository too, when using distributed systems like git.)

 
 The optional -m parameter allows specifying a commit message.
 
 
 The optional -m parameter allows specifying a commit message.
 


@@ -60,6 +66,14 @@ The optional -m parameter allows specifying a commit message.
 
 Show a diff of uncommitted changes.
 
 
 Show a diff of uncommitted changes.
 

+=item log
+
+Show the commit log.
+
+=item list (or ls)
+
+List the repositories that mr will act on.
+

 =item help
 
 Displays this help.
 =item help
 
 Displays this help.


@@ -67,7 +81,13 @@ 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".
+"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.
+This is mostly useful if the repositories mr will act on all use the same
+revision control system.

 
 =head1 OPTIONS
 
 
 =head1 OPTIONS
 


@@ -76,12 +96,11 @@ Actions can be abbreviated to any unambiguous subsctring, so
 =item -d directory
 
 Specifies the topmost directory that B<mr> should work in. The default is
 =item -d directory
 
 Specifies the topmost directory that B<mr> should work in. The default is

-the current working directory. B<mr> will operate on all registered
-repositories at or under the directory.
+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


@@ -101,15 +120,28 @@ registers several additional repositories.
 
 The .mrconfig file uses a variant of the INI file format. Lines starting with
 "#" are comments. Lines ending with "\" are continued on to the next line.
 
 The .mrconfig file uses a variant of the INI file format. Lines starting with
 "#" are comments. Lines ending with "\" are continued on to the next line.

-Sections specify where each repository is located, relative to the
+
+The "default" section allows setting default values for the sections that
+come after it.
+
+The "alias" section allows adding aliases for actions. Each parameter
+is an alias, and its value is the action to use.
+
+All other sections specify where each repository is located, relative to the

 directory that contains the .mrconfig file.
 
 Within a section, each parameter defines a shell command to run to handle a
 directory that contains the .mrconfig file.
 
 Within a section, each parameter defines a shell command to run to handle a

-given action. Note that these shell commands are run in a "set -e" shell
+given action. mr contains default handlers for the "update", "status", and
+"commit" actions, so normally you only need to specify what to do for
+"checkout".
+
+Note that these shell commands are run in a "set -e" shell

 environment, where any additional parameters you pass are available in
 environment, where any additional parameters you pass are available in

-"$@". B<mr> cds into the repository directory before running
-a command, except for the "checkout" command, which is run in the parent
-of the repository directory, since the repository isn't checked out yet.
+"$@". The "checkout" command is run in the parent of the repository
+directory, since the repository isn't checked out yet. All other commands
+are run inside the repository, though not necessarily at the top of it.
+The "MR_REPO" environment variable is set to the path to the top of the
+repository.

 
 There are three special parameters. If the "skip" parameter is set and
 its command returns nonzero, then B<mr> will skip acting on that repository.
 
 There are three special parameters. If the "skip" parameter is set and
 its command returns nonzero, then B<mr> will skip acting on that repository.


@@ -117,16 +149,8 @@ If the "chain" parameter is set and its command returns nonzero, then B<mr>
 will try to load a .mrconfig file from the root of the repository. (You
 should avoid chaining from repositories with untrusted committers.) The
 "lib" parameter can specify some shell code that will be run before each
 will try to load a .mrconfig file from the root of the repository. (You
 should avoid chaining from repositories with untrusted committers.) The
 "lib" parameter can specify some shell code that will be run before each

-command, this can be a useful way to define shell functions other commands
-can use.
-
-The "default" section allows setting up default handlers for each action,
-and is overridden by the contents of other sections. mr contains default
-handlers for the "update", "status", and "commit" actions, so normally
-you only need to specify what to do for "checkout".
-
-The "alias" section allows adding aliases for commands. Each parameter
-is an alias, and its value is the command to run.
+command, this can be a useful way to define shell functions for other commands
+to use.

 
 For example:
 
 
 For example:
 


@@ -194,19 +218,22 @@ eval {
 
 # alias expansion and command stemming
 my $action=shift @ARGV;
 
 # alias expansion and command stemming
 my $action=shift @ARGV;

+if (exists $alias{$action}) {
+       $action=$alias{$action};
+}

 if (! exists $knownactions{$action}) {
 if (! exists $knownactions{$action}) {

-       if (exists $alias{$action}) {
-               $action=$alias{$action};
+       my @matches = grep { /^\Q$action\E/ }
+               keys %knownactions, keys %alias;
+       if (@matches == 1) {
+               $action=$matches[0];
+       }
+       elsif (@matches == 0) {
+               die "mr: unknown action \"$action\" (known actions: ".
+                       join(", ", sort keys %knownactions).")\n";

        }
        else {
        }
        else {

-               my @matches = grep { /^\Q$action\E/ }
-                       keys %knownactions, keys %alias;
-               if (@matches == 1) {
-                       $action=$matches[0];
-               }
-               else {
-                       die "mr: ambiguous action \"$action\" (matches @matches)\n";
-               }
+               die "mr: ambiguous action \"$action\" (matches: ".
+                       join(", ", @matches).")\n";

        }
 }
 
        }
 }
 


@@ -214,31 +241,38 @@ if ($action eq 'help') {
        exec($config{''}{default}{help});
 }
 
        exec($config{''}{default}{help});
 }
 

-# handle being in a subdir of a repository
+# work out what repos to act on
+my @repos;
+my $nochdir=0;

 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {

-               if ($directory =~ /^\Q$topdir$subdir\E\//) {
-                       $directory=$topdir.$subdir;
+               next if $subdir eq 'default';
+               my $dir=$topdir.$subdir;
+               next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
+               push @repos, [$dir, $topdir, $subdir];
+       }
+}
+if (! @repos) {
+       # fallback to find a leaf repo
+       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;
+                       }

                }
        }
                }
        }

+       $nochdir=1;

 }
 
 my (@failed, @successful, @skipped);
 }
 
 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';
-               
-               my $dir=$topdir.$subdir;
-
-               if (defined $directory &&
-                   $dir ne $directory &&
-                   $dir !~ /^\Q$directory\E\//) {
-                       next;
-               }
-
-               action($action, $dir, $topdir, $subdir);
-       }
+foreach my $repo (@repos) {
+       action($action, @$repo);

 }
 
 sub action {
 }
 
 sub action {


@@ -261,32 +295,41 @@ sub action {
                }
        }
        
                }
        }
        

-       if (! chdir($dir)) {
-               print STDERR "mr $action: failed to chdir to $dir: $!\n";
-               push @skipped, $dir;
-       }
+       $ENV{MR_REPO}=$dir;

 
        if (exists $config{$topdir}{$subdir}{skip}) {
 
        if (exists $config{$topdir}{$subdir}{skip}) {

-               my $ret=system($lib.$config{$topdir}{$subdir}{skip});
+               my $test="set -e;".$lib.$config{$topdir}{$subdir}{skip};
+               print "mr $action: running skip test $test\n" if $verbose;
+               my $ret=system($test);

                if ($ret >> 8 == 0) {
                        print "mr $action: $dir skipped per config file\n" if $verbose;
                        push @skipped, $dir;
                        return;
                }
        }
                if ($ret >> 8 == 0) {
                        print "mr $action: $dir skipped per config file\n" if $verbose;
                        push @skipped, $dir;
                        return;
                }
        }

-
-       if (! exists $config{$topdir}{$subdir}{$action}) {
+       
+       if (! $nochdir && ! chdir($dir)) {
+               print STDERR "mr $action: failed to chdir to $dir: $!\n";
+               push @failed, $dir;
+       }
+       elsif (! exists $config{$topdir}{$subdir}{$action}) {

                print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
                push @skipped, $dir;
        }
        else {
                print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
                push @skipped, $dir;
        }
        else {

-               print "mr $action: in $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);

+               print STDERR "mr $action: running $command\n" if $verbose;

                my $ret=system($command);
                if ($ret != 0) {
                my $ret=system($command);
                if ($ret != 0) {

-                       print STDERR "mr $action: failed to run: $command\n" if $verbose;
+                       print STDERR "mr $action: failed ($ret)\n" if $verbose;

                        push @failed, $topdir.$subdir;
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                        push @failed, $topdir.$subdir;
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";


@@ -299,8 +342,7 @@ sub action {
                        push @successful, $dir;
                }
 
                        push @successful, $dir;
                }
 

-               print "\n" unless $first;
-               $first=0;
+               print "\n";

        }
 }
 
        }
 }
 


@@ -313,7 +355,9 @@ sub showstat {
        }
        return;
 }
        }
        return;
 }

-print "\n" unless $first;
+if (! @successful && ! @failed && ! @skipped) {
+       die "mr $action: no repositories found to work on\n";
+}

 print "mr $action: finished (".join("; ",
        showstat($#successful+1, "successful", "successful"),
        showstat($#failed+1, "failed", "failed"),
 print "mr $action: finished (".join("; ",
        showstat($#successful+1, "successful", "successful"),
        showstat($#failed+1, "failed", "failed"),


@@ -426,47 +470,73 @@ __DATA__
 [alias]
        co = checkout
        ci = commit
 [alias]
        co = checkout
        ci = commit

+       ls = list
+

 [default]
 lib = \
        error() { \
                echo "mr: $@" >&2; \
                exit 1; \
        }
 [default]
 lib = \
        error() { \
                echo "mr: $@" >&2; \
                exit 1; \
        }

+

 update = \
 update = \

-       if [ -d .svn ]; then \
+       if [ -d "$MR_REPO"/.svn ]; then \

                svn update "$@"; \
                svn update "$@"; \

-       elif [ -d .git ]; then \
+       elif [ -d "$MR_REPO"/.git ]; then \

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

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs update "$@"; \

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

-       if [ -d .svn ]; then \
+       if [ -d "$MR_REPO"/.svn ]; then \

                svn status "$@"; \
                svn status "$@"; \

-       elif [ -d .git ]; then \
+       elif [ -d "$MR_REPO"/.git ]; then \

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

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs status "$@"; \

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

-       if [ -d .svn ]; then \
+       if [ -d "$MR_REPO"/.svn ]; then \

                svn commit "$@"; \
                svn commit "$@"; \

-       elif [ -d .git ]; then \
+       elif [ -d "$MR_REPO"/.git ]; then \

                git commit -a "$@" && git push --all; \
                git commit -a "$@" && git push --all; \

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs commit "$@"; \

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

-       if [ -d .svn ]; then \
+       if [ -d "$MR_REPO"/.svn ]; then \

                svn diff "$@"; \
                svn diff "$@"; \

-       elif [ -d .git ]; then \
+       elif [ -d "$MR_REPO"/.git ]; then \

                git diff "$@"; \
                git diff "$@"; \

+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs diff "$@"; \
+       else \
+               error "unknown repo type"; \
+       fi
+log = \
+       if [ -d "$MR_REPO"/.svn ]; then \
+               svn log"$@"; \
+       elif [ -d "$MR_REPO"/.git ]; then \
+               git log "$@"; \
+       elif [ -d "$MR_REPO"/CVS ]; then \
+               cvs log "$@"; \

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

+list = true
+

 help = \
        if [ ! -e "$MR_PATH" ]; then \
                error "cannot find program path";\
        fi; \
        (pod2man -c mr "$MR_PATH" | man -l -) || \
                error "pod2man or man failed"
 help = \
        if [ ! -e "$MR_PATH" ]; then \
                error "cannot find program path";\
        fi; \
        (pod2man -c mr "$MR_PATH" | man -l -) || \
                error "pod2man or man failed"

+
+ed = echo "A horse is a horse, of course, of course.."
+T = echo "I pity the fool."