/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/plugins/grep/cmds.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/grep/cmds.py
18
18
 
19
19
from __future__ import absolute_import
20
20
 
21
 
from ... import errors
22
 
from ...commands import Command, display_command
23
 
from ...option import Option, ListOption
24
 
from ...config import GlobalConfig
25
 
 
26
 
from ...sixish import (
27
 
    text_type,
28
 
    )
29
 
 
30
 
# FIXME: _parse_levels should be shared with breezy.builtins. this is a copy
 
21
from bzrlib import errors
 
22
from bzrlib.commands import Command, display_command
 
23
from bzrlib.option import Option, ListOption
 
24
from bzrlib.config import GlobalConfig
 
25
 
 
26
# FIXME: _parse_levels should be shared with bzrlib.builtins. this is a copy
31
27
# to avoid the error
32
28
#   "IllegalUseOfScopeReplacer: ScopeReplacer object '_parse_levels' was used
33
29
#   incorrectly: Object already cleaned up, did you assign it to another
109
105
    takes_options = [
110
106
        'verbose',
111
107
        'revision',
112
 
        Option('color', type=text_type, argname='when',
 
108
        Option('color', type=str, argname='when',
113
109
               help='Show match in color. WHEN is never, always or auto.'),
114
110
        Option('diff', short_name='p',
115
111
               help='Grep for pattern in changeset for each revision.'),
116
 
        ListOption('exclude', type=text_type, argname='glob', short_name='X',
 
112
        ListOption('exclude', type=str, argname='glob', short_name='X',
117
113
            help="Skip files whose base name matches GLOB."),
118
 
        ListOption('include', type=text_type, argname='glob', short_name='I',
 
114
        ListOption('include', type=str, argname='glob', short_name='I',
119
115
            help="Search only files whose base name matches GLOB."),
120
116
        Option('files-with-matches', short_name='l',
121
117
               help='Print only the name of each input file in '
151
147
            path_list=None, revision=None, pattern=None, include=None,
152
148
            exclude=None, fixed_string=False, files_with_matches=False,
153
149
            files_without_match=False, color=None, diff=False):
154
 
        from breezy import _termcolor
155
 
        from breezy.plugins.grep import (
 
150
        from bzrlib import _termcolor
 
151
        from bzrlib.plugins.grep import (
156
152
            grep,
157
153
            )
158
154
        import re