renaming

[code/myrepos.git] / mrconfig.complex

diff --git a/mrconfig.complex b/mrconfig.complex
index a80e981819f7b226c0b8fc97bc11e0814a375981..b96c5bf2104e97c5f3d941233035e5d070b8b916 100644 (file)
--- 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 "$@"
 # 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
 # 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
 # Tests used below.
 # - anon checks whether this is an anonymous checkout, by testing what url
 #   $HOME uses


@@ -71,9 +68,9 @@ checkout = mkdir Maildir Maildir/cur Maildir/new Maildir/tmp; chmod 700 Maildir
 status = :
 
 [mail]
 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
 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]
 skip = ! mylaptop
 
 [tmp]