Merge lp:~parthm/bzr-grep/bzr-grep-1st-full-review into lp:bzr-grep

[Parth Malwankar]

Proposal for reviewing initial version of bzr-grep. This plugin was created in response to bug #503670.

Unfortunately, for lack of a better way to do a first review, I have deleted all files in this mp (so once review comments are closed I will reject this mp).

[~]% bzr help grep
Purpose: Print lines matching PATTERN for specified files and revisions.
Usage: bzr grep PATTERN [PATH...]

Options:
  --from-root Search for pattern starting from the root of the
                        branch. (implies --recursive)
  -Z, --null Write an ascii NUL (\0) separator between output lines
                        rather than a newline.
  -v, --verbose Display more information.
  -R, --recursive Recurse into subdirectories.
  -h, --help Show help message.
  -q, --quiet Only display errors and warnings.
  -i, --ignore-case ignore case distinctions while matching.
  --levels=N Number of levels to display - 0 for all, 1 for
                        collapsed (default).
  --usage Show usage message and options.
  -n, --line-number show 1-based line number.
  -r ARG, --revision=ARG
                        See "help revisionspec" for details.

Description:
  This command searches the specified files and revisions for a given pattern.
  The pattern is specified as a Python regular expressions[1].
  If the file name is not specified the file revisions in the current directory
  are searched. If the revision number is not specified, the latest revision is
  searched.

  Note that this command is different from POSIX grep in that it searches the
  revisions of the branch and not the working copy. Unversioned files and
  uncommitted changes are not seen.

  When searching a pattern, the output is shown in the 'filepath:string' format.
  If a revision is explicitly searched, the output is shown as 'filepath~N:string',
  where N is the revision number.

  [1] http://docs.python.org/library/re.html#regular-expression-syntax

From: plugin "grep"
See also: plugins/grep

[Jelmer Vernooij (jelmer)]

I'm not sure what you're asking for exactly - a review of bzr-grep in its entirety?

[Jelmer Vernooij (jelmer)]

review: Needs Information (code)

[Parth Malwankar (parthm)]

> I'm not sure what you're asking for exactly - a review of bzr-grep in its
> entirety?

This request is very old - for the first version of bzr-grep, when I was new to bzr API. I don't think this review is needed any more. Martin [gz] also helped with some refactoring and cleanup at a later point.
I will go ahead and mark this as rejected.
Thanks.

Unmerged revisions

54. By Parth Malwankar on 2010-03-04

dummy delete to do first review with full source.

=== removed file '__init__.py'
--- __init__.py	2010-03-03 17:07:15 +0000
+++ __init__.py	1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-# Copyright (C) 2010 Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-import sys
-
-from bzrlib import errors
-from bzrlib.commands import Command, register_command, display_command
-from bzrlib.option import (
-    Option,
-    )
-
-from bzrlib.lazy_import import lazy_import
-lazy_import(globals(), """
-import re
-
-import grep
-
-import bzrlib
-from bzrlib.builtins import _get_revision_range
-from bzrlib.revisionspec import RevisionSpec, RevisionSpec_revid
-from bzrlib.workingtree import WorkingTree
-from bzrlib import log as logcmd
-from bzrlib import (
-    osutils,
-    bzrdir,
-    trace,
-    )
-""")
-
-version_info = (0, 0, 1, 'dev', 1)
-
-# FIXME: _parse_levels should be shared with bzrlib.builtins. this is a copy
-# to avoid the error
-#   "IllegalUseOfScopeReplacer: ScopeReplacer object '_parse_levels' was used
-#   incorrectly: Object already cleaned up, did you assign it to another
-#   variable?: _factory
-# with lazy import
-def _parse_levels(s):
-    try:
-        return int(s)
-    except ValueError:
-        msg = "The levels argument must be an integer."
-        raise errors.BzrCommandError(msg)
-
-
-class cmd_grep(Command):
-    """Print lines matching PATTERN for specified files and revisions.
-
-    This command searches the specified files and revisions for a given pattern.
-    The pattern is specified as a Python regular expressions[1].
-    If the file name is not specified the file revisions in the current directory
-    are searched. If the revision number is not specified, the latest revision is
-    searched.
-
-    Note that this command is different from POSIX grep in that it searches the
-    revisions of the branch and not the working copy. Unversioned files and
-    uncommitted changes are not seen.
-
-    When searching a pattern, the output is shown in the 'filepath:string' format.
-    If a revision is explicitly searched, the output is shown as 'filepath~N:string',
-    where N is the revision number.
-
-    [1] http://docs.python.org/library/re.html#regular-expression-syntax
-    """
-
-    takes_args = ['pattern', 'path*']
-    takes_options = [
-        'verbose',
-        'revision',
-        Option('line-number', short_name='n',
-               help='show 1-based line number.'),
-        Option('ignore-case', short_name='i',
-               help='ignore case distinctions while matching.'),
-        Option('recursive', short_name='R',
-               help='Recurse into subdirectories.'),
-        Option('from-root',
-               help='Search for pattern starting from the root of the branch. '
-               '(implies --recursive)'),
-        Option('null', short_name='Z',
-               help='Write an ascii NUL (\\0) separator '
-               'between output lines rather than a newline.'),
-        Option('levels',
-           help='Number of levels to display - 0 for all, 1 for collapsed (default).',
-           argname='N',
-           type=_parse_levels),
-        ]
-
-
-    @display_command
-    def run(self, verbose=False, ignore_case=False, recursive=False, from_root=False,
-            null=False, levels=None, line_number=False, path_list=None, revision=None, pattern=None):
-
-        if levels==None:
-            levels=1
-
-        if path_list == None:
-            path_list = ['.']
-        else:
-            if from_root:
-                raise errors.BzrCommandError('cannot specify both --from-root and PATH.')
-
-        print_revno = False
-        if revision != None or levels == 0:
-            # print revision numbers as we may be showing multiple revisions
-            print_revno = True
-
-        if revision == None:
-            # grep on latest revision by default
-            revision = [RevisionSpec.from_string("last:1")]
-
-        start_rev = revision[0]
-        end_rev = revision[0]
-        if len(revision) == 2:
-            end_rev = revision[1]
-
-        eol_marker = '\n'
-        if null:
-            eol_marker = '\0'
-
-        re_flags = 0
-        if ignore_case:
-            re_flags = re.IGNORECASE
-        patternc = grep.compile_pattern(pattern, re_flags)
-
-        wt, relpath = WorkingTree.open_containing('.')
-
-        start_revid = start_rev.as_revision_id(wt.branch)
-        end_revid   = end_rev.as_revision_id(wt.branch)
-
-        given_revs = logcmd._graph_view_revisions(wt.branch, start_revid, end_revid)
-
-        # edge case: we have a repo created with 'bzr init' and it has no
-        # revisions (revno: 0)
-        try:
-            given_revs = list(given_revs)
-        except errors.NoSuchRevision, e:
-            raise errors.BzrCommandError('No revisions found for grep.')
-
-        for revid, revno, merge_depth in given_revs:
-            if levels == 1 and merge_depth != 0:
-                # with level=1 show only top level
-                continue
-
-            wt.lock_read()
-            rev = RevisionSpec_revid.from_string("revid:"+revid)
-            try:
-                for path in path_list:
-                    tree = rev.as_tree(wt.branch)
-                    path_for_id = osutils.pathjoin(relpath, path)
-                    id = tree.path2id(path_for_id)
-                    if not id:
-                        self._skip_file(path)
-                        continue
-
-                    if osutils.isdir(path):
-                        path_prefix = path
-                        grep.dir_grep(tree, path, relpath, recursive, line_number,
-                            patternc, from_root, eol_marker, revno, print_revno,
-                            self.outf, path_prefix)
-                    else:
-                        tree.lock_read()
-                        try:
-                            grep.file_grep(tree, id, '.', path, patternc, eol_marker,
-                                line_number, revno, print_revno, self.outf)
-                        finally:
-                            tree.unlock()
-            finally:
-                wt.unlock()
-
-    def _skip_file(self, path):
-        trace.warning("warning: skipped unknown file '%s'." % path)
-
-
-register_command(cmd_grep)
-
-def test_suite():
-    from bzrlib.tests import TestUtil
-
-    suite = TestUtil.TestSuite()
-    loader = TestUtil.TestLoader()
-    testmod_names = [
-        'test_grep',
-        ]
-
-    suite.addTest(loader.loadTestsFromModuleNames(
-            ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
-    return suite
-

=== removed file 'grep.py'
--- grep.py	2010-03-03 17:07:15 +0000
+++ grep.py	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-# Copyright (C) 2010 Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-from bzrlib.lazy_import import lazy_import
-lazy_import(globals(), """
-import os
-import re
-import cStringIO
-
-from bzrlib import (
-    errors,
-    lazy_regex,
-    osutils,
-    textfile,
-    trace,
-    )
-""")
-
-def compile_pattern(pattern, flags=0):
-    patternc = None
-    try:
-        # use python's re.compile as we need to catch re.error in case of bad pattern
-        lazy_regex.reset_compile()
-        patternc = re.compile(pattern, flags)
-    except re.error, e:
-        raise errors.BzrError("Invalid pattern: '%s'" % pattern)
-    return patternc
-
-def dir_grep(tree, path, relpath, recursive, line_number, compiled_pattern,
-    from_root, eol_marker, revno, print_revno, outf, path_prefix):
-        # setup relpath to open files relative to cwd
-        rpath = relpath
-        if relpath:
-            rpath = osutils.pathjoin('..',relpath)
-
-        tree.lock_read()
-        try:
-            from_dir = osutils.pathjoin(relpath, path)
-            if from_root:
-                # start searching recursively from root
-                from_dir=None
-                recursive=True
-
-            for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
-                from_dir=from_dir, recursive=recursive):
-                if fc == 'V' and fkind == 'file':
-                    file_grep(tree, fid, rpath, fp, compiled_pattern,
-                        eol_marker, line_number, revno, print_revno, outf, path_prefix)
-        finally:
-            tree.unlock()
-
-
-def file_grep(tree, id, relpath, path, patternc, eol_marker,
-        line_number, revno, print_revno, outf, path_prefix = None):
-
-    if relpath:
-        # update path so to display it w.r.t cwd
-        # handle windows slash separator
-        path = osutils.normpath(osutils.pathjoin(relpath, path))
-        path = path.replace('\\', '/')
-        path = path.replace(relpath + '/', '', 1)
-
-    if path_prefix and path_prefix != '.':
-        # user has passed a dir arg, show that as result prefix
-        path = osutils.pathjoin(path_prefix, path)
-
-    revfmt = ''
-    if print_revno:
-        revfmt = "~%s"
-
-    fmt_with_n = path + revfmt + ":%d:%s" + eol_marker
-    fmt_without_n = path + revfmt + ":%s" + eol_marker
-
-    # test and skip binary files
-    str_file = cStringIO.StringIO(tree.get_file_text(id))
-    try:
-        iter_file = textfile.text_file(str_file)
-    except errors.BinaryFile, e:
-        trace.warning("Binary file '%s' skipped." % path)
-        return
-
-    index = 1
-    for line in iter_file:
-        res = patternc.search(line)
-        if res:
-            if line_number:
-                if print_revno:
-                    out = (revno, index, line.strip())
-                else:
-                    out = (index, line.strip())
-                outf.write(fmt_with_n % out)
-            else:
-                if print_revno:
-                    out = (revno, line.strip())
-                else:
-                    out = (line.strip(),)
-                outf.write(fmt_without_n % out)
-
-        index += 1
-
-

=== removed file 'setup.py'
--- setup.py	2010-03-03 16:48:48 +0000
+++ setup.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/usr/bin/env python2.4
-from distutils.core import setup
-
-bzr_plugin_name = 'grep'
-
-bzr_plugin_version = (0, 0, 1, 'dev', 1)
-bzr_commands = ['grep']
-
-if __name__ == 'main':
-    setup(name="bzr grep",
-          version="0.1dev",
-          description="Print lines matching pattern for specified "
-                      "files and revisions",
-          author="Canonical Ltd",
-          author_email="[e-mail]",
-          license = "GNU GPL v2",
-          url="https://launchpad.net/bzr-grep",
-          packages=['grep'],
-          package_dir={'grep': '.'})

=== removed file 'test_grep.py'
--- test_grep.py	2010-03-03 14:14:47 +0000
+++ test_grep.py	1970-01-01 00:00:00 +0000
@@ -1,447 +0,0 @@
-# Copyright (C) 2010 Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-import re
-
-from bzrlib import tests, osutils
-
-class TestGrep(tests.TestCaseWithTransport):
-    def _str_contains(self, base, pattern, flags=re.MULTILINE|re.DOTALL):
-        res = re.findall(pattern, base, flags)
-        return res != []
-
-    def _mk_file(self, path, line_prefix, total_lines, versioned):
-        text=''
-        for i in range(total_lines):
-            text += line_prefix + str(i+1) + "\n"
-
-        open(path, 'w').write(text)
-        if versioned:
-            self.run_bzr(['add', path])
-            self.run_bzr(['ci', '-m', '"' + path + '"'])
-
-    def _update_file(self, path, text):
-        """append text to file 'path' and check it in"""
-        open(path, 'a').write(text)
-        self.run_bzr(['ci', '-m', '"' + path + '"'])
-
-    def _mk_unknown_file(self, path, line_prefix='line', total_lines=10):
-        self._mk_file(path, line_prefix, total_lines, versioned=False)
-
-    def _mk_versioned_file(self, path, line_prefix='line', total_lines=10):
-        self._mk_file(path, line_prefix, total_lines, versioned=True)
-
-    def _mk_dir(self, path, versioned):
-        os.mkdir(path)
-        if versioned:
-            self.run_bzr(['add', path])
-            self.run_bzr(['ci', '-m', '"' + path + '"'])
-
-    def _mk_unknown_dir(self, path):
-        self._mk_dir(path, versioned=False)
-
-    def _mk_versioned_dir(self, path):
-        self._mk_dir(path, versioned=True)
-
-    def test_basic_unknown_file(self):
-        """search for pattern in specfic file. should issue warning."""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('filex.txt') # force rev to revno:1 and not revno:0
-        self._mk_unknown_file('file0.txt')
-        out, err = self.run_bzr(['grep', 'line1', 'file0.txt'])
-        self.assertFalse(self._str_contains(out, "file0.txt:line1"))
-        self.assertTrue(self._str_contains(err, "warning: skipped.*file0.txt.*\."))
-
-    def test_revno0(self):
-        """search for pattern in when only revno0 is present"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)   # only revno 0 in branch
-        os.chdir(wd)
-        out, err = self.run_bzr(['grep', 'line1'], retcode=3)
-        self.assertTrue(self._str_contains(err, "ERROR: No revisions found"))
-
-    def test_basic_versioned_file(self):
-        """search for pattern in specfic file"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt')
-        out, err = self.run_bzr(['grep', 'line1', 'file0.txt'])
-        self.assertTrue(self._str_contains(out, "file0.txt:line1"))
-        self.assertFalse(self._str_contains(err, "warning: skipped.*file0.txt.*\."))
-
-    def test_multiple_files(self):
-        """search for pattern in multiple files"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt', total_lines=2)
-        self._mk_versioned_file('file1.txt', total_lines=2)
-        self._mk_versioned_file('file2.txt', total_lines=2)
-        out, err = self.run_bzr(['grep', 'line[1-2]'])
-
-        self.assertTrue(self._str_contains(out, "file0.txt:line1"))
-        self.assertTrue(self._str_contains(out, "file0.txt:line2"))
-        self.assertTrue(self._str_contains(out, "file1.txt:line1"))
-        self.assertTrue(self._str_contains(out, "file1.txt:line2"))
-        self.assertTrue(self._str_contains(out, "file2.txt:line1"))
-        self.assertTrue(self._str_contains(out, "file2.txt:line2"))
-
-    def test_null_option(self):
-        """--null option should use NUL instead of newline"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt', total_lines=3)
-
-        out, err = self.run_bzr(['grep', '--null', 'line[1-3]'])
-        self.assertTrue(out == "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0")
-
-        out, err = self.run_bzr(['grep', '-Z', 'line[1-3]'])
-        self.assertTrue(out == "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0")
-
-    def test_versioned_file_in_dir_no_recurse(self):
-        """should not recurse without -R"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_dir('dir0')
-        self._mk_versioned_file('dir0/file0.txt')
-        out, err = self.run_bzr(['grep', 'line1'])
-        self.assertFalse(self._str_contains(out, "file0.txt:line1"))
-
-    def test_versioned_file_in_dir_recurse(self):
-        """should find pattern in hierarchy with -R"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_dir('dir0')
-        self._mk_versioned_file('dir0/file0.txt')
-        out, err = self.run_bzr(['grep', '-R', 'line1'])
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1"))
-        out, err = self.run_bzr(['grep', '--recursive', 'line1'])
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1"))
-
-    def test_versioned_file_within_dir(self):
-        """search for pattern while in nested dir"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_dir('dir0')
-        self._mk_versioned_file('dir0/file0.txt')
-        os.chdir('dir0')
-        out, err = self.run_bzr(['grep', 'line1'])
-        self.assertTrue(self._str_contains(out, "^file0.txt:line1"))
-
-    def test_versioned_files_from_outside_dir(self):
-        """grep for pattern with dirs passed as argument"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-
-        self._mk_versioned_dir('dir0')
-        self._mk_versioned_file('dir0/file0.txt')
-
-        self._mk_versioned_dir('dir1')
-        self._mk_versioned_file('dir1/file1.txt')
-
-        out, err = self.run_bzr(['grep', 'line1', 'dir0', 'dir1'])
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1"))
-        self.assertTrue(self._str_contains(out, "^dir1/file1.txt:line1"))
-
-    def test_versioned_files_from_outside_dir(self):
-        """grep for pattern with dirs passed as argument"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-
-        self._mk_versioned_dir('dir0')
-        self._mk_versioned_file('dir0/file0.txt')
-
-        self._mk_versioned_dir('dir1')
-        self._mk_versioned_file('dir1/file1.txt')
-
-        out, err = self.run_bzr(['grep', 'line1', 'dir0', 'dir1'])
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1"))
-        self.assertTrue(self._str_contains(out, "^dir1/file1.txt:line1"))
-
-    def test_versioned_files_from_outside_two_dirs(self):
-        """grep for pattern with two levels of nested dir"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-
-        self._mk_versioned_dir('dir0')
-        self._mk_versioned_file('dir0/file0.txt')
-
-        self._mk_versioned_dir('dir1')
-        self._mk_versioned_file('dir1/file1.txt')
-
-        self._mk_versioned_dir('dir0/dir00')
-        self._mk_versioned_file('dir0/dir00/file0.txt')
-
-        out, err = self.run_bzr(['grep', 'line1', 'dir0/dir00'])
-        self.assertTrue(self._str_contains(out, "^dir0/dir00/file0.txt:line1"))
-
-        out, err = self.run_bzr(['grep', '-R', 'line1'])
-        self.assertTrue(self._str_contains(out, "^dir0/dir00/file0.txt:line1"))
-
-    def test_versioned_file_within_dir_two_levels(self):
-        """search for pattern while in nested dir (two levels)"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_dir('dir0')
-        self._mk_versioned_dir('dir0/dir1')
-        self._mk_versioned_file('dir0/dir1/file0.txt')
-        os.chdir('dir0')
-        out, err = self.run_bzr(['grep', '-R', 'line1'])
-        self.assertTrue(self._str_contains(out, "^dir1/file0.txt:line1"))
-        out, err = self.run_bzr(['grep', '--from-root', 'line1'])
-        self.assertTrue(self._str_contains(out, "^dir0/dir1/file0.txt:line1"))
-        out, err = self.run_bzr(['grep', 'line1'])
-        self.assertFalse(self._str_contains(out, "file0.txt"))
-
-    def test_ignore_case_no_match(self):
-        """match fails without --ignore-case"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt')
-        out, err = self.run_bzr(['grep', 'LinE1', 'file0.txt'])
-        self.assertFalse(self._str_contains(out, "file0.txt:line1"))
-
-    def test_ignore_case_match(self):
-        """match fails without --ignore-case"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt')
-        out, err = self.run_bzr(['grep', '-i', 'LinE1', 'file0.txt'])
-        self.assertTrue(self._str_contains(out, "file0.txt:line1"))
-        out, err = self.run_bzr(['grep', '--ignore-case', 'LinE1', 'file0.txt'])
-        self.assertTrue(self._str_contains(out, "^file0.txt:line1"))
-
-    def test_from_root_fail(self):
-        """match should fail without --from-root"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt')
-        self._mk_versioned_dir('dir0')
-        os.chdir('dir0')
-        out, err = self.run_bzr(['grep', 'line1'])
-        self.assertFalse(self._str_contains(out, ".*file0.txt:line1"))
-
-    def test_from_root_pass(self):
-        """match pass with --from-root"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt')
-        self._mk_versioned_dir('dir0')
-        os.chdir('dir0')
-        out, err = self.run_bzr(['grep', '--from-root', 'line1'])
-        self.assertTrue(self._str_contains(out, ".*file0.txt:line1"))
-
-    def test_with_line_number(self):
-        """search for pattern with --line-number"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt')
-
-        out, err = self.run_bzr(['grep', '--line-number', 'line3', 'file0.txt'])
-        self.assertTrue(self._str_contains(out, "file0.txt:3:line3"))
-
-        out, err = self.run_bzr(['grep', '-n', 'line1', 'file0.txt'])
-        self.assertTrue(self._str_contains(out, "file0.txt:1:line1"))
-
-    def test_revno_basic_history_grep_file(self):
-        """search for pattern in specific revision number in a file"""
-        wd = 'foobar0'
-        fname = 'file0.txt'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file(fname, total_lines=0)
-        self._update_file(fname, text="v2 text\n")
-        self._update_file(fname, text="v3 text\n")
-        self._update_file(fname, text="v4 text\n")
-
-        # rev 2 should not have text 'v3'
-        out, err = self.run_bzr(['grep', '-r', '2', 'v3', fname])
-        self.assertFalse(self._str_contains(out, "file0.txt"))
-
-        # rev 3 should not have text 'v3'
-        out, err = self.run_bzr(['grep', '-r', '3', 'v3', fname])
-        self.assertTrue(self._str_contains(out, "file0.txt~3:v3.*"))
-
-        # rev 3 should not have text 'v3' with line number
-        out, err = self.run_bzr(['grep', '-r', '3', '-n', 'v3', fname])
-        self.assertTrue(self._str_contains(out, "file0.txt~3:2:v3.*"))
-
-    def test_revno_basic_history_grep_full(self):
-        """search for pattern in specific revision number in a file"""
-        wd = 'foobar0'
-        fname = 'file0.txt'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file(fname, total_lines=0) # rev1
-        self._mk_versioned_file('file1.txt')          # rev2
-        self._update_file(fname, text="v3 text\n")    # rev3
-        self._update_file(fname, text="v4 text\n")    # rev4
-        self._update_file(fname, text="v5 text\n")    # rev5
-
-        # rev 2 should not have text 'v3'
-        out, err = self.run_bzr(['grep', '-r', '2', 'v3'])
-        self.assertFalse(self._str_contains(out, "file0.txt"))
-
-        # rev 3 should not have text 'v3'
-        out, err = self.run_bzr(['grep', '-r', '3', 'v3'])
-        self.assertTrue(self._str_contains(out, "file0.txt~3:v3"))
-
-        # rev 3 should not have text 'v3' with line number
-        out, err = self.run_bzr(['grep', '-r', '3', '-n', 'v3'])
-        self.assertTrue(self._str_contains(out, "file0.txt~3:1:v3"))
-
-    def test_revno_versioned_file_in_dir(self):
-        """we create a file 'foobar0/dir0/file0.txt' and grep specific version of content"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_dir('dir0')                      # rev1
-        self._mk_versioned_file('dir0/file0.txt')           # rev2
-        self._update_file('dir0/file0.txt', "v3 text\n")    # rev3
-        self._update_file('dir0/file0.txt', "v4 text\n")    # rev4
-        self._update_file('dir0/file0.txt', "v5 text\n")    # rev5
-
-        # v4 should not be present in revno 3
-        out, err = self.run_bzr(['grep', '-r', 'last:3', '-R', 'v4'])
-        self.assertFalse(self._str_contains(out, "^dir0/file0.txt"))
-
-        # v4 should be present in revno 4
-        out, err = self.run_bzr(['grep', '-r', 'last:2', '-R', 'v4'])
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v4"))
-
-    def test_revno_range_basic_history_grep(self):
-        """search for pattern in revision range for file"""
-        wd = 'foobar0'
-        fname = 'file0.txt'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file(fname, total_lines=0) # rev1
-        self._mk_versioned_file('file1.txt')          # rev2
-        self._update_file(fname, text="v3 text\n")    # rev3
-        self._update_file(fname, text="v4 text\n")    # rev4
-        self._update_file(fname, text="v5 text\n")    # rev5
-        self._update_file(fname, text="v6 text\n")    # rev6
-
-        out, err = self.run_bzr(['grep', '-r', '1..', 'v3'])
-        self.assertTrue(self._str_contains(out, "file0.txt~3:v3"))
-        self.assertTrue(self._str_contains(out, "file0.txt~4:v3"))
-        self.assertTrue(self._str_contains(out, "file0.txt~5:v3"))
-
-        out, err = self.run_bzr(['grep', '-r', '1..5', 'v3'])
-        self.assertTrue(self._str_contains(out, "file0.txt~3:v3"))
-        self.assertTrue(self._str_contains(out, "file0.txt~4:v3"))
-        self.assertTrue(self._str_contains(out, "file0.txt~5:v3"))
-        self.assertFalse(self._str_contains(out, "file0.txt~6:v3"))
-
-    def test_revno_range_versioned_file_in_dir(self):
-        """we create a file 'foobar0/dir0/file0.txt' and grep rev-range for pattern"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_dir('dir0')                      # rev1
-        self._mk_versioned_file('dir0/file0.txt')           # rev2
-        self._update_file('dir0/file0.txt', "v3 text\n")    # rev3
-        self._update_file('dir0/file0.txt', "v4 text\n")    # rev4
-        self._update_file('dir0/file0.txt', "v5 text\n")    # rev5
-        self._update_file('dir0/file0.txt', "v6 text\n")    # rev6
-
-        out, err = self.run_bzr(['grep', '-R', '-r', '2..5', 'v3'])
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~3:v3"))
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v3"))
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~5:v3"))
-        self.assertFalse(self._str_contains(out, "^dir0/file0.txt~6:v3"))
-
-    def test_revno_range_versioned_file_from_outside_dir(self):
-        """grep rev-range for pattern from outside dir"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_dir('dir0')                      # rev1
-        self._mk_versioned_file('dir0/file0.txt')           # rev2
-        self._update_file('dir0/file0.txt', "v3 text\n")    # rev3
-        self._update_file('dir0/file0.txt', "v4 text\n")    # rev4
-        self._update_file('dir0/file0.txt', "v5 text\n")    # rev5
-        self._update_file('dir0/file0.txt', "v6 text\n")    # rev6
-
-        out, err = self.run_bzr(['grep', '-r', '2..5', 'v3', 'dir0'])
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~3:v3"))
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v3"))
-        self.assertTrue(self._str_contains(out, "^dir0/file0.txt~5:v3"))
-        self.assertFalse(self._str_contains(out, "^dir0/file0.txt~6:v3"))
-
-    def test_levels(self):
-        """levels=0 should show findings from merged revision"""
-        wd0 = 'foobar0'
-        wd1 = 'foobar1'
-
-        self.make_branch_and_tree(wd0)
-        os.chdir(wd0)
-        self._mk_versioned_file('file0.txt')
-        os.chdir('..')
-
-        out, err = self.run_bzr(['branch', wd0, wd1])
-        os.chdir(wd1)
-        self._mk_versioned_file('file1.txt')
-        os.chdir(osutils.pathjoin('..', wd0))
-
-        out, err = self.run_bzr(['merge', osutils.pathjoin('..', wd1)])
-        out, err = self.run_bzr(['ci', '-m', 'merged'])
-
-        out, err = self.run_bzr(['grep', 'line1'])
-        self.assertTrue(self._str_contains(out, "file0.txt:line1"))
-        self.assertTrue(self._str_contains(out, "file1.txt:line1"))
-
-        out, err = self.run_bzr(['grep', '--levels=0', 'line1'])
-        self.assertTrue(self._str_contains(out, "file0.txt~2:line1"))
-        self.assertTrue(self._str_contains(out, "file1.txt~2:line1"))
-        self.assertTrue(self._str_contains(out, "file0.txt~1.1.1:line1"))
-        self.assertTrue(self._str_contains(out, "file1.txt~1.1.1:line1"))
-
-        out, err = self.run_bzr(['grep', '-n', '--levels=0', 'line1'])
-        self.assertTrue(self._str_contains(out, "file0.txt~2:1:line1"))
-        self.assertTrue(self._str_contains(out, "file1.txt~2:1:line1"))
-        self.assertTrue(self._str_contains(out, "file0.txt~1.1.1:1:line1"))
-        self.assertTrue(self._str_contains(out, "file1.txt~1.1.1:1:line1"))
-
-    def test_binary_file_grep(self):
-        """grep for pattern in binary file"""
-        wd = 'foobar0'
-        self.make_branch_and_tree(wd)
-        os.chdir(wd)
-        self._mk_versioned_file('file0.txt')
-        self._update_file('file0.txt', "\x00lineNN\x00\n")
-        out, err = self.run_bzr(['grep', 'lineNN', 'file0.txt'])
-        self.assertFalse(self._str_contains(out, "file0.txt:line1"))
-        self.assertTrue(self._str_contains(err, "Binary file.*file0.txt.*skipped"))
-
-