X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/d11b6a1b817dbbd24774f158de8e4351b82bfae0..36cda79ee48ec6038e0e3123ff6d679e65f6a6f0:/mr?ds=inline

diff --git a/mr b/mr
index 1253102..cf5ffc0 100755
--- a/mr
+++ b/mr
@@ -255,6 +255,18 @@ to use.
 
 =back
 
+When looking for a command to run for a given action, mr first looks for
+a parameter with the same name as the action. If that is not found, it
+looks for a parameter named "rcs_action" (substituting in the name of the
+revision control system and the action). The name of the revision control
+system is itself determined by running each defined "rcs_test" action,
+until one succeeds.
+
+Internally, mr has settings for "git_update", "svn_update", etc. To change
+the action that is performed for a given revision control system, you can
+override these rcs specific actions. To add a new revision control system,
+you can just add rcs specific actions for it.
+
 =head1 AUTHOR
 
 Copyright 2007 Joey Hess <joey@kitenet.net>
@@ -501,6 +513,48 @@ elsif (! @ok && @skipped) {
 }
 exit 0;
 
+sub rcs_test { #{{{
+	my ($action, $dir, $topdir, $subdir) = @_;
+
+	my $test="set -e\n";
+	foreach my $rcs_test (grep { /_test/ } keys %{$config{$topdir}{$subdir}}) {
+		my ($rcs)=$rcs_test=~/(.*)_test/;
+		$test="my_$rcs_test(){ $config{$topdir}{$subdir}{$rcs_test}\n }\n".$test;
+		$test.="if my_$rcs_test; then echo $rcs; fi\n";
+	}
+	$test=$config{$topdir}{$subdir}{lib}."\n".$test
+		if exists $config{$topdir}{$subdir}{lib};
+	
+	print "mr $action: running rcs test >>$test<<\n" if $verbose;
+	$ENV{MR_REPO}=$dir;
+	$ENV{MR_CONFIG}=$configfiles{$topdir};
+	my $rcs=`$test`;
+	chomp $rcs;
+	if (! length $rcs) {
+		return undef;
+	}
+	else {
+		return $rcs;
+	}
+} #}}}
+	
+sub findcommand { #{{{
+	my ($action, $dir, $topdir, $subdir) = @_;
+
+	my $rcs=rcs_test(@_);
+
+	if (defined $rcs && 
+	    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;
+	}
+} #}}}
+
 sub action { #{{{
 	my ($action, $dir, $topdir, $subdir) = @_;
 
@@ -526,12 +580,15 @@ sub action { #{{{
 			return action("checkout", $dir, $topdir, $subdir);
 		}
 	}
-	
+
 	$ENV{MR_REPO}=$dir;
 
-	if (exists $config{$topdir}{$subdir}{skip}) {
+	my $skiptest=findcommand("skip", $dir, $topdir, $subdir);
+	my $command=findcommand($action, $dir, $topdir, $subdir);
+
+	if (defined $skiptest) {
 		my $test="set -e;".$lib.
-			"my_action(){ $config{$topdir}{$subdir}{skip}\n }; my_action '$action'";
+			"my_action(){ $skiptest\n }; my_action '$action'";
 		print "mr $action: running skip test >>$test<<\n" if $verbose;
 		my $ret=system($test);
 		if ($ret != 0) {
@@ -554,9 +611,16 @@ sub action { #{{{
 		print STDERR "mr $action: failed to chdir to $dir: $!\n";
 		return FAILED;
 	}
-	elsif (! exists $config{$topdir}{$subdir}{$action}) {
-		print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
-		return SKIPPED;
+	elsif (! defined $command) {
+		my $rcs=rcs_test(@_);
+		if (! defined $rcs) {
+			print STDERR "mr $action: unknown repository type and no defined $action command for $topdir$subdir\n";
+			return FAILED;
+		}
+		else {
+			print STDERR "mr $action: no defined $action command for $rcs repository $topdir$subdir, skipping\n";
+			return SKIPPED;
+		}
 	}
 	else {
 		if (! $nochdir) {
@@ -567,8 +631,8 @@ sub action { #{{{
 			$s=~s/^\Q$topdir$subdir\E\/?//;
 			print "mr $action: $topdir$subdir (in subdir $s)\n";
 		}
-		my $command="set -e; ".$lib.
-			"my_action(){ $config{$topdir}{$subdir}{$action}\n }; my_action ".
+		$command="set -e; ".$lib.
+			"my_action(){ $command\n }; my_action ".
 			join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
 		print STDERR "mr $action: running >>$command<<\n" if $verbose;
 		my $ret=system($command);
@@ -792,7 +856,7 @@ sub loadconfig { #{{{
 			}
 			else {
 				$config{$dir}{$section}{$parameter}=$value;
-				$knownactions{$parameter}=1;
+				$knownactions{$parameter}=1 if $parameter !~ /_/;
 				if ($parameter eq 'chain' &&
 				    length $dir && $section ne "DEFAULT" &&
 				    -e $dir.$section."/.mrconfig") {
@@ -931,10 +995,17 @@ ls = list
 [DEFAULT]
 order = 10
 lib =
+	PWD="$pwd"
 	error() {
 		echo "mr: $@" >&2
 		exit 1
 	}
+	warning() {
+		echo "mr (warning): $@" >&2
+	}
+	info() {
+		echo "mr: $@" >&2
+	}
 	hours_since() {
 		if [ -z "$1" ] || [ -z "$2" ]; then
 			error "mr: usage: hours_since action num"
@@ -956,139 +1027,171 @@ lib =
 			exit 1
 		fi
 	}
-
-update =
-	if [ -d "$MR_REPO"/.svn ]; then
-		svn update "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
-		if [ -z "$@" ]; then
-			git pull -t origin master
+	get_git_repo_type()
+	{
+		if [ -d "$1"/.git ] && [ -d "$1"/.git/refs/heads ] &&
+			[ -d "$1"/.git/objects ] && [ -f "$1"/.git/config ];
+			then
+			echo non-bare
+		elif [ -d "$1"/refs/heads ] && [ -d "$1"/refs/tags ] &&
+			[ -d "$1"/objects ] && [ -f "$1"/config ]; then
+			local bare
+			bare="$(GIT_CONFIG="$1"/config git-config --get core.bare)"
+			case "$bare" in
+				true) echo bare;;
+				false) echo fake-bare;;
+				*) return 255;;
+			esac
 		else
-			git pull "$@"
+			return 1
 		fi
-	elif [ -d "$MR_REPO"/.bzr ]; then
-		bzr merge "$@"
-	elif [ -d "$MR_REPO"/CVS ]; then
-		cvs update "$@"
-	elif [ -d "$MR_REPO"/.hg ]; then
-		hg pull "$@" && hg update "$@"
-	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs pull -a "$@"
-	else
-		error "unknown repo type"
+	}
+
+svn_test = test -d "$MR_REPO"/.svn
+git_test = test -d "$MR_REPO"/.git
+bzr_test = test -d "$MR_REPO"/.bzr
+cvs_test = test -d "$MR_REPO"/CVS
+hg_test  = test -d "$MR_REPO"/.hg
+darcs_test = test -d "$MR_REPO"/_darcs
+
+svn_update = svn update "$@"
+git_update = 
+	# all this is because of a bug in git-fetch, which requires GIT_DIR set
+	local git_dir_override; git_dir_override=.git
+	case "$(get_git_repo_type "$MR_REPO")" in
+		fake-bare) git_dir_override="$MR_REPO";;
+	esac
+	args="$@"
+	[ -z "$args" ] && args="-t origin master"
+	eval GIT_DIR="$git_dir_override" git pull "$args"
+bzr_update = bzr merge "$@"
+cvs_update = cvs update "$@"
+hg_update  = hg pull "$@" && hg update "$@"
+darcs_update = darcs pull -a "$@"
+
+svn_status = svn status "$@"
+git_status = git status "$@" || true
+bzr_status = bzr status "$@"
+cvs_status = cvs status "$@"
+hg_status  = hg status "$@"
+darcs_status = darcs whatsnew -ls "$@"
+
+svn_commit = svn commit "$@"
+git_commit = 
+	case "$(get_git_repo_type "$MR_REPO")" in
+		bare) error "cannot commit to bare git repositories";;
+		fake-bare) error "commit does not work for fake bare git repositories (yet).";;
+	esac
+	git commit -a "$@" && git push --all
+bzr_commit = bzr commit "$@" && bzr push
+cvs_commit = cvs commit "$@"
+hg_commit  = hg commit -m "$@" && hg push
+darcs_commit = darcs commit -a -m "$@" && darcs push -a
+
+svn_diff = svn diff "$@"
+git_diff = 
+	case "$(get_git_repo_type "$MR_REPO")" in
+		bare) error "cannot diff in bare git repositories";;
+		fake-bare) error "diff does not work for fake bare git repositories (yet).";;
+	esac
+	git diff "$@"
+bzr_diff = bzr diff "$@"
+cvs_diff = cvs diff "$@"
+hg_diff  = hg diff "$@"
+darcs_diff = darcs diff "$@"
+
+svn_log = svn log "$@"
+git_log = git log "$@"
+bzr_log = bzr log "$@"
+cvs_log = cvs log "$@"
+hg_log  = hg log "$@"
+darcs_log = darcs changes "$@"
+
+svn_register =
+	if [ -n "$1" ]; then
+		cd "$1"
 	fi
-status =
-	if [ -d "$MR_REPO"/.svn ]; then
-		svn status "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
-		git status "$@" || true
-	elif [ -d "$MR_REPO"/.bzr ]; then
-		bzr status "$@"
-	elif [ -d "$MR_REPO"/CVS ]; then
-		cvs status "$@"
-	elif [ -d "$MR_REPO"/.hg ]; then
-		hg status "$@"
-	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs whatsnew -ls "$@"
-	else
-		error "unknown repo type"
+	basedir="${PWD##*/}"
+	url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
+	if [ -z "$url" ]; then
+		error "cannot determine svn url"
+	fi
+	echo "Registering svn url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "$PWD" checkout="svn co $url $basedir"
+git_register = 
+	if [ -n "$1" ]; then
+		cd "$1"
 	fi
-commit =
-	if [ -d "$MR_REPO"/.svn ]; then
-		svn commit "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
-		git commit -a "$@" && git push --all
-	elif [ -d "$MR_REPO"/.bzr ]; then
-		bzr commit "$@" && bzr push
-	elif [ -d "$MR_REPO"/CVS ]; then
-		cvs commit "$@"
-	elif [ -d "$MR_REPO"/.hg ]; then
-		hg commit -m "$@" && hg push
-	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs commit -a -m "$@" && darcs push -a
-	else
-		error "unknown repo type"
+	basedir="${PWD##*/}"
+	local repo_type; repo_type="$(get_git_repo_type .)"
+	local config;
+	case "$repo_type" in
+		non-bare) config=.git/config;;
+		bare|fake-bare) config=config;;
+	esac
+	url="$(LANG=C GIT_CONFIG="$config" git-config --get remote.origin.url)"
+	if [ -z "$url" ]; then
+		error "cannot determine git url"
 	fi
-diff =
-	if [ -d "$MR_REPO"/.svn ]; then
-		svn diff "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
-		git diff "$@"
-	elif [ -d "$MR_REPO"/.bzr ]; then
-		bzr diff "$@"
-	elif [ -d "$MR_REPO"/CVS ]; then
-		cvs diff "$@"
-	elif [ -d "$MR_REPO"/.hg ]; then
-		hg diff "$@"
-	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs diff "$@"
-	else
-		error "unknown repo type"
+	case "$repo_type" in
+		bare|fake-bare)
+			# this seems like a bare repo as it has no
+			# worktree.
+			local work_tree
+			work_tree="$(git-config --get core.worktree)" || :
+			if [ ! -d "$work_tree" ]; then
+				error "git worktree $work_tree does not exist"
+			fi
+			suffix=" (with worktree $work_tree)"
+			mr -c "$MR_CONFIG" config "$PWD" \
+				lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
+			;;
+	esac
+	echo "Registering git url: $url in $MR_CONFIG${suffix:-}"
+	mr -c "$MR_CONFIG" config "$PWD" checkout="git clone $url $basedir"
+bzr_register =
+	if [ -n "$1" ]; then
+		cd "$1"
 	fi
-log =
-	if [ -d "$MR_REPO"/.svn ]; then
-		svn log"$@"
-	elif [ -d "$MR_REPO"/.git ]; then
-		git log "$@"
-	elif [ -d "$MR_REPO"/.bzr ]; then
-		bzr log "$@"
-	elif [ -d "$MR_REPO"/CVS ]; then
-		cvs log "$@"
-	elif [ -d "$MR_REPO"/.hg ]; then
-		hg log "$@"
-	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs changes "$@"
-	else
-		error "unknown repo type"
+	basedir="${PWD##*/}"
+	url=$(cat .bzr/branch/parent)
+	if [ -z "$url" ]; then
+		error "cannot determine bzr url"
 	fi
-register =
+	echo "Registering bzr url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "$PWD" checkout="bzr clone $url $basedir"
+cvs_register =
 	if [ -n "$1" ]; then
 		cd "$1"
 	fi
-	basedir="$(basename $(pwd))"
-	if [ -d .svn ]; then
-		url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
-		if [ -z "$url" ]; then
-			error "cannot determine svn url"
-		fi
-		echo "Registering svn url: $url in $MR_CONFIG"
-		mr -c "$MR_CONFIG" config "$(pwd)" checkout="svn co $url $basedir"
-	elif [ -d .git ]; then
-		url=$(LANG=C git-config --get remote.origin.url)
-		if [ -z "$url" ]; then
-			error "cannot determine git url"
+	basedir="${PWD##*/}"
+	repo=$(cat CVS/Repository)
+	root=$(cat CVS/Root)
+	if [ -z "$root" ]; then
+		error "cannot determine cvs root"
 		fi
-		echo "Registering git url: $url in $MR_CONFIG"
-		mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir"
-	elif [ -d .bzr ]; then
-		url=$(cat .bzr/branch/parent)
-		if [ -z "$url" ]; then
-			error "cannot determine bzr url"
-		fi
-		echo "Registering bzr url: $url in $MR_CONFIG"
-		mr -c "$MR_CONFIG" config "$(pwd)" checkout="bzr clone $url $basedir"
-	elif [ -d CVS ]; then
-		repo=$(cat CVS/Repository)
-		root=$(cat CVS/Root)
-		if [ -z "$root" ]; then
-			error "cannot determine cvs root"
-		fi
-		echo "Registering cvs repository $repo at root $root"
-		mr -c "$MR_CONFIG" config "$(pwd)" \
-			checkout="cvs -d '$root' co -d $basedir $repo"
-	elif [ -d .hg ]; then
-		url=$(hg showconfig paths.default)
-		echo "Registering mercurial repo url: $url in $MR_CONFIG"
-		mr -c "$MR_CONFIG" config "$(pwd)" \
-			checkout="hg clone $url $basedir"
-	elif [ -d _darcs ]; then
-		url=$(cat _darcs/prefs/defaultrepo)
-		echo "Registering darcs repository $url in $MR_CONFIG"
-		mr -c "$MR_CONFIG" config "$(pwd)" \
-			checkout="darcs get $url $basedir"
-	else
-		error "unable to register this repo type"
+	echo "Registering cvs repository $repo at root $root"
+	mr -c "$MR_CONFIG" config "$PWD" \
+		checkout="cvs -d '$root' co -d $basedir $repo"
+hg_register = 
+	if [ -n "$1" ]; then
+		cd "$1"
+	fi
+	basedir="${PWD##*/}"
+	url=$(hg showconfig paths.default)
+	echo "Registering mercurial repo url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "$PWD" \
+		checkout="hg clone $url $basedir"
+darcs_register = 
+	if [ -n "$1" ]; then
+		cd "$1"
 	fi
+	basedir="${PWD##*/}"
+	url=$(cat _darcs/prefs/defaultrepo)
+	echo "Registering darcs repository $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "$PWD" \
+		checkout="darcs get $url $basedir"
+
 help =
 	if [ ! -e "$MR_PATH" ]; then
 		error "cannot find program path"
@@ -1101,3 +1204,5 @@ ed = echo "A horse is a horse, of course, of course.."
 T = echo "I pity the fool."
 right = echo "Not found."
 #}}}
+
+# vim:sw=8:sts=0:ts=8:noet