##// END OF EJS Templates
changegroup: cg3 has two empty groups *after* manifests...
changegroup: cg3 has two empty groups *after* manifests changegroup.getchunks() determines the end of the stream by looking for an empty chunk group (two consecutive empty chunks). It ignores empty groups in the first two groups. Changegroup 3 introduced an empty chunk between the manifests and the files, which confuses getchunks(). Since it comes after the first two, getchunks() will stop there. Fix by rewriting getchunks so it first counts two groups (empty or not) and then keeps antostarts counting empty groups. With this counting, changegroup 1 and 2 have exactly one empty group after the first two groups, while changegroup 3 has two (one for directories and one for files). It's a little hard to test this at this point, but I have verified that this patch fixes narrowhg (which was broken before this patch). Also, future patches will fix "hg strip" with treemanifests, and once that's done, getchunks() will be tested through tests of "hg strip".

File last commit:

r27684:e9857fbf default
r27920:da5f2336 stable
Show More
help.wxs
51 lines | 1.7 KiB | text/plain | TextLexer
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <?xml version="1.0" encoding="utf-8"?>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<Fragment>
Matt Harbison
wix: add help for current internal topics...
r27684 <ComponentGroup Id='helpFolder'>
<ComponentRef Id='help.root' />
<ComponentRef Id='help.internals' />
</ComponentGroup>
</Fragment>
<Fragment>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <DirectoryRef Id="INSTALLDIR">
<Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">
Matt Harbison
wix: add help for current internal topics...
r27684 <Component Id="help.root" Guid="$(var.help.root.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="config.txt" KeyPath="yes" />
<File Name="dates.txt" />
<File Name="diffs.txt" />
<File Name="environment.txt" />
<File Name="extensions.txt" />
Steve Borho
wix: catch up with more added files...
r14819 <File Name="filesets.txt" />
Steve Borho
wix: pick up new help topics added between 1.5 and 1.6...
r11491 <File Name="glossary.txt" />
Steve Borho
wix: catch up with more added files...
r14819 <File Name="hgignore.txt" />
Steve Borho
wix: pick up new help topics added between 1.5 and 1.6...
r11491 <File Name="hgweb.txt" />
Steve Borho
wix: add new merge-tools.txt help text
r12790 <File Name="merge-tools.txt" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="multirevs.txt" />
<File Name="patterns.txt" />
Steve Borho
wix: add phases help text and two more translations (issue 3288)
r16220 <File Name="phases.txt" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="revisions.txt" />
Steve Borho
wix: pick up new help topics added between 1.5 and 1.6...
r11491 <File Name="revsets.txt" />
Matt Harbison
wix: avoid an abort with 'hg help -k foo'...
r26119 <File Name="scripting.txt" />
Steve Borho
wix: add subrepos help text
r12830 <File Name="subrepos.txt" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="templates.txt" />
<File Name="urls.txt" />
</Component>
Matt Harbison
wix: add help for current internal topics...
r27684
<Directory Id="help.internaldir" Name="internals">
<Component Id="help.internals" Guid="$(var.help.internals.guid)" Win64='$(var.IsX64)'>
<File Id="internals.bundles.txt" Name="bundles.txt" KeyPath="yes" />
<File Id="internals.changegroups.txt" Name="changegroups.txt" />
<File Id="internals.revlogs.txt" Name="revlogs.txt" />
</Component>
</Directory>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Directory>
</DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>