# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 2014-01-01 23:28:40
# Node ID 174d9b8baf5d5368c7a520c3ddfb1df544d1f8d0
# Parent  cd62532c62a1d780d7b431013a84786372481b75
# Parent  61a47fd64f308ecf18696f06f84918bef9564d7c

merge with stable

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -79,7 +79,9 @@ def tokenize(program):
         pos += 1
     yield ('end', None, pos)
 
-parse = parser.parser(tokenize, elements).parse
+def parse(expr):
+    p = parser.parser(tokenize, elements)
+    return p.parse(expr)
 
 def getstring(x, err):
     if x and (x[0] == 'string' or x[0] == 'symbol'):
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -1880,7 +1880,9 @@ def findaliases(ui, tree):
         aliases[alias.name] = alias
     return _expandaliases(aliases, tree, [], {})
 
-parse = parser.parser(tokenize, elements).parse
+def parse(spec):
+    p = parser.parser(tokenize, elements)
+    return p.parse(spec)
 
 def match(ui, spec):
     if not spec: