diff .hgrc @ 85:c75fecccc3e5

HG config changes: * Move hgeditor to .hgrc out of .bashrc * Create $HOST variable * $HOST-switched includes for fine tuning environments based on hostname
author Steve Huston <huston@astro.princeton.edu>
date Wed, 24 Apr 2013 14:18:18 -0400
parents e2f98d3b4b5b
children 463fe15a340f
line wrap: on
line diff
--- a/.hgrc	Wed Apr 24 11:40:27 2013 -0400
+++ b/.hgrc	Wed Apr 24 14:18:18 2013 -0400
@@ -1,15 +1,21 @@
+# Global .hgrc - see bottom for local information
+
 [ui]
-username = Steve Huston <huston@srhuston.net>
+username = Steve Huston <huston@astro.princeton.edu>
 merge = vimdiff
+editor = $HOME/bin/hgeditor
 
 [extensions]
 convert =
 keyword =
 color =
-# Until I find a nice way to get hgsubversion installed other places, this
-# one's out. Need to decide if I really need it too, I might not.
-# hgsubversion = 
 
 [merge-tools]
 vimdiff.executable = vim
 vimdiff.args = -d $base $local $output $other -c "wincmd J"
+
+# Includes - here we pull in a config file for the particular host on which
+# we're running, if there is one.  This lets us set specific things on
+# specific hosts fairly easily.  $HOST must be defined in the environment
+# (bash's built-in $HOSTNAME is insufficient)
+%include $HOME/.hgrc.d/$HOST.rc