Mercurial > hg
view contrib/wix/contrib.wxs @ 37775:03d7f885d5f2
revsetlang: do not pass in non-bytes to parse()
Since parse() isn't a simple function, we shouldn't expect it would raise
TypeError or ValueError for invalid inputs. Before, TypeError was raised
at 'if pos != len(spec)', which was quite late to report an error.
This patch also makes tokenize() detect invalid object before converting
it to a py3-safe bytes.
Spotted while adding the 'revset(...)' hack to _parsewith().
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Tue, 17 Apr 2018 21:59:58 +0900 |
parents | 5716d10e89e7 |
children |
line wrap: on
line source
<?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include guids.wxi ?> <?include defines.wxi ?> <Fragment> <ComponentGroup Id="contribFolder"> <ComponentRef Id="contrib" /> <ComponentRef Id="contrib.vim" /> </ComponentGroup> </Fragment> <Fragment> <DirectoryRef Id="INSTALLDIR"> <Directory Id="contribdir" Name="contrib" FileSource="$(var.SourceDir)"> <Component Id="contrib" Guid="$(var.contrib.guid)" Win64='$(var.IsX64)'> <File Name="bash_completion" KeyPath="yes" /> <File Name="hgk" /> <File Name="hgweb.fcgi" /> <File Name="hgweb.wsgi" /> <File Name="logo-droplets.svg" /> <File Name="mercurial.el" /> <File Name="tcsh_completion" /> <File Name="tcsh_completion_build.sh" /> <File Name="xml.rnc" /> <File Name="zsh_completion" /> </Component> <Directory Id="vimdir" Name="vim"> <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" Win64='$(var.IsX64)'> <File Name="hg-menu.vim" KeyPath="yes" /> <File Name="HGAnnotate.vim" /> <File Name="hgcommand.vim" /> <File Name="patchreview.txt" /> <File Name="patchreview.vim" /> <File Name="hgtest.vim" /> </Component> </Directory> </Directory> </DirectoryRef> </Fragment> </Wix>