X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/9dccb005268468946b415529c40978265174ef11..a6af578542ff49bdbac29fb5773c24ff2ed4ef5c:/mr?ds=inline diff --git a/mr b/mr index ab71f36..1741812 100755 --- a/mr +++ b/mr @@ -14,6 +14,8 @@ B [options] status B [options] commit [-m "message"] +B [options] diff + B [options] action [params ...] =head1 DESCRIPTION @@ -30,7 +32,7 @@ control system: =over 4 -=item checkout +=item checkout (or co) Checks out all the registered repositories that are not already checked out. @@ -46,7 +48,7 @@ If a repository isn't checked out yet, it will first check it out. Displays a status report for each registered repository, showing what uncommitted changes are present in the repository. -=item commit +=item commit (or ci) Commits changes to each registered repository. (By default, changes are pushed to the remote repository too, when using distributed systems @@ -54,6 +56,14 @@ like git.) The optional -m parameter allows specifying a commit message. +=item diff + +Show a diff of uncommitted changes. + +=item help + +Displays this help. + =back Actions can be abbreviated to any unambiguous subsctring, so @@ -115,6 +125,9 @@ 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. + For example: [src] @@ -155,6 +168,7 @@ my $config="$ENV{HOME}/.mrconfig"; my $verbose=0; my %config; my %knownactions; +my %alias; Getopt::Long::Configure("no_permute"); my $result=GetOptions( @@ -163,7 +177,9 @@ my $result=GetOptions( "v" => \$verbose, ); if (! $result || @ARGV < 1) { - die("Usage: mr [-d directory] action [params ...]\n"); + die("Usage: mr [-d directory] action [params ...]\n". + "(Use mr help for man page.)\n"); + } loadconfig(\*DATA); @@ -171,14 +187,39 @@ loadconfig($config); #use Data::Dumper; #print Dumper(\%config); +eval { + use FindBin qw($Bin $Script); + $ENV{MR_PATH}=$Bin."/".$Script; +}; + +# alias expansion and command stemming my $action=shift @ARGV; -if (! $knownactions{$action}) { - my @matches = grep { /^\Q$action\E/ } keys %knownactions; - if (@matches == 1) { - $action=$matches[0]; +if (! exists $knownactions{$action}) { + if (exists $alias{$action}) { + $action=$alias{$action}; } else { - die "mr: ambiguous action \"$action\" (matches @matches)\n"; + 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"; + } + } +} + +if ($action eq 'help') { + exec($config{''}{default}{help}); +} + +# handle being in a subdir of a repository +foreach my $topdir (sort keys %config) { + foreach my $subdir (sort keys %{$config{$topdir}}) { + if ($directory =~ /^\Q$topdir$subdir\E\//) { + $directory=$topdir.$subdir; + } } } @@ -193,21 +234,18 @@ foreach my $topdir (sort keys %config) { if (defined $directory && $dir ne $directory && $dir !~ /^\Q$directory\E\//) { - print "mr $action: $dir skipped per -d parameter ($directory)\n" if $verbose; - push @skipped, $dir; next; } - print "\n" unless $first; - $first=0; - action($action, $dir, $topdir, $subdir); - } } sub action { my ($action, $dir, $topdir, $subdir) = @_; + + my $lib= exists $config{$topdir}{$subdir}{lib} ? + $config{$topdir}{$subdir}{lib} : ""; if ($action eq 'checkout') { if (-d $dir) { @@ -229,11 +267,11 @@ sub action { } if (exists $config{$topdir}{$subdir}{skip}) { - my $ret=system($config{$topdir}{$subdir}{skip}); + my $ret=system($lib.$config{$topdir}{$subdir}{skip}); if ($ret >> 8 == 0) { print "mr $action: $dir skipped per config file\n" if $verbose; push @skipped, $dir; - next; + return; } } @@ -243,9 +281,7 @@ sub action { } else { print "mr $action: in $dir\n"; - my $command="set -e; ". - (exists $config{$topdir}{$subdir}{lib} ? - $config{$topdir}{$subdir}{lib} : ""). + my $command="set -e; ".$lib. "my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ". join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV); my $ret=system($command); @@ -262,6 +298,9 @@ sub action { else { push @successful, $dir; } + + print "\n" unless $first; + $first=0; } } @@ -274,7 +313,8 @@ sub showstat { } return; } -print "\nmr $action: finished (".join("; ", +print "\n" unless $first; +print "mr $action: finished (".join("; ", showstat($#successful+1, "successful", "successful"), showstat($#failed+1, "failed", "failed"), showstat($#skipped+1, "skipped", "skipped"), @@ -346,28 +386,31 @@ sub loadconfig { if (! defined $section) { die "$f line $.: parameter ($parameter) not in section\n"; } - if (! exists $config{$dir}{$section} && - exists $config{$dir}{default}) { + if ($section ne 'alias' && + ! exists $config{$dir}{$section} && + exists $config{$dir}{default}) { # copy in defaults $config{$dir}{$section}={ %{$config{$dir}{default}} }; } - if ($parameter ne 'lib') { - $config{$dir}{$section}{$parameter}=$value; - $knownactions{$parameter}=1; + if ($section eq 'alias') { + $alias{$parameter}=$value; + } + elsif ($parameter eq 'lib') { + $config{$dir}{$section}{lib}.=$value." ; "; } else { - $config{$dir}{$section}{$parameter}.=$value." ; "; + $config{$dir}{$section}{$parameter}=$value; + $knownactions{$parameter}=1; + if ($parameter eq 'chain' && + length $dir && $section ne "default" && + -e $dir.$section."/.mrconfig" && + system($value) >> 8 == 0) { + push @toload, $dir.$section."/.mrconfig"; + } } - - if ($parameter eq 'chain' && - length $dir && $section ne "default" && - -e $dir.$section."/.mrconfig" && - system($value) >> 8 == 0) { - push @toload, $dir.$section."/.mrconfig"; - } } else { - die "$f line $.: parse error\n"; + die "$f line $.: parse error\n"; } } close $in; @@ -380,6 +423,9 @@ sub loadconfig { # Finally, some useful actions that mr knows about by default. # These can be overridden in ~/.mrconfig. __DATA__ +[alias] + co = checkout + ci = commit [default] lib = \ error() { \ @@ -388,17 +434,17 @@ lib = \ } update = \ if [ -d .svn ]; then \ - svn update; \ + svn update "$@"; \ elif [ -d .git ]; then \ - git pull origin master; \ + git pull origin master "$@"; \ else \ error "unknown repo type"; \ fi status = \ if [ -d .svn ]; then \ - svn status; \ + svn status "$@"; \ elif [ -d .git ]; then \ - git status || true; \ + git status "$@" || true; \ else \ error "unknown repo type"; \ fi @@ -410,3 +456,17 @@ commit = \ else \ error "unknown repo type"; \ fi +diff = \ + if [ -d .svn ]; then \ + svn diff "$@"; \ + elif [ -d .git ]; then \ + git diff "$@"; \ + else \ + error "unknown repo type"; \ + fi +help = \ + if [ ! -e "$MR_PATH" ]; then \ + error "cannot find program path";\ + fi; \ + (pod2man -c mr "$MR_PATH" | man -l -) || \ + error "pod2man or man failed"