X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/9a651e120c51251ab679934557923114ac141ed2..166ff8a840ca4e98ab03305dc10c86e5f28e5554:/mr?ds=inline

diff --git a/mr b/mr
index d7905b6..44ff395 100755
--- a/mr
+++ b/mr
@@ -90,6 +90,9 @@ Register an existing repository in the mrconfig file. By default, the
 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
@@ -143,6 +146,11 @@ Be verbose.
 Expand the statistics line displayed at the end to include information
 about exactly which repositories failed and were skipped, if any.
 
+=item -n
+
+Just operate on the repository for the current directory, do not 
+recurse into deeper repositories.
+
 =back
 
 =head1 FILES
@@ -196,7 +204,7 @@ A few parameters have special meanings:
 
 =item skip
 
-If the "skip" parameter is set and its command returns nonzero, then B<mr>
+If the "skip" parameter is set and its command returns true, then B<mr>
 will skip acting on that repository. The command is passed the action
 name in $1.
 
@@ -210,13 +218,13 @@ been at least 12 hours since the last update.
 
 =item chain
 
-If the "chain" parameter is set and its command returns nonzero, then B<mr>
+If the "chain" parameter is set and its command returns true, 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.)
 
 =item deleted
 
-If the "deleted" parameter is set and its command returns nonzero, then
+If the "deleted" parameter is set and its command returns true, then
 B<mr> will treat the repository as deleted. It won't ever actually delete
 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,
@@ -247,10 +255,16 @@ 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 $verbose=0;
 my $stats=0;
+my $no_recurse=0;
 my %config;
 my %knownactions;
 my %alias;
@@ -258,9 +272,10 @@ my %alias;
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
 	"d|directory=s" => sub { $directory=abs_path($_[1]) },
-	"c|config=s" => \$ENV{MR_CONFIG},
+	"c|config=s" => sub { $ENV{MR_CONFIG}=abs_path($_[1]) },
 	"v|verbose" => \$verbose,
 	"s|stats" => \$stats,
+	"n|no-recurse" => \$no_recurse,
 );
 if (! $result || @ARGV < 1) {
 	die("Usage: mr [-d directory] action [params ...]\n".
@@ -308,7 +323,7 @@ elsif ($action eq 'config') {
 	}
 	my $section=shift;
 	if ($section=~/^\//) {
-		# try to convert to a path relative to $config's dir
+		# try to convert to a path relative to the config file
 		my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
 		if ($section=~/^\Q$dir\E(.*)/) {
 			$section=$1;
@@ -354,7 +369,8 @@ foreach my $topdir (sort keys %config) {
 		my $d=$directory;
 		$dir.="/" unless $dir=~/\/$/;
 		$d.="/" unless $d=~/\/$/;
-		next if $dir ne $directory && $dir !~ /^\Q$directory\E/;
+		next if $no_recurse && $d ne $dir;
+		next if $dir ne $d && $dir !~ /^\Q$d\E/;
 		push @repos, [$dir, $topdir, $subdir];
 	}
 }
@@ -388,18 +404,29 @@ sub action { #{{{
 	                $config{$topdir}{$subdir}{lib}."\n" : "";
 
 	if (exists $config{$topdir}{$subdir}{deleted}) {
-		if (! -d $dir) {
-			return;
+		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 != 0) {
+			if (($? & 127) == 2) {
+				print STDERR "mr $action: interrupted\n";
+				exit 2;
+			}
+			elsif ($? & 127) {
+				print STDERR "mr $action: deleted test received signal ".($? & 127)."\n";
+			}
 		}
-		else {
-			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) {
+		if ($ret >> 8 == 0) {
+			if (-d $dir) {
 				print STDERR "mr error: $dir should be deleted yet still exists\n\n";
 				push @failed, $dir;
 				return;
 			}
+			else {
+				print "mr $action: $dir skipped (as deleted) per config file\n" if $verbose;
+				push @skipped, $dir;
+				return;
+			}
 		}
 	}
 
@@ -409,7 +436,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) {
@@ -424,6 +457,16 @@ 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 != 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;
@@ -452,6 +495,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) {
@@ -497,7 +547,7 @@ if ($stats) {
 		print "mr $action: (skipped: ".join(" ", @skipped).")\n";
 	}
 	if (@failed) {
-		print "mr $action: (failed: ".join(" ", @failed).")\n";
+		print STDERR "mr $action: (failed: ".join(" ", @failed).")\n";
 	}
 }
 if (@failed) {
@@ -598,9 +648,20 @@ 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";
+					}
 			        }
 			}
 		}
@@ -826,6 +887,15 @@ register =
 		fi
 		echo "Registering bzr url: $url"
 		mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir"
+	elif [ -d CVS ]; then
+		repo=$(cat CVS/Repository)
+		root=$(cat CVS/Root)
+		if [ -z "$root" ]; then
+			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 $basedir $repo"
 	else
 		error "unable to register this repo type"
 	fi