/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: Jelmer Vernooij
  • Date: 2009-04-06 02:54:14 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4255.
  • Revision ID: jelmer@samba.org-20090406025414-65tpjwcmjp5wa5oj
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2152
2152
def _create_files(tt, tree, desired_files, pb, offset, accelerator_tree,
2153
2153
                  hardlink):
2154
2154
    total = len(desired_files) + offset
 
2155
    wt = tt._tree
2155
2156
    if accelerator_tree is None:
2156
2157
        new_desired_files = desired_files
2157
2158
    else:
2171
2172
                                   trans_id)
2172
2173
            else:
2173
2174
                contents = accelerator_tree.get_file(file_id, accelerator_path)
2174
 
                if tree.supports_content_filtering():
2175
 
                    filters = tree._content_filter_stack(tree_path)
 
2175
                if wt.supports_content_filtering():
 
2176
                    filters = wt._content_filter_stack(tree_path)
2176
2177
                    contents = filtered_output_bytes(contents, filters,
2177
2178
                        ContentFilterContext(tree_path, tree))
2178
2179
                try:
2187
2188
        offset += count
2188
2189
    for count, ((trans_id, tree_path), contents) in enumerate(
2189
2190
            tree.iter_files_bytes(new_desired_files)):
2190
 
        if tree.supports_content_filtering():
2191
 
            filters = tree._content_filter_stack(tree_path)
 
2191
        if wt.supports_content_filtering():
 
2192
            filters = wt._content_filter_stack(tree_path)
2192
2193
            contents = filtered_output_bytes(contents, filters,
2193
2194
                ContentFilterContext(tree_path, tree))
2194
2195
        tt.create_file(contents, trans_id)