X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/51a00c77d7d399ee5bc7493d03d374fc0312975a..21e166fb07013bc42520052d35042651c656cd7f:/mr?ds=sidebyside

diff --git a/mr b/mr
index f8b78c0..577fa85 100755
--- a/mr
+++ b/mr
@@ -30,7 +30,7 @@ control system:
 
 =over 4
 
-=item checkout
+=item checkout (or co)
 
 Checks out all the registered repositories that are not already checked
 out.
@@ -46,7 +46,7 @@ If a repository isn't checked out yet, it will first check it out.
 Displays a status report for each registered repository, showing what
 uncommitted changes are present in the repository.
 
-=item commit
+=item commit (or ci)
 
 Commits changes to each registered repository. (By default, changes
 are pushed to the remote repository too, when using distributed systems
@@ -115,6 +115,9 @@ and is overridden by the contents of other sections. mr contains default
 handlers for the "update", "status", and "commit" actions, so normally
 you only need to specify what to do for "checkout".
 
+The "alias" section allows adding aliases for commands. Each parameter
+is an alias, and its value is the command to run.
+
 For example:
 
   [src]
@@ -155,6 +158,7 @@ my $config="$ENV{HOME}/.mrconfig";
 my $verbose=0;
 my %config;
 my %knownactions;
+my %alias;
 
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
@@ -171,14 +175,30 @@ loadconfig($config);
 #use Data::Dumper;
 #print Dumper(\%config);
 
+# alias expansion and command stemming
 my $action=shift @ARGV;
-if (! $knownactions{$action}) {
-	my @matches = grep { /^\Q$action\E/ } keys %knownactions;
-	if (@matches == 1) {
-		$action=$matches[0];
+if (! exists $knownactions{$action}) {
+	if (exists $alias{$action}) {
+		$action=$alias{$action};
 	}
 	else {
-		die "mr: ambiguous action \"$action\" (matches @matches)\n";
+		my @matches = grep { /^\Q$action\E/ }
+			keys %knownactions, keys %alias;
+		if (@matches == 1) {
+			$action=$matches[0];
+		}
+		else {
+			die "mr: ambiguous action \"$action\" (matches @matches)\n";
+		}
+	}
+}
+
+# handle being in a subdir of a repository
+foreach my $topdir (sort keys %config) {
+	foreach my $subdir (sort keys %{$config{$topdir}}) {
+		if ($directory =~ /^\Q$topdir$subdir\E\//) {
+			$directory=$topdir.$subdir;
+		}
 	}
 }
 
@@ -193,8 +213,6 @@ foreach my $topdir (sort keys %config) {
 		if (defined $directory &&
 		    $dir ne $directory &&
 		    $dir !~ /^\Q$directory\E\//) {
-			print "mr $action: $dir skipped per -d parameter ($directory)\n" if $verbose;
-			push @skipped, $dir;
 			next;
 		}
 
@@ -236,7 +254,7 @@ sub action {
 		if ($ret >> 8 == 0) {
 			print "mr $action: $dir skipped per config file\n" if $verbose;
 			push @skipped, $dir;
-			next;
+			return;
 		}
 	}
 
@@ -347,28 +365,31 @@ sub loadconfig {
 			if (! defined $section) {
 				die "$f line $.: parameter ($parameter) not in section\n";
 			}
-			if (! exists $config{$dir}{$section} &&
-			      exists $config{$dir}{default}) {
+			if ($section ne 'alias' &&
+			    ! exists $config{$dir}{$section} &&
+			    exists $config{$dir}{default}) {
 				# copy in defaults
 				$config{$dir}{$section}={ %{$config{$dir}{default}} };
 			}
-			if ($parameter ne 'lib') {
-				$config{$dir}{$section}{$parameter}=$value;
-				$knownactions{$parameter}=1;
+			if ($section eq 'alias') {
+				$alias{$parameter}=$value;
+			}
+			elsif ($parameter eq 'lib') {
+				$config{$dir}{$section}{lib}.=$value." ; ";
 			}
 			else {
-				$config{$dir}{$section}{$parameter}.=$value." ; ";
+				$config{$dir}{$section}{$parameter}=$value;
+				$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";
+			        }
 			}
-
-			if ($parameter eq 'chain' &&
-			    length $dir && $section ne "default" &&
-			    -e $dir.$section."/.mrconfig" &&
-		    	    system($value) >> 8 == 0) {
-				push @toload, $dir.$section."/.mrconfig";
-		        }
 		}
 		else {
-				die "$f line $.: parse error\n";
+			die "$f line $.: parse error\n";
 		}
 	}
 	close $in;
@@ -381,6 +402,9 @@ sub loadconfig {
 # Finally, some useful actions that mr knows about by default.
 # These can be overridden in ~/.mrconfig.
 __DATA__
+[alias]
+	co = checkout
+	ci = commit
 [default]
 lib = \
 	error() { \
@@ -389,17 +413,17 @@ lib = \
 	}
 update = \
 	if [ -d .svn ]; then \
-		svn update; \
+		svn update "$@"; \
 	elif [ -d .git ]; then \
-		git pull origin master; \
+		git pull origin master "$@"; \
 	else \
 		error "unknown repo type"; \
 	fi
 status = \
 	if [ -d .svn ]; then \
-		svn status; \
+		svn status "$@"; \
 	elif [ -d .git ]; then \
-		git status || true; \
+		git status "$@" || true; \
 	else \
 		error "unknown repo type"; \
 	fi