# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1332439876 25200
# Node ID 6b2c3f14a5c1ca77b903349a3270a623acd95ac3
# Parent  2e0fbe44e9fe123310f4fccf06b214cba7cbc513
Install changes:
- Don't use any linking on Windows (requires admin rights).
- Reference the global hgignore correctly from hgrc.

diff -r 2e0fbe44e9fe -r 6b2c3f14a5c1 hgrc/hgrc-MacOSX
--- a/hgrc/hgrc-MacOSX	Wed Mar 14 11:34:05 2012 -0700
+++ b/hgrc/hgrc-MacOSX	Thu Mar 22 11:11:16 2012 -0700
@@ -1,6 +1,3 @@
-[ui]
-ignore = ~/.hgignore
-
 [extdiff]
 cmd.opendiff = opendiff-w
 opts.opendiff =
diff -r 2e0fbe44e9fe -r 6b2c3f14a5c1 hgrc/hgrc-Windows_NT
--- a/hgrc/hgrc-Windows_NT	Wed Mar 14 11:34:05 2012 -0700
+++ b/hgrc/hgrc-Windows_NT	Thu Mar 22 11:11:16 2012 -0700
@@ -1,5 +1,4 @@
 [ui]
-ignore = ~\mercurial_ignore
 #ssh="${userprofile}\Dropbox\Utilities\plink.exe" -ssh -i "${userprofile}\Dropbox\Personal\Security\PuTTY\key.ppk"
 
 [extensions]
diff -r 2e0fbe44e9fe -r 6b2c3f14a5c1 install.cmd
--- a/install.cmd	Wed Mar 14 11:34:05 2012 -0700
+++ b/install.cmd	Thu Mar 22 11:11:16 2012 -0700
@@ -8,13 +8,13 @@
     set /P confirm=Will delete existing "%userprofile%\vimfiles". OK with that? Press CTRL-C to abort.
     rmdir /Q /S "%userprofile%\vimfiles"
 )
-mklink /D "%userprofile%\vimfiles"	"%CWD%vim"
 
 if exist "%userprofile%\_vimrc" (
     set /P confirm=Will delete existing "%userprofile%\_vimrc". OK with that? Press CTRL-C to abort.
     del /Q "%userprofile%\_vimrc"
 )
-mklink    "%userprofile%\_vimrc"	"%CWD%vim\vimrc"
+echo set runtimepath=%CWD:\=/%vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,%CWD:\=/%vim/after > "%userprofile%\_vimrc"
+echo source %CWD:\=/%vim/vimrc >> "%userprofile%\_vimrc"
 
 :: Mercurial Files
 if exist "%userprofile%\mercurial.ini" (
@@ -22,13 +22,8 @@
     del /Q "%userprofile%\mercurial.ini"
 )
 echo %%include %CWD%hgrc\hgrc > "%userprofile%\mercurial.ini"
+echo [ui] >> "%userprofile%\mercurial.ini"
+echo ignore = %CWD:\=/%/hgrc/hgignore >> "%userprofile%\mercurial.ini"
 echo [extensions] >> "%userprofile%\mercurial.ini"
 echo hggit = %CWD:\=/%lib/hg/hg-git/hggit/ >> "%userprofile%\mercurial.ini"
 echo onsub = %CWD:\=/%lib/hg/onsub/onsub.py >> "%userprofile%\mercurial.ini"
-
-if exist "%userprofile%\mercurial_ignore" (
-    set /P confirm=Will delete existing "%userprofile%\mercurial_ignore". OK with that? Press CTRL-C to abort.
-    del /Q "%userprofile%\mercurial_ignore"
-)
-mklink    "%userprofile%\mercurial_ignore" "%CWD%hgrc\hgignore"
-
diff -r 2e0fbe44e9fe -r 6b2c3f14a5c1 install.sh
--- a/install.sh	Wed Mar 14 11:34:05 2012 -0700
+++ b/install.sh	Thu Mar 22 11:11:16 2012 -0700
@@ -15,10 +15,8 @@
 # MERCURIAL
 # ---------
 echo %include $CWD/hgrc/hgrc > "$HOME/.hgrc"
+echo [ui] >> "$HOME/.hgrc"
+echo ignore = $CWD/hgrc/hgignore >> "$HOME/.hgrc"
 echo [extensions] >> "$HOME/.hgrc"
 echo hggit = $CWD/lib/hg/hg-git/hggit/ >> "$HOME/.hgrc"
 echo onsub = $CWD/lib/hg/onsub/onsub.py >> "$HOME/.hgrc"
-
-ln -s "$CWD/hgrc/hgignore" "$HOME/.hgignore"
-
-
diff -r 2e0fbe44e9fe -r 6b2c3f14a5c1 uninstall.cmd
--- a/uninstall.cmd	Wed Mar 14 11:34:05 2012 -0700
+++ b/uninstall.cmd	Thu Mar 22 11:11:16 2012 -0700
@@ -1,7 +1,8 @@
 @echo off
 setlocal
+    
+set /P confirm=This will delete your configuration files for Vim/Mercurial/etc. OK with that? Press CTRL-C to abort.
 
-rmdir  "%userprofile%\vimfiles"
-del    "%userprofile%\_vimrc"
-del    "%userprofile%\mercurial.ini"
-
+rmdir /Q /S  "%userprofile%\vimfiles"
+del          "%userprofile%\_vimrc"
+del          "%userprofile%\mercurial.ini"
diff -r 2e0fbe44e9fe -r 6b2c3f14a5c1 uninstall.sh
--- a/uninstall.sh	Wed Mar 14 11:34:05 2012 -0700
+++ b/uninstall.sh	Thu Mar 22 11:11:16 2012 -0700
@@ -5,5 +5,3 @@
 rm $HOME/.vim
 rm $HOME/.vimrc
 rm $HOME/.hgrc
-rm $HOME/.hgignore
-