/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 python3-h.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2123
2123
            if file_id is None:
2124
2124
                continue
2125
2125
            if (specific_files is not None and
2126
 
                text_type(self._final_paths.get_path(trans_id)) not in specific_files):
 
2126
                self._final_paths.get_path(trans_id) not in specific_files):
2127
2127
                continue
2128
2128
            kind = self._transform.final_kind(trans_id)
2129
2129
            if kind is None:
2168
2168
        ordered_ids = self._list_files_by_dir()
2169
2169
        for entry, trans_id in self._make_inv_entries(ordered_ids,
2170
2170
            specific_files):
2171
 
            yield text_type(self._final_paths.get_path(trans_id)), entry
 
2171
            yield self._final_paths.get_path(trans_id), entry
2172
2172
 
2173
2173
    def _iter_entries_for_dir(self, dir_path):
2174
2174
        """Return path, entry for items in a directory without recursing down."""
2178
2178
        for child_trans_id in self._all_children(dir_trans_id):
2179
2179
            ordered_ids.append((child_trans_id, dir_id))
2180
2180
        for entry, trans_id in self._make_inv_entries(ordered_ids):
2181
 
            yield text_type(self._final_paths.get_path(trans_id)), entry
 
2181
            yield self._final_paths.get_path(trans_id), entry
2182
2182
 
2183
2183
    def list_files(self, include_root=False, from_dir=None, recursive=True):
2184
2184
        """See WorkingTree.list_files."""
2464
2464
 
2465
2465
    def _determine_path(self, trans_id):
2466
2466
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
2467
 
            return ""
 
2467
            return u""
2468
2468
        name = self.transform.final_name(trans_id)
2469
2469
        parent_id = self.transform.final_parent(trans_id)
2470
2470
        if parent_id == self.transform.root: