/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
from __future__ import absolute_import
20
20
 
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
 
21
from ... import errors
 
22
from ...commands import Command, display_command
 
23
from ...option import Option, ListOption
 
24
from ...config import GlobalConfig
25
25
 
26
 
# FIXME: _parse_levels should be shared with bzrlib.builtins. this is a copy
 
26
# FIXME: _parse_levels should be shared with breezy.builtins. this is a copy
27
27
# to avoid the error
28
28
#   "IllegalUseOfScopeReplacer: ScopeReplacer object '_parse_levels' was used
29
29
#   incorrectly: Object already cleaned up, did you assign it to another
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
151
 
        from bzrlib.plugins.grep import (
 
150
        from breezy import _termcolor
 
151
        from breezy.plugins.grep import (
152
152
            grep,
153
153
            )
154
154
        import re