/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 breezy/plugins/grep/cmds.py

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/grep/cmds.py
23
23
from ...option import Option, ListOption
24
24
from ...config import GlobalConfig
25
25
 
 
26
from ...sixish import (
 
27
    text_type,
 
28
    )
 
29
 
26
30
# FIXME: _parse_levels should be shared with breezy.builtins. this is a copy
27
31
# to avoid the error
28
32
#   "IllegalUseOfScopeReplacer: ScopeReplacer object '_parse_levels' was used
105
109
    takes_options = [
106
110
        'verbose',
107
111
        'revision',
108
 
        Option('color', type=str, argname='when',
 
112
        Option('color', type=text_type, argname='when',
109
113
               help='Show match in color. WHEN is never, always or auto.'),
110
114
        Option('diff', short_name='p',
111
115
               help='Grep for pattern in changeset for each revision.'),
112
 
        ListOption('exclude', type=str, argname='glob', short_name='X',
 
116
        ListOption('exclude', type=text_type, argname='glob', short_name='X',
113
117
            help="Skip files whose base name matches GLOB."),
114
 
        ListOption('include', type=str, argname='glob', short_name='I',
 
118
        ListOption('include', type=text_type, argname='glob', short_name='I',
115
119
            help="Search only files whose base name matches GLOB."),
116
120
        Option('files-with-matches', short_name='l',
117
121
               help='Print only the name of each input file in '