]> 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:

projects / code / myrepos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* Add a lib file for using unison with mr.
[code/myrepos.git] / mr
diff --git a/mr b/mr
index 13807f8f3f4c890dd27eebdde950d67cc2a1b1ce..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,62 +305,23 @@ 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 $no_chdir=0;
 my $jobs=1;
 my $config_overridden=0;
 my $verbose=0;
 my $stats=0;
 my $no_recurse=0;
 my $no_chdir=0;
 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);
 
 my (@ok, @failed, @skipped);
 
-getopts();
-
-# 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;
-};
-
-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;
-}
+main();
 
 sub dispatch { #{{{
        my $action=shift;
 
 sub dispatch { #{{{
        my $action=shift;
@@ -635,6 +597,7 @@ sub record { #{{{
 } #}}}
 
 sub showstats { #{{{
 } #}}}
 
 sub showstats { #{{{
+       my $action=shift;
        if (! @ok && ! @failed && ! @skipped) {
                die "mr $action: no repositories found to work on\n";
        }
        if (! @ok && ! @failed && ! @skipped) {
                die "mr $action: no repositories found to work on\n";
        }
@@ -830,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 {
@@ -951,7 +914,7 @@ sub modifyconfig { #{{{
 } #}}}
        
 sub help { #{{{
 } #}}}
        
 sub help { #{{{
-       exec($config{''}{DEFAULT}{$action}) || die "exec: $!";
+       exec($config{''}{DEFAULT}{help}) || die "exec: $!";
 } #}}}
        
 sub config { #{{{
 } #}}}
        
 sub config { #{{{
@@ -984,7 +947,7 @@ sub config { #{{{
                                }
                        }
                        if (! $found) {
                                }
                        }
                        if (! $found) {
-                               die "mr $action: $section $_ not set\n";
+                               die "mr config: $section $_ not set\n";
                        }
                }
        }
                        }
                }
        }
@@ -1009,21 +972,21 @@ sub register { #{{{
        if (@ARGV) {
                my $subdir=shift @ARGV;
                if (! chdir($subdir)) {
        if (@ARGV) {
                my $subdir=shift @ARGV;
                if (! chdir($subdir)) {
-                       print STDERR "mr $action: failed to chdir to $subdir: $!\n";
+                       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) {
                }
        }
 
        $ENV{MR_REPO}=getcwd();
        my $command=findcommand("register", $ENV{MR_REPO}, $directory, 'DEFAULT');
        if (! defined $command) {
-               die "mr $action: unknown repository type\n";
+               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);
        }
 
        $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 $action: running >>$command<<\n" if $verbose;
+       print "mr register: running >>$command<<\n" if $verbose;
        exec($command) || die "exec: $!";
 } #}}}
 
        exec($command) || die "exec: $!";
 } #}}}
 
@@ -1067,6 +1030,54 @@ sub getopts { #{{{
        }
 } #}}}
 
        }
 } #}}}
 
+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.
 #DATA{{{
 # Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.
 #DATA{{{
@@ -1079,7 +1090,6 @@ ls = list
 [DEFAULT]
 order = 10
 lib =
 [DEFAULT]
 order = 10
 lib =
-       PWD="$(pwd)"
        error() {
                echo "mr: $@" >&2
                exit 1
        error() {
                echo "mr: $@" >&2
                exit 1
@@ -1165,21 +1175,21 @@ svn_register =
                error "cannot determine svn url"
        fi
        echo "Registering svn url: $url in $MR_CONFIG"
                error "cannot determine svn url"
        fi
        echo "Registering svn url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "$PWD" checkout="svn co '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
        url="$(LANG=C git-config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
 git_register = 
        url="$(LANG=C git-config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "$PWD" checkout="git clone '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
        url=$(cat .bzr/branch/parent)
        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi
        echo "Registering bzr url: $url in $MR_CONFIG"
 bzr_register =
        url=$(cat .bzr/branch/parent)
        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi
        echo "Registering bzr url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "$PWD" checkout="bzr clone '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr clone '$url' '$MR_REPO'"
 cvs_register =
        repo=$(cat CVS/Repository)
        root=$(cat CVS/Root)
 cvs_register =
        repo=$(cat CVS/Repository)
        root=$(cat CVS/Root)
@@ -1187,22 +1197,22 @@ cvs_register =
                error "cannot determine cvs root"
                fi
        echo "Registering cvs repository $repo at root $root"
                error "cannot determine cvs root"
                fi
        echo "Registering cvs repository $repo at root $root"
-       mr -c "$MR_CONFIG" config "$PWD" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
 hg_register = 
        url=$(hg showconfig paths.default)
        echo "Registering mercurial repo url: $url in $MR_CONFIG"
 hg_register = 
        url=$(hg showconfig paths.default)
        echo "Registering mercurial repo url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "$PWD" checkout="hg clone '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone '$url' '$MR_REPO'"
 darcs_register = 
        url=$(cat _darcs/prefs/defaultrepo)
        echo "Registering darcs repository $url in $MR_CONFIG"
 darcs_register = 
        url=$(cat _darcs/prefs/defaultrepo)
        echo "Registering darcs repository $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "$PWD" checkout="darcs get '$url'p '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
 git_bare_register = 
        url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
 git_bare_register = 
        url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "$PWD" checkout="git clone --bare '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'"
 
 help =
        if [ ! -e "$MR_PATH" ]; then
 
 help =
        if [ ! -e "$MR_PATH" ]; then
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.