← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: John Arbash Meinel
  • Date: 2007-01-29 21:11:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2255.
  • Revision ID: john@arbash-meinel.com-20070129211128-hg0myfxd22jwg38t
bzr annotate should use Branch's dotted revnos.
Not the dotted revnos from the last modification of the file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
83
83
        prevanno=anno
84
84
 
85
85
 
86
 
def _annotate_file(branch, rev_id, file_id ):
 
86
def _annotate_file(branch, rev_id, file_id):
87
87
    """Yield the origins for each line of a file.
88
88
 
89
89
    This includes detailed information, such as the committer name, and
91
91
    """
92
92
 
93
93
    rh = branch.revision_history()
94
 
    revision_graph = branch.repository.get_revision_graph(rev_id)
 
94
    branch_last_revision = branch.last_revision()
 
95
    revision_graph = branch.repository.get_revision_graph(branch_last_revision)
95
96
    merge_sorted_revisions = tsort.merge_sort(
96
97
        revision_graph,
97
 
        rev_id,
 
98
        branch_last_revision,
98
99
        None,
99
100
        generate_revno=True)
100
101
    revision_id_to_revno = dict((rev_id, revno)