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

Merge with stable

Changeset d6363fbfe2c8…

Parents c2fbab1bfeab…

Parents 5b1e5f2e1896…

by Steve Borho

Changes to 2 files · Browse files at d6363fbfe2c8 Showing diff from parent c2fbab1bfeab 5b1e5f2e1896 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qscilib.py Stacked
 
83
84
85
86
 
87
88
89
 
83
84
85
 
86
87
88
89
@@ -83,7 +83,7 @@
    def movepreeditcursor(self, pos):   """Move the cursor to the relative pos inside preedit text""" - self._preeditcursorpos = pos + self._preeditcursorpos = min(pos, self._preeditlen)   l, i = self._preeditpos   self._sci.setCursorPosition(l, i + self._preeditcursorpos)  
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
444
445
446
 
447
448
449
 
451
452
453
 
 
 
 
 
 
 
 
454
455
456
 
444
445
446
447
448
449
450
 
452
453
454
455
456
457
458
459
460
461
462
463
464
465
@@ -444,6 +444,7 @@
  self.setContextMenuPolicy(Qt.CustomContextMenu)   self.customContextMenuRequested.connect(self.menuRequested)   self.setTextElideMode(Qt.ElideLeft) + self.doubleClicked.connect(self.onDoubleClick)     def scrollTo(self, index, hint=QAbstractItemView.EnsureVisible):   # don't update horizontal position by selection change @@ -451,6 +452,14 @@
  super(WctxFileTree, self).scrollTo(index, hint)   self.horizontalScrollBar().setValue(orighoriz)   + def onDoubleClick(self, index): + if not index.isValid(): + return + path = self.model().getRow(index)[COL_PATH] + dlg = visdiff.visualdiff(self.repo.ui, self.repo, [path], {}) + if dlg: + dlg.exec_() +   def keyPressEvent(self, event):   if event.key() == 32:   for index in self.selectedRows():