← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-17 17:16:11 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080317171611-o9wdrnf0m7qwo198
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
297
297
        """Return the file_id for the root of this tree."""
298
298
        raise NotImplementedError(self.get_root_id)
299
299
 
300
 
    def annotate_iter(self, file_id):
 
300
    def annotate_iter(self, file_id,
 
301
                      default_revision=_mod_revision.CURRENT_REVISION):
301
302
        """Return an iterator of revision_id, line tuples.
302
303
 
303
304
        For working trees (and mutable trees in general), the special
304
305
        revision_id 'current:' will be used for lines that are new in this
305
306
        tree, e.g. uncommitted changes.
306
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.
307
311
        """
308
312
        raise NotImplementedError(self.annotate_iter)
309
313