Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Mon Jul 08 21:47:26 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Mon Jul 08 22:36:10 2013 +0200
@@ -203,7 +203,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:
@@ -1039,7 +1039,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:
@@ -1108,7 +1108,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:
@@ -1267,7 +1267,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:
@@ -1315,7 +1315,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:
@@ -1444,7 +1444,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:
@@ -1486,7 +1486,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:
@@ -1758,7 +1758,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:
@@ -1910,6 +1910,7 @@
         if not os.path.exists(cfgFile):
             try:
                 f = open(cfgFile, "w")
+                f.write("[ui]\nusername = Firstname Lastname <email_address>\n")
                 f.close()
             except (IOError, OSError):
                 # ignore these
@@ -2905,7 +2906,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: