← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
55
55
def _annotate_file(branch, rev_id, file_id ):
56
56
 
57
57
    rh = branch.revision_history()
58
 
    w = branch.storage.weave_store.get_weave(file_id, 
59
 
                                             branch.storage.get_transaction())
 
58
    w = branch.repository.weave_store.get_weave(file_id, 
 
59
        branch.repository.get_transaction())
60
60
    last_origin = None
61
61
    for origin, text in w.annotate_iter(rev_id):
62
62
        text = text.rstrip('\r\n')
65
65
        else:
66
66
            last_origin = origin
67
67
            line_rev_id = w.idx_to_name(origin)
68
 
            if not branch.storage.has_revision(line_rev_id):
 
68
            if not branch.repository.has_revision(line_rev_id):
69
69
                (revno_str, author, date_str) = ('?','?','?')
70
70
            else:
71
71
                if line_rev_id in rh:
72
72
                    revno_str = str(rh.index(line_rev_id) + 1)
73
73
                else:
74
74
                    revno_str = 'merge'
75
 
            rev = branch.storage.get_revision(line_rev_id)
 
75
            rev = branch.repository.get_revision(line_rev_id)
76
76
            tz = rev.timezone or 0
77
77
            date_str = time.strftime('%Y%m%d', 
78
78
                                     time.gmtime(rev.timestamp + tz))