Mercurial > index.cgi > dotfiles
changeset 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 | fe021064d723 |
| children | 463fe15a340f |
| files | .bashrc .hgrc .hgrc.d/joshua.rc .hgrc.d/milton.rc .hgrc.d/rapture.rc .hgrc.d/xanadu.rc |
| diffstat | 6 files changed, 21 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.bashrc Wed Apr 24 11:40:27 2013 -0400 +++ b/.bashrc Wed Apr 24 14:18:18 2013 -0400 @@ -29,9 +29,9 @@ } export PAGER=less export EDITOR=vim -export HGEDITOR=$HOME/bin/hgeditor export RUBYLIB=$HOME/Installs/rubygems/lib export GEM_HOME=$HOME/Installs/rubygems/gems +export HOST=`hostname -s` # If this is an xterm set the title to user@host:dir case $TERM in
--- 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgrc.d/joshua.rc Wed Apr 24 14:18:18 2013 -0400 @@ -0,0 +1,2 @@ +[ui] +username = Steve Huston <huston@srhuston.net>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgrc.d/milton.rc Wed Apr 24 14:18:18 2013 -0400 @@ -0,0 +1,4 @@ +[ui] +username = Steve Huston <huston@srhuston.net> +[extensions] +hgsubversion =