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

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

localrepo: omit ".hgsubstate" also from "added" files...
localrepo: omit ".hgsubstate" also from "added" files Before this patch, "localrepository.commit()" omits ".hgsubstate" from "modified" (changes[0]) and "removed" (changes[2]) file list before checking subrepositories, but leaves one in "added" (changes[1]) as it is. Then, "localrepository.commit()" adds ".hgsubstate" into "modified" or "removed" list forcibly, according to subrepository statuses. If "added" contains ".hgsubstate", the committed context will contain two ".hgsubstate" in its "files": one from "added" (not omitted one), and another from "modified" or "removed" (newly added one). How many times ".hgsubstate" appears in "files" changes node hash, even though revision content is same, because node hash calculation uses the specified "files" directly (without duplication check or so). This means that node hash of committed revision changes according to existence of ".hgsubstate" in "added" at "localrepository.commit()". ".hgsubstate" is treated as "added", not only in accidental cases, but also in the case of "qpush" for the patch adding ".hgsubstate". This patch omits ".hgsubstate" also from "added" files before checking subrepositories. This patch also omits ".hgsubstate" exclusion in "qnew"/"qrefresh" introduced by changeset d666da075b91, because this patch makes them meaningless. "hg parents --template '{files}\n'" newly added to "test-mq-subrepo.t" enhances checking unexpected multiple appearances of ".hgsubstate" in "files" of created/refreshed MQ revisions.
Steve Borho - - Load All Authors

File last commit:

r17389:59581b66 stable
r20827:ca5dd216 default
Show More
dist.wxs
31 lines | 1.0 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: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 <File Name="library.zip" KeyPath="yes" />
<File Name="mercurial.base85.pyd" />
<File Name="mercurial.bdiff.pyd" />
<File Name="mercurial.diffhelpers.pyd" />
<File Name="mercurial.mpatch.pyd" />
<File Name="mercurial.osutil.pyd" />
<File Name="mercurial.parsers.pyd" />
<File Name="pyexpat.pyd" />
Steve Borho
wix: bump MSI based installers to use Python 2.7...
 r17389 <File Name="python27.dll" />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 <File Name="bz2.pyd" />
<File Name="select.pyd" />
<File Name="unicodedata.pyd" />
Adrian Buehlmann
port win32.py to using the Python ctypes library...
 r13375 <File Name="_ctypes.pyd" />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 <File Name="_elementtree.pyd" />
<File Name="_hashlib.pyd" />
<File Name="_socket.pyd" />
<File Name="_ssl.pyd" />
</Component>
</DirectoryRef>
</Fragment>
</Wix>