From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 26 Oct 2007 02:07:32 +0000 (-0400)
Subject: actions not split by rcs override those that are
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/49414b4e3aa308c2691c2bed417469144d436637?ds=inline;hp=--cc

actions not split by rcs override those that are
---

49414b4e3aa308c2691c2bed417469144d436637
diff --git a/mr b/mr
index e927a12..74d0129 100755
--- a/mr
+++ b/mr
@@ -570,6 +570,10 @@ sub rcs_test { #{{{
 	
 sub findcommand { #{{{
 	my ($action, $dir, $topdir, $subdir) = @_;
+	
+	if (exists $config{$topdir}{$subdir}{$action}) {
+		return $config{$topdir}{$subdir}{$action};
+	}
 
 	my $rcs=rcs_test(@_);
 
@@ -577,9 +581,6 @@ sub findcommand { #{{{
 	    exists $config{$topdir}{$subdir}{$rcs."_".$action}) {
 		return $config{$topdir}{$subdir}{$rcs."_".$action};
 	}
-	elsif (exists $config{$topdir}{$subdir}{$action}) {
-		return $config{$topdir}{$subdir}{$action};
-	}
 	else {
 		return undef;
 	}