##// END OF EJS Templates
filemerge: add support for partial conflict resolution by external tool...
filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356

File last commit:

r47976:603efb38 default
r49838:f3aafd78 default
Show More
mercurial.wxs
157 lines | 6.6 KiB | text/plain | TextLexer
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 <?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)'
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 Manufacturer='Olivia Mackall and others'>
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086
<Package Id='*'
Keywords='Installer'
Description="Mercurial distributed SCM (version $(var.Version))"
Comments='$(var.Comments)'
Platform='$(var.Platform)'
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 Manufacturer='Olivia Mackall and others'
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 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'
Kyle Lippincott
wix: tell ComponentSearch that it is finding a directory (not a file)...
r47159 Guid='$(var.ComponentMainExecutableGUID)'
Type='directory' />
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 </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)'>
Gregory Szorc
packaging: stage files and dynamically generate WiX installer...
r44022 <CreateFolder />
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 <Environment Id="Environment" Name="PATH" Part="last" System="yes"
Permanent="no" Value="[INSTALLDIR]" Action="set" />
</Component>
</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>
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 <!-- Install VCRedist merge modules on Python 2. On Python 3,
vcruntimeXXX.dll is part of the install layout and gets picked up
as a regular file. -->
<?if $(var.PythonVersion) = "2" ?>
<?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?>
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 <?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='ProgramMenuDir' />
Gregory Szorc
packaging: stage files and dynamically generate WiX installer...
r44022 <ComponentGroupRef Id="hg.group.ROOT" />
Matt Harbison
packaging: rename hgrc.d to defaultrc for Windows config files next to the exe...
r44614 <ComponentGroupRef Id="hg.group.defaultrc" />
Augie Fackler
windows: further build fixes for the WiX installer...
r44188 <ComponentGroupRef Id="hg.group.helptext" />
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 <?ifdef MercurialHasLib?>
<ComponentGroupRef Id="hg.group.lib" />
<?endif?>
Gregory Szorc
packaging: stage files and dynamically generate WiX installer...
r44022 <ComponentGroupRef Id="hg.group.templates" />
Gregory Szorc
packaging: support building WiX installers with PyOxidizer...
r45274 <?if $(var.PythonVersion) = "2" ?>
<MergeRef Id='VCRuntime' />
<MergeRef Id='VCRuntimePolicy' />
<?endif?>
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 </Feature>
Augie Fackler
wix: fix the package build when not adding features...
r42220 <?ifdef MercurialExtraFeatures?>
Augie Fackler
wix: add functionality to inject additional Features into installer...
r42216 <?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?>
<FeatureRef Id="$(var.EXTRAFEAT)" />
<?endforeach?>
<?endif?>
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>
Gregory Szorc
packaging: stage files and dynamically generate WiX installer...
r44022 <ComponentGroupRef Id="hg.group.locale" />
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 </Feature>
<Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'>
Gregory Szorc
packaging: stage files and dynamically generate WiX installer...
r44022 <ComponentGroupRef Id="hg.group.doc" />
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 </Feature>
<Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'>
Gregory Szorc
packaging: stage files and dynamically generate WiX installer...
r44022 <ComponentGroupRef Id="hg.group.contrib" />
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 </Feature>
</Feature>
<UIRef Id="WixUI_FeatureTree" />
<UIRef Id="WixUI_ErrorProgressText" />
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976 <?ifdef PyOxidizer?>
<WixVariable Id="WixUILicenseRtf" Value="COPYING.rtf" />
<Icon Id="hgIcon.ico" SourceFile="mercurial.ico" />
<?else?>
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086 <WixVariable Id="WixUILicenseRtf" Value="contrib\packaging\wix\COPYING.rtf" />
<Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" />
Gregory Szorc
pyoxidizer: support producing MSI installers...
r47976 <?endif?>
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
r42086
<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>