# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1264971250 18000
# Node ID f21315844a40334aafd14a71b2ff0c47ffcaf838
# Parent  194d59fd43a854bc5d9be3b992daacba21a39175# Parent  e221cd857ce5e10662240e68c1508e44f859a0f8
Merge changes.

diff -r e221cd857ce5 -r f21315844a40 zsh/mercurial.zsh
--- a/zsh/mercurial.zsh	Sat Jan 30 19:06:04 2010 -0500
+++ b/zsh/mercurial.zsh	Sun Jan 31 15:54:10 2010 -0500
@@ -2,7 +2,8 @@
 
 alias mq='hg -R $(hg root)/.hg/patches'
 alias tmd="hg tmd -X '**fixtures**' | mate"
-alias hgt='hg log -vd "`date -j \"+%Y-%m-%d\"`" -u steve | grep "{t:"'
+alias calctime="sed -e 's/{t: *\([0-9]*\)*.*/\1/' | python -c 'import sys; print sum(map(int, sys.stdin.readlines())) / 60.0, \"hours\"'"
+alias hgt='hg log -vd "`date -j \"+%Y-%m-%d\"`" -u steve | grep "{t:" | calctime'
 
 function pull_everything() {
     for repo in $( ls -1 ); do