X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/ef1db305643600d7f7cb21e60d57c01c428e7a4e..af1ece782ef8ad328a97bed416a2793f9c56fc35:/mr?ds=sidebyside

diff --git a/mr b/mr
index 4243194..8eb0374 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,21 @@ Show the commit log.
 
 List the repositories that mr will act on.
 
+=item register
+
+The next parameter is the directory of an existing repository. The
+repository will be registered in the mrconfig file.
+
+=item config
+
+Modifies the mrconfig file. The next parameter is the name of the section
+to add or modify, and it is followed by one or more instances of
+"parameter=value". Use "parameter=" to remove 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"
+
 =item help
 
 Displays this help.
@@ -84,10 +103,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
 
@@ -248,7 +267,38 @@ 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 %fields;
+	foreach (@ARGV) {
+		if (/^([^=]+)=(.*)$/) {
+			$fields{$1}=$2;
+		}
+		else {
+			die "mr config: expected parameter=value, not \"$_\"\n";
+		}
+	}
+	modifyconfig($config, $section, %fields);
+	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
@@ -413,7 +463,6 @@ sub loadconfig {
 		$dir="";
 	}
 	else {
-		# $f might be a symlink
 		my $absf=abs_path($f);
 		if ($loaded{$absf}) {
 			return;
@@ -493,6 +542,85 @@ 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;
+	if (-e $f) {
+		open(my $in, "<", $f) || die "mr: open $f: $!\n";
+		@lines=<$in>;
+		close $in;
+	}
+
+	my $section;
+	my @out;
+	while (@lines) {
+		$_=shift(@lines);
+
+		if (/^\s*\#/ || /^\s*$/) {
+			push @out, $_;
+		}
+		elsif (/^\s*\[([^\]]*)\]\s*$/) {
+			if (defined $section && 
+			    $section eq $targetsection) {
+				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;
+			}
+
+			$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 (%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__
@@ -568,8 +696,32 @@ log =							\
 	else						\
 		error "unknown repo type"		\
 	fi
+register =								\
+	if [ -z "$1" ]; then						\
+		error "repository directory not specified"		\
+	fi								\
+	cd "$1"								\
+	basedir="$(basename $(pwd))"					\
+	if [ -d .svn ]; then						\
+		url=$(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=$(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"	\
+	else								\
+		error "unable to register this repo type"		\
+	fi
 list = true
-
+config = 
 help =							\
 	if [ ! -e "$MR_PATH" ]; then			\
 		error "cannot find program path"	\