--- a/mercurial/revset.py Fri Sep 24 12:00:55 2010 +0200
+++ b/mercurial/revset.py Fri Sep 24 12:46:54 2010 -0500
@@ -87,7 +87,7 @@
# helpers
def getstring(x, err):
- if x and x[0] in ('string', 'symbol'):
+ if x and (x[0] == 'string' or x[0] == 'symbol'):
return x[1]
raise error.ParseError(err)
@@ -537,7 +537,7 @@
'-' + getstring(x[1], _("can't negate that"))), small)
elif op in 'string symbol negate':
return smallbonus, x # single revisions are small
- elif op in ('and', 'dagrange'):
+ elif op == 'and' or op == 'dagrange':
wa, ta = optimize(x[1], True)
wb, tb = optimize(x[2], True)
w = min(wa, wb)