##// END OF EJS Templates
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.

File last commit:

r13042:bd9bc412 stable
r20827:ca5dd216 default
Show More
locale.wxs
34 lines | 1.0 KiB | text/plain | TextLexer
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <?define hglocales =
da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW
?>
<Fragment>
<ComponentGroup Id="localeFolder">
<?foreach LOC in $(var.hglocales) ?>
<ComponentRef Id="hg.locale.$(var.LOC)"/>
<?endforeach?>
</ComponentGroup>
</Fragment>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
Adrian Buehlmann
wix updates...
r10930 <Directory Id="localedir" Name="locale" FileSource="$(var.SourceDir)">
<?foreach LOC in $(var.hglocales) ?>
<Directory Id="hg.locale.$(var.LOC)" Name="$(var.LOC)">
<Directory Id="hg.locale.$(var.LOC).LC_MESSAGES" Name="LC_MESSAGES">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="hg.locale.$(var.LOC)" Guid="*" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Id="hg.mo.$(var.LOC)" Name="hg.mo" KeyPath="yes" />
</Component>
</Directory>
</Directory>
<?endforeach?>
</Directory>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>