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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fastimport-fix-2
Merge into: lp:brz/3.0
Diff against target: 30 lines (+4/-4)
2 files modified
breezy/plugins/fastimport/processors/generic_processor.py (+1/-4)
doc/en/release-notes/brz-3.0.txt (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/fastimport-fix-2
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+376208@code.launchpad.net

Commit message

fastimport: Drop unused mode flag, use standard transport.

Description of the change

Drop unused mode flag, use standard transport.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/fastimport/processors/generic_processor.py'
2--- breezy/plugins/fastimport/processors/generic_processor.py 2018-11-18 19:16:07 +0000
3+++ breezy/plugins/fastimport/processors/generic_processor.py 2019-12-01 16:55:55 +0000
4@@ -202,12 +202,9 @@
5
6 def _load_info_and_params(self):
7 from .. import bzr_commit_handler
8- self._mode = bool(self.params.get('mode', 'default'))
9- self._experimental = self._mode == 'experimental'
10-
11 # This is currently hard-coded but might be configurable via
12 # parameters one day if that's needed
13- repo_transport = self.repo.control_files._transport
14+ repo_transport = self.repo.control_transport
15 self.id_map_path = repo_transport.local_abspath("fastimport-id-map")
16
17 # Load the info file, if any
18
19=== modified file 'doc/en/release-notes/brz-3.0.txt'
20--- doc/en/release-notes/brz-3.0.txt 2019-11-19 17:16:42 +0000
21+++ doc/en/release-notes/brz-3.0.txt 2019-12-01 16:55:55 +0000
22@@ -32,6 +32,9 @@
23 .. Fixes for situations where brz would previously crash or give incorrect
24 or undesirable results.
25
26+ * Don't rely on private transport attribute in fast-import.
27+ (Jelmer Vernooij, #1854607)
28+
29 Documentation
30 *************
31

Subscribers

People subscribed via source and target branches