--- a/.hgrc Fri Apr 13 15:09:51 2012 -0400
+++ b/.hgrc Fri Apr 13 15:13:59 2012 -0400
@@ -21,7 +21,7 @@
fetch =
prompt = ~/lib/dotfiles/mercurial/hg-prompt/prompt.py
histedit = ~/lib/dotfiles/mercurial/histedit/hg_histedit.py
-hggit = ~/lib/dotfiles/mercurial/hg-git/hggit
+hggit = ~/.hg-git/hggit
[progress]
delay = 1.0
--- a/.hgsub Fri Apr 13 15:09:51 2012 -0400
+++ b/.hgsub Fri Apr 13 15:13:59 2012 -0400
@@ -1,6 +1,5 @@
mercurial/templates = [hg]https://bitbucket.org/sjl/mercurial-cli-templates
mercurial/hg-prompt = [hg]https://bitbucket.org/sjl/hg-prompt
-mercurial/hg-git = [hg]https://bitbucket.org/durin42/hg-git
mercurial/histedit = [hg]https://bitbucket.org/durin42/histedit
vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
--- a/.hgsubstate Fri Apr 13 15:09:51 2012 -0400
+++ b/.hgsubstate Fri Apr 13 15:13:59 2012 -0400
@@ -1,4 +1,3 @@
-d54ed5c637afce2d36c73a101419084a5c8b2a31 mercurial/hg-git
661dbd42f386611a1c03f3eaf82927d3f1b874d8 mercurial/hg-prompt
b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
--- a/bin/bootstrap.sh Fri Apr 13 15:09:51 2012 -0400
+++ b/bin/bootstrap.sh Fri Apr 13 15:13:59 2012 -0400
@@ -1,29 +1,25 @@
#!/bin/bash
-
-set -e
-
# THIS IS A WORK IN PROGRESS
# BE CAREFUL, DAMMIT
-mkdir -p lib/hg
-mkdir -p lib/python
-mkdir -p lib/virtualenvs
-mkdir -p ~/bin
-mkdir -p ~/src
-
-# hg clone 'http://selenic.com/repo/hg#stable' ~/lib/hg/hg-stable
-# cd ~/lib/hg/hg-stable
-# make local
-# cd
-# export PATH="$HOME/lib/hg/hg-stable:$PATH"
-
-test -d ~/lib/dotfiles || hg clone http://bitbucket.org/sjl/dotfiles ~/lib/dotfiles
-test -d ~/lib/oh-my-zsh || git clone git://github.com/sjl/oh-my-zsh ~/lib/oh-my-zsh
+set -e
function ensure_link {
test -L "$HOME/$2" || ln -s "$HOME/$1" "$HOME/$2"
}
+mkdir -p ~/lib/hg
+mkdir -p ~/lib/virtualenvs
+mkdir -p ~/bin
+mkdir -p ~/src
+
+test -d ~/.hg-git/ || clone "bb://durin42/hg-git/" "$HOME/.hg-git"
+test -d ~/.hg-git/dulwich || git clone "git://github.com/jelmer/dulwich.git" "$HOME/lib/dulwich"
+ensure_link "lib/dulwich" "lib/hg/hg-stable/dulwich"
+
+test -d ~/lib/dotfiles || hg clone http://bitbucket.org/sjl/dotfiles ~/lib/dotfiles
+test -d ~/lib/oh-my-zsh || git clone git://github.com/sjl/oh-my-zsh ~/lib/oh-my-zsh
+
ensure_link "lib/dotfiles/tmux/tmux.conf" ".tmux.conf"
ensure_link "lib/dotfiles/vim" ".vim"
ensure_link "lib/dotfiles/vim/vimrc" ".vimrc"
@@ -33,5 +29,8 @@
ensure_link "lib/dotfiles/zsh" "lib/oh-my-zsh/custom"
ensure_link "lib/dotfiles/zshrc" ".zshrc"
-git clone "git://github.com/jelmer/dulwich.git" "$HOME/lib/dulwich"
-ensure_link "lib/dulwich" "lib/hg/hg-stable/dulwich"
+hg clone "bb://sjl/hg-prompt/" "$HOME/lib/dotfiles/mercurial/hg-prompt"
+hg clone "bb://ccaughie/hgcollapse/" "$HOME/lib/dotfiles/mercurial/hgcollapse"
+hg clone "bb://durin42/histedit/" "$HOME/lib/dotfiles/mercurial/histedit"
+
+