From e26ee89caf830b4af21d08fd053836872ffcade3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 29 Jan 2014 17:06:02 +0530 Subject: [PATCH] Insert context boundary at top of file is first change is not at top of file --- src/calibre/gui2/tweak_book/diff/view.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/tweak_book/diff/view.py b/src/calibre/gui2/tweak_book/diff/view.py index 9b50e4ffdd..22ba0baaca 100644 --- a/src/calibre/gui2/tweak_book/diff/view.py +++ b/src/calibre/gui2/tweak_book/diff/view.py @@ -653,13 +653,13 @@ class DiffSplit(QSplitter): # {{{ QApplication.processEvents(QEventLoop.ExcludeUserInputEvents | QEventLoop.ExcludeSocketNotifiers) else: for i, group in enumerate(cruncher.get_grouped_opcodes(context)): - if i > 0: - self.changes.append(Change( - ltop=cl.block().blockNumber()-1, lbot=cl.block().blockNumber(), - rtop=cr.block().blockNumber()-1, rbot=cr.block().blockNumber(), kind='boundary')) - self.left.line_number_map[self.changes[-1].ltop] = '-' - self.right.line_number_map[self.changes[-1].rtop] = '-' - for tag, alo, ahi, blo, bhi in group: + for j, (tag, alo, ahi, blo, bhi) in enumerate(group): + if j == 0 and (i > 0 or min(alo, blo) > 0): + self.changes.append(Change( + ltop=cl.block().blockNumber()-1, lbot=cl.block().blockNumber(), + rtop=cr.block().blockNumber()-1, rbot=cr.block().blockNumber(), kind='boundary')) + self.left.line_number_map[self.changes[-1].ltop] = '-' + self.right.line_number_map[self.changes[-1].rtop] = '-' getattr(self, tag)(alo, ahi, blo, bhi) QApplication.processEvents(QEventLoop.ExcludeUserInputEvents | QEventLoop.ExcludeSocketNotifiers) cl.insertBlock(), cr.insertBlock()