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

diff --git a/mr b/mr
index 0a50a33..b268027 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 ".
@@ -958,12 +960,15 @@ lib =
 update =
 	if [ -d "$MR_REPO"/.svn ]; then
 		svn update "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
+	elif [ -d "$MR_REPO"/.git ] || [ "${MR_REPO%.git/}" != "$MR_REPO" ]; then
+		# this is a bug in git-fetch, which requires GIT_DIR set
+		[ "${MR_REPO%.git/}" != "$MR_REPO" ] && GIT_DIR="$MR_REPO" && export GIT_DIR
 		if [ -z "$@" ]; then
 			git pull -t origin master
 		else
 			git pull "$@"
 		fi
+		unset GIT_DIR
 	elif [ -d "$MR_REPO"/.bzr ]; then
 		bzr merge "$@"
 	elif [ -d "$MR_REPO"/CVS ]; then
@@ -971,14 +976,14 @@ update =
 	elif [ -d "$MR_REPO"/.hg ]; then
 		hg pull "$@" && hg update "$@"
 	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs pull "$@"
+		darcs pull -a "$@"
 	else
 		error "unknown repo type"
 	fi
 status =
 	if [ -d "$MR_REPO"/.svn ]; then
 		svn status "$@"
-	elif [ -d "$MR_REPO"/.git ]; then
+	elif [ -d "$MR_REPO"/.git ] || [ "${MR_REPO%.git/}" != "$MR_REPO" ]; then
 		git status "$@" || true
 	elif [ -d "$MR_REPO"/.bzr ]; then
 		bzr status "$@"
@@ -996,6 +1001,8 @@ commit =
 		svn commit "$@"
 	elif [ -d "$MR_REPO"/.git ]; then
 		git commit -a "$@" && git push --all
+	elif [ "${MR_REPO%.git/}" != "$MR_REPO" ]; then
+		error "commit does not work for fake bare git repositories (yet)."
 	elif [ -d "$MR_REPO"/.bzr ]; then
 		bzr commit "$@" && bzr push
 	elif [ -d "$MR_REPO"/CVS ]; then
@@ -1003,7 +1010,7 @@ commit =
 	elif [ -d "$MR_REPO"/.hg ]; then
 		hg commit -m "$@" && hg push
 	elif [ -d "$MR_REPO"/_darcs ]; then
-		darcs commit -m "$@" && darcs push
+		darcs commit -a -m "$@" && darcs push -a
 	else
 		error "unknown repo type"
 	fi
@@ -1012,6 +1019,8 @@ diff =
 		svn diff "$@"
 	elif [ -d "$MR_REPO"/.git ]; then
 		git diff "$@"
+	elif [ "${MR_REPO%.git/}" != "$MR_REPO" ]; then
+		error "commit does not work for fake bare git repositories (yet)."
 	elif [ -d "$MR_REPO"/.bzr ]; then
 		bzr diff "$@"
 	elif [ -d "$MR_REPO"/CVS ]; then
@@ -1026,7 +1035,7 @@ diff =
 log =
 	if [ -d "$MR_REPO"/.svn ]; then
 		svn log"$@"
-	elif [ -d "$MR_REPO"/.git ]; then
+	elif [ -d "$MR_REPO"/.git ] || [ "${MR_REPO%.git/}" != "$MR_REPO" ]; then
 		git log "$@"
 	elif [ -d "$MR_REPO"/.bzr ]; then
 		bzr log "$@"
@@ -1051,12 +1060,37 @@ register =
 		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)
+	elif [ -d .git ] || [ "${basedir%.git}" != "$basedir" ]; then
+		GIT_CONFIG=.git/config
+		[ ! -f $GIT_CONFIG ] && GIT_CONFIG=config
+		export GIT_CONFIG
+		url="$(LANG=C git-config --get remote.origin.url)"
 		if [ -z "$url" ]; then
 			error "cannot determine git url"
 		fi
-		echo "Registering git url: $url in $MR_CONFIG"
+		if [ $GIT_CONFIG = config ]; then
+			# this seems like a bare repo as it has no worktree.
+			# mr needs a worktree and cannot work with bare
+			# repositories, so ensure that it's "fake bare" and
+			# has a worktree configured.
+			case "$(git-config --get core.bare)" in
+				true) error "cannot register a bare git repository";;
+			esac
+			GIT_WORK_TREE="$(git-config --get core.worktree)" || :
+			case "$GIT_WORK_TREE" in
+				'') error "cannot register a fake bare git repository without core.worktree";;
+				*)
+					if [ ! -d "$GIT_WORK_TREE" ]; then
+						error "git worktree $GIT_WORK_TREE does not exist"
+					fi;;
+			esac
+			suffix=" (with worktree $GIT_WORK_TREE)"
+			mr -c "$MR_CONFIG" config "$(pwd)" \
+				lib="GIT_WORK_TREE=$GIT_WORK_TREE; export GIT_WORK_TREE"
+			unset GIT_WORK_TREE
+		fi
+		echo "Registering git url: $url in $MR_CONFIG${suffix:-}"
+		unset GIT_CONFIG
 		mr -c "$MR_CONFIG" config "$(pwd)" checkout="git clone $url $basedir"
 	elif [ -d .bzr ]; then
 		url=$(cat .bzr/branch/parent)
@@ -1099,3 +1133,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