diff -r 9d1e04f5dca7 -r af329a84310c mercurial/fileset.py --- a/mercurial/fileset.py Sat Jun 20 20:11:53 2015 -0700 +++ b/mercurial/fileset.py Sun Jun 21 00:49:26 2015 +0900 @@ -80,8 +80,8 @@ yield ('end', None, pos) def parse(expr): - p = parser.parser(tokenize, elements) - tree, pos = p.parse(expr) + p = parser.parser(elements) + tree, pos = p.parse(tokenize(expr)) if pos != len(expr): raise error.ParseError(_("invalid token"), pos) return tree