Comments
Patch
@@ -62,9 +62,6 @@ def minusmatch(mctx, x, y):
ym = getmatch(mctx, y)
return matchmod.differencematcher(xm, ym)
-def negatematch(mctx, x):
- raise error.ParseError(_("can't use negate operator in this context"))
-
def listmatch(mctx, *xs):
raise error.ParseError(_("can't use a list in this context"),
hint=_('see \'hg help "filesets.x or y"\''))
@@ -436,7 +433,6 @@ methods = {
'and': andmatch,
'or': ormatch,
'minus': minusmatch,
- 'negate': negatematch,
'list': listmatch,
'not': notmatch,
'func': func,
@@ -144,7 +144,9 @@ def _analyze(x):
return (op, x[1], t)
if op == 'group':
return _analyze(x[1])
- if op in {'not', 'negate'}:
+ if op == 'negate':
+ raise error.ParseError(_("can't use negate operator in this context"))
+ if op == 'not':
t = _analyze(x[1])
return (op, t)
if op in {'and', 'minus'}:
@@ -65,8 +65,6 @@ def _compile(tree):
func1 = _compile(tree[1])
func2 = _compile(tree[2])
return lambda n, s: func1(n, s) and not func2(n, s)
- elif op == 'negate':
- raise error.ParseError(_("can't use negate operator in this context"))
elif op == 'list':
raise error.ParseError(_("can't use a list in this context"),
hint=_('see \'hg help "filesets.x or y"\''))