/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

Merge trunk.

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),
2240
2238
                    if not path.startswith(prefix):
2241
2239
                        continue
2242
2240
                    path = path[len(prefix):]
2243
 
                yield path, 'V', entry.kind, entry.file_id, entry
 
2241
                yield path, 'V', entry.kind, entry
2244
2242
        else:
2245
2243
            if from_dir is None and include_root is True:
2246
 
                root_entry = inventory.make_entry('directory', '',
2247
 
                                                  ROOT_PARENT, self.get_root_id())
2248
 
                yield '', 'V', 'directory', root_entry.file_id, root_entry
 
2244
                root_entry = inventory.make_entry(
 
2245
                    'directory', '', ROOT_PARENT, self.get_root_id())
 
2246
                yield '', 'V', 'directory', root_entry
2249
2247
            entries = self._iter_entries_for_dir(from_dir or '')
2250
2248
            for path, entry in entries:
2251
 
                yield path, 'V', entry.kind, entry.file_id, entry
 
2249
                yield path, 'V', entry.kind, entry
2252
2250
 
2253
2251
    def kind(self, path):
2254
2252
        trans_id = self._path2trans_id(path)
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)