/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 bzrlib/transform.py

Revert out the build_tree updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2543
2543
                    executable = tree.is_executable(file_id, tree_path)
2544
2544
                    if executable:
2545
2545
                        tt.set_executability(executable, trans_id)
2546
 
                    trans_data = (trans_id, tree_path, entry.text_sha1)
 
2546
                    trans_data = (trans_id, tree_path)
2547
2547
                    deferred_contents.append((file_id, trans_data))
2548
2548
                else:
2549
2549
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2594
2594
        unchanged = dict(unchanged)
2595
2595
        new_desired_files = []
2596
2596
        count = 0
2597
 
        for file_id, (trans_id, tree_path, text_sha1) in desired_files:
 
2597
        for file_id, (trans_id, tree_path) in desired_files:
2598
2598
            accelerator_path = unchanged.get(file_id)
2599
2599
            if accelerator_path is None:
2600
 
                new_desired_files.append((file_id,
2601
 
                    (trans_id, tree_path, text_sha1)))
 
2600
                new_desired_files.append((file_id, (trans_id, tree_path)))
2602
2601
                continue
2603
2602
            pb.update('Adding file contents', count + offset, total)
2604
2603
            if hardlink:
2611
2610
                    contents = filtered_output_bytes(contents, filters,
2612
2611
                        ContentFilterContext(tree_path, tree))
2613
2612
                try:
2614
 
                    tt.create_file(contents, trans_id, sha1=text_sha1)
 
2613
                    tt.create_file(contents, trans_id)
2615
2614
                finally:
2616
2615
                    try:
2617
2616
                        contents.close()
2620
2619
                        pass
2621
2620
            count += 1
2622
2621
        offset += count
2623
 
    for count, ((trans_id, tree_path, text_sha1), contents) in enumerate(
 
2622
    for count, ((trans_id, tree_path), contents) in enumerate(
2624
2623
            tree.iter_files_bytes(new_desired_files)):
2625
2624
        if wt.supports_content_filtering():
2626
2625
            filters = wt._content_filter_stack(tree_path)
2627
2626
            contents = filtered_output_bytes(contents, filters,
2628
2627
                ContentFilterContext(tree_path, tree))
2629
 
        tt.create_file(contents, trans_id, sha1=text_sha1)
 
2628
        tt.create_file(contents, trans_id)
2630
2629
        pb.update('Adding file contents', count + offset, total)
2631
2630
 
2632
2631