X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/d81ade697e3720bb1467c2da088b547b54fba7ae..da4251ccfad6a4ea83fcc21a70f7f7dd26e5fa55:/mr?ds=inline diff --git a/mr b/mr index 29e5fad..95a7fe8 100755 --- a/mr +++ b/mr @@ -1,5 +1,7 @@ #!/usr/bin/perl +#man{{{ + =head1 NAME mr - a Multiple Repository management tool @@ -32,12 +34,12 @@ a set of repositories as if they were one combined respository. It supports any combination of subversion, git, cvs, and bzr repositories, and support for other revision control systems can easily be added. -B cds into and operates on all registered repsitories at or below your +B cds into and operates on all registered repositories 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 +These predefined commands should be fairly familiar to users of any revision control system: =over 4 @@ -72,6 +74,12 @@ Show a diff of uncommitted changes. Show the commit log. +=back + +These commands are also available: + +=over 4 + =item list (or ls) List the repositories that mr will act on. @@ -79,9 +87,12 @@ List the repositories that mr will act on. =item register Register an existing repository in the mrconfig file. By default, the -epository in the current directory is registered, or you can specify a +repository in the current directory is registered, or you can specify a directory to register. +By default it registers it to the ~/.mrconfig file. To make it write to a +different file, use the -c option. + =item config Adds, modifies, removes, or prints a value from the mrconfig file. The next @@ -130,6 +141,11 @@ directory. Be verbose. +=item -s + +Expand the statistics line displayed at the end to include information +about exactly which repositories failed and were skipped, if any. + =back =head1 FILES @@ -175,7 +191,7 @@ environment, where any additional parameters you pass are available in 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. +repository, and "MR_CONFIG" is set to the topmost .mrconfig file used. A few parameters have special meanings: @@ -205,7 +221,7 @@ should avoid chaining from repositories with untrusted committers.) If the "deleted" parameter is set and its command returns nonzero, then B will treat the repository as deleted. It won't ever actually delete -the repository, but it will warn if it sees the repsoitory's directory. +the repository, but it will warn if it sees the repository's directory. This is useful when one mrconfig file is shared amoung multiple machines, to keep track of and remember to delete old repositories. @@ -227,14 +243,22 @@ http://kitenet.net/~joey/code/mr/ =cut +#}}} + use warnings; use strict; use Getopt::Long; use Cwd qw(getcwd abs_path); +$SIG{INT}=sub { + print STDERR "mr: interrupted\n"; + exit 2; +}; + +$ENV{MR_CONFIG}="$ENV{HOME}/.mrconfig"; my $directory=getcwd(); -my $config="$ENV{HOME}/.mrconfig"; my $verbose=0; +my $stats=0; my %config; my %knownactions; my %alias; @@ -242,8 +266,9 @@ my %alias; Getopt::Long::Configure("no_permute"); my $result=GetOptions( "d|directory=s" => sub { $directory=abs_path($_[1]) }, - "c|config=s" => \$config, - "verbose" => \$verbose, + "c|config=s" => sub { $ENV{MR_CONFIG}=abs_path($_[1]) }, + "v|verbose" => \$verbose, + "s|stats" => \$stats, ); if (! $result || @ARGV < 1) { die("Usage: mr [-d directory] action [params ...]\n". @@ -252,7 +277,7 @@ if (! $result || @ARGV < 1) { } loadconfig(\*DATA); -loadconfig($config); +loadconfig($ENV{MR_CONFIG}); #use Data::Dumper; #print Dumper(\%config); @@ -291,8 +316,8 @@ elsif ($action eq 'config') { } my $section=shift; if ($section=~/^\//) { - # try to convert to a path relative to $config's dir - my ($dir)=$config=~/^(.*\/)[^\/]+$/; + # try to convert to a path relative to the config file + my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/; if ($section=~/^\Q$dir\E(.*)/) { $section=$1; } @@ -316,7 +341,7 @@ elsif ($action eq 'config') { } } } - modifyconfig($config, $section, %changefields) if %changefields; + modifyconfig($ENV{MR_CONFIG}, $section, %changefields) if %changefields; exit 0; } elsif ($action eq 'register') { @@ -364,7 +389,7 @@ foreach my $repo (@repos) { action($action, @$repo); } -sub action { +sub action { #{{{ my ($action, $dir, $topdir, $subdir) = @_; my $lib= exists $config{$topdir}{$subdir}{lib} ? @@ -378,10 +403,19 @@ sub action { my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted}; print "mr $action: running deleted test >>$test<<\n" if $verbose; my $ret=system($test); - if ($ret >> 8 == 0) { - print STDERR "mr error: $dir should be deleted yet still exists\n\n"; - push @failed, $dir; - return; + if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: deleted test received signal ".($? & 127)."\n"; + } + if ($ret >> 8 == 0) { + print STDERR "mr error: $dir should be deleted yet still exists\n\n"; + push @failed, $dir; + return; + } } } } @@ -392,7 +426,13 @@ sub action { push @skipped, $dir; return; } + $dir=~s/^(.*)\/[^\/]+\/?$/$1/; + + if (! -d $dir) { + print "mr $action: creating parent directory $dir\n" if $verbose; + my $ret=system("mkdir", "-p", $dir); + } } elsif ($action eq 'update') { if (! -d $dir) { @@ -407,10 +447,20 @@ sub action { "my_action(){ $config{$topdir}{$subdir}{skip}\n }; my_action '$action'"; 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 != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: skip test received signal ".($? & 127)."\n"; + exit 1; + } + if ($ret >> 8 == 0) { + print "mr $action: $dir skipped per config file\n" if $verbose; + push @skipped, $dir; + return; + } } } @@ -435,6 +485,13 @@ sub action { print STDERR "mr $action: running >>$command<<\n" if $verbose; my $ret=system($command); if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: received signal ".($? & 127)."\n"; + } print STDERR "mr $action: failed ($ret)\n" if $verbose; push @failed, $dir; if ($ret >> 8 != 0) { @@ -445,14 +502,20 @@ sub action { } } else { + if ($action eq 'checkout' && ! -d $dir) { + print STDERR "mr $action: $dir missing after checkout\n";; + push @failed, $dir; + return; + } + push @ok, $dir; } print "\n"; } -} +} #}}} -sub showstat { +sub showstat { #{{{ my $count=shift; my $singular=shift; my $plural=shift; @@ -460,7 +523,7 @@ sub showstat { return "$count ".($count > 1 ? $plural : $singular); } return; -} +} #}}} if (! @ok && ! @failed && ! @skipped) { die "mr $action: no repositories found to work on\n"; } @@ -469,6 +532,14 @@ print "mr $action: finished (".join("; ", 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; } @@ -478,7 +549,7 @@ elsif (! @ok && @skipped) { exit 0; my %loaded; -sub loadconfig { +sub loadconfig { #{{{ my $f=shift; my @toload; @@ -508,7 +579,10 @@ sub loadconfig { # copy in defaults from first parent my $parent=$dir; - while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) { + while ($parent=~s/^(.*\/)[^\/]+\/?$/$1/) { + if ($parent eq '/') { + $parent=""; + } if (exists $config{$parent} && exists $config{$parent}{DEFAULT}) { $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} }; @@ -523,8 +597,10 @@ sub loadconfig { close $in; my $section; + my $line=0; while (@lines) { $_=shift @lines; + $line++; chomp; next if /^\s*\#/ || /^\s*$/; if (/^\[([^\]]*)\]\s*$/) { @@ -537,6 +613,7 @@ sub loadconfig { # continued value while (@lines && $lines[0]=~/^\s(.+)/) { shift(@lines); + $line++; $value.="\n$1"; chomp $value; } @@ -561,23 +638,34 @@ sub loadconfig { $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"; + -e $dir.$section."/.mrconfig") { + my $ret=system($value); + if ($ret != 0) { + if (($? & 127) == 2) { + print STDERR "mr $action: chain test interrupted\n"; + exit 2; + } + elsif ($? & 127) { + print STDERR "mr $action: chain test received signal ".($? & 127)."\n"; + } + } + else { + push @toload, $dir.$section."/.mrconfig"; + } } } } else { - die "$f line $.: parse error\n"; + die "$f line $line: parse error\n"; } } foreach (@toload) { loadconfig($_); } -} +} #}}} -sub modifyconfig { +sub modifyconfig { #{{{ my $f=shift; # the section to modify or add my $targetsection=shift; @@ -672,10 +760,11 @@ sub modifyconfig { open(my $out, ">", $f) || die "mr: write $f: $!\n"; print $out @out; close $out; -} +} #}}} # Finally, some useful actions that mr knows about by default. # These can be overridden in ~/.mrconfig. +#DATA{{{ __DATA__ [ALIAS] co = checkout @@ -773,21 +862,21 @@ register = error "cannot determine svn url" fi echo "Registering svn url: $url" - mr config "$(pwd)" checkout="svn co $url $basedir" + mr -c "$MR_CONFIG" config "$(pwd)" checkout="svn co $url $basedir" elif [ -d .git ]; then url=$(LANG=C git-config --get remote.origin.url) if [ -z "$url" ]; then error "cannot determine git url" fi echo "Registering git url: $url" - mr config "$(pwd)" checkout="git clone $url $basedir" + mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir" elif [ -d .bzr ]; then url=$(cat .bzr/branch/parent) if [ -z "$url" ]; then error "cannot determine bzr url" fi echo "Registering bzr url: $url" - mr config "$(pwd)" checkout="bzr clone $url $basedir" + mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir" else error "unable to register this repo type" fi @@ -801,3 +890,5 @@ config = ed = echo "A horse is a horse, of course, of course.." T = echo "I pity the fool." +right = echo "Not found." +#}}}