changeset 20209:174d9b8baf5d

merge with stable
author Augie Fackler <raf@durin42.com>
date Wed, 01 Jan 2014 18:28:40 -0500
parents cd62532c62a1 (current diff) 61a47fd64f30 (diff)
children bdd340d8a595
files mercurial/fileset.py
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/fileset.py	Mon Dec 23 15:29:51 2013 -0800
+++ b/mercurial/fileset.py	Wed Jan 01 18:28:40 2014 -0500
@@ -79,7 +79,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'):
--- a/mercurial/revset.py	Mon Dec 23 15:29:51 2013 -0800
+++ b/mercurial/revset.py	Wed Jan 01 18:28:40 2014 -0500
@@ -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: