]> git.madduck.net Git - code/myrepos.git/blobdiff - mr

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

add an example of how to include all available libs
[code/myrepos.git] / mr
diff --git a/mr b/mr
index f9a208f7b31db6fbeefeed8b04e71e6ad551fa50..bc73d4023353ec8c69accc848a1cdbe88e9b7394 100755 (executable)
--- a/mr
+++ b/mr
@@ -296,7 +296,8 @@ use warnings;
 use strict;
 use Getopt::Long;
 use Cwd qw(getcwd abs_path);
 use strict;
 use Getopt::Long;
 use Cwd qw(getcwd abs_path);
-use POSIX "WNOHANG";
+
+# things that can happen when mr runs a command
 use constant {
        OK => 0,
        FAILED => 1,
 use constant {
        OK => 0,
        FAILED => 1,
@@ -304,242 +305,47 @@ use constant {
        ABORT => 3,
 };
 
        ABORT => 3,
 };
 
-$SIG{INT}=sub {
-       print STDERR "mr: interrupted\n";
-       exit 2;
-};
-
-$ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
+# configurables
 my $config_overridden=0;
 my $verbose=0;
 my $stats=0;
 my $no_recurse=0;
 my $config_overridden=0;
 my $verbose=0;
 my $stats=0;
 my $no_recurse=0;
+my $no_chdir=0;
 my $jobs=1;
 my $jobs=1;
+my $directory=getcwd();
+
+# globals :-(
 my %config;
 my %configfiles;
 my %knownactions;
 my %alias;
 my %config;
 my %configfiles;
 my %knownactions;
 my %alias;
-my $directory=getcwd();
+my (@ok, @failed, @skipped);
 
 
-Getopt::Long::Configure("no_permute");
-my $result=GetOptions(
-       "d|directory=s" => sub { $directory=abs_path($_[1]) },
-       "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
-       "v|verbose" => \$verbose,
-       "s|stats" => \$stats,
-       "n|no-recurse" => \$no_recurse,
-       "j|jobs=i" => \$jobs,
-);
-if (! $result || @ARGV < 1) {
-       die("Usage: mr [-d directory] action [params ...]\n".
-           "(Use mr help for man page.)\n");
-
-}
-if (! defined $directory) {
-       die("mr: failed to determine working directory\n");
-}
-
-# Make sure MR_CONFIG is an absolute path, but don't use abs_path since
-# the config file might be a symlink to elsewhere, and the directory it's
-# in is significant.
-if ($ENV{MR_CONFIG} !~ /^\//) {
-       $ENV{MR_CONFIG}=getcwd()."/".$ENV{MR_CONFIG};
-}
-# Try to set MR_PATH to the path to the program.
-eval {
-       use FindBin qw($Bin $Script);
-       $ENV{MR_PATH}=$Bin."/".$Script;
-};
+main();
 
 
-loadconfig(\*DATA);
-loadconfig($ENV{MR_CONFIG});
-#use Data::Dumper;
-#print Dumper(\%config);
+sub dispatch { #{{{
+       my $action=shift;
 
 
-# alias expansion and command stemming
-my $action=shift @ARGV;
-if (exists $alias{$action}) {
-       $action=$alias{$action};
-}
-if (! exists $knownactions{$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 {
-               die "mr: ambiguous action \"$action\" (matches: ".
-                       join(", ", @matches).")\n";
-       }
-}
-
-# commands that do not operate on all repos
-if ($action eq 'help') {
-       exec($config{''}{DEFAULT}{$action}) || die "exec: $!";
-}
-elsif ($action eq 'config') {
-       if (@ARGV < 2) {
-               die "mr config: not enough parameters\n";
+       # actions that do not operate on all repos
+       if ($action eq 'help') {
+               help(@ARGV);
        }
        }
-       my $section=shift;
-       if ($section=~/^\//) {
-               # try to convert to a path relative to the config file
-               my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
-               $dir=abs_path($dir);
-               $dir.="/" unless $dir=~/\/$/;
-               if ($section=~/^\Q$dir\E(.*)/) {
-                       $section=$1;
-               }
-       }
-       my %changefields;
-       foreach (@ARGV) {
-               if (/^([^=]+)=(.*)$/) {
-                       $changefields{$1}=$2;
-               }
-               else {
-                       my $found=0;
-                       foreach my $topdir (sort keys %config) {
-                               if (exists $config{$topdir}{$section} &&
-                                   exists $config{$topdir}{$section}{$_}) {
-                                       print $config{$topdir}{$section}{$_}."\n";
-                                       $found=1;
-                                       last if $section eq 'DEFAULT';
-                               }
-                       }
-                       if (! $found) {
-                               die "mr $action: $section $_ not set\n";
-                       }
-               }
+       elsif ($action eq 'config') {
+               config(@ARGV);
        }
        }
-       modifyconfig($ENV{MR_CONFIG}, $section, %changefields) if %changefields;
-       exit 0;
-}
-elsif ($action eq 'register') {
-       if (! $config_overridden) {
-               # Find the closest known mrconfig file to the current
-               # directory.
-               $directory.="/" unless $directory=~/\/$/;
-               foreach my $topdir (reverse sort keys %config) {
-                       next unless length $topdir;
-                       if ($directory=~/^\Q$topdir\E/) {
-                               $ENV{MR_CONFIG}=$configfiles{$topdir};
-                               $directory=$topdir;
-                               last;
-                       }
-               }
-       }
-       if (@ARGV) {
-               my $subdir=shift @ARGV;
-               if (! chdir($subdir)) {
-                       print STDERR "mr $action: failed to chdir to $subdir: $!\n";
-               }
-       }
-
-       $ENV{MR_REPO}=getcwd();
-       my $command=findcommand("register", $ENV{MR_CONFIG}, $directory, 'DEFAULT');
-       if (! defined $command) {
-               die "mr $action: unknown repository type\n";
+       elsif ($action eq 'register') {
+               register(@ARGV);
        }
 
        }
 
-       $ENV{MR_REPO}=~s/.*\/(.*)/$1/;
-       $command="set -e; ".$config{$ENV{MR_CONFIG}}{$directory}{lib}."\n".
-               "my_action(){ $command\n }; my_action ".
-               join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
-       print "mr $action: running >>$command<<\n" if $verbose;
-       exec($command) || die "exec: $!";
-}
-
-# an ordered list of repos
-my @list;
-foreach my $topdir (sort keys %config) {
-       foreach my $subdir (sort keys %{$config{$topdir}}) {
-               push @list, {
-                       topdir => $topdir,
-                       subdir => $subdir,
-                       order => $config{$topdir}{$subdir}{order},
-               };
+       if ($jobs > 1) {
+               mrs($action, selectrepos());
        }
        }
-}
-@list = sort {
-               $a->{order}  <=> $b->{order}
-                            ||
-               $a->{topdir} cmp $b->{topdir}
-                            ||
-               $a->{subdir} cmp $b->{subdir}
-       } @list;
-
-# work out what repos to act on
-my @repos;
-my $nochdir=0;
-foreach my $repo (@list) {
-       my $topdir=$repo->{topdir};
-       my $subdir=$repo->{subdir};
-
-       next if $subdir eq 'DEFAULT';
-       my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
-       my $d=$directory;
-       $dir.="/" unless $dir=~/\/$/;
-       $d.="/" unless $d=~/\/$/;
-       next if $no_recurse && $d ne $dir;
-       next if $dir ne $d && $dir !~ /^\Q$d\E/;
-       push @repos, [$dir, $topdir, $subdir];
-}
-if (! @repos) {
-       # fallback to find a leaf repo
-       foreach my $repo (reverse @list) {
-               my $topdir=$repo->{topdir};
-               my $subdir=$repo->{subdir};
-               
-               next if $subdir eq 'DEFAULT';
-               my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
-               my $d=$directory;
-               $dir.="/" unless $dir=~/\/$/;
-               $d.="/" unless $d=~/\/$/;
-               if ($d=~/^\Q$dir\E/) {
-                       push @repos, [$dir, $topdir, $subdir];
-                       last;
+       else {
+               foreach my $repo (selectrepos()) {
+                       record($repo, action($action, @$repo));
                }
        }
                }
        }
-       $nochdir=1;
-}
-
-# run the action on each repository and print stats
-my (@ok, @failed, @skipped);
-if ($jobs > 1) {
-       mrs(@repos);
-}
-else {
-       foreach my $repo (@repos) {
-               record($repo, action($action, @$repo));
-       }
-}
-if (! @ok && ! @failed && ! @skipped) {
-       die "mr $action: no repositories found to work on\n";
-}
-print "mr $action: finished (".join("; ",
-       showstat($#ok+1, "ok", "ok"),
-       showstat($#failed+1, "failed", "failed"),
-       showstat($#skipped+1, "skipped", "skipped"),
-).")\n";
-if ($stats) {
-       if (@skipped) {
-               print "mr $action: (skipped: ".join(" ", @skipped).")\n";
-       }
-       if (@failed) {
-               print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";
-       }
-}
-if (@failed) {
-       exit 1;
-}
-elsif (! @ok && @skipped) {
-       exit 1;
-}
-exit 0;
+} #}}}
 
 sub rcs_test { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
 
 sub rcs_test { #{{{
        my ($action, $dir, $topdir, $subdir) = @_;
@@ -639,7 +445,7 @@ sub action { #{{{
                }
        }
        
                }
        }
        
-       if (! $nochdir && ! chdir($dir)) {
+       if (! $no_chdir && ! chdir($dir)) {
                print STDERR "mr $action: failed to chdir to $dir: $!\n";
                return FAILED;
        }
                print STDERR "mr $action: failed to chdir to $dir: $!\n";
                return FAILED;
        }
@@ -655,7 +461,7 @@ sub action { #{{{
                }
        }
        else {
                }
        }
        else {
-               if (! $nochdir) {
+               if (! $no_chdir) {
                        print "mr $action: $topdir$subdir\n";
                }
                else {
                        print "mr $action: $topdir$subdir\n";
                }
                else {
@@ -699,6 +505,9 @@ sub action { #{{{
 
 # run actions on multiple repos, in parallel
 sub mrs { #{{{
 
 # run actions on multiple repos, in parallel
 sub mrs { #{{{
+       my $action=shift;
+       my @repos=@_;
+
        $| = 1;
        my @active;
        my @fhs;
        $| = 1;
        my @active;
        my @fhs;
@@ -787,6 +596,26 @@ sub record { #{{{
        }
 } #}}}
 
        }
 } #}}}
 
+sub showstats { #{{{
+       my $action=shift;
+       if (! @ok && ! @failed && ! @skipped) {
+               die "mr $action: no repositories found to work on\n";
+       }
+       print "mr $action: finished (".join("; ",
+               showstat($#ok+1, "ok", "ok"),
+               showstat($#failed+1, "failed", "failed"),
+               showstat($#skipped+1, "skipped", "skipped"),
+       ).")\n";
+       if ($stats) {
+               if (@skipped) {
+                       print "mr $action: (skipped: ".join(" ", @skipped).")\n";
+               }
+               if (@failed) {
+                       print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";
+               }
+       }
+} #}}}
+
 sub showstat { #{{{
        my $count=shift;
        my $singular=shift;
 sub showstat { #{{{
        my $count=shift;
        my $singular=shift;
@@ -797,6 +626,64 @@ sub showstat { #{{{
        return;
 } #}}}
 
        return;
 } #}}}
 
+# an ordered list of repos
+sub repolist { #{{{
+       my @list;
+       foreach my $topdir (sort keys %config) {
+               foreach my $subdir (sort keys %{$config{$topdir}}) {
+                       push @list, {
+                               topdir => $topdir,
+                               subdir => $subdir,
+                               order => $config{$topdir}{$subdir}{order},
+                       };
+               }
+       }
+       return sort {
+               $a->{order}  <=> $b->{order}
+                            ||
+               $a->{topdir} cmp $b->{topdir}
+                            ||
+               $a->{subdir} cmp $b->{subdir}
+       } @list;
+} #}}}
+
+# figure out which repos to act on
+sub selectrepos { #{{{
+       my @repos;
+       foreach my $repo (repolist()) {
+               my $topdir=$repo->{topdir};
+               my $subdir=$repo->{subdir};
+
+               next if $subdir eq 'DEFAULT';
+               my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+               my $d=$directory;
+               $dir.="/" unless $dir=~/\/$/;
+               $d.="/" unless $d=~/\/$/;
+               next if $no_recurse && $d ne $dir;
+               next if $dir ne $d && $dir !~ /^\Q$d\E/;
+               push @repos, [$dir, $topdir, $subdir];
+       }
+       if (! @repos) {
+               # fallback to find a leaf repo
+               foreach my $repo (reverse repolist()) {
+                       my $topdir=$repo->{topdir};
+                       my $subdir=$repo->{subdir};
+                       
+                       next if $subdir eq 'DEFAULT';
+                       my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+                       my $d=$directory;
+                       $dir.="/" unless $dir=~/\/$/;
+                       $d.="/" unless $d=~/\/$/;
+                       if ($d=~/^\Q$dir\E/) {
+                               push @repos, [$dir, $topdir, $subdir];
+                               last;
+                       }
+               }
+               $no_chdir=1;
+       }
+       return @repos;
+} #}}}
+
 my %loaded;
 sub loadconfig { #{{{
        my $f=shift;
 my %loaded;
 sub loadconfig { #{{{
        my $f=shift;
@@ -906,11 +793,11 @@ sub loadconfig { #{{{
                                        my $ret=system($value);
                                        if ($ret != 0) {
                                                if (($? & 127) == 2) {
                                        my $ret=system($value);
                                        if ($ret != 0) {
                                                if (($? & 127) == 2) {
-                                                       print STDERR "mr $action: chain test interrupted\n";
+                                                       print STDERR "mr: chain test interrupted\n";
                                                        exit 2;
                                                }
                                                elsif ($? & 127) {
                                                        exit 2;
                                                }
                                                elsif ($? & 127) {
-                                                       print STDERR "mr $action: chain test received signal ".($? & 127)."\n";
+                                                       print STDERR "mr: chain test received signal ".($? & 127)."\n";
                                                }
                                        }
                                        else {
                                                }
                                        }
                                        else {
@@ -1025,6 +912,171 @@ sub modifyconfig { #{{{
        print $out @out;
        close $out;     
 } #}}}
        print $out @out;
        close $out;     
 } #}}}
+       
+sub help { #{{{
+       exec($config{''}{DEFAULT}{help}) || die "exec: $!";
+} #}}}
+       
+sub config { #{{{
+       if (@_ < 2) {
+               die "mr config: not enough parameters\n";
+       }
+       my $section=shift;
+       if ($section=~/^\//) {
+               # try to convert to a path relative to the config file
+               my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
+               $dir=abs_path($dir);
+               $dir.="/" unless $dir=~/\/$/;
+               if ($section=~/^\Q$dir\E(.*)/) {
+                       $section=$1;
+               }
+       }
+       my %changefields;
+       foreach (@_) {
+               if (/^([^=]+)=(.*)$/) {
+                       $changefields{$1}=$2;
+               }
+               else {
+                       my $found=0;
+                       foreach my $topdir (sort keys %config) {
+                               if (exists $config{$topdir}{$section} &&
+                                   exists $config{$topdir}{$section}{$_}) {
+                                       print $config{$topdir}{$section}{$_}."\n";
+                                       $found=1;
+                                       last if $section eq 'DEFAULT';
+                               }
+                       }
+                       if (! $found) {
+                               die "mr config: $section $_ not set\n";
+                       }
+               }
+       }
+       modifyconfig($ENV{MR_CONFIG}, $section, %changefields) if %changefields;
+       exit 0;
+} #}}}
+
+sub register { #{{{
+       if (! $config_overridden) {
+               # Find the closest known mrconfig file to the current
+               # directory.
+               $directory.="/" unless $directory=~/\/$/;
+               foreach my $topdir (reverse sort keys %config) {
+                       next unless length $topdir;
+                       if ($directory=~/^\Q$topdir\E/) {
+                               $ENV{MR_CONFIG}=$configfiles{$topdir};
+                               $directory=$topdir;
+                               last;
+                       }
+               }
+       }
+       if (@ARGV) {
+               my $subdir=shift @ARGV;
+               if (! chdir($subdir)) {
+                       print STDERR "mr register: failed to chdir to $subdir: $!\n";
+               }
+       }
+
+       $ENV{MR_REPO}=getcwd();
+       my $command=findcommand("register", $ENV{MR_REPO}, $directory, 'DEFAULT');
+       if (! defined $command) {
+               die "mr register: unknown repository type\n";
+       }
+
+       $ENV{MR_REPO}=~s/.*\/(.*)/$1/;
+       $command="set -e; ".$config{$directory}{DEFAULT}{lib}."\n".
+               "my_action(){ $command\n }; my_action ".
+               join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
+       print "mr register: running >>$command<<\n" if $verbose;
+       exec($command) || die "exec: $!";
+} #}}}
+
+# alias expansion and command stemming
+sub expandaction { #{{{
+       my $action=shift;
+       if (exists $alias{$action}) {
+               $action=$alias{$action};
+       }
+       if (! exists $knownactions{$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 {
+                       die "mr: ambiguous action \"$action\" (matches: ".
+                               join(", ", @matches).")\n";
+               }
+       }
+       return $action;
+} #}}}
+
+sub getopts { #{{{
+       Getopt::Long::Configure("no_permute");
+       my $result=GetOptions(
+               "d|directory=s" => sub { $directory=abs_path($_[1]) },
+               "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
+               "v|verbose" => \$verbose,
+               "s|stats" => \$stats,
+               "n|no-recurse" => \$no_recurse,
+               "j|jobs=i" => \$jobs,
+       );
+       if (! $result || @ARGV < 1) {
+               die("Usage: mr [-d directory] action [params ...]\n".
+                   "(Use mr help for man page.)\n");
+       }
+} #}}}
+
+sub init { #{{{
+       $SIG{INT}=sub {
+               print STDERR "mr: interrupted\n";
+               exit 2;
+       };
+       
+       $ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig";
+
+       # This can happen if it's run in a directory that was removed
+       # or other strangeness.
+       if (! defined $directory) {
+               die("mr: failed to determine working directory\n");
+       }
+       # Make sure MR_CONFIG is an absolute path, but don't use abs_path since
+       # the config file might be a symlink to elsewhere, and the directory it's
+       # in is significant.
+       if ($ENV{MR_CONFIG} !~ /^\//) {
+               $ENV{MR_CONFIG}=getcwd()."/".$ENV{MR_CONFIG};
+       }
+       # Try to set MR_PATH to the path to the program.
+       eval {
+               use FindBin qw($Bin $Script);
+               $ENV{MR_PATH}=$Bin."/".$Script;
+       };
+} #}}}
+
+sub main { #{{{
+       getopts();
+       init();
+       loadconfig(\*DATA);
+       loadconfig($ENV{MR_CONFIG});
+       #use Data::Dumper; print Dumper(\%config);
+
+       my $action=expandaction(shift @ARGV);
+       dispatch($action);
+       showstats($action);
+
+       if (@failed) {
+               exit 1;
+       }
+       elsif (! @ok && @skipped) {
+               exit 1;
+       }
+       else {
+               exit 0;
+       }
+} #}}}
 
 # Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.
 
 # Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.