# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1443206543 14400
# Node ID 1e4a6dcc043da8402a1ca2f4fa852f95486eb666
# Parent  8b2a2f63e7998fdfa7b61ef10b35cbde060f04d4
hgrc: clean up machine-specific settings handling

HGRCPATH ends up overriding machine-wide settings, which isn't what I
want. Recent hg is nice enough to silently ignore includes of
nonexistent files, so just use %include now.

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -81,3 +81,5 @@ desc.here = inverse
 [revsetalias]
 canmutate = not (public() or upstream())
 smart = (parents(canmutate) or canmutate or . or (head() - closed())) and (not obsolete() or unstable()^)
+
+%include $HOME/.hgrc-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
@@ -17,10 +17,4 @@ insert_element_into_var "$HOME/unixSoft/
 insert_element_into_var /opt/hg/lib/python PYTHONPATH
 
 insert_path_element /opt/hg/bin
-
-export HGRCPATH="$HOME/.hgrc:$HOME/.private/hgrc:$HOME/.hgrc-$(hostname)"
-which opendiff > /dev/null
-if [ $? = 0 ] ; then
-    export HGRCPATH="$HGRCPATH:$HOME/unixSoft/hgrc-opendiff"
-fi
 export LESS=FSRX