# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1263965171 18000
# Node ID 1e3f788b38b448a26ffb9ae8b7b3bef0d1e178ad
# Parent  5db76a0b018d19808be249d04460c52af9fee045# Parent  6c9b566cf5ac01b25e578acd956ff524c60ce675
Merge the work and home changes.

diff -r 6c9b566cf5ac -r 1e3f788b38b4 .hgrc
--- a/.hgrc	Wed Jan 20 00:23:05 2010 -0500
+++ b/.hgrc	Wed Jan 20 00:26:11 2010 -0500
@@ -15,13 +15,12 @@
 parentrevspec =
 schemes = 
 hgshelve = ~/lib/hg/hgshelve/hgshelve.py
-paste = ~/src/hg-paste/paste.py
-prompt = ~/src/hg-prompt/prompt.py
+paste = ~/lib/hg/hg-paste/paste.py
+prompt = ~/lib/hg/hg-prompt/prompt.py
 histedit = ~/lib/hg/histedit
 hggit = ~/lib/hg/hg-git/hggit
 collapse = ~/lib/hg/hgcollapse/hgext/collapse.py
-diffstat = ~/lib/hg/hgdiffstat/hgext/diffstat.py
-review = ~/src/hg-review/review
+review = ~/lib/hg/hg-review/review
 
 [schemes]
 webf = ssh://sjl@sjl.webfactional.com/repos/
diff -r 6c9b566cf5ac -r 1e3f788b38b4 .zshrc
--- a/.zshrc	Wed Jan 20 00:23:05 2010 -0500
+++ b/.zshrc	Wed Jan 20 00:26:11 2010 -0500
@@ -37,6 +37,10 @@
 export R_LIBS="$HOME/lib/r"
 export BAT_CHARGE="$HOME/bin/batcharge.py"
 
+# Mercurial variables --------------------------------------------------------
+export PATH="$HOME/lib/hg/hg-stable:$PATH"
+export PYTHONPATH="$HOME/lib/hg/hg-stable:$PYTHONPATH"
+
 # Extra shell extensions like z and tab completion for Mercurial -------------
 source ~/lib/z/z.sh
 source ~/lib/python/virtualenvwrapper/virtualenvwrapper_bashrc
diff -r 6c9b566cf5ac -r 1e3f788b38b4 zsh/tasks.zsh