← 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-04-21 14:39:50 UTC
  • mto: This revision was merged to the branch mainline in revision 2440.
  • Revision ID: john@arbash-meinel.com-20070421143950-glyo2gbmjwopp2w7
Remove a superfluous 'else' (recommended by Martin)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
89
89
    This includes detailed information, such as the committer name, and
90
90
    date string for the commit, rather than just the revision id.
91
91
    """
92
 
    revision_id_to_revno = branch.get_revision_id_to_revno_map()
 
92
    branch_last_revision = branch.last_revision()
 
93
    revision_graph = branch.repository.get_revision_graph(branch_last_revision)
 
94
    merge_sorted_revisions = tsort.merge_sort(
 
95
        revision_graph,
 
96
        branch_last_revision,
 
97
        None,
 
98
        generate_revno=True)
 
99
    revision_id_to_revno = dict((rev_id, revno)
 
100
                                for seq_num, rev_id, depth, revno, end_of_merge
 
101
                                 in merge_sorted_revisions)
93
102
    w = branch.repository.weave_store.get_weave(file_id,
94
103
        branch.repository.get_transaction())
95
104
    last_origin = None