win32: update Inno Setup installer script and extensions list

contrib/win32/mercurial.ini

@@ -1,97 +1,98 b''
 ; System-wide Mercurial config file.
 ;
 ; !!!  Do Not Edit This File !!!
 ;
 ; This file will be replaced by the installer on every upgrade.
 ; Editing this file can cause strange side effects on Vista.
 ;
 ; http://bitbucket.org/tortoisehg/stable/issue/135
 ;
 ; To change settings you see in this file, override (or enable) them in
 ; your user Mercurial.ini file, where USERNAME is your Windows user name:
 ;
 ; XP or older    - C:\Documents and Settings\USERNAME\Mercurial.ini
 ; Vista or later - C:\Users\USERNAME\Mercurial.ini
 
 
 [ui]
 ; editor used to enter commit logs, etc.  Most text editors will work.
 editor = notepad
 ; show changed files and be a bit more verbose if True
 ; verbose = True
  
 ; username data to appear in commits
 ; it usually takes the form: Joe User <[e-mail]>
 ; username = Joe User <[e-mail]>
 
 ; In order to push/pull over ssh you must specify an ssh tool
 ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2
 ;ssh = C:\cygwin\bin\ssh
 
 ;
 ; For more information about mercurial extensions, start here
 ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
 ;
 ; Extensions shipped with Mercurial
 ;
 [extensions]
 ;acl =
+;blackbox =
 ;bugzilla =
 ;children =
 ;churn =
 ;color =
 ;convert =
 ;eol =
 ;extdiff =
 ;fetch =
 ;gpg =
 ;graphlog = 
 ;hgcia =
 ;hgk =
 ;highlight = 
 ;histedit =
 ;interhg =
 ;largefiles =
 ;keyword =
 ;mq =
 ;notify =
 ;pager =
 ;patchbomb =
 ;progress =
 ;purge =
 ;rebase =
 ;record =
 ;relink =
 ;schemes =
 ;share =
 ;transplant =
 ;win32mbcs =
 ;zeroconf =
 
 ;
 ; Define external diff commands
 ;
 [extdiff]
 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
 ;cmd.vimdiff = gvim.exe
 ;opts.vimdiff = -f "+next" "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
 
 
 [hgk]
 ; Replace the following with your path to hgk, uncomment it and 
 ; install ActiveTcl (or another win32 port like tclkit)
 ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
 ; vdiff=vdiff
  
 
 ;
 ; The git extended diff format can represent binary files, file
 ; permission changes, and rename information that the normal patch format
 ; cannot describe.  However it is also not compatible with tools which
 ; expect normal patches. so enable git patches at your own risk.
 ;
 [diff]
 ;git = false
 ;nodates = false
 

contrib/win32/mercurial.iss

@@ -1,148 +1,146 b''
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #ifndef VERSION
 #define FileHandle
 #define FileLine
 #define VERSION = "unknown"
 #if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py")
   #expr FileLine = FileRead(FileHandle)
   #expr FileLine = FileRead(FileHandle)
   #define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1)
 #endif
 #if FileHandle
   #expr FileClose(FileHandle)
 #endif
 #pragma message "Detected Version: " + VERSION
 #endif
 
 #ifndef ARCH
 #define ARCH = "x86"
 #endif
 
 [Setup]
 AppCopyright=Copyright 2005-2010 Matt Mackall and others
 AppName=Mercurial
 #if ARCH == "x64"
 AppVerName=Mercurial {#VERSION} (64-bit)
 OutputBaseFilename=Mercurial-{#VERSION}-x64
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
 #else
 AppVerName=Mercurial {#VERSION}
 OutputBaseFilename=Mercurial-{#VERSION}
 #endif
 InfoAfterFile=contrib/win32/postinstall.txt
 LicenseFile=COPYING
 ShowLanguageDialog=yes
 AppPublisher=Matt Mackall and others
 AppPublisherURL=http://mercurial.selenic.com/
 AppSupportURL=http://mercurial.selenic.com/
 AppUpdatesURL=http://mercurial.selenic.com/
 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
 AppContact=[e-mail]
 DefaultDirName={pf}\Mercurial
 SourceDir=..\..
 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
 VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others
 VersionInfoCompany=Matt Mackall and others
 InternalCompressLevel=max
 SolidCompression=true
 SetupIconFile=contrib\win32\mercurial.ico
 AllowNoIcons=true
 DefaultGroupName=Mercurial
 PrivilegesRequired=none
 
 [Files]
 Source: contrib\mercurial.el; DestDir: {app}/Contrib
 Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim
 Source: contrib\zsh_completion; DestDir: {app}/Contrib
 Source: contrib\bash_completion; DestDir: {app}/Contrib
 Source: contrib\tcsh_completion; DestDir: {app}/Contrib
 Source: contrib\tcsh_completion_build.sh; DestDir: {app}/Contrib
 Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl
 Source: contrib\xml.rnc; DestDir: {app}/Contrib
-Source: contrib\shrink-revlog.py; DestDir: {app}/Contrib
 Source: contrib\mercurial.el; DestDir: {app}/Contrib
 Source: contrib\mq.el; DestDir: {app}/Contrib
 Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
 Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
 Source: contrib\mergetools.hgrc; DestDir: {tmp};
 Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Check: CheckFile; AfterInstall: ConcatenateFiles;
 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
 #if ARCH == "x64"
 Source: dist\*.dll; Destdir: {app}
 Source: dist\*.pyd; Destdir: {app}
 #else
 Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
 Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist
 Source: dist\w9xpopen.exe; DestDir: {app}
 #endif
 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
 Source: dist\library.zip; DestDir: {app}
 Source: dist\add_path.exe; DestDir: {app}
 Source: dist\cacert.pem; Destdir: {app}
 Source: doc\*.html; DestDir: {app}\Docs
 Source: doc\style.css; DestDir: {app}\Docs
 Source: mercurial\help\*.txt; DestDir: {app}\help
 Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
 Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
 Source: COPYING; DestDir: {app}; DestName: Copying.txt
 
 [INI]
 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/
 Filename: {app}\Mercurial.ini; Section: web; Key: cacerts; String: {app}\cacert.pem
 
 [UninstallDelete]
 Type: files; Name: {app}\Mercurial.url
-Type: files; Name: {app}\Contrib\shrink-revlog.pyc
 
 [Icons]
 Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
 Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html
 Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html
 Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html
 Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url
 
 [Run]
 Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "Add the installation path to the search path"
 
 [UninstallRun]
 Filename: "{app}\add_path.exe"; Parameters: "/del {app}"
 
 [UninstallDelete]
 Type: files; Name: "{app}\hg.exe.local"
 
 [Code]
 var
   WriteFile: Boolean;
   CheckDone: Boolean;
 
 function CheckFile(): Boolean;
 begin
   if not CheckDone then begin
     WriteFile := True;
     if FileExists(ExpandConstant(CurrentFileName)) then begin
         WriteFile := MsgBox('' + ExpandConstant(CurrentFileName) + '' #13#13 'The file already exists.' #13#13 'Would you like Setup to overwrite it?', mbConfirmation, MB_YESNO) = idYes;
     end;
     CheckDone := True;
   end;
   Result := WriteFile;
 end;
 
 procedure ConcatenateFiles();
 var
   MergeConfigs: TArrayOfString;
 begin
   if LoadStringsFromFile(ExpandConstant('{tmp}\mergetools.hgrc'),MergeConfigs) then begin
     SaveStringsToFile(ExpandConstant(CurrentFileName),MergeConfigs,True);
   end;
 end;
 
 procedure Touch(fn: String);
 begin
   SaveStringToFile(ExpandConstant(fn), '', False);
 end;