| pulkit |
| hg-reviewers |
I didn't know that 'hg help "revsets.x or y"' was valid syntax, so the
quoting is extra useful here to make it clear that that is an actual
command.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/fileset.py (2 lines) | |||
| M | mercurial/minifileset.py (2 lines) | |||
| M | mercurial/revset.py (2 lines) | |||
| M | tests/test-fileset.t (4 lines) | |||
| M | tests/test-revset2.t (4 lines) |
| ym = getmatch(mctx, y) | ym = getmatch(mctx, y) | ||||
| return matchmod.differencematcher(xm, ym) | return matchmod.differencematcher(xm, ym) | ||||
| def negatematch(mctx, x): | def negatematch(mctx, x): | ||||
| raise error.ParseError(_("can't use negate operator in this context")) | raise error.ParseError(_("can't use negate operator in this context")) | ||||
| def listmatch(mctx, *xs): | def listmatch(mctx, *xs): | ||||
| raise error.ParseError(_("can't use a list in this context"), | raise error.ParseError(_("can't use a list in this context"), | ||||
| hint=_('see hg help "filesets.x or y"')) | hint=_('see \'hg help "filesets.x or y"\'')) | ||||
| def func(mctx, a, b): | def func(mctx, a, b): | ||||
| funcname = getsymbol(a) | funcname = getsymbol(a) | ||||
| if funcname in symbols: | if funcname in symbols: | ||||
| return symbols[funcname](mctx, b) | return symbols[funcname](mctx, b) | ||||
| keep = lambda fn: getattr(fn, '__doc__', None) is not None | keep = lambda fn: getattr(fn, '__doc__', None) is not None | ||||
| elif op == 'minus': # equivalent to 'x and not y' | elif op == 'minus': # equivalent to 'x and not y' | ||||
| func1 = _compile(tree[1]) | func1 = _compile(tree[1]) | ||||
| func2 = _compile(tree[2]) | func2 = _compile(tree[2]) | ||||
| return lambda n, s: func1(n, s) and not func2(n, s) | return lambda n, s: func1(n, s) and not func2(n, s) | ||||
| elif op == 'negate': | elif op == 'negate': | ||||
| raise error.ParseError(_("can't use negate operator in this context")) | raise error.ParseError(_("can't use negate operator in this context")) | ||||
| elif op == 'list': | elif op == 'list': | ||||
| raise error.ParseError(_("can't use a list in this context"), | raise error.ParseError(_("can't use a list in this context"), | ||||
| hint=_('see hg help "filesets.x or y"')) | hint=_('see \'hg help "filesets.x or y"\'')) | ||||
| raise error.ProgrammingError('illegal tree: %r' % (tree,)) | raise error.ProgrammingError('illegal tree: %r' % (tree,)) | ||||
| def compile(text): | def compile(text): | ||||
| """generate a function (path, size) -> bool from filter specification. | """generate a function (path, size) -> bool from filter specification. | ||||
| "text" could contain the operators defined by the fileset language for | "text" could contain the operators defined by the fileset language for | ||||
| common logic operations, and parenthesis for grouping. The supported path | common logic operations, and parenthesis for grouping. The supported path | ||||
| tests are '**.extname' for file extension test, and '"path:dir/subdir"' | tests are '**.extname' for file extension test, and '"path:dir/subdir"' | ||||
| raise error.UnknownIdentifier(rel, ['generations']) | raise error.UnknownIdentifier(rel, ['generations']) | ||||
| def subscriptset(repo, subset, x, y, order): | def subscriptset(repo, subset, x, y, order): | ||||
| raise error.ParseError(_("can't use a subscript in this context")) | raise error.ParseError(_("can't use a subscript in this context")) | ||||
| def listset(repo, subset, *xs, **opts): | def listset(repo, subset, *xs, **opts): | ||||
| raise error.ParseError(_("can't use a list in this context"), | raise error.ParseError(_("can't use a list in this context"), | ||||
| hint=_('see hg help "revsets.x or y"')) | hint=_('see \'hg help "revsets.x or y"\'')) | ||||
| def keyvaluepair(repo, subset, k, v, order): | def keyvaluepair(repo, subset, k, v, order): | ||||
| raise error.ParseError(_("can't use a key-value pair in this context")) | raise error.ParseError(_("can't use a key-value pair in this context")) | ||||
| def func(repo, subset, a, b, order): | def func(repo, subset, a, b, order): | ||||
| f = getsymbol(a) | f = getsymbol(a) | ||||
| if f in symbols: | if f in symbols: | ||||
| func = symbols[f] | func = symbols[f] | ||||
| [255] | [255] | ||||
| $ fileset -p parsed 'a, b, c' | $ fileset -p parsed 'a, b, c' | ||||
| * parsed: | * parsed: | ||||
| (list | (list | ||||
| (symbol 'a') | (symbol 'a') | ||||
| (symbol 'b') | (symbol 'b') | ||||
| (symbol 'c')) | (symbol 'c')) | ||||
| hg: parse error: can't use a list in this context | hg: parse error: can't use a list in this context | ||||
| (see hg help "filesets.x or y") | (see 'hg help "filesets.x or y"') | ||||
| [255] | [255] | ||||
| $ fileset '"path":.' | $ fileset '"path":.' | ||||
| hg: parse error: not a symbol | hg: parse error: not a symbol | ||||
| [255] | [255] | ||||
| $ fileset 'path:foo bar' | $ fileset 'path:foo bar' | ||||
| hg: parse error at 9: invalid token | hg: parse error at 9: invalid token | ||||
| [255] | [255] | ||||
| >>> open('1k', 'wb').write(b' '*1024) and None | >>> open('1k', 'wb').write(b' '*1024) and None | ||||
| >>> open('2k', 'wb').write(b' '*2048) and None | >>> open('2k', 'wb').write(b' '*2048) and None | ||||
| $ hg add 1k 2k | $ hg add 1k 2k | ||||
| $ fileset 'size("bar")' | $ fileset 'size("bar")' | ||||
| hg: parse error: couldn't parse size: bar | hg: parse error: couldn't parse size: bar | ||||
| [255] | [255] | ||||
| $ fileset '(1k, 2k)' | $ fileset '(1k, 2k)' | ||||
| hg: parse error: can't use a list in this context | hg: parse error: can't use a list in this context | ||||
| (see hg help "filesets.x or y") | (see 'hg help "filesets.x or y"') | ||||
| [255] | [255] | ||||
| $ fileset 'size(1k)' | $ fileset 'size(1k)' | ||||
| 1k | 1k | ||||
| $ fileset '(1k or 2k) and size("< 2k")' | $ fileset '(1k or 2k) and size("< 2k")' | ||||
| 1k | 1k | ||||
| $ fileset '(1k or 2k) and size("<=2k")' | $ fileset '(1k or 2k) and size("<=2k")' | ||||
| 1k | 1k | ||||
| 2k | 2k | ||||
| $ log '0|0000' | $ log '0|0000' | ||||
| 0 | 0 | ||||
| -1 | -1 | ||||
| test ',' in `_list` | test ',' in `_list` | ||||
| $ log '0,1' | $ log '0,1' | ||||
| hg: parse error: can't use a list in this context | hg: parse error: can't use a list in this context | ||||
| (see hg help "revsets.x or y") | (see 'hg help "revsets.x or y"') | ||||
| [255] | [255] | ||||
| $ try '0,1,2' | $ try '0,1,2' | ||||
| (list | (list | ||||
| (symbol '0') | (symbol '0') | ||||
| (symbol '1') | (symbol '1') | ||||
| (symbol '2')) | (symbol '2')) | ||||
| hg: parse error: can't use a list in this context | hg: parse error: can't use a list in this context | ||||
| (see hg help "revsets.x or y") | (see 'hg help "revsets.x or y"') | ||||
| [255] | [255] | ||||
| test that chained `or` operations make balanced addsets | test that chained `or` operations make balanced addsets | ||||
| $ try '0:1|1:2|2:3|3:4|4:5' | $ try '0:1|1:2|2:3|3:4|4:5' | ||||
| (or | (or | ||||
| (list | (list | ||||
| (range | (range | ||||