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

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
Merge into: lp:brz
Diff against target: 19 lines (+2/-2)
1 file modified
breezy/plugins/fastimport/revision_store.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/fastimport-fix
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+324825@code.launchpad.net

Commit message

Fix fastimport tests after the removal of deprecated RevisionTree.inventory.

Description of the change

Fix fastimport tests after the removal of deprecated RevisionTree.inventory.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/29/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/30/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/fastimport/revision_store.py'
2--- breezy/plugins/fastimport/revision_store.py 2017-05-25 01:35:55 +0000
3+++ breezy/plugins/fastimport/revision_store.py 2017-05-31 00:08:15 +0000
4@@ -427,7 +427,7 @@
5 raise AssertionError('signatures not guaranteed yet')
6 self.repo.add_signature_text(rev.revision_id, signature)
7 # self._add_revision(rev, inv)
8- return builder.revision_tree().inventory
9+ return builder.revision_tree().root_inventory
10
11 def _non_root_entries_iter(self, inv, revision_id):
12 if hasattr(inv, 'iter_non_root_entries'):
13@@ -526,7 +526,7 @@
14 rev_tree = self.repo.revision_tree(revision_id)
15 else:
16 rev_tree = self.repo.revision_tree(None)
17- inventories.append(rev_tree.inventory)
18+ inventories.append(rev_tree.root_inventory)
19 return present, inventories
20
21

Subscribers

People subscribed via source and target branches