~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to obsolete/annotate.py

  • Committer: Aaron Bentley
  • Date: 2007-07-24 17:10:08 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070724171008-b3ygal61ec5dojub
Better error when shelving binary files

Show diffs side-by-side

added added

removed removed

Lines of Context:
97
97
class CantGetRevisionData(Exception):
98
98
    def __init__(self, revision):
99
99
        Exception.__init__(self, "Can't get data for revision %s" % revision)
100
 
        
 
100
 
101
101
def annotate_file2(file_lines, anno_iter):
102
102
    for result in iter_annotate_file(file_lines, anno_iter):
103
103
        pass
104
104
    return result
105
105
 
106
 
        
 
106
 
107
107
def iter_annotate_file(file_lines, anno_iter):
108
108
    lines = [AnnotateLine(f) for f in file_lines]
109
109
    patches = []
118
118
 
119
119
                for cur_patch in patches:
120
120
                    num = cur_patch.pos_in_mod(num)
121
 
                    if num == None: 
 
121
                    if num == None:
122
122
                        break
123
123
 
124
124
                if num >= len(lines):