← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/annotate.py

  • Committer: Robert Collins
  • Date: 2006-02-22 10:35:05 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060222103505-bddb211d353f2543
Merge in a variation of the versionedfile api from versioned-file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/annotate.py
64
64
            (revno_str, author, date_str) = ('','','')
65
65
        else:
66
66
            last_origin = origin
67
 
            line_rev_id = w.idx_to_name(origin)
68
 
            if not branch.repository.has_revision(line_rev_id):
 
67
            if not branch.repository.has_revision(origin):
69
68
                (revno_str, author, date_str) = ('?','?','?')
70
69
            else:
71
 
                if line_rev_id in rh:
72
 
                    revno_str = str(rh.index(line_rev_id) + 1)
 
70
                if origin in rh:
 
71
                    revno_str = str(rh.index(origin) + 1)
73
72
                else:
74
73
                    revno_str = 'merge'
75
 
            rev = branch.repository.get_revision(line_rev_id)
 
74
            rev = branch.repository.get_revision(origin)
76
75
            tz = rev.timezone or 0
77
76
            date_str = time.strftime('%Y%m%d', 
78
77
                                     time.gmtime(rev.timestamp + tz))
83
82
                author = extract_email_address(author)
84
83
            except BzrError:
85
84
                pass        # use the whole name
86
 
        yield (revno_str, author, date_str, line_rev_id, text)
 
85
        yield (revno_str, author, date_str, origin, text)