← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

 * bzr add now lists how many files were ignored per glob.  add --verbose
   lists the specific files.  (Aaron Bentley)

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.repository.weave_store.get_weave(file_id, 
59
 
        branch.repository.get_transaction())
 
58
    w = branch.weave_store.get_weave(file_id, branch.get_transaction())
60
59
    last_origin = None
61
60
    for origin, text in w.annotate_iter(rev_id):
62
61
        text = text.rstrip('\r\n')
65
64
        else:
66
65
            last_origin = origin
67
66
            line_rev_id = w.idx_to_name(origin)
68
 
            if not branch.repository.has_revision(line_rev_id):
 
67
            if not branch.has_revision(line_rev_id):
69
68
                (revno_str, author, date_str) = ('?','?','?')
70
69
            else:
71
70
                if line_rev_id in rh:
72
71
                    revno_str = str(rh.index(line_rev_id) + 1)
73
72
                else:
74
73
                    revno_str = 'merge'
75
 
            rev = branch.repository.get_revision(line_rev_id)
 
74
            rev = branch.get_revision(line_rev_id)
76
75
            tz = rev.timezone or 0
77
76
            date_str = time.strftime('%Y%m%d', 
78
77
                                     time.gmtime(rev.timestamp + tz))