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 445e5bd9f2b9…

Parents e631d4af058e…

Parents 1bb2fad76914…

by Steve Borho

Changes to one file · Browse files at 445e5bd9f2b9 Showing diff from parent e631d4af058e 1bb2fad76914 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​guess.py Stacked
 
104
105
106
107
 
108
109
110
 
224
225
226
 
 
 
 
227
228
229
 
104
105
106
 
107
108
109
110
 
224
225
226
227
228
229
230
231
232
233
@@ -104,7 +104,7 @@
  matchtv.setRootIsDecorated(False)   matchtv.setModel(MatchModel())   matchtv.setSortingEnabled(True) - matchtv.clicked.connect(self.showDiff) + matchtv.selectionModel().selectionChanged.connect(self.showDiff)   buthbox = QHBoxLayout()   matchbtn = QPushButton(_('Accept Selected Matches'))   matchbtn.clicked.connect(self.acceptMatch) @@ -224,6 +224,10 @@
    def showDiff(self, index):   'User selected a row in the candidate tree' + indexes = index.indexes() + if not indexes: + return + index = indexes[0]   ctx = self.repo['.']   hu = htmlui.htmlui()   row = self.matchtv.model().getRow(index)