← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-07 02:59:58 UTC
  • mfrom: (4826.1.8 hardlink-2a-408193)
  • Revision ID: pqm@pqm.ubuntu.com-20091207025958-wrddjbe59f5mjgva
(andrew) Allow '--hardlink' of files from 2a trees for any file that
        is unfiltered. (#408193)

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: