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

[Jelmer Vernooij]

Fix 'brz git-objects', and add a test.

Fix 'brz git-objects', and add a test.

[Martin Packman (gz)]

Thanks! One of the risks of inline imports, I wonder if there's a way we can lint rule them as well.

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/172/

=== modified file 'breezy/git/commands.py'
--- breezy/git/commands.py	2018-11-16 11:37:47 +0000
+++ breezy/git/commands.py	2019-01-02 23:29:09 +0000
@@ -194,14 +194,14 @@
         from .object_store import (
             get_object_store,
             )
-        from . import gettext
+        from ..i18n import gettext
         controldir, _ = ControlDir.open_containing(directory)
         repo = controldir.find_repository()
         object_store = get_object_store(repo)
         with object_store.lock_read():
             if sha1 is not None:
                 try:
-                    obj = object_store[str(sha1)]
+                    obj = object_store[sha1.encode('ascii')]
                 except KeyError:
                     raise BzrCommandError(
                         gettext("Object not found: %s") % sha1)
@@ -212,7 +212,7 @@
                 self.outf.write(text)
             else:
                 for sha1 in object_store:
-                    self.outf.write("%s\n" % sha1)
+                    self.outf.write("%s\n" % sha1.decode('ascii'))
 
 
 class cmd_git_refs(Command):
@@ -265,7 +265,7 @@
         :param f: Patch file to read.
         :param signoff: Add Signed-Off-By flag.
         """
-        from . import gettext
+        from ..i18n import gettext
         from ..errors import BzrCommandError
         from dulwich.patch import git_am_patch_split
         import subprocess

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2018-12-18 20:55:37 +0000
+++ breezy/git/tests/test_blackbox.py	2019-01-02 23:29:09 +0000
@@ -433,3 +433,25 @@
         tree.commit('a commit', committer='Somebody <[e-mail]>')
         output, error = self.run_bzr('stats')
         self.assertEqual(output, '   1 Somebody <[e-mail]>\n')
+
+
+class GitObjectsTests(ExternalBase):
+
+    def run_simple(self, format):
+        tree = self.make_branch_and_tree('.', format=format)
+        self.build_tree(['a/', 'a/foo'])
+        tree.add(['a'])
+        tree.commit('add a')
+        output, error = self.run_bzr('git-objects')
+        shas = list(output.splitlines())
+        self.assertEqual([40, 40], [len(s) for s in shas])
+        self.assertEqual(error, '')
+
+        output, error = self.run_bzr('git-object %s' % shas[0])
+        self.assertEqual('', error)
+
+    def test_in_native(self):
+        self.run_simple(format='git')
+
+    def test_in_bzr(self):
+        self.run_simple(format='2a')