← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Aaron Bentley
  • Date: 2006-09-21 22:02:58 UTC
  • mto: This revision was merged to the branch mainline in revision 2048.
  • Revision ID: abentley@panoramicfeedback.com-20060921220258-50026dc4220c8b11
More work on bundles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
155
155
        require_versioned=require_versioned)
156
156
 
157
157
 
158
 
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids):
 
158
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids, 
 
159
                   include_root):
159
160
 
160
161
    from osutils import is_inside_any
161
162
    
167
168
    # TODO: Rather than iterating over the whole tree and then filtering, we
168
169
    # could diff just the specified files (if any) and their subtrees.  
169
170
 
170
 
    old_files = old_tree.list_files()
171
 
    new_files = new_tree.list_files()
 
171
    old_files = old_tree.list_files(include_root)
 
172
    new_files = new_tree.list_files(include_root)
172
173
 
173
174
    more_old = True
174
175
    more_new = True