comparison mercurial/match.py @ 20401:906358d0350e

match: use ctx.getfileset() instead of fileset.getfileset()

Resolves an import cycle involving match and merge.

20400:f0137d994c83

#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

import re
import util, fileset, pathutil
from i18n import _

def _rematcher(pat):
    m = util.compilere(pat)
    try:

    for kind, expr in pats:
        if kind == 'set':
            if not ctx:
                raise util.Abort("fileset expression with no context")
            s = fileset.getfileset(ctx, expr)
            fset.update(s)
            continue
        other.append((kind, expr))
    return fset, other

20401:906358d0350e

#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

import re
import util, pathutil
from i18n import _

def _rematcher(pat):
    m = util.compilere(pat)
    try:

    for kind, expr in pats:
        if kind == 'set':
            if not ctx:
                raise util.Abort("fileset expression with no context")
            s = ctx.getfileset(expr)
            fset.update(s)
            continue
        other.append((kind, expr))
    return fset, other