← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Alexander Belchenko
  • Date: 2008-03-17 22:16:52 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3295.
  • Revision ID: bialix@ukr.net-20080317221652-gwq1ohxini63zhum
merge bzr.dev

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):
293
297
        """Return the file_id for the root of this tree."""
294
298
        raise NotImplementedError(self.get_root_id)
295
299
 
296
 
    def annotate_iter(self, file_id):
 
300
    def annotate_iter(self, file_id,
 
301
                      default_revision=_mod_revision.CURRENT_REVISION):
297
302
        """Return an iterator of revision_id, line tuples.
298
303
 
299
304
        For working trees (and mutable trees in general), the special
300
305
        revision_id 'current:' will be used for lines that are new in this
301
306
        tree, e.g. uncommitted changes.
302
307
        :param file_id: The file to produce an annotated version from
 
308
        :param default_revision: For lines that don't match a basis, mark them
 
309
            with this revision id. Not all implementations will make use of
 
310
            this value.
303
311
        """
304
312
        raise NotImplementedError(self.annotate_iter)
305
313
 
718
726
            require_versioned=require_versioned,
719
727
            want_unversioned=want_unversioned)
720
728
 
721
 
    def _iter_changes(self, include_unchanged=False,
 
729
    def iter_changes(self, include_unchanged=False,
722
730
                      specific_files=None, pb=None, extra_trees=[],
723
731
                      require_versioned=True, want_unversioned=False):
724
732
        """Generate an iterator of changes between trees.