# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1388634363 21600
# Node ID ca387377df7a3a67dbb90b6336b781cdadc3ef41
# Parent  c3623586378de0d0f830b37c67d3767b836d5f96# Parent  61a47fd64f308ecf18696f06f84918bef9564d7c
merge with i18n

diff -r c3623586378d -r ca387377df7a mercurial/fileset.py
--- a/mercurial/fileset.py	Mon Dec 30 21:30:34 2013 +0900
+++ b/mercurial/fileset.py	Wed Jan 01 21:46:03 2014 -0600
@@ -78,7 +78,9 @@
         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 -r c3623586378d -r ca387377df7a mercurial/revset.py
--- a/mercurial/revset.py	Mon Dec 30 21:30:34 2013 +0900
+++ b/mercurial/revset.py	Wed Jan 01 21:46:03 2014 -0600
@@ -1880,7 +1880,9 @@
         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: