Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

filedialogs: use module import of blockmatcher

Changeset 5dc262bc6c08…

Parent e849ee5aae83…

by Steve Borho

Changes to one file · Browse files at 5dc262bc6c08 Showing diff from parent e849ee5aae83 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
23
24
25
26
27
28
29
30
31
 
32
33
34
 
354
355
356
357
 
358
359
360
 
392
393
394
395
 
396
397
398
 
23
24
25
 
26
27
28
29
 
30
31
32
33
 
353
354
355
 
356
357
358
359
 
391
392
393
 
394
395
396
397
@@ -23,12 +23,11 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt.blockmatcher import BlockList, BlockMatch  from tortoisehg.hgqt.lexers import get_lexer  from tortoisehg.hgqt.fileview import HgFileView  from tortoisehg.hgqt.repoview import HgRepoView  from tortoisehg.hgqt.revpanel import RevPanelWidget -from tortoisehg.hgqt import qtlib, visdiff, filerevmodel +from tortoisehg.hgqt import qtlib, visdiff, filerevmodel, blockmatcher    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -354,7 +353,7 @@
  self.viewers = {}   # block are diff-block displayers   self.block = {} - self.diffblock = BlockMatch(self.frame) + self.diffblock = blockmatcher.BlockMatch(self.frame)   lay = QHBoxLayout(self.frame)   lay.setSpacing(0)   lay.setContentsMargins(0, 0, 0, 0) @@ -392,7 +391,7 @@
  sci.SendScintilla(sci.SCI_MARKERSETBACK, self.markertriangle, 0xFFA0A0)     self.viewers[side] = sci - blk = BlockList(self.frame) + blk = blockmatcher.BlockList(self.frame)   blk.linkScrollBar(sci.verticalScrollBar())   self.diffblock.linkScrollBar(sci.verticalScrollBar(), side)   lay.insertWidget(idx, blk)