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

  • Committer: Robert Collins
  • Date: 2008-07-01 03:38:35 UTC
  • mfrom: (3514 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3515.
  • Revision ID: robertc@robertcollins.net-20080701033835-dwbt0f0x3vmf5atr
Merge bzr.dev, fixing minor skew.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
111
111
 
112
112
 
113
113
def _annotations(repo, file_id, rev_id):
114
 
    """Return the list of (origin,text) for a revision of a file in a repository."""
 
114
    """Return the list of (origin_revision_id, line_text) for a revision of a file in a repository."""
115
115
    annotations = repo.texts.annotate((file_id, rev_id))
116
 
    return [(key[-1], line) for key, line in annotations]
 
116
    # 
 
117
    return [(key[-1], line) for (key, line) in annotations]
117
118
 
118
119
 
119
120
def _annotate_file(branch, rev_id, file_id):