Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

workbench: commit widget handling fixes

this should fix repo tab switching

Changeset 8203383d6c9b…

Parent 0f2c52388e34…

by Adrian Buehlmann

Changes to 2 files · Browse files at 8203383d6c9b Showing diff from parent 0f2c52388e34 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
38
39
40
41
42
43
44
 
262
263
264
265
266
267
268
269
270
 
321
322
323
324
325
326
327
328
 
38
39
40
 
41
42
43
 
261
262
263
 
 
 
264
265
266
 
317
318
319
 
 
320
321
322
@@ -38,7 +38,6 @@
  self.repo = repo   self.workbench = workbench   self.revDetailsStackedWidget = workbench.revDetailsStackedWidget - self.commitStackedWidget = workbench.commitStackedWidget   self.commitWidget = None   self._reload_rev = '.'   self._loading = True @@ -262,9 +261,6 @@
  return   ctx = self.repomodel.repo.changectx(rev)   if ctx.rev() is None: - cw = self.workbench.getCommitWidget(self.repo.root) - self.commitWidget = cw - self.commitStackedWidget.setCurrentWidget(cw)   self.workbench.workingCopySelected()   else:   self.revDetailsWidget.revision_selected(rev) @@ -321,8 +317,6 @@
    def switchedTo(self):   self.revDetailsStackedWidget.setCurrentWidget(self.revDetailsWidget) - if self.commitWidget: - self.commitStackedWidget.setCurrentWidget(self.commitWidget)     def storeSettings(self):   s = QSettings()
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
253
254
255
 
 
256
257
258
 
306
307
308
 
 
 
 
 
 
 
309
310
311
312
313
 
320
321
322
323
 
324
325
326
 
253
254
255
256
257
258
259
260
 
308
309
310
311
312
313
314
315
316
317
318
 
319
320
321
 
328
329
330
 
331
332
333
334
@@ -253,6 +253,8 @@
  self.addToolBar(Qt.ToolBarArea(Qt.TopToolBarArea), tb)     def workingCopySelected(self): + cw = self.getCommitWidget(self.currentRepoRoot) + self.commitStackedWidget.setCurrentWidget(cw)   self.taskTabsWidget.setCurrentIndex(1)     def revisionSelected(self): @@ -306,8 +308,14 @@
  mode = w.getMode()   ann = w.getAnnotate()   tags = w.repo.tags().keys() + self.currentRepoRoot = root = w.repo.root + if self.taskTabsWidget.currentIndex() == 1: + cw = self.commitwidgets.get(root) + if cw: + self.commitStackedWidget.setCurrentWidget(cw) + else: + self.taskTabsWidget.setCurrentIndex(0)   w.switchedTo() - self.currentRepoRoot = w.repo.root   self.repotabs_splitter.show()   else:   self.revDetailsStackedWidget.setCurrentWidget(self.dummywidget) @@ -320,7 +328,7 @@
    def taskTabChanged(self, index=0):   if index == 1: - self.getCommitWidget(self.currentRepoRoot) + self.workingCopySelected()     def getCurentRepoRoot(self):   return self.currentRepoRoot