##// END OF EJS Templates
changegroup: cg3 has two empty groups *after* manifests...
changegroup: cg3 has two empty groups *after* manifests changegroup.getchunks() determines the end of the stream by looking for an empty chunk group (two consecutive empty chunks). It ignores empty groups in the first two groups. Changegroup 3 introduced an empty chunk between the manifests and the files, which confuses getchunks(). Since it comes after the first two, getchunks() will stop there. Fix by rewriting getchunks so it first counts two groups (empty or not) and then keeps antostarts counting empty groups. With this counting, changegroup 1 and 2 have exactly one empty group after the first two groups, while changegroup 3 has two (one for directories and one for files). It's a little hard to test this at this point, but I have verified that this patch fixes narrowhg (which was broken before this patch). Also, future patches will fix "hg strip" with treemanifests, and once that's done, getchunks() will be tested through tests of "hg strip".

File last commit:

r27687:4cea1b91 default
r27920:da5f2336 stable
Show More
mercurial.iss
120 lines | 4.5 KiB | text/plain | TextLexer
Bryan O'Sullivan
Add Windows installer file....
r1290 ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
Steve Borho
iss: take version from iscc command line or __version__.py...
r9356
#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
Pascal Quantin
win32: 64-bit Inno Setup installer
r12263 #ifndef ARCH
#define ARCH = "x86"
#endif
Bryan O'Sullivan
Add Windows installer file....
r1290 [Setup]
Jesus Cea
copyright: update to 2015...
r24191 AppCopyright=Copyright 2005-2015 Matt Mackall and others
Bryan O'Sullivan
Add Windows installer file....
r1290 AppName=Mercurial
Urs Rau
installer: add windows application version number to inno installer script...
r27687 AppVersion={#VERSION}
Pascal Quantin
win32: 64-bit Inno Setup installer
r12263 #if ARCH == "x64"
AppVerName=Mercurial {#VERSION} (64-bit)
OutputBaseFilename=Mercurial-{#VERSION}-x64
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64
#else
Steve Borho
iss: take version from iscc command line or __version__.py...
r9356 AppVerName=Mercurial {#VERSION}
Pascal Quantin
win32: 64-bit Inno Setup installer
r12263 OutputBaseFilename=Mercurial-{#VERSION}
#endif
Bryan O'Sullivan
Add Windows installer file....
r1290 InfoAfterFile=contrib/win32/postinstall.txt
LicenseFile=COPYING
ShowLanguageDialog=yes
AppPublisher=Matt Mackall and others
Matt Mackall
urls: bulk-change primary website URLs
r26421 AppPublisherURL=https://mercurial-scm.org/
AppSupportURL=https://mercurial-scm.org/
AppUpdatesURL=https://mercurial-scm.org/
Bryan O'Sullivan
Add Windows installer file....
r1290 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
AppContact=mercurial@selenic.com
Steve Borho
win32: move default install path inside program files...
r5625 DefaultDirName={pf}\Mercurial
Steve Borho
win32: use relative path to install source...
r5626 SourceDir=..\..
Steve Borho
iss: take version from iscc command line or __version__.py...
r9356 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
Jesus Cea
copyright: update to 2015...
r24191 VersionInfoCopyright=Copyright 2005-2015 Matt Mackall and others
Bryan O'Sullivan
Add Windows installer file....
r1290 VersionInfoCompany=Matt Mackall and others
InternalCompressLevel=max
SolidCompression=true
Pascal Quantin
Add Lee Cantey's installer icon to win32 installer...
r7659 SetupIconFile=contrib\win32\mercurial.ico
Bryan O'Sullivan
Add Windows installer file....
r1290 AllowNoIcons=true
DefaultGroupName=Mercurial
Lee Cantey
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer....
r4629 PrivilegesRequired=none
Bryan O'Sullivan
Add Windows installer file....
r1290
[Files]
Source: contrib\mercurial.el; DestDir: {app}/Contrib
Steve Borho
win32: include contrib/vim in Windows package
r5627 Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim
Steve Borho
win32: include zsh_completion in Windows package
r5628 Source: contrib\zsh_completion; DestDir: {app}/Contrib
Martin Geisler
mercurial.iss: backout 08bbed8ac9b8...
r10029 Source: contrib\bash_completion; DestDir: {app}/Contrib
Pascal Quantin
mercurial.iss: add tcsh completion script
r10031 Source: contrib\tcsh_completion; DestDir: {app}/Contrib
Source: contrib\tcsh_completion_build.sh; DestDir: {app}/Contrib
Pascal Quantin
Package hgk Tcl/Tk script in win32 installer...
r7663 Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl
Pascal Quantin
Add RelaxNG schema to win32 installer
r10182 Source: contrib\xml.rnc; DestDir: {app}/Contrib
Pascal Quantin
win32: add Emacs scripts to Inno Setup installer
r12080 Source: contrib\mercurial.el; DestDir: {app}/Contrib
Source: contrib\mq.el; DestDir: {app}/Contrib
Pascal Quantin
win32: add hgweb scripts to Inno Setup installer
r12081 Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
Lee Cantey
Remove patchbomb from list of contrib files to install since it's now an extension....
r1844 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
Lee Cantey
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer....
r4629 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
Pascal Quantin
win32: 64-bit Inno Setup installer
r12263 #if ARCH == "x64"
Pascal Quantin
win32: update Inno Setup script after the changes done in 95e042d77a5f
r25858 Source: dist\lib\*.dll; Destdir: {app}\lib
Source: dist\lib\*.pyd; Destdir: {app}\lib
Pascal Quantin
win32: 64-bit Inno Setup installer
r12263 #else
Pascal Quantin
win32: update Inno Setup script after the changes done in 95e042d77a5f
r25858 Source: dist\w9xpopen.exe; DestDir: {app}
#endif
Pascal Quantin
Bundle python dll in win32 installer if present...
r8057 Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
Steve Borho
iss: make mfc*.dll and msvc*.dll optional...
r9357 Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist
Pascal Quantin
Add Python 2.6 support to win32 installer...
r8058 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
Pascal Quantin
win32: update Inno Setup script after the changes done in 95e042d77a5f
r25858 Source: dist\lib\library.zip; DestDir: {app}\lib
Marco Barisione
Automatically add the path of hg to %PATH% using add_path
r2384 Source: dist\add_path.exe; DestDir: {app}
Lee Cantey
Add html docs and use for help shortcut
r4822 Source: doc\*.html; DestDir: {app}\Docs
Pascal Quantin
Add style.css file to Inno Setup script
r9633 Source: doc\style.css; DestDir: {app}\Docs
Pascal Quantin
Update win32 installer with changes from f91e5630ce7e
r10002 Source: mercurial\help\*.txt; DestDir: {app}\help
Pascal Quantin
win32: add internals help topics to Inno Setup installer
r27435 Source: mercurial\help\internals\*.txt; DestDir: {app}\help\internals
Pascal Quantin
win32: fix win32 installers generation...
r23174 Source: mercurial\default.d\*.rc; DestDir: {app}\default.d
Pascal Quantin
win32: update Inno Setup build instructions with up-to-date software
r12262 Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
Pascal Quantin
Update win32 installer with changes from f91e5630ce7e
r10002 Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
Lee Cantey
Remove patchbomb from list of contrib files to install since it's now an extension....
r1844 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
Bryan O'Sullivan
Add Windows installer file....
r1290 Source: COPYING; DestDir: {app}; DestName: Copying.txt
[INI]
Matt Mackall
urls: bulk-change primary website URLs
r26421 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/
Pascal Quantin
win32: remove Mercurial.ini file from Inno Setup installer (issue4435)
r23175 Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad
Bryan O'Sullivan
Add Windows installer file....
r1290
[UninstallDelete]
Type: files; Name: {app}\Mercurial.url
Pascal Quantin
win32: remove Mercurial.ini file from Inno Setup installer (issue4435)
r23175 Type: filesandordirs; Name: {app}\default.d
Type: files; Name: "{app}\hg.exe.local"
Bryan O'Sullivan
Add Windows installer file....
r1290
[Icons]
Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
Lee Cantey
Add html docs and use for help shortcut
r4822 Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html
Pascal Quantin
Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
r8056 Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html
Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html
Bryan O'Sullivan
Add Windows installer file....
r1290 Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url
Marco Barisione
Automatically add the path of hg to %PATH% using add_path
r2384
[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}"
Lee Cantey
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer....
r4629
Pascal Quantin
Update mercurial.ini file packaged in win32 installer...
r7662 [Code]
Lee Cantey
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer....
r4629 procedure Touch(fn: String);
begin
SaveStringToFile(ExpandConstant(fn), '', False);
end;