← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-30 08:11:54 UTC
  • mfrom: (2766 +trunk)
  • mto: (2535.3.55 repo-refactor)
  • mto: This revision was merged to the branch mainline in revision 2772.
  • Revision ID: andrew.bennetts@canonical.com-20070830081154-16hebp2xwr15x2hc
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
20
20
    )
21
21
from bzrlib.inventory import InventoryEntry
22
22
from bzrlib.trace import mutter
23
 
from bzrlib.symbol_versioning import deprecated_function, zero_nine
 
23
from bzrlib.symbol_versioning import deprecated_function
24
24
 
25
25
 
26
26
class TreeDelta(object):
202
202
        self.show(output, show_ids, show_unchanged, short_status)
203
203
        return output.getvalue()
204
204
 
205
 
@deprecated_function(zero_nine)
206
 
def compare_trees(old_tree, new_tree, want_unchanged=False,
207
 
                  specific_files=None, extra_trees=None,
208
 
                  require_versioned=False):
209
 
    """compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
210
 
    return new_tree.changes_from(old_tree,
211
 
        want_unchanged=want_unchanged,
212
 
        specific_files=specific_files,
213
 
        extra_trees=extra_trees,
214
 
        require_versioned=require_versioned,
215
 
        include_root=False)
216
 
 
217
205
 
218
206
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
219
207
                   include_root, extra_trees=None,