← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-08-02 10:38:21 UTC
  • mto: This revision was merged to the branch mainline in revision 6555.
  • Revision ID: jelmer@samba.org-20120802103821-pto2dgacjtmpzl1n
Move color feature into bzrlib.tests.features.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/grep/cmds.py
147
147
            path_list=None, revision=None, pattern=None, include=None,
148
148
            exclude=None, fixed_string=False, files_with_matches=False,
149
149
            files_without_match=False, color=None, diff=False):
150
 
        from bzrlib import _termcolor
 
150
        from bzrlib import termcolor
151
151
        from bzrlib.plugins.grep import (
152
152
            grep,
153
153
            )
208
208
        elif color == 'never':
209
209
            show_color = False
210
210
        elif color == 'auto':
211
 
            show_color = _termcolor.allow_color()
 
211
            show_color = termcolor.allow_color()
212
212
 
213
213
        GrepOptions.verbose = verbose
214
214
        GrepOptions.ignore_case = ignore_case