← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Merge with preview-changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1402
1402
        except KeyError:
1403
1403
            return
1404
1404
        file_id = self.tree_file_id(parent_id)
1405
 
        for child in self._tree.inventory[file_id].children.iterkeys():
 
1405
        children = getattr(self._tree.inventory[file_id], 'children', {})
 
1406
        for child in children:
1406
1407
            childpath = joinpath(path, child)
1407
1408
            yield self.trans_id_tree_path(childpath)
1408
1409
 
1582
1583
        while len(todo) > 0:
1583
1584
            parent = todo.pop()
1584
1585
            parent_file_id = self._transform.final_file_id(parent)
1585
 
            children = self._all_children(parent)
 
1586
            children = list(self._all_children(parent))
 
1587
            paths = dict(zip(children, self._final_paths.get_paths(children)))
 
1588
            children.sort(key=paths.get)
1586
1589
            todo.extend(children)
1587
1590
            for trans_id in children:
1588
1591
                ordered_ids.append((trans_id, parent_file_id))
1589
1592
        for entry, trans_id in self._make_inv_entries(ordered_ids,
1590
1593
                                                      specific_file_ids):
1591
 
            yield self._final_paths.get_path(trans_id), entry
 
1594
            yield unicode(self._final_paths.get_path(trans_id)), entry
1592
1595
 
1593
1596
    def kind(self, file_id):
1594
1597
        trans_id = self._transform.trans_id_file_id(file_id)