/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: Jelmer Vernooij
  • Date: 2018-06-29 20:24:31 UTC
  • mfrom: (6999 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180629202431-2td8kihrsthzuvau
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
66
66
    )
67
67
from .progress import ProgressPhase
68
68
from .sixish import (
 
69
    text_type,
69
70
    viewitems,
70
71
    viewvalues,
71
72
    )
2122
2123
            if file_id is None:
2123
2124
                continue
2124
2125
            if (specific_files is not None and
2125
 
                unicode(self._final_paths.get_path(trans_id)) not in specific_files):
 
2126
                self._final_paths.get_path(trans_id) not in specific_files):
2126
2127
                continue
2127
2128
            kind = self._transform.final_kind(trans_id)
2128
2129
            if kind is None:
2167
2168
        ordered_ids = self._list_files_by_dir()
2168
2169
        for entry, trans_id in self._make_inv_entries(ordered_ids,
2169
2170
            specific_files):
2170
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
2171
            yield self._final_paths.get_path(trans_id), entry
2171
2172
 
2172
2173
    def _iter_entries_for_dir(self, dir_path):
2173
2174
        """Return path, entry for items in a directory without recursing down."""
2177
2178
        for child_trans_id in self._all_children(dir_trans_id):
2178
2179
            ordered_ids.append((child_trans_id, dir_id))
2179
2180
        for entry, trans_id in self._make_inv_entries(ordered_ids):
2180
 
            yield unicode(self._final_paths.get_path(trans_id)), entry
 
2181
            yield self._final_paths.get_path(trans_id), entry
2181
2182
 
2182
2183
    def list_files(self, include_root=False, from_dir=None, recursive=True):
2183
2184
        """See WorkingTree.list_files."""
2463
2464
 
2464
2465
    def _determine_path(self, trans_id):
2465
2466
        if (trans_id == self.transform.root or trans_id == ROOT_PARENT):
2466
 
            return ""
 
2467
            return u""
2467
2468
        name = self.transform.final_name(trans_id)
2468
2469
        parent_id = self.transform.final_parent(trans_id)
2469
2470
        if parent_id == self.transform.root:
2622
2623
            precomputed_delta = None
2623
2624
        conflicts = cook_conflicts(raw_conflicts, tt)
2624
2625
        for conflict in conflicts:
2625
 
            trace.warning(unicode(conflict))
 
2626
            trace.warning(text_type(conflict))
2626
2627
        try:
2627
2628
            wt.add_conflicts(conflicts)
2628
2629
        except errors.UnsupportedOperation:
2814
2815
                    unversioned_filter=working_tree.is_ignored)
2815
2816
                delta.report_changes(tt.iter_changes(), change_reporter)
2816
2817
            for conflict in conflicts:
2817
 
                trace.warning(unicode(conflict))
 
2818
                trace.warning(text_type(conflict))
2818
2819
            pp.next_phase()
2819
2820
            tt.apply()
2820
2821
            if working_tree.supports_merge_modified():