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

Proposed by Jelmer Vernooij on 2019-02-05
Status: Merged
Approved by: Jelmer Vernooij on 2019-02-14
Approved revision: 7266
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-fastexport
Merge into: lp:brz
Diff against target: 14 lines (+2/-2)
1 file modified
breezy/plugins/fastimport/exporter.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/brz/fix-fastexport
Reviewer Review Type Date Requested Status
Martin Packman 2019-02-05 Approve on 2019-02-14
Review via email: mp+362709@code.launchpad.net

Commit message

fastexport: Stop specifying file_id and use tree rather than inventory function.

Description of the change

fastexport: Stop specifying file_id and use tree rather than inventory function.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/plugins/fastimport/exporter.py'
--- breezy/plugins/fastimport/exporter.py 2019-01-12 01:24:42 +0000
+++ breezy/plugins/fastimport/exporter.py 2019-02-05 02:05:46 +0000
@@ -581,8 +581,8 @@
581581
582 # Renaming a directory implies all children must be renamed.582 # Renaming a directory implies all children must be renamed.
583 # Note: changes_from() doesn't handle this583 # Note: changes_from() doesn't handle this
584 if kind == 'directory' and tree_old.kind(oldpath, id_) == 'directory':584 if kind == 'directory' and tree_old.kind(oldpath) == 'directory':
585 for p, e in tree_old.inventory.iter_entries_by_dir(from_dir=id_):585 for p, e in tree_old.iter_entries_by_dir(specific_files=[oldpath]):
586 if e.kind == 'directory' and self.plain_format:586 if e.kind == 'directory' and self.plain_format:
587 continue587 continue
588 old_child_path = osutils.pathjoin(oldpath, p)588 old_child_path = osutils.pathjoin(oldpath, p)

Subscribers

People subscribed via source and target branches