X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/31a32ab5b76abd8c375c3a0e1219f0a23f3dbcf2..f1064b084b2fbf042a4e9421cf611df5b532d1b2:/mrconfig.complex?ds=inline

diff --git a/mrconfig.complex b/mrconfig.complex
index 5924de1..b96c5bf 100644
--- a/mrconfig.complex
+++ b/mrconfig.complex
@@ -9,13 +9,10 @@ include = cat /usr/share/mr/* 2>/dev/null || true
 # Teach mr to run a few git and svn specific commands.
 svn_cleanup = svn cleanup "$@"
 git_gc = git gc "$@"
-git_tag = git tag -l
-svn_tag = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
+git_tags = git tag -l
+svn_tags = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
 # I prefer to git-svn rebase to fetch
 git_svn_update = git svn rebase
-# 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
 # Tests used below.
 # - anon checks whether this is an anonymous checkout, by testing what url
 #   $HOME uses
@@ -71,16 +68,16 @@ checkout = mkdir Maildir Maildir/cur Maildir/new Maildir/tmp; chmod 700 Maildir
 status = :
 
 [mail]
-# I use mairix to index my mail archive; run it after each update.
 checkout = git clone ssh://joey@git.kitenet.net/srv/git/joey/private/mail
-update = git pull "$@"; if [ "$(which mairix)" ]; then mairix -Q; fi
+# I use mairix to index my mail archive; keep its index up-to-date.
+fixups = if [ "$(which mairix)" ]; then ionice -c 3 mairix -Q; fi
 skip = ! mylaptop
 
 [tmp]
 # This is a dummy target, all it does is run fixups at the end of
 # an update.
-update = $HOME/bin/fixups
-checkout = $HOME/bin/fixups
+fixups = $HOME/bin/fixups
+checkout = mkdir -p $HOME/tmp
 status = :
 order = 25