Mercurial > hg
view contrib/wix/mercurial.wxs @ 35816:f6ca1e11d8b4 stable
revset: evaluate filesets against each revision for 'file()' (issue5778)
After f2aeff8a87b6, the fileset was evaluated to a set of files against the
working directory, and then those files were applied against each revision. The
result was nonsense. For example, `hg log -r 'file("set:exec()")'` on the
Mercurial repo listed revision 0 because it has the `hg` script, which is
currently +x. But that bit wasn't applied until revision 280 (which
'contains()' properly indicates).
This technique was borrowed from checkstatus(), which services adds(),
modifies(), and removes(), so it seems safe enough. The 'r:' case is explicitly
assigned to wdirrev, freeing up rev=None to mean "re-evaluate at each revision".
The distinction is important to avoid behavior changes with `hg log set:...`
(test-largefiles-misc.t and test-fileset-generated.t drop current log output
without this). I'm not sure what the right behavior for that is (1fd352aa08fc
explicitly enabled this behavior for graphlog), but the day before the release
isn't the time to experiment.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 28 Jan 2018 14:08:59 -0500 |
parents | 561a019c0268 |
children |
line wrap: on
line source
<?xml version='1.0' encoding='windows-1252'?> <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> <!-- Copyright 2010 Steve Borho <steve@borho.org> This software may be used and distributed according to the terms of the GNU General Public License version 2 or any later version. --> <?include guids.wxi ?> <?include defines.wxi ?> <?if $(var.Platform) = "x64" ?> <?define PFolder = ProgramFiles64Folder ?> <?else?> <?define PFolder = ProgramFilesFolder ?> <?endif?> <Product Id='*' Name='Mercurial $(var.Version) ($(var.Platform))' UpgradeCode='$(var.ProductUpgradeCode)' Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others'> <Package Id='*' Keywords='Installer' Description="Mercurial distributed SCM (version $(var.Version))" Comments='$(var.Comments)' Platform='$(var.Platform)' Manufacturer='Matt Mackall and others' InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' /> <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' CompressionLevel='high' /> <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" /> <Condition Message='Mercurial MSI installers require Windows XP or higher'> VersionNT >= 501 </Condition> <Property Id="INSTALLDIR"> <ComponentSearch Id='SearchForMainExecutableComponent' Guid='$(var.ComponentMainExecutableGUID)' /> </Property> <!--Property Id='ARPCOMMENTS'>any comments</Property--> <Property Id='ARPCONTACT'>mercurial@mercurial-scm.org</Property> <Property Id='ARPHELPLINK'>https://mercurial-scm.org/wiki/</Property> <Property Id='ARPURLINFOABOUT'>https://mercurial-scm.org/about/</Property> <Property Id='ARPURLUPDATEINFO'>https://mercurial-scm.org/downloads/</Property> <Property Id='ARPHELPTELEPHONE'>https://mercurial-scm.org/wiki/Support</Property> <Property Id='ARPPRODUCTICON'>hgIcon.ico</Property> <Property Id='INSTALLEDMERCURIALPRODUCTS' Secure='yes'></Property> <Property Id='REINSTALLMODE'>amus</Property> <!--Auto-accept the license page--> <Property Id='LicenseAccepted'>1</Property> <Directory Id='TARGETDIR' Name='SourceDir'> <Directory Id='$(var.PFolder)' Name='PFiles'> <Directory Id='INSTALLDIR' Name='Mercurial'> <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'> <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' /> <Environment Id="Environment" Name="PATH" Part="last" System="yes" Permanent="no" Value="[INSTALLDIR]" Action="set" /> </Component> <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'> <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html' KeyPath='yes'/> </Component> <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'> <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf' KeyPath='yes'/> </Component> <Directory Id='HGRCD' Name='hgrc.d'> <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'> <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini' ReadOnly='yes' KeyPath='yes'/> </Component> <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'> <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' ReadOnly='yes' KeyPath='yes'/> </Component> </Directory> </Directory> </Directory> <Directory Id="ProgramMenuFolder" Name="Programs"> <Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)"> <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)" Win64='$(var.IsX64)'> <RemoveFolder Id='ProgramMenuDir' On='uninstall' /> <RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string' Value='[INSTALLDIR]' KeyPath='yes' /> <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site' Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' /> </Component> </Directory> </Directory> <?if $(var.Platform) = "x86" ?> <Merge Id='VCRuntime' DiskId='1' Language='1033' SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' /> <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' /> <?else?> <Merge Id='VCRuntime' DiskId='1' Language='1033' SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x64_msm.msm' /> <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x64_msm.msm' /> <?endif?> </Directory> <Feature Id='Complete' Title='Mercurial' Description='The complete package' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' Level='1' Absent='disallow' > <ComponentRef Id='MainExecutable' /> <ComponentRef Id='distOutput' /> <ComponentRef Id='libOutput' /> <ComponentRef Id='ProgramMenuDir' /> <ComponentRef Id='ReadMe' /> <ComponentRef Id='COPYING' /> <ComponentRef Id='mercurial.rc' /> <ComponentRef Id='mergetools.rc' /> <ComponentGroupRef Id='helpFolder' /> <ComponentGroupRef Id='templatesFolder' /> <MergeRef Id='VCRuntime' /> <MergeRef Id='VCRuntimePolicy' /> </Feature> <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'> <ComponentGroupRef Id='localeFolder' /> <ComponentRef Id='i18nFolder' /> </Feature> <Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'> <ComponentGroupRef Id='docFolder' /> </Feature> <Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'> <ComponentGroupRef Id='contribFolder' /> </Feature> </Feature> <UIRef Id="WixUI_FeatureTree" /> <UIRef Id="WixUI_ErrorProgressText" /> <WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" /> <Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" /> <Upgrade Id='$(var.ProductUpgradeCode)'> <UpgradeVersion IncludeMinimum='yes' Minimum='0.0.0' IncludeMaximum='no' OnlyDetect='no' Property='INSTALLEDMERCURIALPRODUCTS' /> </Upgrade> <InstallExecuteSequence> <RemoveExistingProducts After='InstallInitialize'/> </InstallExecuteSequence> </Product> </Wix>