/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to annotate/gannotate.py

  • Committer: Aaron Bentley
  • Date: 2006-11-21 15:30:44 UTC
  • mto: (66.6.5 gtk)
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: abentley@panoramicfeedback.com-20061121153044-58onrnqijuwxr8jd
force long revnos to 'merge'

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
137
137
        return dotted
138
138
 
139
139
    def _annotate(self, branch, file_id, revision_id):
140
 
        rev_hist = branch.revision_history()
141
140
        repository = branch.repository
142
141
        if revision_id is None:
143
142
            revision_id = branch.last_revision()
152
151
            rev_id = origin
153
152
            try:
154
153
                revision = revision_cache.get_revision(rev_id)
155
 
                if rev_id in rev_hist:
156
 
                    revno = branch.revision_id_to_revno(rev_id)
157
 
                else:
158
 
                    revno = dotted.get(rev_id, "merge")
 
154
                revno = dotted.get(rev_id, 'merge')
 
155
                if len(revno) > 15:
 
156
                    revno = 'merge'
159
157
            except NoSuchRevision:
160
158
                revision = NoneRevision(rev_id)
161
159
                revno = "?"