# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1273704481 18000
# Node ID 50244cf921fb77361f895579abeaafa6c103c2da
# Parent  c965d5dbd8685164de164aee6d1edd1555f2198d# Parent  226d1ac6acb6cda6ee3ae6ff74541eb8a77a9e94
Merge

diff --git a/.elisp/settings/50.localfuncs.el b/.elisp/settings/50.localfuncs.el
--- a/.elisp/settings/50.localfuncs.el
+++ b/.elisp/settings/50.localfuncs.el
@@ -31,6 +31,18 @@ spends an eternity in a regex if you mak
 (global-set-key [(control c)(t)(=)] 'af-generic-diff-repo)
 (global-set-key [(control c)(d)] 'af-generic-diff-repo)
 
+(defun af-rotate-list (l)
+  "Move the head of l to the end of the list."
+  (append (cdr l) (list (car l))))
+
+(defun af-spacejoin (l)
+  "Given list of strings l, join them with spaces and return.
+
+Returns the empty string if l is nil."
+  (if l
+      (reduce '(lambda (x &optional y) (concat x " " (if y y))) l)
+    ""))
+
 (defun pyflakes-this-buffer ()
   (interactive)
   (compilation-start (concat "cd  "
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -3,11 +3,12 @@ syntax:re
 # complex regex to ignore all but what I want from dotfiles
 ^\.(?!bashrc$|best_unicode|elisp|emacs$|gitconfig$|hg|inputrc$|ipython|irbrc$|pdbrc\.py$|python|screenrc$|shell\.d|vim|zfun|zsh)
 
-# above RE fails to exclude viminfo
+# above RE fails to exclude some ignorable things
 ^\.viminfo$
 ^\.hg\.
 ^\.ipython/db$
 ^\.python-eggs$
+^\.hgrc-[^/]+$
 
 # above RE fails to exclude history or machine-specific files
 ^\..*(?=history|machine).*
diff --git a/.shell.d/50.common_env.sh b/.shell.d/50.common_env.sh
--- a/.shell.d/50.common_env.sh
+++ b/.shell.d/50.common_env.sh
@@ -21,4 +21,4 @@ insert_element_into_var /opt/hg/lib/pyth
 
 insert_path_element /opt/hg/bin
 
-export HGRCPATH="$HOME/.hgrc:$HOME/.private/hgrc"
+export HGRCPATH="$HOME/.hgrc:$HOME/.private/hgrc:$HOME/.hgrc-$(hostname)"