/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: Andrew Bennetts
  • Date: 2009-11-26 07:45:19 UTC
  • mto: This revision was merged to the branch mainline in revision 4869.
  • Revision ID: andrew.bennetts@canonical.com-20091126074519-ztu0hm7br5y096c5
Quick change to allow hardlinking from a tree that supports content filtering for files that are unaffected by filters.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2300
2300
        new_desired_files = desired_files
2301
2301
    else:
2302
2302
        iter = accelerator_tree.iter_changes(tree, include_unchanged=True)
2303
 
        unchanged = dict((f, p[1]) for (f, p, c, v, d, n, k, e)
2304
 
                         in iter if not (c or e[0] != e[1]))
 
2303
        unchanged = [(f, p[1]) for (f, p, c, v, d, n, k, e)
 
2304
                     in iter if not (c or e[0] != e[1])]
 
2305
        if accelerator_tree.supports_content_filtering():
 
2306
            unchanged = [(f, p) for (f, p) in unchanged
 
2307
                         if not accelerator_tree.iter_search_rules([p]).next()]
 
2308
        unchanged = dict(unchanged)
2305
2309
        new_desired_files = []
2306
2310
        count = 0
2307
2311
        for file_id, (trans_id, tree_path) in desired_files: