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

diff --git a/mr b/mr
index cf5ffc0..f9a208f 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.
 
@@ -247,6 +251,15 @@ If the "chain" parameter is set and its command returns true, then B<mr>
 will try to load a .mrconfig file from the root of the repository. (You
 should avoid chaining from repositories with untrusted committers.)
 
+=item include
+
+If the "include" parameter is set, its command is ran, and should output
+additional mrconfig file content. The content is included as if it were
+part of the including file.
+
+Unlike all other parameters, this parameter does not need to be placed
+within a section.
+
 =item lib
 
 The "lib" parameter can specify some shell code that will be run before each
@@ -414,14 +427,29 @@ elsif ($action eq 'register') {
 			next unless length $topdir;
 			if ($directory=~/^\Q$topdir\E/) {
 				$ENV{MR_CONFIG}=$configfiles{$topdir};
+				$directory=$topdir;
 				last;
 			}
 		}
 	}
-	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", $ENV{MR_CONFIG}, $directory, 'DEFAULT');
+	if (! defined $command) {
+		die "mr $action: unknown repository type\n";
+	}
+
+	$ENV{MR_REPO}=~s/.*\/(.*)/$1/;
+	$command="set -e; ".$config{$ENV{MR_CONFIG}}{$directory}{lib}."\n".
+		"my_action(){ $command\n }; my_action ".
 		join(" ", map { s/\//\/\//g; s/"/\"/g; '"'.$_.'"' } @ARGV);
-	print STDERR "mr $action: running >>$command<<\n" if $verbose;
+	print "mr $action: running >>$command<<\n" if $verbose;
 	exec($command) || die "exec: $!";
 }
 
@@ -517,17 +545,20 @@ sub rcs_test { #{{{
 	my ($action, $dir, $topdir, $subdir) = @_;
 
 	my $test="set -e\n";
-	foreach my $rcs_test (grep { /_test/ } keys %{$config{$topdir}{$subdir}}) {
+	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(){ $config{$topdir}{$subdir}{$rcs_test}\n }\n".$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;
-	$ENV{MR_REPO}=$dir;
-	$ENV{MR_CONFIG}=$configfiles{$topdir};
 	my $rcs=`$test`;
 	chomp $rcs;
 	if (! length $rcs) {
@@ -540,6 +571,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(@_);
 
@@ -547,9 +582,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;
 	}
@@ -634,7 +666,7 @@ sub 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;
+		print "mr $action: running >>$command<<\n" if $verbose;
 		my $ret=system($command);
 		if ($ret != 0) {
 			if (($? & 127) == 2) {
@@ -839,6 +871,12 @@ sub loadconfig { #{{{
 				chomp $value;
 			}
 
+			if ($parameter eq "include") {
+				print "mr: including output of \"$value\"\n" if $verbose;
+				unshift @lines, `$value`;
+				next;
+			}
+
 			if (! defined $section) {
 				die "$f line $.: parameter ($parameter) not in section\n";
 			}
@@ -856,7 +894,12 @@ sub loadconfig { #{{{
 			}
 			else {
 				$config{$dir}{$section}{$parameter}=$value;
-				$knownactions{$parameter}=1 if $parameter !~ /_/;
+				if ($parameter =~ /.*_(.*)/) {
+					$knownactions{$1}=1;
+				}
+				else {
+					$knownactions{$parameter}=1;
+				}
 				if ($parameter eq 'chain' &&
 				    length $dir && $section ne "DEFAULT" &&
 				    -e $dir.$section."/.mrconfig") {
@@ -995,7 +1038,6 @@ ls = list
 [DEFAULT]
 order = 10
 lib =
-	PWD="$pwd"
 	error() {
 		echo "mr: $@" >&2
 		exit 1
@@ -1027,25 +1069,6 @@ 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
-	}
 
 svn_test = test -d "$MR_REPO"/.svn
 git_test = test -d "$MR_REPO"/.git
@@ -1053,17 +1076,13 @@ 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
 
 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"
+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 "$@"
@@ -1077,24 +1096,14 @@ 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
+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
 
 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 "$@"
+git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"
 cvs_diff = cvs diff "$@"
 hg_diff  = hg diff "$@"
@@ -1106,91 +1115,52 @@ bzr_log = bzr log "$@"
 cvs_log = cvs log "$@"
 hg_log  = hg log "$@"
 darcs_log = darcs changes "$@"
+git_bare_log = git log "$@"
 
 svn_register =
-	if [ -n "$1" ]; then
-		cd "$1"
-	fi
-	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"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
-	if [ -n "$1" ]; then
-		cd "$1"
-	fi
-	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)"
+	url="$(LANG=C git-config --get remote.origin.url)" || true
 	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"
+	echo "Registering git url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
-	if [ -n "$1" ]; then
-		cd "$1"
-	fi
-	basedir="${PWD##*/}"
 	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"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr clone '$url' '$MR_REPO'"
 cvs_register =
-	if [ -n "$1" ]; then
-		cd "$1"
-	fi
-	basedir="${PWD##*/}"
 	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"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d '$MR_REPO' '$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"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone '$url' '$MR_REPO'"
 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"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$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
+	echo "Registering git url: $url in $MR_CONFIG"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'"
 
 help =
 	if [ ! -e "$MR_PATH" ]; then