Steve Borho avatar Steve Borho committed b9fcc7d Merge

Merge with stable

Comments (0)

Files changed (6)

tortoisehg/hgqt/backout.py

         repo.repositoryChanged.connect(self.repositoryChanged)
         repo.configChanged.connect(self.configChanged)
 
+    @pyqtSlot()
     def repositoryChanged(self):
         self.currentPage().repositoryChanged()
 
+    @pyqtSlot()
     def configChanged(self):
         self.currentPage().configChanged()
 

tortoisehg/hgqt/merge.py

         repo.configChanged.connect(self.configChanged)
         self.repo = repo
 
+    @pyqtSlot()
     def repositoryChanged(self):
         self.currentPage().repositoryChanged()
 
+    @pyqtSlot()
     def configChanged(self):
         self.currentPage().configChanged()
 
         if self.currentPage().canExit():
             super(MergeDialog, self).reject()
 
-    def done(self, ret):
-        self.repo.repositoryChanged.disconnect(self.repositoryChanged)
-        self.repo.configChanged.disconnect(self.configChanged)
-        super(MergeDialog, self).done(ret)
-
 
 class BasePage(QWizardPage):
     def __init__(self, repo, parent):

tortoisehg/hgqt/pbranch.py

             self.patchDiffMessage.setText(_('No patch branch selected'))
             self.patchDiffStack.setCurrentWidget(self.patchDiffMessage)
 
-    def closeEvent(self, event):
-        self.repo.configChanged.disconnect(self.configChanged)
-        self.repo.repositoryChanged.disconnect(self.repositoryChanged)
-        self.repo.workingBranchChanged.disconnect(self.workingBranchChanged)
-        super(PatchBranchWidget, self).closeEvent(event)
-
     def contextMenuEvent(self, event):
         if self.patchlist.geometry().contains(event.pos()):
             self.show_patch_cmenu(event.globalPos())
         self.repo.decrementBusyCount()
         self.refresh()
 
+    @pyqtSlot()
     def configChanged(self):
         pass
 
+    @pyqtSlot()
     def repositoryChanged(self):
         self.refresh()
 
+    @pyqtSlot()
     def workingBranchChanged(self):
         self.refresh()
 

tortoisehg/hgqt/qfold.py

               [hglib.tounicode(self.repo.changectx(p).description())
                for p in ['qtip'] + patches])
 
+    @pyqtSlot()
     def configChanged(self):
         '''Repository is reporting its config files have changed'''
         self.msgte.refresh(self.repo)

tortoisehg/hgqt/resolve.py

         repo.configChanged.connect(self.configChanged)
         repo.repositoryChanged.connect(self.repositoryChanged)
 
-    def done(self, ret):
-        self.repo.configChanged.disconnect(self.configChanged)
-        self.repo.repositoryChanged.disconnect(self.repositoryChanged)
-        super(ResolveDialog, self).done(ret)
-
+    @pyqtSlot()
     def repositoryChanged(self):
         self.refresh()
 
             if dlg:
                 dlg.exec_()
 
+    @pyqtSlot()
     def configChanged(self):
         'repository has detected a change to config files'
         self.tcombo.reset()

tortoisehg/hgqt/sync.py

             index = 0
         self.targetcombo.setCurrentIndex(index)
 
+    @pyqtSlot()
     def configChanged(self):
         'Repository is reporting its config files have changed'
         self.reload()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.