merge in madduck's changes to fix fake-bare worktree checkout

[code/myrepos.git] / mrconfig.complex

diff --git a/mrconfig.complex b/mrconfig.complex
index 2d566c3ccb92cc94d4c31d9c1ce2c40ac2e6bc14..fd88893c132cfd4c4885a1bb35342322e52b3c80 100644 (file)
--- a/mrconfig.complex
+++ b/mrconfig.complex
@@ -4,21 +4,12 @@
 # although slightly cut down.
 
 [DEFAULT]
-# Teach mr how to run svn cleanup.
-cleanup = if [ -d "$MR_REPO"/.svn ]; then svn cleanup ; fi
-# And how to run git gc and push.
-gc = if [ -d "$MR_REPO"/.git ]; then git gc; fi
-push = if [ -d "$MR_REPO"/.git ]; then git push; fi
-# And how to list tags for git and svn.
-tag = 
-       if [ -d "$MR_REPO"/.git ]; then
-               git tag -l
-       elsif [ -d "$MR_REPO"/.svn ]; then
-               url=$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2)
-               svn ls "$(echo '$url' | sed -e 's/trunk/tags/')"
-       else
-               error "unknown repo type"
-       fi
+# Teach mr to run a few git and svn specific commands.
+svn_cleanup = svn cleanup "$@"
+git_gc = git gc "$@"
+git_push = git push "$@"
+git_tag = git tag -l
+svn_tag = svn ls "$(LANG=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
 # This hack is here because git-pull stupidly outputs tag info to stderr.
 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true