Merge lp:~jelmer/brz/git-grep into lp:brz

[Jelmer Vernooij]

Fix 'bzr grep' in git working trees.

Fix 'bzr grep' in git working trees.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/55/

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_blackbox.py	2018-11-16 19:48:09 +0000
@@ -336,3 +336,14 @@
              'gitr'])
         self.assertEqual(error, '')
         self.assertEqual(output, 'VERSION_INFO \n')
+
+
+class GrepTests(ExternalBase):
+
+    def test_simple_grep(self):
+        tree = self.make_branch_and_tree('.', format='git')
+        self.build_tree_contents([('a', 'text for a\n')])
+        tree.add(['a'])
+        output, error = self.run_bzr('grep text')
+        self.assertEqual(output, 'a:text for a\n')
+        self.assertEqual(error, '')

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2018-11-16 18:33:17 +0000
+++ breezy/git/tree.py	2018-11-16 19:48:09 +0000
@@ -394,7 +394,7 @@
     def list_files(self, include_root=False, from_dir=None, recursive=True):
         if self.tree is None:
             return
-        if from_dir is None:
+        if from_dir is None or from_dir == '.':
             from_dir = u""
         (store, mode, hexsha) = self._lookup_path(from_dir)
         if mode is None:  # Root

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2018-11-16 18:33:17 +0000
+++ breezy/git/workingtree.py	2018-11-16 19:48:09 +0000
@@ -764,7 +764,7 @@
                 path, stat_result)
 
     def list_files(self, include_root=False, from_dir=None, recursive=True):
-        if from_dir is None:
+        if from_dir is None or from_dir == '.':
             from_dir = u""
         dir_ids = {}
         fk_entries = {'directory': tree.TreeDirectory,

=== modified file 'breezy/tests/per_tree/test_list_files.py'
--- breezy/tests/per_tree/test_list_files.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_tree/test_list_files.py	2018-11-16 19:48:09 +0000
@@ -29,13 +29,10 @@
                     ('b', 'V', 'directory', tree.path2id('b')),
                     ('b/c', 'V', 'file', tree.path2id('b/c')),
                     ]
-        tree.lock_read()
-        try:
+        with tree.lock_read():
             actual = [(path, status, kind, file_id)
                       for path, status, kind, file_id, ie in
                       tree.list_files(include_root=True)]
-        finally:
-            tree.unlock()
         self.assertEqual(expected, actual)
 
     def test_list_files_no_root(self):
@@ -45,13 +42,10 @@
                     ('b', 'V', 'directory', tree.path2id('b')),
                     ('b/c', 'V', 'file', tree.path2id('b/c')),
                     ]
-        tree.lock_read()
-        try:
+        with tree.lock_read():
             actual = [(path, status, kind, file_id)
                       for path, status, kind, file_id, ie in
                       tree.list_files()]
-        finally:
-            tree.unlock()
         self.assertEqual(expected, actual)
 
     def test_list_files_with_root_no_recurse(self):
@@ -74,13 +68,10 @@
         expected = [('a', 'V', 'file', tree.path2id('a'))]
         expected.append(
             ('b', 'V', 'directory', tree.path2id('b')))
-        tree.lock_read()
-        try:
+        with tree.lock_read():
             actual = [(path, status, kind, file_id)
                       for path, status, kind, file_id, ie in
                       tree.list_files(recursive=False)]
-        finally:
-            tree.unlock()
         self.assertEqual(expected, actual)
 
     def test_list_files_from_dir(self):
@@ -88,13 +79,10 @@
         tree = self.get_tree_no_parents_abc_content(work_tree)
         expected = [('c', 'V', 'file', tree.path2id('b/c')),
                     ]
-        tree.lock_read()
-        try:
+        with tree.lock_read():
             actual = [(path, status, kind, file_id)
                       for path, status, kind, file_id, ie in
                       tree.list_files(from_dir=u'b')]
-        finally:
-            tree.unlock()
         self.assertEqual(expected, actual)
 
     def test_list_files_from_dir_no_recurse(self):

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2018-11-16 18:40:46 +0000
+++ breezy/transform.py	2018-11-16 19:48:09 +0000
@@ -2212,6 +2212,8 @@
         """See WorkingTree.list_files."""
         # XXX This should behave like WorkingTree.list_files, but is really
         # more like RevisionTree.list_files.
+        if from_dir == '.':
+            from_dir = None
         if recursive:
             prefix = None
             if from_dir: