##// END OF EJS Templates
http: allow 'auth.prefix' to have a username consistent with the URI...
http: allow 'auth.prefix' to have a username consistent with the URI It may be a little weird to put a username in the prefix, but the documentation doesn't disallow it, and silently disallowing it has caused confusion[1]. The username must match what is passed in (which seems to be from the URI via a circuitous route), as well as 'auth.username' if it was specified. I thought about printing a warning for a mismatch, but we already don't print a warning if the 'auth.username' and URI username don't match. This change allows the first and second last new test cases to work as expected. It looks like this would have been a problem since at least 0593e8f81c71. [1] https://www.mercurial-scm.org/pipermail/mercurial/2018-November/051069.html

File last commit:

r37587:2025bf60 default
r40699:c53f0ead default
Show More
dist.wxs
37 lines | 1.4 KiB | text/plain | TextLexer
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
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>