comparison mercurial/minifileset.py @ 35740:06a757b9e334

minifileset: unify handling of symbol and string patterns

They must be identical for fileset compatibility.

35739:9eb5c400f488

def _compile(tree):
    if not tree:
        raise error.ParseError(_("missing argument"))
    op = tree[0]
    if op == 'symbol':
        name = fileset.getstring(tree, _('invalid file pattern'))
        if name.startswith('**'): # file extension test, ex. "**.tar.gz"
            ext = name[2:]
            for c in ext:
                if c in '*{}[]?/\\':
                    raise error.ParseError(_('reserved character: %s') % c)
            return lambda n, s: n.endswith(ext)
        raise error.ParseError(_('invalid symbol: %s') % name)
    elif op == 'string':
        # TODO: teach fileset about 'path:', so that this can be a symbol and
        # not require quoting.
        name = fileset.getstring(tree, _('invalid path literal'))
        if name.startswith('path:'): # directory or full path test
            p = name[5:] # prefix
            pl = len(p)
            f = lambda n, s: n.startswith(p) and (len(n) == pl or n[pl] == '/')
            return f
        raise error.ParseError(_("invalid string"),
                               hint=_('paths must be prefixed with "path:"'))
    elif op == 'or':
        func1 = _compile(tree[1])
        func2 = _compile(tree[2])
        return lambda n, s: func1(n, s) or func2(n, s)

35740:06a757b9e334

def _compile(tree):
    if not tree:
        raise error.ParseError(_("missing argument"))
    op = tree[0]
    if op in {'symbol', 'string'}:
        name = fileset.getstring(tree, _('invalid file pattern'))
        if name.startswith('**'): # file extension test, ex. "**.tar.gz"
            ext = name[2:]
            for c in ext:
                if c in '*{}[]?/\\':
                    raise error.ParseError(_('reserved character: %s') % c)
            return lambda n, s: n.endswith(ext)
        # TODO: teach fileset about 'path:', so that this can be a symbol and
        # not require quoting.
        elif name.startswith('path:'): # directory or full path test
            p = name[5:] # prefix
            pl = len(p)
            f = lambda n, s: n.startswith(p) and (len(n) == pl or n[pl] == '/')
            return f
        raise error.ParseError(_("unsupported file pattern"),
                               hint=_('paths must be prefixed with "path:"'))
    elif op == 'or':
        func1 = _compile(tree[1])
        func2 = _compile(tree[2])
        return lambda n, s: func1(n, s) or func2(n, s)