From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 11 Oct 2007 21:25:28 +0000 (-0400)
Subject: support absolute paths to repos
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/6ebadb2ec2e244911d754a97d493ed8f967c7e78?ds=sidebyside;hp=-c

support absolute paths to repos
---

6ebadb2ec2e244911d754a97d493ed8f967c7e78
diff --git a/mr b/mr
index b35a3b7..04a5cbf 100755
--- a/mr
+++ b/mr
@@ -133,8 +133,10 @@ come after it.
 The "ALIAS" section allows adding aliases for actions. Each parameter
 is an alias, and its value is the action to use.
 
-All other sections specify where each repository is located, relative to the
-directory that contains the .mrconfig file.
+All other sections add repositories. The section header specifies the
+directory where the repository is located. This is relative to the directory
+that contains the mrconfig file, but you can also choose to use absolute
+paths.
 
 Within a section, each parameter defines a shell command to run to handle a
 given action. mr contains default handlers for the "update", "status", and
@@ -247,8 +249,11 @@ my $nochdir=0;
 foreach my $topdir (sort keys %config) {
 	foreach my $subdir (sort keys %{$config{$topdir}}) {
 		next if $subdir eq 'DEFAULT';
-		my $dir=$topdir.$subdir;
-		next if $dir ne $directory && $dir !~ /^\Q$directory\E\//;
+		my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+		my $d=$directory;
+		$dir.="/" unless $dir=~/\/$/;
+		$d.="/" unless $d=~/\/$/;
+		next if $dir ne $directory && $dir !~ /^\Q$directory\E/;
 		push @repos, [$dir, $topdir, $subdir];
 	}
 }
@@ -257,7 +262,7 @@ if (! @repos) {
 	LEAF: foreach my $topdir (reverse sort keys %config) {
 		foreach my $subdir (reverse sort keys %{$config{$topdir}}) {
 			next if $subdir eq 'DEFAULT';
-			my $dir=$topdir.$subdir;
+			my $dir=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
 			my $d=$directory;
 			$dir.="/" unless $dir=~/\/$/;
 			$d.="/" unless $d=~/\/$/;
@@ -330,7 +335,7 @@ sub action {
 		my $ret=system($command);
 		if ($ret != 0) {
 			print STDERR "mr $action: failed ($ret)\n" if $verbose;
-			push @failed, $topdir.$subdir;
+			push @failed, $dir;
 			if ($ret >> 8 != 0) {
 				print STDERR "mr $action: command failed\n";
 			}
diff --git a/mrconfig b/mrconfig
index 28a68b0..f70ff9b 100644
--- a/mrconfig
+++ b/mrconfig
@@ -8,12 +8,16 @@ cleanup = if [ -d "$MR_REPO"/.svn ]; then svn cleanup ; fi
 #   large)
 # - mylaptop only succeeds if it's on my main development laptop, which 
 #   gets lots of extra cruft
+# - kite only succeeds on kite
 lib = \
 	wantsrc() { \
 		test "$(whoami)" = joey; \
 	}; \
 	mylaptop() { \
 		test "$(hostname)" = kodama; \
+	}; \
+	kite() { \
+		test "$(hostname)" = wren; \
 	}
 
 [src/mr]