/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-03-20 02:02:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6886.
  • Revision ID: jelmer@jelmer.uk-20180320020254-0ac6anr9au04t0os
Remove remaining uses of .trans_id_tree_file_id

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
132
132
        # The trans_id that will be used as the tree root
133
133
        root_id = tree.get_root_id()
134
134
        if root_id is not None:
135
 
            self._new_root = self.trans_id_tree_file_id(root_id)
 
135
            self._new_root = self.trans_id_tree_path('')
136
136
        else:
137
137
            self._new_root = None
138
138
        # Indicator of whether the transform has been applied
216
216
        # the physical root needs a new transaction id
217
217
        self._tree_path_ids.pop("")
218
218
        self._tree_id_paths.pop(old_root)
219
 
        self._new_root = self.trans_id_tree_file_id(self._tree.get_root_id())
 
219
        self._new_root = self.trans_id_tree_path('')
220
220
        if parent == old_root:
221
221
            parent = self._new_root
222
222
        self.adjust_path(name, parent, old_root)
2575
2575
    divert = set()
2576
2576
    try:
2577
2577
        pp.next_phase()
2578
 
        file_trans_id[wt.get_root_id()] = \
2579
 
            tt.trans_id_tree_file_id(wt.get_root_id())
 
2578
        file_trans_id[wt.get_root_id()] = tt.trans_id_tree_path('')
2580
2579
        with ui.ui_factory.nested_progress_bar() as pb:
2581
2580
            deferred_contents = []
2582
2581
            num = 0
3229
3228
                continue
3230
3229
            if executable[0] != executable[1]:
3231
3230
                continue
3232
 
            trans_id = tt.trans_id_tree_file_id(file_id)
 
3231
            trans_id = tt.trans_id_tree_path(paths[1])
3233
3232
            tt.delete_contents(trans_id)
3234
 
            tt.create_hardlink(source_tree.id2abspath(file_id), trans_id)
 
3233
            tt.create_hardlink(source_tree.abspath(paths[0]), trans_id)
3235
3234
        tt.apply()
3236
3235
    finally:
3237
3236
        tt.finalize()