/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/delta.py

  • Committer: Aaron Bentley
  • Date: 2007-08-15 01:11:27 UTC
  • mfrom: (2699 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2700.
  • Revision ID: aaron.bentley@utoronto.ca-20070815011127-0il5s8oqmt26bma7
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
217
217
 
218
218
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
219
219
                   include_root, extra_trees=None,
220
 
                   want_unversioned=False):
 
220
                   require_versioned=False, want_unversioned=False):
221
221
    """Worker function that implements Tree.changes_from."""
222
222
    delta = TreeDelta()
223
223
    # mutter('start compare_trees')
225
225
    for (file_id, path, content_change, versioned, parent_id, name, kind,
226
226
         executable) in new_tree._iter_changes(old_tree, want_unchanged,
227
227
            specific_files, extra_trees=extra_trees,
 
228
            require_versioned=require_versioned,
228
229
            want_unversioned=want_unversioned):
229
230
        if versioned == (False, False):
230
231
            delta.unversioned.append((path[1], None, kind[1]))