Merge lp:~jelmer/brz/remote-git-import into lp:brz

[Jelmer Vernooij]

Fix importing from remote git repositories.

Fix importing from remote git repositories.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2019-06-22 11:51:56 +0000
+++ breezy/git/branch.py	2019-07-12 01:12:40 +0000
@@ -785,7 +785,7 @@
         :param refs: Refs dictionary (name -> git sha1)
         :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
         """
-        refs = self.repository._git.refs
+        refs = self.repository.controldir.get_refs_container()
         for ref_name, unpeeled in viewitems(refs.as_dict()):
             try:
                 tag_name = ref_to_tag_name(ref_name)

=== modified file 'breezy/git/commands.py'
--- breezy/git/commands.py	2019-06-06 22:22:47 +0000
+++ breezy/git/commands.py	2019-07-12 01:12:40 +0000
@@ -24,12 +24,14 @@
 from __future__ import absolute_import
 
 import breezy.bzr  # noqa: F401
+from breezy import controldir
 from ..commands import (
     Command,
     display_command,
     )
 from ..option import (
     Option,
+    RegistryOption,
     )
 from ..sixish import (
     text_type,
@@ -46,6 +48,15 @@
 
     takes_options = [
         Option('colocated', help='Create colocated branches.'),
+        RegistryOption('dest-format',
+                       help='Specify a format for this branch. '
+                       'See "help formats" for a full list.',
+                       lazy_registry=('breezy.controldir', 'format_registry'),
+                       converter=lambda name: controldir.format_registry.make_controldir(
+                            name),
+                       value_switches=True,
+                       title="Branch format",
+                       ),
         ]
 
     def _get_colocated_branch(self, target_controldir, name):
@@ -69,7 +80,7 @@
         except NotBranchError:
             return head_controldir.create_branch()
 
-    def run(self, src_location, dest_location=None, colocated=False):
+    def run(self, src_location, dest_location=None, colocated=False, dest_format=None):
         import os
         from .. import (
             controldir,
@@ -100,9 +111,8 @@
             )
         from .repository import GitRepository
 
-        dest_format = controldir.ControlDirFormat.get_default_format()
         if dest_format is None:
-            raise BzrError('no default format')
+            dest_format = controldir.format_registry.make_controldir('default')
 
         if dest_location is None:
             dest_location = os.path.basename(src_location.rstrip("/\\"))

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-07-07 19:36:13 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-07-12 01:12:40 +0000
@@ -85,6 +85,9 @@
 * Ignore UnknownFormatErrors when scanning for control directories.
   (Jelmer Vernooij, #468332)
 
+* Fix fetching from remote git repositories in ``brz git-import``.
+  (Jelmer Vernooij, #1836238)
+
 Documentation
 *************