Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).

Sat, 06 Jul 2013 15:48:58 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 06 Jul 2013 15:48:58 +0200
changeset 2771
281c9b30dd91
parent 2770
fd5ee85f0450
child 2772
8e88a2bae65b

Changed all QProcess.waitForStarted() calls to use a 5s timeout (except the debugger interfaces, which have a 10s timeout).

Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py file | annotate | diff | comparison | revisions
Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgClient.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/hg.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py file | annotate | diff | comparison | revisions
Project/Project.py file | annotate | diff | comparison | revisions
Project/ProjectFormsBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectInterfacesBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectResourcesBrowser.py file | annotate | diff | comparison | revisions
Project/ProjectTranslationsBrowser.py file | annotate | diff | comparison | revisions
VCS/VersionControl.py file | annotate | diff | comparison | revisions
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -80,7 +80,7 @@
             
         self.setWindowTitle(self.trUtf8('{0} - {1}').format(self.cmdname, self.filename))
         self.process.start(program, args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             E5MessageBox.critical(self,
                 self.trUtf8('Process Generation Error'),
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -80,7 +80,7 @@
         
         self.setWindowTitle(self.trUtf8('{0} - {1}').format(self.cmdname, self.filename))
         self.process.start(program, args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             E5MessageBox.critical(self,
                 self.trUtf8('Process Generation Error'),
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -129,7 +129,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -114,7 +114,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py	Sat Jul 06 15:48:58 2013 +0200
@@ -75,7 +75,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -271,7 +271,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -108,7 +108,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -128,7 +128,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Sat Jul 06 15:48:58 2013 +0200
@@ -80,7 +80,7 @@
             self.__server.setProcessEnvironment(env)
         
         self.__server.start('hg', self.__serverArgs)
-        serverStarted = self.__server.waitForStarted()
+        serverStarted = self.__server.waitForStarted(5000)
         if not serverStarted:
             return False, self.trUtf8(
                     'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -136,7 +136,7 @@
             if workingDir:
                 self.proc.setWorkingDirectory(workingDir)
             self.proc.start('hg', args)
-            procStarted = self.proc.waitForStarted()
+            procStarted = self.proc.waitForStarted(5000)
             if not procStarted:
                 self.buttonBox.setFocus()
                 self.inputGroup.setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -185,7 +185,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 QApplication.restoreOverrideCursor()
                 self.inputGroup.setEnabled(False)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -402,7 +402,7 @@
                 process = QProcess()
                 process.setWorkingDirectory(self.repodir)
                 process.start('hg', args)
-                procStarted = process.waitForStarted()
+                procStarted = process.waitForStarted(5000)
                 if procStarted:
                     finished = process.waitForFinished(30000)
                     if finished and process.exitCode() == 0:
@@ -444,7 +444,7 @@
             process = QProcess()
             process.setWorkingDirectory(self.repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -490,7 +490,7 @@
             process = QProcess()
             process.setWorkingDirectory(self.repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -694,7 +694,7 @@
             self.inputGroup.show()
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -178,7 +178,7 @@
             self.process.setWorkingDirectory(self.repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
@@ -223,7 +223,7 @@
                 process = QProcess()
                 process.setWorkingDirectory(self.repodir)
                 process.start('hg', args)
-                procStarted = process.waitForStarted()
+                procStarted = process.waitForStarted(5000)
                 if procStarted:
                     finished = process.waitForFinished(30000)
                     if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -121,7 +121,7 @@
         self.process.setWorkingDirectory(self.__repoPath)
         
         self.process.start('hg', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if procStarted:
             self.__startAct.setEnabled(False)
             self.__stopAct.setEnabled(True)
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -239,7 +239,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py	Sat Jul 06 15:48:58 2013 +0200
@@ -85,7 +85,7 @@
             process = QProcess()
             process.setWorkingDirectory(self.projectDir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(300000)
                 if finished and process.exitCode() == 0:
@@ -127,7 +127,7 @@
         else:
             process.setWorkingDirectory(self.projectDir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(300000)
                 if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -127,7 +127,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Sat Jul 06 15:48:58 2013 +0200
@@ -65,7 +65,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -145,7 +145,7 @@
             process = QProcess()
             process.setWorkingDirectory(self.__repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -285,7 +285,7 @@
                 process = QProcess()
                 process.setWorkingDirectory(self.__repodir)
                 process.start('hg', args)
-                procStarted = process.waitForStarted()
+                procStarted = process.waitForStarted(5000)
                 if procStarted:
                     finished = process.waitForFinished(30000)
                     if finished:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -101,7 +101,7 @@
             self.process.setWorkingDirectory(repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 E5MessageBox.critical(self,
                     self.trUtf8('Process Generation Error'),
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -64,7 +64,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -142,7 +142,7 @@
             self.process.setWorkingDirectory(self.__repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
@@ -183,7 +183,7 @@
             self.process.setWorkingDirectory(self.__repodir)
             
             self.process.start('hg', args)
-            procStarted = self.process.waitForStarted()
+            procStarted = self.process.waitForStarted(5000)
             if not procStarted:
                 self.inputGroup.setEnabled(False)
                 self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -101,7 +101,7 @@
             process = QProcess()
             process.setWorkingDirectory(self.__repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -98,7 +98,7 @@
             process = QProcess()
             process.setWorkingDirectory(self.__repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sat Jul 06 15:48:58 2013 +0200
@@ -104,7 +104,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -144,7 +144,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -174,7 +174,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -208,7 +208,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -650,7 +650,7 @@
                     process = QProcess()
                     process.setWorkingDirectory(repodir)
                     process.start('hg', args)
-                    procStarted = process.waitForStarted()
+                    procStarted = process.waitForStarted(5000)
                     if procStarted:
                         process.waitForFinished(30000)
         else:
@@ -776,7 +776,7 @@
                     process = QProcess()
                     process.setWorkingDirectory(repodir)
                     process.start('hg', args)
-                    procStarted = process.waitForStarted()
+                    procStarted = process.waitForStarted(5000)
                     if procStarted:
                         finished = process.waitForFinished(30000)
                         if finished:
@@ -848,7 +848,7 @@
                     process = QProcess()
                     process.setWorkingDirectory(repodir)
                     process.start('hg', args)
-                    procStarted = process.waitForStarted()
+                    procStarted = process.waitForStarted(5000)
                     if procStarted:
                         finished = process.waitForFinished(30000)
                         if finished:
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Jul 06 15:48:58 2013 +0200
@@ -199,7 +199,7 @@
         
         process = QProcess()
         process.start('hg', ['version'])
-        procStarted = process.waitForStarted()
+        procStarted = process.waitForStarted(5000)
         if procStarted:
             finished = process.waitForFinished(30000)
             if finished and process.exitCode() == 0:
@@ -1035,7 +1035,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -1104,7 +1104,7 @@
                 process = QProcess()
                 process.setWorkingDirectory(dname)
                 process.start('hg', args)
-                procStarted = process.waitForStarted()
+                procStarted = process.waitForStarted(5000)
                 if procStarted:
                     finished = process.waitForFinished(30000)
                     if finished and process.exitCode() == 0:
@@ -1263,7 +1263,7 @@
             process = QProcess()
             process.setWorkingDirectory(ppath)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -1311,7 +1311,7 @@
         if self.__client is None:
             process.setWorkingDirectory(ppath)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -1440,7 +1440,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -1482,7 +1482,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -1754,7 +1754,7 @@
             process = QProcess()
             process.setWorkingDirectory(repodir)
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -2902,7 +2902,7 @@
         if self.__client is None:
             process = QProcess()
             process.start('hg', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -92,7 +92,7 @@
         self.process.setWorkingDirectory(dname)
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.inputGroup.setEnabled(False)
             self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -102,7 +102,7 @@
         self.process.setWorkingDirectory(self.dname)
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.inputGroup.setEnabled(False)
             self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -137,7 +137,7 @@
         if workingDir:
             self.proc.setWorkingDirectory(workingDir)
         self.proc.start('svn', args)
-        procStarted = self.proc.waitForStarted()
+        procStarted = self.proc.waitForStarted(5000)
         if not procStarted:
             self.buttonBox.setFocus()
             self.inputGroup.setEnabled(False)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -166,7 +166,7 @@
         self.process.setWorkingDirectory(dname)
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.inputGroup.setEnabled(False)
             self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -235,7 +235,7 @@
         self.inputGroup.show()
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.inputGroup.setEnabled(False)
             self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -121,7 +121,7 @@
         self.process.setWorkingDirectory(self.dname)
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.inputGroup.setEnabled(False)
             E5MessageBox.critical(self,
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -118,7 +118,7 @@
         self.process.setWorkingDirectory(dname)
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             E5MessageBox.critical(self,
                 self.trUtf8('Process Generation Error'),
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -159,7 +159,7 @@
         args.append(url)
         
         process.start('svn', args)
-        procStarted = process.waitForStarted()
+        procStarted = process.waitForStarted(5000)
         if procStarted:
             finished = process.waitForFinished(30000)
             if finished:
@@ -243,7 +243,7 @@
         args.append(url)
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.__finish()
             self.inputGroup.setEnabled(False)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -382,7 +382,7 @@
         self.setWindowTitle(self.trUtf8('Subversion Status'))
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.inputGroup.setEnabled(False)
             self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Jul 06 15:48:58 2013 +0200
@@ -68,7 +68,7 @@
         args.append('.')
         process.setWorkingDirectory(self.projectDir)
         process.start('svn', args)
-        procStarted = process.waitForStarted()
+        procStarted = process.waitForStarted(5000)
         if procStarted:
             finished = process.waitForFinished(300000)
             if finished and process.exitCode() == 0:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -144,7 +144,7 @@
         self.process.setWorkingDirectory(dname)
         
         self.process.start('svn', args)
-        procStarted = self.process.waitForStarted()
+        procStarted = self.process.waitForStarted(5000)
         if not procStarted:
             self.inputGroup.setEnabled(False)
             self.inputGroup.hide()
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Jul 06 15:48:58 2013 +0200
@@ -146,7 +146,7 @@
         
         process = QProcess()
         process.start('svn', ['--version'])
-        procStarted = process.waitForStarted()
+        procStarted = process.waitForStarted(5000)
         if procStarted:
             finished = process.waitForFinished(30000)
             if finished and process.exitCode() == 0:
@@ -1263,7 +1263,7 @@
             args.append('--non-interactive')
             args.append(dname)
             process.start('svn', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -1328,7 +1328,7 @@
             args.append('--non-interactive')
             args.append(dname)
             process.start('svn', args)
-            procStarted = process.waitForStarted()
+            procStarted = process.waitForStarted(5000)
             if procStarted:
                 finished = process.waitForFinished(30000)
                 if finished and process.exitCode() == 0:
@@ -1473,7 +1473,7 @@
         args.append('--xml')
         args.append(ppath)
         process.start('svn', args)
-        procStarted = process.waitForStarted()
+        procStarted = process.waitForStarted(5000)
         if procStarted:
             finished = process.waitForFinished(30000)
             if finished and process.exitCode() == 0:
@@ -1548,7 +1548,7 @@
         args.append('--non-interactive')
         args.append(path)
         process.start('svn', args)
-        procStarted = process.waitForStarted()
+        procStarted = process.waitForStarted(5000)
         if procStarted:
             finished = process.waitForFinished(30000)
             if finished and process.exitCode() == 0:
@@ -2038,7 +2038,7 @@
         process = QProcess()
         process.setWorkingDirectory(ppath)
         process.start('svn', args)
-        procStarted = process.waitForStarted()
+        procStarted = process.waitForStarted(5000)
         if procStarted:
             finished = process.waitForFinished(30000)
             if finished and process.exitCode() == 0:
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Sat Jul 06 15:48:58 2013 +0200
@@ -70,7 +70,7 @@
         self.__pyqt5Server = QProcess(self)
         self.__pyqt5Server.start(sys.executable, [
             os.path.join(os.path.dirname(__file__), "QRegularExpressionWizardServer.py")])
-        if self.__pyqt5Server.waitForStarted(10000):
+        if self.__pyqt5Server.waitForStarted(5000):
             self.__pyqt5Server.setReadChannel(QProcess.StandardOutput)
             if self.__sendCommand("available"):
                 response = self.__receiveResponse()
--- a/Project/Project.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Project/Project.py	Sat Jul 06 15:48:58 2013 +0200
@@ -2372,8 +2372,9 @@
                     QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
                     QApplication.processEvents()
                     
+                    oldState = self.isDirty()
                     self.vcs = self.initVCS()
-                    if self.vcs is None:
+                    if self.vcs is None and self.isDirty() == oldState:
                         # check, if project is version controlled
                         pluginManager = e5App().getObject("PluginManager")
                         for indicator, vcsData in \
--- a/Project/ProjectFormsBrowser.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Project/ProjectFormsBrowser.py	Sat Jul 06 15:48:58 2013 +0200
@@ -738,7 +738,7 @@
         
         self.noDialog = noDialog
         self.compileProc.start(uic, args)
-        procStarted = self.compileProc.waitForStarted()
+        procStarted = self.compileProc.waitForStarted(5000)
         if procStarted:
             self.compileRunning = True
             e5App().getObject("ViewManager").enableEditorsCheckFocusIn(False)
--- a/Project/ProjectInterfacesBrowser.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Project/ProjectInterfacesBrowser.py	Sat Jul 06 15:48:58 2013 +0200
@@ -498,7 +498,7 @@
         
         self.noDialog = noDialog
         self.compileProc.start(self.omniidl, args)
-        procStarted = self.compileProc.waitForStarted()
+        procStarted = self.compileProc.waitForStarted(5000)
         if procStarted:
             self.compileRunning = True
             return self.compileProc
--- a/Project/ProjectResourcesBrowser.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Project/ProjectResourcesBrowser.py	Sat Jul 06 15:48:58 2013 +0200
@@ -617,7 +617,7 @@
         
         self.noDialog = noDialog
         self.compileProc.start(rcc, args)
-        procStarted = self.compileProc.waitForStarted()
+        procStarted = self.compileProc.waitForStarted(5000)
         if procStarted:
             self.compileRunning = True
             e5App().getObject("ViewManager").enableEditorsCheckFocusIn(False)
--- a/Project/ProjectTranslationsBrowser.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Sat Jul 06 15:48:58 2013 +0200
@@ -950,7 +950,7 @@
         self.pylupdateProc.readyReadStandardError.connect(self.__readStderrLupdate)
         
         self.pylupdateProc.start(self.pylupdate, args)
-        procStarted = self.pylupdateProc.waitForStarted()
+        procStarted = self.pylupdateProc.waitForStarted(5000)
         if procStarted:
             self.pylupdateProcRunning = True
         else:
@@ -1088,7 +1088,7 @@
         self.lreleaseProc.readyReadStandardError.connect(self.__readStderrLrelease)
         
         self.lreleaseProc.start(lrelease, args)
-        procStarted = self.lreleaseProc.waitForStarted()
+        procStarted = self.lreleaseProc.waitForStarted(5000)
         if procStarted:
             self.lreleaseProcRunning = True
         else:
--- a/VCS/VersionControl.py	Fri Jul 05 19:39:15 2013 +0200
+++ b/VCS/VersionControl.py	Sat Jul 06 15:48:58 2013 +0200
@@ -542,7 +542,7 @@
         if workingDir:
             proc.setWorkingDirectory(workingDir)
         proc.start(program, arguments)
-        procStarted = proc.waitForStarted()
+        procStarted = proc.waitForStarted(5000)
         if not procStarted:
             E5MessageBox.critical(None,
                 self.trUtf8('Process Generation Error'),

eric ide

mercurial