##// END OF EJS Templates
verify: replace _validpath() by matcher...
verify: replace _validpath() by matcher The verifier calls out to _validpath() to check if it should verify that path and the narrowhg extension overrides _validpath() to tell the verifier to skip that path. In treemanifest repos, the verifier calls the same method to check if it should visit a directory. However, the decision to visit a directory is different from the condition that it's a matching path, and narrowhg was working around it by returning True from its _validpath() override if *either* was true. Similar to how one can do "hg files -I foo/bar/ -X foo/" (making the include pointless), narrowhg can be configured to track the same paths. In that case match("foo/bar/baz") would be false, but match.visitdir("foo/bar/baz") turns out to be true, causing verify to fail. This may seem like a bug in visitdir(), but it's explicitly documented to be undefined for subdirectories of excluded directories. When using treemanifests, the walk would not descend into foo/, so verification would pass. However, when using flat manifests, there is no recursive directory walk and the file path "foo/bar/baz" would be passed to _validpath() without "foo/" (actually without the slash) being passed first. As explained above, _validpath() would return true for the file path and "hg verify" would fail. Replacing the _validpath() method by a matcher seems like the obvious fix. Narrowhg can then pass in its own matcher and not have to conflate the two matching functions (for dirs and files). I think it also makes the code clearer.

File last commit:

r30769:e520f0f4 default
r30866:5249b647 default
Show More
help.wxs
51 lines | 1.8 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="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" />
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" />
Gregory Szorc
help: document requirements...
r28523 <File Id="internals.requirements.txt" Name="requirements.txt" />
Matt Harbison
wix: add help for current internal topics...
r27684 <File Id="internals.revlogs.txt" Name="revlogs.txt" />
Gregory Szorc
help: internals topic for wire protocol...
r29859 <File Id="internals.wireprotocol.txt" Name="wireprotocol.txt" />
Matt Harbison
wix: add help for current internal topics...
r27684 </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>