##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

exchange: don't attempt phase exchange if phase-heads was in bundle...
exchange: don't attempt phase exchange if phase-heads was in bundle The Mercurial core server doesn't yet include phase-heads parts in the bundle, but our Google-internal server wants to do that. Unfortunately, the usual exchange still happens even if phase-heads part is included (including the short-circuited one for old/publishing servers). That means that even if our server (again, the Google-internal one, but also future Mercurial core servers) includes a phase-heads part to indicate that some heads should be drafts, that would still get overwritten by the phase updating that happens after. So let's fix that by marking the phase step done if we receive at least one phase-heads part in the bundle. Differential Revision: https://phab.mercurial-scm.org/D440
Steve Borho - - Load All Authors

File last commit:

r33582:e12c3049 stable
r33887:13dc7f29 default
Show More
dist.wxs
38 lines | 1.4 KiB | text/plain | TextLexer
/ contrib / wix / dist.wxs
History | Source | Raw |Copy content |Copy permalink
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <?include defines.wxi ?>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041
<Fragment>
<DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'>
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <File Name="python27.dll" KeyPath="yes" />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 </Component>
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib">
<Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'>
<File Name="library.zip" KeyPath="yes" />
Yuya Nishihara
base85: switch to policy importer
 r32368 <File Name="mercurial.cext.base85.pyd" />
Yuya Nishihara
bdiff: switch to policy importer...
 r32369 <File Name="mercurial.cext.bdiff.pyd" />
Yuya Nishihara
diffhelpers: switch to policy importer...
 r32370 <File Name="mercurial.cext.diffhelpers.pyd" />
Yuya Nishihara
mpatch: switch to policy importer
 r32371 <File Name="mercurial.cext.mpatch.pyd" />
Yuya Nishihara
osutil: switch to policy importer...
 r32367 <File Name="mercurial.cext.osutil.pyd" />
Yuya Nishihara
parsers: switch to policy importer...
 r32372 <File Name="mercurial.cext.parsers.pyd" />
Matt Harbison
wix: include zstd.pyd in the installation...
 r32460 <File Name="mercurial.zstd.pyd" />
Steve Borho
wix: update list of necessary pyd files
 r33582 <File Name="hgext.fsmonitor.pywatchman.bser.pyd" />
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <File Name="pyexpat.pyd" />
<File Name="bz2.pyd" />
<File Name="select.pyd" />
<File Name="unicodedata.pyd" />
<File Name="_ctypes.pyd" />
<File Name="_elementtree.pyd" />
Steve Borho
wix: update list of necessary pyd files
 r33582 <File Name="_testcapi.pyd" />
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <File Name="_hashlib.pyd" />
<File Name="_socket.pyd" />
<File Name="_ssl.pyd" />
</Component>
</Directory>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 </DirectoryRef>
</Fragment>
</Wix>