/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

  • Committer: Ian Clatworthy
  • Date: 2009-09-01 05:54:35 UTC
  • mto: (4634.102.1 eol-update-bug)
  • mto: This revision was merged to the branch mainline in revision 4857.
  • Revision ID: ian.clatworthy@canonical.com-20090901055435-l29siogxulwep167
test and fix for revert with content filtering

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2621
2621
                tt.adjust_path(name[1], parent_trans, trans_id)
2622
2622
            if executable[0] != executable[1] and kind[1] == "file":
2623
2623
                tt.set_executability(executable[1], trans_id)
2624
 
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
2625
 
            deferred_files):
2626
 
            tt.create_file(bytes, trans_id, mode_id)
 
2624
        if working_tree.supports_content_filtering():
 
2625
            for index, ((trans_id, mode_id), bytes) in enumerate(
 
2626
                target_tree.iter_files_bytes(deferred_files)):
 
2627
                file_id = deferred_files[index][0]
 
2628
                filter_tree_path = target_tree.id2path(file_id)
 
2629
                filters = working_tree._content_filter_stack(filter_tree_path)
 
2630
                bytes = filtered_output_bytes(bytes, filters,
 
2631
                    ContentFilterContext(filter_tree_path, working_tree))
 
2632
                tt.create_file(bytes, trans_id, mode_id)
 
2633
        else:
 
2634
            for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
 
2635
                deferred_files):
 
2636
                tt.create_file(bytes, trans_id, mode_id)
2627
2637
    finally:
2628
2638
        if basis_tree is not None:
2629
2639
            basis_tree.unlock()