X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/19919a98a8382dcc8723a0fb01b4a674f2c25214..22abbafff6704623678e9c65b7aaa5f2a6339fb0:/mr

diff --git a/mr b/mr
index 0a50a33..4c4d267 100755
--- a/mr
+++ b/mr
@@ -563,7 +563,9 @@ sub action { #{{{
 			print "mr $action: $topdir$subdir\n";
 		}
 		else {
-			print "mr $action: $topdir$subdir (in subdir $directory)\n";
+			my $s=$directory;
+			$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 ".
@@ -954,118 +956,173 @@ 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 "$@"
-	else
-		error "unknown repo type"
-	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 =
-	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"
-	fi
+	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 =
-	if [ -d "$MR_REPO"/.svn ]; then
-		svn commit "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
+	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
-	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 -m "$@" && darcs push
-	else
-		error "unknown repo type"
-	fi
+		;;
+	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 =
-	if [ -d "$MR_REPO"/.svn ]; then
-		svn diff "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
+	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 "$@"
-	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"
-	fi
+		;;
+	bzr) bzr diff "$@";;
+	CVS) cvs diff "$@";;
+	hg) hg diff "$@";;
+	darcs) darcs diff "$@";;
+	*) error "unknown repo type";;
+	esac
+
 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"
-	fi
+	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";;
+	esac
+
 register =
 	if [ -n "$1" ]; then
 		cd "$1"
 	fi
 	basedir="$(basename $(pwd))"
-	if [ -d .svn ]; then
+	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"
-	elif [ -d .git ]; then
-		url=$(LANG=C git-config --get remote.origin.url)
+		;;
+	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
-		echo "Registering git url: $url in $MR_CONFIG"
+		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"
-	elif [ -d .bzr ]; then
+		;;
+	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"
-	elif [ -d CVS ]; then
+		;;
+	CVS)
 		repo=$(cat CVS/Repository)
 		root=$(cat CVS/Root)
 		if [ -z "$root" ]; then
@@ -1074,19 +1131,22 @@ register =
 		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
+		;;
+	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"
-	elif [ -d _darcs ]; then
+		;;
+	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"
-	else
-		error "unable to register this repo type"
-	fi
+		;;
+	*) error "unable to register this repo type";;
+	esac
+
 help =
 	if [ ! -e "$MR_PATH" ]; then
 		error "cannot find program path"
@@ -1099,3 +1159,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