Merge lp:~jelmer/brz/fastimport-fix-2 into lp:brz/3.0

[Jelmer Vernooij]

fastimport: Drop unused mode flag, use standard transport.

Drop unused mode flag, use standard transport.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/fastimport/processors/generic_processor.py'
--- breezy/plugins/fastimport/processors/generic_processor.py	2018-11-18 19:16:07 +0000
+++ breezy/plugins/fastimport/processors/generic_processor.py	2019-12-01 16:55:55 +0000
@@ -202,12 +202,9 @@
 
     def _load_info_and_params(self):
         from .. import bzr_commit_handler
-        self._mode = bool(self.params.get('mode', 'default'))
-        self._experimental = self._mode == 'experimental'
-
         # This is currently hard-coded but might be configurable via
         # parameters one day if that's needed
-        repo_transport = self.repo.control_files._transport
+        repo_transport = self.repo.control_transport
         self.id_map_path = repo_transport.local_abspath("fastimport-id-map")
 
         # Load the info file, if any
 
=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-11-19 17:16:42 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-12-01 16:55:55 +0000
@@ -32,6 +32,9 @@
 .. Fixes for situations where brz would previously crash or give incorrect
    or undesirable results.
 
+ * Don't rely on private transport attribute in fast-import.
+   (Jelmer Vernooij, #1854607)
+
 Documentation
 *************