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

  • Committer: John Arbash Meinel
  • Date: 2008-03-14 16:23:28 UTC
  • mfrom: (3276 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3279.
  • Revision ID: john@arbash-meinel.com-20080314162328-9uc5ut91w0at3otd
[merge] bzr.dev 3276

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
93
93
            want_unversioned=want_unversioned,
94
94
            )
95
95
 
96
 
    def _iter_changes(self, from_tree, include_unchanged=False,
 
96
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
 
97
    def _iter_changes(self, *args, **kwargs):
 
98
        return self.iter_changes(*args, **kwargs)
 
99
 
 
100
    def iter_changes(self, from_tree, include_unchanged=False,
97
101
                     specific_files=None, pb=None, extra_trees=None,
98
102
                     require_versioned=True, want_unversioned=False):
99
103
        intertree = InterTree.get(from_tree, self)
100
 
        return intertree._iter_changes(include_unchanged, specific_files, pb,
 
104
        return intertree.iter_changes(include_unchanged, specific_files, pb,
101
105
            extra_trees, require_versioned, want_unversioned=want_unversioned)
102
106
    
103
107
    def conflicts(self):
718
722
            require_versioned=require_versioned,
719
723
            want_unversioned=want_unversioned)
720
724
 
721
 
    def _iter_changes(self, include_unchanged=False,
 
725
    def iter_changes(self, include_unchanged=False,
722
726
                      specific_files=None, pb=None, extra_trees=[],
723
727
                      require_versioned=True, want_unversioned=False):
724
728
        """Generate an iterator of changes between trees.