X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/a992ce8dba8c624d6266cb29a59280895ba51947..b33e29ce2ef806666f8bf7bee68abd97aa191076:/mr

diff --git a/mr b/mr
index 59aab5a..50564f7 100755
--- a/mr
+++ b/mr
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+#man{{{
+
 =head1 NAME
 
 mr - a Multiple Repository management tool
@@ -26,20 +28,18 @@ B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
 
-B<mr> is a Multiple Repository management tool. It allows you to register a
-set of repositories in a .mrconfig file, and then checkout, update, or
-perform other actions on the repositories as if they were one big
-respository.
-
-Any mix of revision control systems can be used with B<mr>, and you can
-define arbitrary actions for commands like "update", "checkout", or "commit".
+B<mr> is a Multiple Repository management tool. It
+can checkout, update, or perform other actions on
+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<mr> cds into and operates on all registered repsitories 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
@@ -74,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.
@@ -132,6 +138,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
@@ -147,10 +158,13 @@ Here is an example .mrconfig file:
   chain = true
 
   [src/linux-2.6]
-  checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+  checkout = git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git &&
+  	cd linux-2.6 &&
+  	git checkout -b mybranch origin/master
 
 The .mrconfig file uses a variant of the INI file format. Lines starting with
-"#" are comments. Lines ending with "\" are continued on to the next line.
+"#" are comments. Values can be continued to the following line by
+indenting the line with whitespace.
 
 The "DEFAULT" section allows setting default values for the sections that
 come after it.
@@ -174,7 +188,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:
 
@@ -226,14 +240,17 @@ http://kitenet.net/~joey/code/mr/
 
 =cut
 
+#}}}
+
 use warnings;
 use strict;
 use Getopt::Long;
 use Cwd qw(getcwd abs_path);
 
+$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;
@@ -241,8 +258,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" => \$ENV{MR_CONFIG},
+	"v|verbose" => \$verbose,
+	"s|stats" => \$stats,
 );
 if (! $result || @ARGV < 1) {
 	die("Usage: mr [-d directory] action [params ...]\n".
@@ -251,7 +269,7 @@ if (! $result || @ARGV < 1) {
 }
 
 loadconfig(\*DATA);
-loadconfig($config);
+loadconfig($ENV{MR_CONFIG});
 #use Data::Dumper;
 #print Dumper(\%config);
 
@@ -291,7 +309,7 @@ elsif ($action eq 'config') {
 	my $section=shift;
 	if ($section=~/^\//) {
 		# try to convert to a path relative to $config's dir
-		my ($dir)=$config=~/^(.*\/)[^\/]+$/;
+		my ($dir)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
 		if ($section=~/^\Q$dir\E(.*)/) {
 			$section=$1;
 		}
@@ -315,7 +333,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') {
@@ -358,12 +376,12 @@ if (! @repos) {
 	$nochdir=1;
 }
 
-my (@failed, @successful, @skipped);
+my (@failed, @ok, @skipped);
 foreach my $repo (@repos) {
 	action($action, @$repo);
 }
 
-sub action {
+sub action { #{{{
 	my ($action, $dir, $topdir, $subdir) = @_;
 	
 	my $lib= exists $config{$topdir}{$subdir}{lib} ?
@@ -444,14 +462,20 @@ sub action {
 			}
 		}
 		else {
-			push @successful, $dir;
+			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;
@@ -459,25 +483,33 @@ sub showstat {
 		return "$count ".($count > 1 ? $plural : $singular);
 	}
 	return;
-}
-if (! @successful && ! @failed && ! @skipped) {
+} #}}}
+if (! @ok && ! @failed && ! @skipped) {
 	die "mr $action: no repositories found to work on\n";
 }
 print "mr $action: finished (".join("; ",
-	showstat($#successful+1, "successful", "successful"),
+	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 "mr $action: (failed: ".join(" ", @failed).")\n";
+	}
+}
 if (@failed) {
 	exit 1;
 }
-elsif (! @successful && @skipped) {
+elsif (! @ok && @skipped) {
 	exit 1;
 }
 exit 0;
 
 my %loaded;
-sub loadconfig {
+sub loadconfig { #{{{
 	my $f=shift;
 
 	my @toload;
@@ -485,8 +517,8 @@ sub loadconfig {
 	my $in;
 	my $dir;
 	if (ref $f eq 'GLOB') {
-		$in=$f;	
 		$dir="";
+		$in=$f;	
 	}
 	else {
 		if (! -e $f) {
@@ -499,8 +531,6 @@ sub loadconfig {
 		}
 		$loaded{$absf}=1;
 
-		print "mr: loading config $f\n" if $verbose;
-		open($in, "<", $f) || die "mr: open $f: $!\n";
 		($dir)=$f=~/^(.*\/)[^\/]+$/;
 		if (! defined $dir) {
 			$dir=".";
@@ -509,29 +539,42 @@ 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}} };
 				last;
 			}
 		}
+		
+		print "mr: loading config $f\n" if $verbose;
+		open($in, "<", $f) || die "mr: open $f: $!\n";
 	}
+	my @lines=<$in>;
+	close $in;
 
 	my $section;
-	while (<$in>) {
+	my $line=0;
+	while (@lines) {
+		$_=shift @lines;
+		$line++;
 		chomp;
 		next if /^\s*\#/ || /^\s*$/;
-		if (/^\s*\[([^\]]*)\]\s*$/) {
+		if (/^\[([^\]]*)\]\s*$/) {
 			$section=$1;
 		}
-		elsif (/^\s*(\w+)\s*=\s*(.*)/) {
+		elsif (/^(\w+)\s*=\s*(.*)/) {
 			my $parameter=$1;
 			my $value=$2;
 
-			# continuation line
-			while ($value=~/(.*)\\$/s) {
-				$value=$1."\n".<$in>;
+			# continued value
+			while (@lines && $lines[0]=~/^\s(.+)/) {
+				shift(@lines);
+				$line++;
+				$value.="\n$1";
 				chomp $value;
 			}
 
@@ -562,17 +605,16 @@ sub loadconfig {
 			}
 		}
 		else {
-			die "$f line $.: parse error\n";
+			die "$f line $line: parse error\n";
 		}
 	}
-	close $in;
 
 	foreach (@toload) {
 		loadconfig($_);
 	}
-}
+} #}}}
 
-sub modifyconfig {
+sub modifyconfig { #{{{
 	my $f=shift;
 	# the section to modify or add
 	my $targetsection=shift;
@@ -589,6 +631,13 @@ sub modifyconfig {
 		close $in;
 	}
 
+	my $formatfield=sub {
+		my $field=shift;
+		my @value=split(/\n/, shift);
+
+		return "$field = ".shift(@value)."\n".
+			join("", map { "\t$_\n" } @value);
+	};
 	my $addfields=sub {
 		my @blanks;
 		while ($out[$#out] =~ /^\s*$/) {
@@ -597,6 +646,7 @@ sub modifyconfig {
 		foreach my $field (sort keys %changefields) {
 			if (length $changefields{$field}) {
 				push @out, "$field = $changefields{$field}\n";
+				delete $changefields{$field};
 			}
 		}
 		push @out, @blanks;
@@ -609,7 +659,7 @@ sub modifyconfig {
 		if (/^\s*\#/ || /^\s*$/) {
 			push @out, $_;
 		}
-		elsif (/^\s*\[([^\]]*)\]\s*$/) {
+		elsif (/^\[([^\]]*)\]\s*$/) {
 			if (defined $section && 
 			    $section eq $targetsection) {
 				$addfields->();
@@ -619,13 +669,14 @@ sub modifyconfig {
 
 			push @out, $_;
 		}
-		elsif (/^\s*(\w+)\s*=\s(.*)/) {
+		elsif (/^(\w+)\s*=\s(.*)/) {
 			my $parameter=$1;
 			my $value=$2;
 
-			# continuation line
-			while ($value=~/(.*\\)$/s) {
-				$value=$1."\n".shift(@lines);
+			# continued value
+			while (@lines && $lines[0]=~/^\s(.+)/) {
+				shift(@lines);
+				$value.="\n$1";
 				chomp $value;
 			}
 
@@ -638,19 +689,19 @@ sub modifyconfig {
 				}
 			}
 
-			push @out, "$parameter = $value\n";
+			push @out, $formatfield->($parameter, $value);
 		}
 	}
 
 	if (defined $section && 
 	    $section eq $targetsection) {
-			$addfields->();
+		$addfields->();
 	}
 	elsif (%changefields) {
 		push @out, "\n[$targetsection]\n";
 		foreach my $field (sort keys %changefields) {
 			if (length $changefields{$field}) {
-				push @out, "$field = $changefields{$field}\n";
+				push @out, $formatfield->($field, $changefields{$field});
 			}
 		}
 	}
@@ -658,134 +709,135 @@ 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
-	ci = commit
-	ls = list
+co = checkout
+ci = commit
+ls = list
 
 [DEFAULT]
-lib =									\
-	error() {							\
-		echo "mr: $@" >&2					\
-		exit 1							\
-	}								\
-	hours_since() {							\
-		for dir in .git .svn .bzr CVS; do			\
-			if [ -e "$MR_REPO/$dir" ]; then			\
-				flagfile="$MR_REPO/$dir/.mr_last$1"	\
-				break					\
-			fi						\
-		done							\
-		if [ -z "$flagfile" ]; then				\
-			error "cannot determine flag filename"		\
-		fi							\
-		perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile" \
-		touch "$flagfile"					\
+lib =
+	error() {
+		echo "mr: $@" >&2
+		exit 1
+	}
+	hours_since() {
+		for dir in .git .svn .bzr CVS; do
+			if [ -e "$MR_REPO/$dir" ]; then
+				flagfile="$MR_REPO/$dir/.mr_last$1"
+				break
+			fi
+		done
+		if [ -z "$flagfile" ]; then
+			error "cannot determine flag filename"
+		fi
+		perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile"
+		touch "$flagfile"
 	}
 
-update =								\
-	if [ -d "$MR_REPO"/.svn ]; then					\
-		svn update "$@"						\
-	elif [ -d "$MR_REPO"/.git ]; then				\
-		git pull origin master "$@"				\
-	elif [ -d "$MR_REPO"/.bzr ]; then				\
-		bzr merge "$@"						\
-	elif [ -d "$MR_REPO"/CVS ]; then				\
-		cvs update "$@"						\
-	else								\
-		error "unknown repo type"				\
+update =
+	if [ -d "$MR_REPO"/.svn ]; then
+		svn update "$@"
+	elif [ -d "$MR_REPO"/.git ]; then
+		git pull origin master "$@"
+	elif [ -d "$MR_REPO"/.bzr ]; then
+		bzr merge "$@"
+	elif [ -d "$MR_REPO"/CVS ]; then
+		cvs update "$@"
+	else
+		error "unknown repo type"
+	fi
+status =
+	if [ -d "$MR_REPO"/.svn ]; then
+		svn status "$@"
+	elif [ -d "$MR_REPO"/.git ]; then
+		git status "$@" || true
+	elif [ -d "$MR_REPO"/.bzr ]; then
+		bzr status "$@"
+	elif [ -d "$MR_REPO"/CVS ]; then
+		cvs status "$@"
+	else
+		error "unknown repo type"
+	fi
+commit =
+	if [ -d "$MR_REPO"/.svn ]; then
+		svn commit "$@"
+	elif [ -d "$MR_REPO"/.git ]; then
+		git commit -a "$@" && git push --all
+	elif [ -d "$MR_REPO"/.bzr ]; then
+		bzr commit "$@" && bzr push
+	elif [ -d "$MR_REPO"/CVS ]; then
+		cvs commit "$@"
+	else
+		error "unknown repo type"
 	fi
-status =								\
-	if [ -d "$MR_REPO"/.svn ]; then					\
-		svn status "$@"						\
-	elif [ -d "$MR_REPO"/.git ]; then				\
-		git status "$@" || true					\
-	elif [ -d "$MR_REPO"/.bzr ]; then				\
-		bzr status "$@"						\
-	elif [ -d "$MR_REPO"/CVS ]; then				\
-		cvs status "$@"						\
-	else								\
-		error "unknown repo type"				\
+diff =
+	if [ -d "$MR_REPO"/.svn ]; then
+		svn diff "$@"
+	elif [ -d "$MR_REPO"/.git ]; then
+		git diff "$@"
+	elif [ -d "$MR_REPO"/.bzr ]; then
+		bzr diff "$@"
+	elif [ -d "$MR_REPO"/CVS ]; then
+		cvs diff "$@"
+	else
+		error "unknown repo type"
 	fi
-commit =								\
-	if [ -d "$MR_REPO"/.svn ]; then					\
-		svn commit "$@"						\
-	elif [ -d "$MR_REPO"/.git ]; then				\
-		git commit -a "$@" && git push --all			\
-	elif [ -d "$MR_REPO"/.bzr ]; then				\
-		bzr commit "$@" && bzr push				\
-	elif [ -d "$MR_REPO"/CVS ]; then				\
-		cvs commit "$@"						\
-	else								\
-		error "unknown repo type"				\
+log =
+	if [ -d "$MR_REPO"/.svn ]; then
+		svn log"$@"
+	elif [ -d "$MR_REPO"/.git ]; then
+		git log "$@"
+	elif [ -d "$MR_REPO"/.bzr ]; then
+		bzr log "$@"
+	elif [ -d "$MR_REPO"/CVS ]; then
+		cvs log "$@"
+	else
+		error "unknown repo type"
 	fi
-diff =									\
-	if [ -d "$MR_REPO"/.svn ]; then					\
-		svn diff "$@"						\
-	elif [ -d "$MR_REPO"/.git ]; then				\
-		git diff "$@"						\
-	elif [ -d "$MR_REPO"/.bzr ]; then				\
-		bzr diff "$@"						\
-	elif [ -d "$MR_REPO"/CVS ]; then				\
-		cvs diff "$@"						\
-	else								\
-		error "unknown repo type"				\
+register =
+	if [ -n "$1" ]; then
+		cd "$1"
 	fi
-log =									\
-	if [ -d "$MR_REPO"/.svn ]; then					\
-		svn log"$@"						\
-	elif [ -d "$MR_REPO"/.git ]; then				\
-		git log "$@"						\
-	elif [ -d "$MR_REPO"/.bzr ]; then				\
-		bzr log "$@"						\
-	elif [ -d "$MR_REPO"/CVS ]; then				\
-		cvs log "$@"						\
-	else								\
-		error "unknown repo type"				\
+	basedir="$(basename $(pwd))"
+	if [ -d .svn ]; then
+		url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
+		if [ -z "$url" ]; then
+			error "cannot determine svn url"
+		fi
+		echo "Registering svn url: $url"
+		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 -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 -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir"
+	else
+		error "unable to register this repo type"
 	fi
-register =								\
-	if [ -n "$1" ]; then						\
-		cd "$1"							\
-	fi								\
-	basedir="$(basename $(pwd))"					\
-	if [ -d .svn ]; then						\
-		url=$(LANG=C svn info . |				\
-		      grep -i ^URL: | cut -d ' ' -f 2)			\
-		if [ -z "$url" ]; then					\
-			error "cannot determine svn url"		\
-		fi							\
-		echo "Registering svn url: $url"			\
-		mr 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"	\
-	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"	\
-	else								\
-		error "unable to register this repo type"		\
+help =
+	if [ ! -e "$MR_PATH" ]; then
+		error "cannot find program path"
 	fi
+	(pod2man -c mr "$MR_PATH" | man -l -) || error "pod2man or man failed"
 list = true
 config = 
-help =									\
-	if [ ! -e "$MR_PATH" ]; then					\
-		error "cannot find program path"			\
-	fi								\
-	(pod2man -c mr "$MR_PATH" | man -l -) ||			\
-		error "pod2man or man failed"
 
 ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
+right = echo "Not found."
+#}}}