X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/398033ad68e4cfd347d57a3cbb903dae17ace0f4..bba0730143212b171b7bb9b2bdec04c4fb1aad33:/mr?ds=sidebyside

diff --git a/mr b/mr
index a8d864f..3dbacf0 100755
--- a/mr
+++ b/mr
@@ -209,7 +209,11 @@ directory, since the repository isn't checked out yet. All other commands
 are run inside the repository, though not necessarily at the top of it.
 
 The "MR_REPO" environment variable is set to the path to the top of the
-repository. The "MR_CONFIG" environment variable is set to the .mrconfig file
+repository. (For the "register" action, "MR_REPO" is instead set to the 
+basename of the directory that should be created when checking the
+repository out.)
+
+The "MR_CONFIG" environment variable is set to the .mrconfig file
 that defines the repo being acted on, or, if the repo is not yet in a config
 file, the .mrconfig file that should be modified to register the repo.
 
@@ -255,6 +259,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>
@@ -406,8 +422,22 @@ elsif ($action eq 'register') {
 			}
 		}
 	}
-	my $command="set -e; ".$config{''}{DEFAULT}{lib}."\n".
-		"my_action(){ $config{''}{DEFAULT}{$action}\n }; my_action ".
+	if (@ARGV) {
+		my $subdir=shift @ARGV;
+		if (! chdir($subdir)) {
+			print STDERR "mr $action: failed to chdir to $subdir: $!\n";
+		}
+	}
+
+	$ENV{MR_REPO}=getcwd();
+	my $command=findcommand("register", '', '', 'DEFAULT');
+	if (! defined $command) {
+		die "mr $action: unknown repository type\n";
+	}
+
+	$ENV{MR_REPO}=~s/.*\/(.*)/$1/;
+	$command="set -e; ".$config{''}{DEFAULT}{lib}."\n".
+		"my_action(){ $command\n }; my_action ".
 		join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
 	print STDERR "mr $action: running >>$command<<\n" if $verbose;
 	exec($command) || die "exec: $!";
@@ -501,6 +531,51 @@ elsif (! @ok && @skipped) {
 }
 exit 0;
 
+sub rcs_test { #{{{
+	my ($action, $dir, $topdir, $subdir) = @_;
+
+	my $test="set -e\n";
+	foreach my $rcs_test (
+			sort {
+				length $a <=> length $b 
+				          ||
+				       $a cmp $b
+			} grep { /_test/ } keys %{$config{$topdir}{$subdir}}) {
+		my ($rcs)=$rcs_test=~/(.*)_test/;
+		$test="my_$rcs_test() {\n$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;
+	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 +601,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 +632,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 +652,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 +877,12 @@ sub loadconfig { #{{{
 			}
 			else {
 				$config{$dir}{$section}{$parameter}=$value;
-				$knownactions{$parameter}=1;
+				if ($parameter =~ /.*_(.*)/) {
+					$knownactions{$1}=1;
+				}
+				else {
+					$knownactions{$parameter}=1;
+				}
 				if ($parameter eq 'chain' &&
 				    length $dir && $section ne "DEFAULT" &&
 				    -e $dir.$section."/.mrconfig") {
@@ -931,7 +1021,6 @@ ls = list
 [DEFAULT]
 order = 10
 lib =
-	PWD="$pwd"
 	error() {
 		echo "mr: $@" >&2
 		exit 1
@@ -963,196 +1052,138 @@ lib =
 			exit 1
 		fi
 	}
-	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
-			return 1
-		fi
-	}
-	is_git_repo() {
-		get_git_repo_type "$1" >/dev/null
-	}
-	get_repo_type() {
-		if [ -d "$1"/.svn ]; then
-			echo svn
-		elif is_git_repo "$1"; then
-			echo git
-		elif [ -d "$1"/.bzr ]; then
-			echo bzr
-		elif [ -d "$1"/CVS ]; then
-			echo CVS
-		elif [ -d "$1"/.hg ]; then
-			echo hg
-		elif [ -d "$1"/_darcs ]; then
-			echo darcs
-		else
-			echo unknown
-		fi
-	}
-
-update =
-	case "$(get_repo_type "$MR_REPO")" in
-	svn) svn update "$@";;
-	git)
-		# 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) bzr merge "$@";;
-	CVS) cvs update "$@";;
-	hg) hg pull "$@" && hg update "$@";;
-	darcs) darcs pull -a "$@";;
-	*) error "unknown repo type";;
-	esac
-
-status =
-	case "$(get_repo_type "$MR_REPO")" in
-	svn) svn status "$@";;
-	git) git status "$@" || :;;
-	bzr) bzr status "$@";;
-	CVS) cvs status "$@";;
-	hg) hg status "$@";;
-	darcs) darcs whatsnew -ls "$@";;
-	*) error "unknown repo type";;
-	esac
-
-commit =
-	case "$(get_repo_type "$MR_REPO")" in
-	svn) svn commit "$@";;
-	git)
-		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) bzr commit "$@" && bzr push;;
-	CVS) cvs commit "$@";;
-	hg) hg commit -m "$@" && hg push;;
-	darcs) darcs commit -a -m "$@" && darcs push -a;;
-	*) error "unknown repo type";;
-	esac
-
-diff =
-	case "$(get_repo_type "$MR_REPO")" in
-	svn) svn diff "$@";;
-	git)
-		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) bzr diff "$@";;
-	CVS) cvs diff "$@";;
-	hg) hg diff "$@";;
-	darcs) darcs diff "$@";;
-	*) error "unknown repo type";;
-	esac
 
-log =
-	case "$(get_repo_type "$MR_REPO")" in
-	svn) svn log"$@";;
-	git) git log "$@";;
-	bzr) bzr log "$@";;
-	CVS) cvs log "$@";;
-	hg) hg log "$@";;
-	darcs) darcs changes "$@";;
-	*) 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
+git_bare_test =
+	test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
+	test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
+	test "$(GIT_CONFIG="$MR_REPO"/config git-config --get core.bare)" = true
+git_fake_bare_test = 
+	test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
+	test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
+	test "$(GIT_CONFIG="$MR_REPO"/config git-config --get core.bare)" = false
+
+svn_update = svn update "$@"
+git_update = if [ "$@" ]; then git pull "$@"; else git pull -t origin master; fi
+bzr_update = bzr merge "$@"
+cvs_update = cvs update "$@"
+hg_update  = hg pull "$@" && hg update "$@"
+darcs_update = darcs pull -a "$@"
+git_fake_bare_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
-
-register =
-	if [ -n "$1" ]; then
-		cd "$1"
+	args="$@"
+	[ -z "$args" ] && args="-t origin master"
+	eval GIT_DIR="$git_dir_override" git pull "$args"
+
+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 "$@"
+git_fake_bare_status = git status "$@" || true
+
+svn_commit = svn commit "$@"
+git_commit = 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
+git_fake_bare_commit = error "commit does not work for fake bare git repositories (yet)."
+
+svn_diff = svn diff "$@"
+git_diff = git diff "$@"
+bzr_diff = bzr diff "$@"
+cvs_diff = cvs diff "$@"
+hg_diff  = hg diff "$@"
+darcs_diff = darcs diff "$@"
+git_fake_bare_diff = error "diff does not work for fake bare git repositories (yet)."
+
+svn_log = svn log "$@"
+git_log = git log "$@"
+bzr_log = bzr log "$@"
+cvs_log = cvs log "$@"
+hg_log  = hg log "$@"
+darcs_log = darcs changes "$@"
+git_bare_log = git log "$@"
+git_fake_bare_log = git log "$@"
+
+svn_register =
+	url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
+	if [ -z "$url" ]; then
+		error "cannot determine svn url"
 	fi
-	basedir="$(basename $PWD)"
-	case "$(get_repo_type .)" in
-	svn)
-		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)
-		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
-		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)
-		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"
-		;;
-	CVS)
-		repo=$(cat CVS/Repository)
-		root=$(cat CVS/Root)
-		if [ -z "$root" ]; then
-			error "cannot determine cvs root"
+	echo "Registering svn url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co $url $MR_REPO"
+git_register = 
+	url="$(LANG=C git-config --get remote.origin.url)" || true
+	if [ -z "$url" ]; then
+		error "cannot determine git url"
+	fi
+	echo "Registering git url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone $url $MR_REPO"
+bzr_register =
+	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 $MR_REPO"
+cvs_register =
+	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"
-		;;
-	hg)
-		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)
-		url=$(cat _darcs/prefs/defaultrepo)
-		echo "Registering darcs repository $url in $MR_CONFIG"
-		mr -c "$MR_CONFIG" config "$PWD" \
-			checkout="darcs get $url $basedir"
-		;;
-	*) error "unable to register this repo type";;
-	esac
+	echo "Registering cvs repository $repo at root $root"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d $MR_REPO $repo"
+hg_register = 
+	url=$(hg showconfig paths.default)
+	echo "Registering mercurial repo url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone $url $MR_REPO"
+darcs_register = 
+	url=$(cat _darcs/prefs/defaultrepo)
+	echo "Registering darcs repository $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get $url $MR_REPO"
+git_bare_register = 
+	url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+	if [ -z "$url" ]; then
+		error "cannot determine git url"
+	fi
+	mr -c "$MR_CONFIG" config "`pwd`" \
+		lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
+	echo "Registering git url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare $url $MR_REPO"
+git_fake_bare_register = 
+	url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
+	if [ -z "$url" ]; then
+		error "cannot determine git url"
+	fi
+	worktree="$(git-config --get core.worktree)" || true
+	worktree="${worktree%%/}/"
+	if [ ! -d "$worktree" ]; then
+		error "git worktree $worktree does not exist"
+	fi
+	mr -c "$MR_CONFIG" config "`pwd`" \
+		lib="GIT_WORK_TREE=$work_tree; export GIT_WORK_TREE"
+	echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)"
+	mr -c "$MR_CONFIG" config "`pwd`" \
+	checkout="
+	git clone --no-checkout $url $MR_REPO
+	cd $MR_REPO
+	git read-tree HEAD
+	git checkout-index -a --prefix='$work_tree' || true
+	git config core.worktree '$worktree'"
+	mv .git/* . && rmdir .git"
 
 help =
 	if [ ! -e "$MR_PATH" ]; then