Mercurial > dotfiles
changeset 370:1e4a6dcc043d
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.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Fri, 25 Sep 2015 14:42:23 -0400 |
| parents | 8b2a2f63e799 |
| children | 7d59b638f711 |
| files | .hgrc .shell.d/50.common_env.sh |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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