Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 12386:8eedf53547b8
merge with stable
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Thu, 23 Sep 2010 10:59:21 +0200 |
parents | f1e8d6f6e682 9a93f4fb141b |
children | 4ac734b9b3fd |
comparison
equal
deleted
inserted
replaced
12383:f1e8d6f6e682 | 12386:8eedf53547b8 |
---|---|
1583 reflags = 0 | 1583 reflags = 0 |
1584 if opts.get('ignore_case'): | 1584 if opts.get('ignore_case'): |
1585 reflags |= re.I | 1585 reflags |= re.I |
1586 try: | 1586 try: |
1587 regexp = re.compile(pattern, reflags) | 1587 regexp = re.compile(pattern, reflags) |
1588 except Exception, inst: | 1588 except re.error, inst: |
1589 ui.warn(_("grep: invalid match pattern: %s\n") % inst) | 1589 ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
1590 return 1 | 1590 return 1 |
1591 sep, eol = ':', '\n' | 1591 sep, eol = ':', '\n' |
1592 if opts.get('print0'): | 1592 if opts.get('print0'): |
1593 sep = eol = '\0' | 1593 sep = eol = '\0' |