comparison mercurial/ignore.py @ 5640:04c76f296ad6

ignore: fix up comment parsing

- remove redundant newline bits
- change loop to use regex
- eliminate escaping of # in internal representation

5639:7dd5cf9d1e09

#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from i18n import _
import util

def _parselines(fp):
    for line in fp:
        if not line.endswith('\n'):
            line += '\n'
        escape = False
        for i in xrange(len(line)):
            if escape: escape = False
            elif line[i] == '\\': escape = True
            elif line[i] == '#': break
        line = line[:i].rstrip()
        if line:
            yield line

def ignore(root, files, warn):
    '''return the contents of .hgignore files as a list of patterns.

5640:04c76f296ad6

#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from i18n import _
import util, re

_commentre = None

def _parselines(fp):
    for line in fp:
        if "#" in line:
            global _commentre
            if not _commentre:
                _commentre = re.compile(r'((^|[^\\])(\\\\)*)#.*')
            # remove comments prefixed by an even number of escapes
            line = _commentre.sub(r'\1', line)
            # fixup properly escaped comments that survived the above
            line = line.replace("\\#", "#")
        line = line.rstrip()
        if line:
            yield line

def ignore(root, files, warn):
    '''return the contents of .hgignore files as a list of patterns.