Merge lp:~jelmer/brz/git-fixes into lp:brz/3.0

[Jelmer Vernooij]

Fix git-remote-helper and git directory cache setting for bzr remote repositories.

Some more git fixes:

* Fix git-remote-helper
* Fix finding of cache directory for remote URLs

[Martin Packman (gz)]

Looks good, nice to have a test even if it requires subprocess usage inline.

review: Approve

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

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

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

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

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

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

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

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

=== modified file 'breezy/git/cache.py'
--- breezy/git/cache.py	2018-11-12 01:41:38 +0000
+++ breezy/git/cache.py	2019-03-04 07:15:42 +0000
@@ -613,11 +613,9 @@
 
     def open(self, transport):
         try:
-            basepath = transport.local_abspath(".").encode(osutils._fs_enc)
+            basepath = transport.local_abspath(".")
         except bzr_errors.NotLocalUrl:
             basepath = get_cache_dir()
-        if not isinstance(basepath, str):
-            raise TypeError(basepath)
         try:
             return TdbBzrGitCache(os.path.join(basepath, "idmap.tdb"))
         except ImportError:

=== modified file 'breezy/git/git-remote-bzr'
--- breezy/git/git-remote-bzr	2018-03-26 22:28:24 +0000
+++ breezy/git/git-remote-bzr	2019-03-04 07:15:42 +0000
@@ -32,10 +32,12 @@
 import breezy
 breezy.initialize()
 
+from breezy.sixish import PY3
+
 from breezy.plugin import load_plugins
 load_plugins()
 
-from breezy.plugins.git.git_remote_helper import (
+from breezy.git.git_remote_helper import (
     RemoteHelper,
     open_local_dir,
     open_remote_dir,
@@ -46,4 +48,7 @@
 (shortname, url) = args
 
 helper = RemoteHelper(open_local_dir(), shortname, open_remote_dir(url))
-helper.process(sys.stdin, sys.stdout)
+if PY3:
+    helper.process(sys.stdin.buffer, sys.stdout.buffer)
+else:
+    helper.process(sys.stdin, sys.stdout)

=== modified file 'breezy/git/git_remote_helper.py'
--- breezy/git/git_remote_helper.py	2018-11-11 14:23:06 +0000
+++ breezy/git/git_remote_helper.py	2019-03-04 07:15:42 +0000
@@ -186,7 +186,7 @@
             self.batchcmd = None
         else:
             try:
-                self.commands[argv[0]](self, outf, argv)
+                self.commands[argv[0].decode()](self, outf, argv)
             except KeyError:
                 raise Exception("Unknown remote command %r" % argv)
         outf.flush()

=== modified file 'breezy/git/tests/test_git_remote_helper.py'
--- breezy/git/tests/test_git_remote_helper.py	2018-11-21 03:39:28 +0000
+++ breezy/git/tests/test_git_remote_helper.py	2019-03-04 07:15:42 +0000
@@ -23,12 +23,15 @@
 
 from io import BytesIO
 import os
+import subprocess
+import sys
 
 from dulwich.repo import Repo
 
 from ...tests import (
     TestCaseWithTransport,
     )
+from ...tests.features import PathFeature
 
 from ..object_store import get_object_store
 from ..git_remote_helper import (
@@ -46,6 +49,11 @@
         return object_store._lookup_revision_sha1(bzr_revid)
 
 
+git_remote_bzr_path = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '..', 'git-remote-bzr'))
+git_remote_bzr_feature = PathFeature(git_remote_bzr_path)
+
+
 class OpenLocalDirTests(TestCaseWithTransport):
 
     def test_from_env_dir(self):
@@ -86,8 +94,29 @@
         self.assertEqual(out, b"\n")
         r = Repo('local')
         self.assertTrue(git_sha1 in r.object_store)
-        self.assertEqual({
-            }, r.get_refs())
+        self.assertEqual({}, r.get_refs())
+
+
+class ExecuteRemoteHelperTests(TestCaseWithTransport):
+
+    def test_run(self):
+        self.requireFeature(git_remote_bzr_feature)
+        local_dir = self.make_branch_and_tree('local', format='git').controldir
+        local_path = local_dir.control_transport.local_abspath('.')
+        remote_tree = self.make_branch_and_tree('remote')
+        remote_dir = remote_tree.controldir
+        shortname = 'bzr'
+        env = dict(os.environ)
+        env['GIT_DIR'] = local_path
+        env['PYTHONPATH'] = ':'.join(sys.path)
+        p = subprocess.Popen(
+            [sys.executable, git_remote_bzr_path, local_path, remote_dir.user_url],
+            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE, env=env)
+        (out, err) = p.communicate(b'capabilities\n')
+        lines = out.splitlines()
+        self.assertIn(b'push', lines, "no 'push' in %r, error: %r" % (lines, err))
+        self.assertEqual(b'', err)
 
 
 class RemoteHelperTests(TestCaseWithTransport):

=== modified file 'breezy/tests/features.py'
--- breezy/tests/features.py	2019-01-19 01:44:20 +0000
+++ breezy/tests/features.py	2019-03-04 07:15:42 +0000
@@ -568,3 +568,17 @@
 
 
 BackslashFilenameFeature = _BackslashFilenameFeature()
+
+
+class PathFeature(Feature):
+    """Feature testing whether a particular path exists."""
+
+    def __init__(self, path):
+        super(PathFeature, self).__init__()
+        self.path = path
+
+    def _probe(self):
+        return os.path.exists(self.path)
+
+    def feature_name(self):
+        return "%s exists" % self.path