avoid importing pynotify more than once

[snippets/.git] / git-hooks / zephyr-post-receive

diff --git a/git-hooks/zephyr-post-receive b/git-hooks/zephyr-post-receive
index 0b2fde4f8423affaf110af914d8175df25626fe0..7e06b30b72578ed000690b663b4b1674047ac82d 100755 (executable)
--- a/git-hooks/zephyr-post-receive
+++ b/git-hooks/zephyr-post-receive
@@ -8,7 +8,16 @@
 #  aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
 
 class=`git config zephyr.class`
+instance=`git config zephyr.instance`
 zsig=`git config zephyr.zsig`
+color=`git config --bool zephyr.color`
+
+if [ "${color:-true}" = "true" ]; then
+    usecolor="--color"
+else
+    usecolor=""
+fi
+
 if [ -z "$class" ]; then
   echo "I don't know where to send a commit zephyr!" >&2
   echo "Please set the zephyr.class config variable in" >&2
@@ -18,12 +27,15 @@ fi
 while read oldrev newrev refname; do
   git-rev-list --reverse "$oldrev..$newrev" | while read rev; do
     shortrev=`git log -1 --pretty=format:%h "$rev"`
-    (git show --stat --color "$rev" |
-     sed "s/@/@@/g" |
-     sed "s/\e\[m/@color(default)/g" |
-     sed "s/\e\[33m/@color(yellow)/g" |
-     sed "s/\e\[31m/@color(red)/g" |
-     sed "s/\e\[32m/@color(green)/g") |
-    zwrite -c "$class" -i "$shortrev" -s "$zsig: $refname" -d
+    (git show --stat $usecolor "$rev" |
+     sed -e 's/@/@@/g' \
+         -e 's/}/@(})/g' \
+         -e 's/\e\[m/}@{/g' \
+         -e 's/\e\[33m/@color(yellow)/g' \
+         -e 's/\e\[31m/@color(red)/g' \
+         -e 's/\e\[32m/@color(green)/g' \
+         -e '1s/^/@{/' \
+         -e '$s/$/}/') |
+    zwrite -c "$class" -i "${instance:-$shortrev}" -s "${zsig:-Git}: $refname" -d
   done
 done