/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-22 03:51:03 UTC
  • mfrom: (7192.5.2 remove-more-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181122035103-1c5jnbdx2t5yujqb
Stop actually accepting optional file_id in many Tree methods.

Merged from https://code.launchpad.net/~jelmer/brz/remove-more-file-ids/+merge/358950

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
1796
1796
                    continue
1797
1797
                kind = self.final_kind(trans_id)
1798
1798
                if kind is None:
1799
 
                    kind = self._tree.stored_kind(
1800
 
                        self._tree.id2path(file_id), file_id)
 
1799
                    kind = self._tree.stored_kind(self._tree.id2path(file_id))
1801
1800
                parent_trans_id = self.final_parent(trans_id)
1802
1801
                parent_file_id = new_path_file_ids.get(parent_trans_id)
1803
1802
                if parent_file_id is None:
2167
2166
            kind = self._transform.final_kind(trans_id)
2168
2167
            if kind is None:
2169
2168
                kind = self._transform._tree.stored_kind(
2170
 
                    self._transform._tree.id2path(file_id),
2171
 
                    file_id)
 
2169
                    self._transform._tree.id2path(file_id))
2172
2170
            new_entry = inventory.make_entry(
2173
2171
                kind,
2174
2172
                self._transform.final_name(trans_id),
2709
2707
                tt.create_hardlink(accelerator_tree.abspath(accelerator_path),
2710
2708
                                   trans_id)
2711
2709
            else:
2712
 
                with accelerator_tree.get_file(accelerator_path, file_id) as f:
 
2710
                with accelerator_tree.get_file(accelerator_path) as f:
2713
2711
                    chunks = osutils.file_iterator(f)
2714
2712
                    if wt.supports_content_filtering():
2715
2713
                        filters = wt._content_filter_stack(tree_path)