Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Mon Jul 08 21:47:26 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Mon Jul 08 22:36:10 2013 +0200
@@ -152,7 +152,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:
@@ -1269,7 +1269,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:
@@ -1334,7 +1334,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:
@@ -1479,7 +1479,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:
@@ -1554,7 +1554,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:
@@ -1952,7 +1952,7 @@
         
     def svnRemoveFromChangelist(self, names):
         """
-        Public method to remove a file or directory from it's changelist.
+        Public method to remove a file or directory from its changelist.
         
         Note: Directories will be removed recursively.
         
@@ -2044,7 +2044,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: