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

diff --git a/mr b/mr
index 4243194..59aab5a 100755
--- a/mr
+++ b/mr
@@ -18,6 +18,10 @@ B<mr> [options] diff
 
 B<mr> [options] log
 
+B<mr> [options] register [repository]
+
+B<mr> [options] config section [parameter=[value] ...]
+
 B<mr> [options] action [params ...]
 
 =head1 DESCRIPTION
@@ -74,6 +78,27 @@ Show the commit log.
 
 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
+directory to register.
+
+=item config
+
+Adds, modifies, removes, or prints a value from the mrconfig file. The next
+parameter is the name of the section the value is in. To add or modify
+values, use one or more instances of "parameter=value". Use "parameter=" to
+remove a parameter. Use just "parameter" to get the value of a parameter.
+
+For example, to add (or edit) a repository in src/foo:
+
+  mr config src/foo checkout="svn co svn://example.com/foo/trunk foo"
+
+To show the command that mr uses to update the repository in src/foo:
+
+  mr config src/foo update
+
 =item help
 
 Displays this help.
@@ -84,10 +109,10 @@ Actions can be abbreviated to any unambiguous subsctring, so
 "mr st" is equivilant to "mr status", and "mr up" is equivilant to "mr
 update"
 
-Additional parameters can be passed to other commands than "commit", they
-will be passed on unchanged to the underlying revision control system.
-This is mostly useful if the repositories mr will act on all use the same
-revision control system.
+Additional parameters can be passed to most commands, and are passed on
+unchanged to the underlying revision control system. This is mostly useful
+if the repositories mr will act on all use the same revision control
+system.
 
 =head1 OPTIONS
 
@@ -158,7 +183,16 @@ A few parameters have special meanings:
 =item skip
 
 If the "skip" parameter is set and its command returns nonzero, then B<mr>
-will skip acting on that repository.
+will skip acting on that repository. The command is passed the action
+name in $1.
+
+Here are two examples. The first skips the repo unless
+mr is run by joey. The second uses the hours_since function
+(included in mr's built-in library) to skip updating the repo unless it's
+been at least 12 hours since the last update.
+
+  skip = test $(whoami) != joey
+  skip = [ "$1" = update ] && [ $(hours_since "$1") -lt 12 ]
 
 =item chain
 
@@ -248,7 +282,48 @@ if (! exists $knownactions{$action}) {
 }
 
 if ($action eq 'help') {
-	exec($config{''}{DEFAULT}{help});
+	exec($config{''}{DEFAULT}{$action}) || die "exec: $!";
+}
+elsif ($action eq 'config') {
+	if (@ARGV < 2) {
+		die "mr config: not enough parameters\n";
+	}
+	my $section=shift;
+	if ($section=~/^\//) {
+		# try to convert to a path relative to $config's dir
+		my ($dir)=$config=~/^(.*\/)[^\/]+$/;
+		if ($section=~/^\Q$dir\E(.*)/) {
+			$section=$1;
+		}
+	}
+	my %changefields;
+	foreach (@ARGV) {
+		if (/^([^=]+)=(.*)$/) {
+			$changefields{$1}=$2;
+		}
+		else {
+			my $found=0;
+			foreach my $topdir (sort keys %config) {
+				if (exists $config{$topdir}{$section} &&
+				    exists $config{$topdir}{$section}{$_}) {
+					print $config{$topdir}{$section}{$_}."\n";
+					$found=1;
+				}
+			}
+			if (! $found) {
+				die "mr $action: $section $_ not set\n";
+			}
+		}
+	}
+	modifyconfig($config, $section, %changefields) if %changefields;
+	exit 0;
+}
+elsif ($action eq 'register') {
+	my $command="set -e; ".$config{''}{DEFAULT}{lib}."\n".
+		"my_action(){ $config{''}{DEFAULT}{$action}\n }; my_action ".
+		join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
+	print STDERR "mr $action: running >>$command<<\n" if $verbose;
+	exec($command) || die "exec: $!";
 }
 
 # work out what repos to act on
@@ -296,7 +371,7 @@ sub action {
 
 	if (exists $config{$topdir}{$subdir}{deleted}) {
 		if (! -d $dir) {
-			next;
+			return;
 		}
 		else {
 			my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted};
@@ -327,7 +402,8 @@ sub action {
 	$ENV{MR_REPO}=$dir;
 
 	if (exists $config{$topdir}{$subdir}{skip}) {
-		my $test="set -e;".$lib.$config{$topdir}{$subdir}{skip};
+		my $test="set -e;".$lib.
+			"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) {
@@ -413,7 +489,10 @@ sub loadconfig {
 		$dir="";
 	}
 	else {
-		# $f might be a symlink
+		if (! -e $f) {
+			return;
+		}
+
 		my $absf=abs_path($f);
 		if ($loaded{$absf}) {
 			return;
@@ -493,6 +572,94 @@ sub loadconfig {
 	}
 }
 
+sub modifyconfig {
+	my $f=shift;
+	# the section to modify or add
+	my $targetsection=shift;
+	# fields to change in the section
+	# To remove a field, set its value to "".
+	my %changefields=@_;
+
+	my @lines;
+	my @out;
+
+	if (-e $f) {
+		open(my $in, "<", $f) || die "mr: open $f: $!\n";
+		@lines=<$in>;
+		close $in;
+	}
+
+	my $addfields=sub {
+		my @blanks;
+		while ($out[$#out] =~ /^\s*$/) {
+			unshift @blanks, pop @out;
+		}
+		foreach my $field (sort keys %changefields) {
+			if (length $changefields{$field}) {
+				push @out, "$field = $changefields{$field}\n";
+			}
+		}
+		push @out, @blanks;
+	};
+
+	my $section;
+	while (@lines) {
+		$_=shift(@lines);
+
+		if (/^\s*\#/ || /^\s*$/) {
+			push @out, $_;
+		}
+		elsif (/^\s*\[([^\]]*)\]\s*$/) {
+			if (defined $section && 
+			    $section eq $targetsection) {
+				$addfields->();
+			}
+
+			$section=$1;
+
+			push @out, $_;
+		}
+		elsif (/^\s*(\w+)\s*=\s(.*)/) {
+			my $parameter=$1;
+			my $value=$2;
+
+			# continuation line
+			while ($value=~/(.*\\)$/s) {
+				$value=$1."\n".shift(@lines);
+				chomp $value;
+			}
+
+			if ($section eq $targetsection) {
+				if (exists $changefields{$parameter}) {
+					if (length $changefields{$parameter}) {
+						$value=$changefields{$parameter};
+					}
+					delete $changefields{$parameter};
+				}
+			}
+
+			push @out, "$parameter = $value\n";
+		}
+	}
+
+	if (defined $section && 
+	    $section eq $targetsection) {
+			$addfields->();
+	}
+	elsif (%changefields) {
+		push @out, "\n[$targetsection]\n";
+		foreach my $field (sort keys %changefields) {
+			if (length $changefields{$field}) {
+				push @out, "$field = $changefields{$field}\n";
+			}
+		}
+	}
+
+	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__
@@ -502,79 +669,122 @@ __DATA__
 	ls = list
 
 [DEFAULT]
-lib =							\
-	error() {					\
-		echo "mr: $@" >&2			\
-		exit 1					\
+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"		\
+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"		\
+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
-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"		\
+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
-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"		\
+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
+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"		\
 	fi
 list = true
-
-help =							\
-	if [ ! -e "$MR_PATH" ]; then			\
-		error "cannot find program path"	\
-	fi						\
-	(pod2man -c mr "$MR_PATH" | man -l -) ||	\
+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.."