/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: 2020-06-29 20:49:23 UTC
  • mto: (7490.40.39 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200629204923-c4eempwzk8znjk3m
Remove use of file_id when we don't need it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2712
2712
                    executable = tree.is_executable(tree_path)
2713
2713
                    if executable:
2714
2714
                        tt.set_executability(executable, trans_id)
2715
 
                    trans_data = (trans_id, file_id,
2716
 
                                  tree_path, entry.text_sha1)
 
2715
                    trans_data = (trans_id, tree_path, entry.text_sha1)
2717
2716
                    deferred_contents.append((tree_path, trans_data))
2718
2717
                else:
2719
2718
                    file_trans_id[file_id] = new_by_entry(
2765
2764
        unchanged = dict(unchanged)
2766
2765
        new_desired_files = []
2767
2766
        count = 0
2768
 
        for unused_tree_path, (trans_id, file_id, tree_path, text_sha1) in desired_files:
 
2767
        for unused_tree_path, (trans_id, tree_path, text_sha1) in desired_files:
2769
2768
            accelerator_path = unchanged.get(tree_path)
2770
2769
            if accelerator_path is None:
2771
2770
                new_desired_files.append((tree_path,
2772
 
                                          (trans_id, file_id, tree_path, text_sha1)))
 
2771
                                          (trans_id, tree_path, text_sha1)))
2773
2772
                continue
2774
2773
            pb.update(gettext('Adding file contents'), count + offset, total)
2775
2774
            if hardlink:
2785
2784
                    tt.create_file(chunks, trans_id, sha1=text_sha1)
2786
2785
            count += 1
2787
2786
        offset += count
2788
 
    for count, ((trans_id, file_id, tree_path, text_sha1), contents) in enumerate(
 
2787
    for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
2789
2788
            tree.iter_files_bytes(new_desired_files)):
2790
2789
        if wt.supports_content_filtering():
2791
2790
            filters = wt._content_filter_stack(tree_path)