X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/589208a7aa520f2cf570caddb2f0b2880e65129a..f096cfec16f6b36046862cdf84c88a426948a6dc:/mr?ds=inline

diff --git a/mr b/mr
index 26c6113..f2e4af5 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(
@@ -172,13 +176,19 @@ loadconfig($config);
 #print Dumper(\%config);
 
 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";
+		}
 	}
 }
 
@@ -201,15 +211,6 @@ foreach my $topdir (sort keys %config) {
 		print "\n" unless $first;
 		$first=0;
 
-		if (exists $config{$topdir}{$subdir}{skip}) {
-			my $ret=system($config{$topdir}{$subdir}{skip});
-			if ($ret >> 8 == 0) {
-				print "mr $action: $dir skipped per config file\n" if $verbose;
-				push @skipped, $dir;
-				next;
-			}
-		}
-
 		action($action, $dir, $topdir, $subdir);
 
 	}
@@ -217,34 +218,45 @@ foreach my $topdir (sort keys %config) {
 
 sub action {
 	my ($action, $dir, $topdir, $subdir) = @_;
+	
+	my $lib= exists $config{$topdir}{$subdir}{lib} ?
+	                $config{$topdir}{$subdir}{lib} : "";
 
 	if ($action eq 'checkout') {
 		if (-d $dir) {
-			print "mr $action: $dir already exists, skipping checkout\n";
+			print "mr $action: $dir already exists, skipping checkout\n" if $verbose;
 			push @skipped, $dir;
 			return;
 		}
 		$dir=~s/^(.*)\/[^\/]+\/?$/$1/;
 	}
-	if ($action eq 'update') {
+	elsif ($action eq 'update') {
 		if (! -d $dir) {
 			return action("checkout", $dir, $topdir, $subdir);
 		}
 	}
-
+	
 	if (! chdir($dir)) {
 		print STDERR "mr $action: failed to chdir to $dir: $!\n";
 		push @skipped, $dir;
 	}
-	elsif (! exists $config{$topdir}{$subdir}{$action}) {
+
+	if (exists $config{$topdir}{$subdir}{skip}) {
+		my $ret=system($lib.$config{$topdir}{$subdir}{skip});
+		if ($ret >> 8 == 0) {
+			print "mr $action: $dir skipped per config file\n" if $verbose;
+			push @skipped, $dir;
+			return;
+		}
+	}
+
+	if (! exists $config{$topdir}{$subdir}{$action}) {
 		print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
 		push @skipped, $dir;
 	}
 	else {
 		print "mr $action: in $dir\n";
-		my $command="set -e; ".
-			(exists $config{$topdir}{$subdir}{lib} ?
-				$config{$topdir}{$subdir}{lib} : "").
+		my $command="set -e; ".$lib.
 			"my_action(){ $config{$topdir}{$subdir}{$action} ; }; my_action ".
 			join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
 		my $ret=system($command);
@@ -345,28 +357,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;
@@ -379,6 +394,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() { \