# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1197092768 28800
# Node ID 1db1c7c1eb5e441f6744784535e4586c565110ea
# Parent  71179daf694121c17919fa5bc2b8a332aa87798d# Parent  652f57de3ccf4353a83fc3130c9154bd22879fd6
Merge with mpm

diff -r 652f57de3ccf -r 1db1c7c1eb5e .hgignore
--- a/.hgignore	Fri Dec 07 14:59:33 2007 -0600
+++ b/.hgignore	Fri Dec 07 21:46:08 2007 -0800
@@ -22,8 +22,8 @@
 MANIFEST
 patches
 mercurial/__version__.py
+Output/Mercurial-*.exe
 .DS_Store
 
 syntax: regexp
 ^\.pc/
-Output/Mercurial-[0-9.]*.exe
diff -r 652f57de3ccf -r 1db1c7c1eb5e contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html	Fri Dec 07 14:59:33 2007 -0600
+++ b/contrib/win32/ReadMe.html	Fri Dec 07 21:46:08 2007 -0800
@@ -33,7 +33,7 @@
       href="http://hgbook.red-bean.com/">Distributed revision control
       with Mercurial</a>.</p>
 
-    <p>By default, Mercurial installs to <tt>C:\Mercurial</tt>.  The
+    <p>By default, Mercurial installs to <tt>C:\Program Files\Mercurial</tt>.  The
       Mercurial command is called <tt>hg.exe</tt>.</p>
 
     <h1>Testing Mercurial after you've installed it</h1>
diff -r 652f57de3ccf -r 1db1c7c1eb5e contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss	Fri Dec 07 14:59:33 2007 -0600
+++ b/contrib/win32/mercurial.iss	Fri Dec 07 21:46:08 2007 -0800
@@ -15,8 +15,8 @@
 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
 AppContact=mercurial@selenic.com
 OutputBaseFilename=Mercurial-snapshot
-DefaultDirName={sd}\Mercurial
-SourceDir=C:\hg\hg-release
+DefaultDirName={pf}\Mercurial
+SourceDir=..\..
 VersionInfoDescription=Mercurial distributed SCM
 VersionInfoCopyright=Copyright 2005-2007 Matt Mackall and others
 VersionInfoCompany=Matt Mackall and others
@@ -29,12 +29,13 @@
 
 [Files]
 Source: contrib\mercurial.el; DestDir: {app}/Contrib
+Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim
+Source: contrib\zsh_completion; DestDir: {app}/Contrib
 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
 Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Flags: confirmoverwrite
 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
 Source: dist\library.zip; DestDir: {app}
-Source: dist\patch.exe; DestDir: {app}
 Source: dist\mfc71.dll; DestDir: {app}
 Source: dist\msvcr71.dll; DestDir: {app}
 Source: dist\w9xpopen.exe; DestDir: {app}
diff -r 652f57de3ccf -r 1db1c7c1eb5e setup.py
--- a/setup.py	Fri Dec 07 14:59:33 2007 -0600
+++ b/setup.py	Fri Dec 07 21:46:08 2007 -0800
@@ -40,6 +40,11 @@
 except ImportError:
     pass
 
+if os.name in ['nt']:
+    extra['scripts'] = ['hg']
+else:
+    extra['scripts'] = ['hg', 'hgmerge']
+
 # specify version string, otherwise 'hg identify' will be used:
 version = ''
 
@@ -78,7 +83,6 @@
                    [os.path.join(root, file_) for file_ in files])
                   for root, dirs, files in os.walk('templates')],
       cmdclass=cmdclass,
-      scripts=['hg', 'hgmerge'],
       options=dict(py2exe=dict(packages=['hgext']),
                    bdist_mpkg=dict(zipdist=True,
                                    license='COPYING',