← Back to branch summary

~jameinel/loggerhead/merge_point_config

« back to all changes in this revision

Viewing changes to loggerhead/controllers/annotate_ui.py

Merge my old pep8 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/annotate_ui.py
62
62
        try:
63
63
            bzrlib.textfile.check_text_lines(file_lines)
64
64
        except bzrlib.errors.BinaryFile:
65
 
                # bail out; this isn't displayable text
66
 
                yield util.Container(parity=0, lineno=1, status='same',
67
 
                                     text='(This is a binary file.)',
68
 
                                     change=util.Container())
 
65
            # bail out; this isn't displayable text
 
66
            yield util.Container(parity=0, lineno=1, status='same',
 
67
                                 text='(This is a binary file.)',
 
68
                                 change=util.Container())
69
69
        else:
70
70
            if highlight is not None:
71
71
                hl_lines = highlight(file_name, file_text, encoding)
95
95
                    change=change, text=hl_lines[lineno - 1])
96
96
                lineno += 1
97
97
 
98
 
        self.log.debug('annotate: %r secs' % (time.time() - z))
 
98
        self.log.debug('annotate: %r secs' % (time.time() - z,))
99
99
 
100
100
    def get_values(self, path, kwargs, headers):
101
101
        history = self._history