comparison mercurial/ignore.py @ 25066:e91b32d3c67b

ignore: refactor syntax concatenation

This refactors the syntax+rule concatenation logic to be more separated. It
determines the syntax and the rule separately and then puts them back together.
This will help in a later patch when we want to process just the rule before it
gets concatenated.

25065:8cf7f0c4cb14

            try:
                syntax = syntaxes[s]
            except KeyError:
                warnings.append(_("ignoring invalid syntax '%s'") % s)
            continue
        pat = syntax + line
        for s, rels in syntaxes.iteritems():
            if line.startswith(rels):
                pat = line
                break
            elif line.startswith(s+':'):
                pat = rels + line[len(s) + 1:]
                break
        patterns.append(pat)

    return patterns, warnings

def readignorefile(filepath, warn, skipwarning=False):
    try:

25066:e91b32d3c67b

            try:
                syntax = syntaxes[s]
            except KeyError:
                warnings.append(_("ignoring invalid syntax '%s'") % s)
            continue

        linesyntax = syntax
        for s, rels in syntaxes.iteritems():
            if line.startswith(rels):
                linesyntax = rels
                line = line[len(rels):]
                break
            elif line.startswith(s+':'):
                linesyntax = rels
                line = line[len(s) + 1:]
                break
        patterns.append(linesyntax + line)

    return patterns, warnings

def readignorefile(filepath, warn, skipwarning=False):
    try: