← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Robert J. Tanner
  • Date: 2009-04-08 03:34:31 UTC
  • mfrom: (4266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4267.
  • Revision ID: tanner@real-time.com-20090408033431-draj0u7nd9bbby53
Merge 1.14rc1 back bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
173
173
 
174
174
 
175
175
def _expand_annotations(annotations, branch, current_rev=None):
176
 
    """Expand a a files annotations into command line UI ready tuples.
 
176
    """Expand a file's annotations into command line UI ready tuples.
177
177
 
178
178
    Each tuple includes detailed information, such as the author name, and date
179
179
    string for the commit, rather than just the revision id.
252
252
        between the text and its left-hand-parent.  The format is
253
253
        the SequenceMatcher.get_matching_blocks format
254
254
        (start_left, start_right, length_of_match).
255
 
    :param heads_provider: An object which provids a .heads() call to resolve
 
255
    :param heads_provider: An object which provides a .heads() call to resolve
256
256
        if any revision ids are children of others.
257
257
        If None, then any ancestry disputes will be resolved with
258
258
        new_revision_id